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

Enforce a naming convention

Browse Source 
method names without a suffix returns values in a human readable
form, wrapped in a Ipv4Addr. With a suffix returns values in a
machine readable form.
This commit is contained in:
Abhishek Chanda
2015-04-26 00:25:30 -07:00
parent 84d173d46f
commit d6ab8ef58c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ipnetwork.rs
View File

@ -31,18 +31,18 @@ impl Ipv4Network {
self.prefix self.prefix
} }
fn mask(&self) -> u32 { fn mask_int(&self) -> u32 {
let prefix = self.prefix; let prefix = self.prefix;
!(0xffffffff >> prefix) !(0xffffffff >> prefix)
} }
fn mask_to_string(&self) -> String { fn mask(&self) -> Ipv4Addr {
let mask = self.mask(); let mask = self.mask_int();
Ipv4Network::int_to_ip(mask).to_string() Ipv4Network::int_to_ip(mask)
} }
fn network_int(&self) -> u32 { fn network_int(&self) -> u32 {
Ipv4Network::ip_to_int(*(self.ip())) & self.mask() Ipv4Network::ip_to_int(*(self.ip())) & self.mask_int()
} }
fn network(&self) -> Ipv4Addr { fn network(&self) -> Ipv4Addr {
@ -127,15 +127,15 @@ mod test {
} }
#[test] #[test]
fn mask_v4() { fn mask_int_v4() {
let cidr = Ipv4Network::new(Ipv4Addr::new(74, 125, 227, 0), 29); let cidr = Ipv4Network::new(Ipv4Addr::new(74, 125, 227, 0), 29);
assert_eq!(cidr.mask(), 4294967288); assert_eq!(cidr.mask_int(), 4294967288);
} }
#[test] #[test]
fn mask_string_v4() { fn mask_v4() {
let cidr = Ipv4Network::new(Ipv4Addr::new(74, 125, 227, 0), 29); let cidr = Ipv4Network::new(Ipv4Addr::new(74, 125, 227, 0), 29);
assert_eq!(cidr.mask_to_string(), "255.255.255.248"); assert_eq!(cidr.mask(), Ipv4Addr::new(255, 255, 255, 248));
} }
#[test] #[test]