Skip to content

Commit

Permalink
Auto merge of #36707 - achanda:ip_type, r=alexcrichton
Browse files Browse the repository at this point in the history
Add two functions to check type of given address

The is_v4 function returns true if the given IP is v4. The is_v6
function returns true if the IP is v6.
  • Loading branch information
bors committed Oct 11, 2016
2 parents a3bc191 + 80a7a3c commit ead9212
Showing 1 changed file with 32 additions and 0 deletions.
32 changes: 32 additions & 0 deletions src/libstd/net/ip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,24 @@ impl IpAddr {
IpAddr::V6(ref a) => a.is_documentation(),
}
}

/// Returns true if this address is a valid IPv4 address, false if it's a valid IPv6 address.
#[unstable(feature = "ipaddr_checker", issue = "36949")]
pub fn is_ipv4(&self) -> bool {
match *self {
IpAddr::V4(_) => true,
IpAddr::V6(_) => false,
}
}

/// Returns true if this address is a valid IPv6 address, false if it's a valid IPv4 address.
#[unstable(feature = "ipaddr_checker", issue = "36949")]
pub fn is_ipv6(&self) -> bool {
match *self {
IpAddr::V4(_) => false,
IpAddr::V6(_) => true,
}
}
}

impl Ipv4Addr {
Expand Down Expand Up @@ -1022,4 +1040,18 @@ mod tests {
assert!("2001:db8:f00::1002".parse::<Ipv6Addr>().unwrap() <
"2001:db8:f00::2001".parse::<Ipv6Addr>().unwrap());
}

#[test]
fn is_v4() {
let ip = IpAddr::V4(Ipv4Addr::new(100, 64, 3, 3));
assert!(ip.is_ipv4());
assert!(!ip.is_ipv6());
}

#[test]
fn is_v6() {
let ip = IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0x1234, 0x5678));
assert!(!ip.is_ipv4());
assert!(ip.is_ipv6());
}
}

0 comments on commit ead9212

Please sign in to comment.