Remove duplicated multicast prefix declaration
(Following #7957)
Also,
Update copyright
Few documentation improvements
Change-Id: If4a6b9f168e9d7587976f1f2b59c2b59b81c6c2f
diff --git a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
index 9545fa4..ab5cd02 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -321,8 +321,8 @@
*/
public boolean isMulticast() {
return isIp4() ?
- Ip4Prefix.IPV4_MULTICAST_RANGE.contains(this.getIp4Address()) :
- Ip6Prefix.IPV6_MULTICAST_RANGE.contains(this.getIp6Address());
+ Ip4Prefix.IPV4_MULTICAST_PREFIX.contains(this.getIp4Address()) :
+ Ip6Prefix.IPV6_MULTICAST_PREFIX.contains(this.getIp6Address());
}
@Override
diff --git a/utils/misc/src/main/java/org/onlab/packet/IpPrefix.java b/utils/misc/src/main/java/org/onlab/packet/IpPrefix.java
index 7812045..ef3fbe0 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IpPrefix.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IpPrefix.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,11 +43,11 @@
/**
* An IpPrefix that contains all IPv4 multicast addresses.
*/
- public static final IpPrefix IPV4_MULTICAST_RANGE = IpPrefix.valueOf("224.0.0.0/4");
+ public static final IpPrefix IPV4_MULTICAST_PREFIX = IpPrefix.valueOf("224.0.0.0/4");
/**
* An IpPrefix that contains all IPv6 multicast addresses.
*/
- public static final IpPrefix IPV6_MULTICAST_RANGE = IpPrefix.valueOf("ff00::/8");
+ public static final IpPrefix IPV6_MULTICAST_PREFIX = IpPrefix.valueOf("ff00::/8");
private final IpAddress address;
private final short prefixLength;
@@ -93,6 +93,17 @@
}
/**
+ * Check if this IP prefix is a multicast prefix.
+ *
+ * @return true if this prefix a multicast prefix
+ */
+ public boolean isMulticast() {
+ return isIp4() ?
+ IPV4_MULTICAST_PREFIX.contains(this.getIp4Prefix()) :
+ IPV6_MULTICAST_PREFIX.contains(this.getIp6Prefix());
+ }
+
+ /**
* Returns the IP address value of the prefix.
*
* @return the IP address value of the prefix
diff --git a/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java b/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
index 8505d10..43a9d5e 100644
--- a/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java b/utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
index 052a4cb..34e1e91 100644
--- a/utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -97,6 +97,25 @@
}
/**
+ * Tests if the prefix is a multicast prefix.
+ */
+ @Test
+ public void testIsMulticast() {
+ IpPrefix v4Unicast = IpPrefix.valueOf("10.0.0.1/16");
+ IpPrefix v4Multicast = IpPrefix.valueOf("224.0.0.1/4");
+ IpPrefix v4Overlap = IpPrefix.valueOf("192.0.0.0/2");
+ IpPrefix v6Unicast = IpPrefix.valueOf("1000::1/8");
+ IpPrefix v6Multicast = IpPrefix.valueOf("ff02::1/8");
+ IpPrefix v6Overlap = IpPrefix.valueOf("ff00::1/4");
+ assertFalse(v4Unicast.isMulticast());
+ assertTrue(v4Multicast.isMulticast());
+ assertFalse(v4Overlap.isMulticast());
+ assertFalse(v6Unicast.isMulticast());
+ assertTrue(v6Multicast.isMulticast());
+ assertFalse(v6Overlap.isMulticast());
+ }
+
+ /**
* Tests returning the IP address value and IP address prefix length of
* an IPv4 prefix.
*/