홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Pavlin Radoslavov
Committed by Ray Milkey
dbeab4cc 1 parent 5a7787a6

Fix a bug when using IpPrefix.contains() and we are mixing IP address 

families.

The bug (an exception) is triggered when internally we try to create
a masked IPv4 address with a very long IPv6-derived mask length.

Added the corresponding unit tests.

Change-Id: Id835d27ab3ff38dcf7a1387ff32ccb701aa2fe11
Inline Side-by-side
Showing 2 changed files with 32 additions and 0 deletions
......@@ -179,6 +179,10 @@ public class IpPrefix {
* otherwise false
*/
public boolean contains(IpPrefix other) {
if (version() != other.version()) {
return false;
}
if (this.prefixLength > other.prefixLength) {
return false; // This prefix has smaller prefix size
}
......@@ -201,6 +205,10 @@ public class IpPrefix {
* false
*/
public boolean contains(IpAddress other) {
if (version() != other.version()) {
return false;
}
//
// Mask the other address with my prefix length.
// If the other prefix is within this prefix, the masked address must
......
......@@ -767,6 +767,12 @@ public class IpPrefixTest {
assertFalse(ipPrefix.contains(IpPrefix.valueOf("0.0.0.0/16")));
assertFalse(ipPrefix.contains(IpPrefix.valueOf("0.0.0.0/0")));
assertTrue(ipPrefix.contains(IpPrefix.valueOf("255.255.255.255/32")));
// Test when there is a mistmatch in the compared IP address families
ipPrefix = IpPrefix.valueOf("0.0.0.0/0");
assertFalse(ipPrefix.contains(IpPrefix.valueOf("1111:2222:3333:4444::/120")));
ipPrefix = IpPrefix.valueOf("255.255.255.255/32");
assertFalse(ipPrefix.contains(IpPrefix.valueOf("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128")));
}
/**
......@@ -840,6 +846,12 @@ public class IpPrefixTest {
assertFalse(ipPrefix.contains(IpPrefix.valueOf("::/0")));
assertTrue(ipPrefix.contains(
IpPrefix.valueOf("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128")));
// Test when there is a mistmatch in the compared IP address families
ipPrefix = IpPrefix.valueOf("::/0");
assertFalse(ipPrefix.contains(IpPrefix.valueOf("1.2.0.0/24")));
ipPrefix = IpPrefix.valueOf("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128");
assertFalse(ipPrefix.contains(IpPrefix.valueOf("255.255.255.255/32")));
}
/**
......@@ -876,6 +888,12 @@ public class IpPrefixTest {
assertFalse(ipPrefix.contains(IpAddress.valueOf("1.3.0.0")));
assertFalse(ipPrefix.contains(IpAddress.valueOf("0.0.0.0")));
assertTrue(ipPrefix.contains(IpAddress.valueOf("255.255.255.255")));
// Test when there is a mistmatch in the compared IP address families
ipPrefix = IpPrefix.valueOf("0.0.0.0/0");
assertFalse(ipPrefix.contains(IpAddress.valueOf("1111:2222:3333:4444::")));
ipPrefix = IpPrefix.valueOf("255.255.255.255/32");
assertFalse(ipPrefix.contains(IpAddress.valueOf("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")));
}
/**
......@@ -929,6 +947,12 @@ public class IpPrefixTest {
assertFalse(ipPrefix.contains(IpAddress.valueOf("::")));
assertTrue(ipPrefix.contains(
IpAddress.valueOf("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")));
// Test when there is a mistmatch in the compared IP address families
ipPrefix = IpPrefix.valueOf("::/0");
assertFalse(ipPrefix.contains(IpAddress.valueOf("1.2.0.0")));
ipPrefix = IpPrefix.valueOf("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128");
assertFalse(ipPrefix.contains(IpAddress.valueOf("255.255.255.255")));
}
/**
......