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

Add check that IP in CIDR is network

Browse Source
This commit is contained in:
Linus Färnstrand
2016-02-12 19:30:56 +01:00
parent 235399c7e7
commit af76578eac
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib.rs
View File

@ -12,6 +12,9 @@ use std::str::FromStr;
use ip::IpAddr; use ip::IpAddr;
const IPV4_BITS: u8 = 32;
const IPV6_BITS: u8 = 128;
// A network // A network
#[derive(Debug)] #[derive(Debug)]
pub enum IpNetwork { pub enum IpNetwork {
@ -40,8 +43,14 @@ impl Ipv4Network {
pub fn from_cidr(cidr: &str) -> Result<Ipv4Network, String> { pub fn from_cidr(cidr: &str) -> Result<Ipv4Network, String> {
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, 32)); let prefix = try!(parse_prefix(prefix_str, IPV4_BITS));
Ok(Self::new(addr, prefix)) let new = Self::new(addr, prefix);
let (net, _) = new.network();
if addr != net {
Err(format!("IP must have zeroes in host part"))
} else {
Ok(new)
}
} }
pub fn ip(&self) -> Ipv4Addr { pub fn ip(&self) -> Ipv4Addr {
@ -102,7 +111,7 @@ impl Ipv6Network {
pub fn from_cidr(cidr: &str) -> Result<Ipv6Network, String> { pub fn from_cidr(cidr: &str) -> Result<Ipv6Network, String> {
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, 128)); let prefix = try!(parse_prefix(prefix_str, IPV6_BITS));
Ok(Self::new(addr, prefix)) Ok(Self::new(addr, prefix))
} }