nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 23:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #32211 - achanda:ipv6-global, r=alexcrichton

Browse Source 
Reject unspecified IP from global

Also fixed the test
This commit is contained in:
bors 2016-03-13 16:53:09 -07:00
commit 74b886ab14
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libstd/net/ip.rs
View File

@ -371,10 +371,12 @@ impl Ipv6Addr {
/// - the link-local addresses /// - the link-local addresses
/// - the (deprecated) site-local addresses /// - the (deprecated) site-local addresses
/// - unique local addresses /// - unique local addresses
/// - the unspecified address
pub fn is_unicast_global(&self) -> bool { pub fn is_unicast_global(&self) -> bool {
!self.is_multicast() !self.is_multicast()
&& !self.is_loopback() && !self.is_unicast_link_local() && !self.is_loopback() && !self.is_unicast_link_local()
&& !self.is_unicast_site_local() && !self.is_unique_local() && !self.is_unicast_site_local() && !self.is_unique_local()
&& !self.is_unspecified()
} }
/// Returns the address's multicast scope if the address is multicast. /// Returns the address's multicast scope if the address is multicast.
@ -768,7 +770,7 @@ mod tests {
// unspec loopbk uniqlo global unill unisl uniglo mscope // unspec loopbk uniqlo global unill unisl uniglo mscope
check("::", check("::",
true, false, false, true, false, false, true, None); true, false, false, false, false, false, false, None);
check("::1", check("::1",
false, true, false, false, false, false, false, None); false, true, false, false, false, false, false, None);
check("::0.0.0.2", check("::0.0.0.2",