Kieran/ipnetwork
1
0
Fork 0
mirror of https://github.com/achanda/ipnetwork.git synced 2025-06-16 16:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the network function and associated tests

Browse Source
This commit is contained in:
Abhishek Chanda
2016-01-31 22:29:41 -08:00
parent eaa36f4b0b
commit d84dc6161a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib.rs
View File

@ -51,7 +51,9 @@ impl Ipv4Network {
} }
pub fn network(&self) -> (Ipv4Addr, u32) { pub fn network(&self) -> (Ipv4Addr, u32) {
(self.addr, u32::from(self.addr)) let (_, mask) = self.mask();
let ip = u32::from(self.addr) & mask;
(Ipv4Addr::from(ip), ip)
} }
pub fn contains(&self, ip: Ipv4Addr) -> bool { pub fn contains(&self, ip: Ipv4Addr) -> bool {
@ -139,10 +141,10 @@ mod test {
#[test] #[test]
fn network_v4() { fn network_v4() {
let cidr = Ipv4Network::new(Ipv4Addr::new(74, 125, 227, 0), 25); let cidr = Ipv4Network::new(Ipv4Addr::new(10, 10, 1, 97), 23);
let (ip, int) = cidr.network(); let (ip, int) = cidr.network();
assert_eq!(ip, Ipv4Addr::new(74, 125, 227, 0)); assert_eq!(ip, Ipv4Addr::new(10, 10, 0, 0));
assert_eq!(int, 1249764096); assert_eq!(int, 168427520);
} }
#[test] #[test]