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

Allow non-zero host bits in from_cidr

Browse Source
This commit is contained in:
Linus Färnstrand
2016-06-18 08:29:33 +02:00
parent 81a9029fa3
commit 1bb9b2c794
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib.rs
View File

@ -53,13 +53,7 @@ impl Ipv4Network {
let (addr_str, prefix_str) = try!(cidr_parts(cidr)); let (addr_str, prefix_str) = try!(cidr_parts(cidr));
let addr = try!(Self::parse_addr(addr_str)); let addr = try!(Self::parse_addr(addr_str));
let prefix = try!(parse_prefix(prefix_str, IPV4_BITS)); let prefix = try!(parse_prefix(prefix_str, IPV4_BITS));
let new = try!(Self::new(addr, prefix)); Self::new(addr, prefix)
let (net, _) = new.network();
if addr != net {
Err(IpNetworkError::InvalidCidrFormat(format!("Host bits must be zero")))
} else {
Ok(new)
}
} }
pub fn ip(&self) -> Ipv4Addr { pub fn ip(&self) -> Ipv4Addr {
@ -299,8 +293,9 @@ mod test {
#[test] #[test]
fn parse_v4_non_zero_host_bits() { fn parse_v4_non_zero_host_bits() {
let cidr = Ipv4Network::from_cidr("10.1.1.1/24"); let cidr = Ipv4Network::from_cidr("10.1.1.1/24").unwrap();
assert!(cidr.is_err()); assert_eq!(cidr.ip(), Ipv4Addr::new(10, 1, 1, 1));
assert_eq!(cidr.prefix(), 24);
} }
#[test] #[test]