Skip to content

Commit

Permalink
Add functions to convert IPv4 to long and back
Browse files Browse the repository at this point in the history
  • Loading branch information
Abhishek Chanda committed May 4, 2015
1 parent e959fab commit 285ab02
Showing 1 changed file with 27 additions and 1 deletion.
28 changes: 27 additions & 1 deletion src/libstd/net/ip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ impl Ipv4Addr {
((self.octets()[0] as u16) << 8) | self.octets()[1] as u16,
((self.octets()[2] as u16) << 8) | self.octets()[3] as u16)
}

}

#[stable(feature = "rust1", since = "1.0.0")]
Expand Down Expand Up @@ -244,6 +243,21 @@ impl FromInner<libc::in_addr> for Ipv4Addr {
}
}

#[stable(feature = "ip_u32", since = "1.1.0")]
impl From<Ipv4Addr> for u32 {
fn from(ip: Ipv4Addr) -> u32 {
let ip = ip.octets();
((ip[0] as u32) << 24) + ((ip[1] as u32) << 16) + ((ip[2] as u32) << 8) + (ip[3] as u32)
}
}

#[stable(feature = "ip_u32", since = "1.1.0")]
impl From<u32> for Ipv4Addr {
fn from(ip: u32) -> Ipv4Addr {
Ipv4Addr::new((ip >> 24) as u8, (ip >> 16) as u8, (ip >> 8) as u8, ip as u8)
}
}

impl Ipv6Addr {
/// Creates a new IPv6 address from eight 16-bit segments.
///
Expand Down Expand Up @@ -738,4 +752,16 @@ mod tests {
let a = sa4(Ipv4Addr::new(77, 88, 21, 11), 12345);
assert_eq!(Ok(vec![a]), tsa(a));
}

#[test]
fn test_ipv4_to_int() {
let a = Ipv4Addr::new(127, 0, 0, 1);
assert_eq!(u32::from(a), 2130706433);
}

#[test]
fn test_int_to_ipv4() {
let a = Ipv4Addr::new(127, 0, 0, 1);
assert_eq!(Ipv4Addr::from(2130706433), a);
}
}

0 comments on commit 285ab02

Please sign in to comment.