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

Sync with nightly

Browse Source
This commit is contained in:
Abhishek Chanda
2015-05-05 12:25:06 -07:00
parent aaf451db41
commit bbf8cb0964
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib.rs
View File

@ -42,7 +42,7 @@ impl Ipv4Network {
pub fn mask(&self) -> Ipv4Addr { pub fn mask(&self) -> Ipv4Addr {
let mask = self.mask_int(); let mask = self.mask_int();
Ipv4Network::int_to_ip(mask) Ipv4Addr::from(mask)
} }
pub fn network_int(&self) -> u32 { pub fn network_int(&self) -> u32 {
@ -50,18 +50,13 @@ impl Ipv4Network {
} }
pub fn network(&self) -> Ipv4Addr { pub fn network(&self) -> Ipv4Addr {
Ipv4Network::int_to_ip(self.network_int()) Ipv4Addr::from(self.network_int())
} }
fn ip_to_int(addr: Ipv4Addr) -> u32 { fn ip_to_int(addr: Ipv4Addr) -> u32 {
let ip = addr.octets(); let ip = addr.octets();
((ip[0] as u32) << 24) + ((ip[1] as u32) << 16) + ((ip[2] as u32) << 8) + (ip[3] as u32) ((ip[0] as u32) << 24) + ((ip[1] as u32) << 16) + ((ip[2] as u32) << 8) + (ip[3] as u32)
} }
fn int_to_ip(ip: u32) -> Ipv4Addr {
Ipv4Addr::new(((ip >> 24) & 0xff) as u8, ((ip >> 16) & 0xff) as u8,
((ip >> 8) & 0xff) as u8, (ip & 0xff) as u8)
}
} }
impl Ipv6Network { impl Ipv6Network {