Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Cleanup dependencyManagement section"
[controller.git]
/
opendaylight
/
sal
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
utils
/
NetUtils.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java
index f81e7e3d03b0c4af14f5e539b45567725d80c43b..dc341625af642395872a3e2860a9d0fcc6f1ce3b 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/NetUtils.java
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2013
-2014
Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@
-12,6
+12,7
@@
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.Arrays;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@
-246,11
+247,18
@@
public abstract class NetUtils {
* Checks if the test address and mask conflicts with the filter address and
* mask
*
* Checks if the test address and mask conflicts with the filter address and
* mask
*
- * For example: testAddress: 172.28.2.23 testMask: 255.255.255.0
- * filtAddress: 172.28.1.10 testMask: 255.255.255.0 conflict
+ * For example:
+ * testAddress: 172.28.2.23
+ * testMask: 255.255.255.0
+ * filterAddress: 172.28.1.10
+ * testMask: 255.255.255.0
+ * do conflict
*
*
- * testAddress: 172.28.2.23 testMask: 255.255.255.0 filtAddress: 172.28.1.10
- * testMask: 255.255.0.0 do not conflict
+ * testAddress: 172.28.2.23
+ * testMask: 255.255.255.0
+ * filterAddress: 172.28.1.10
+ * testMask: 255.255.0.0
+ * do not conflict
*
* Null parameters are permitted
*
*
* Null parameters are permitted
*
@@
-274,7
+282,8
@@
public abstract class NetUtils {
int testMaskLen = (testMask == null) ? ((testAddress instanceof Inet4Address) ? 32 : 128) : NetUtils
.getSubnetMaskLength(testMask);
int testMaskLen = (testMask == null) ? ((testAddress instanceof Inet4Address) ? 32 : 128) : NetUtils
.getSubnetMaskLength(testMask);
- int filterMaskLen = NetUtils.getSubnetMaskLength(filterMask);
+ int filterMaskLen = (filterMask == null) ? ((testAddress instanceof Inet4Address) ? 32 : 128) : NetUtils
+ .getSubnetMaskLength(filterMask);
// Mask length check. Test mask has to be more specific than filter one
if (testMaskLen < filterMaskLen) {
// Mask length check. Test mask has to be more specific than filter one
if (testMaskLen < filterMaskLen) {
@@
-463,7
+472,7
@@
public abstract class NetUtils {
/*
* Following utilities are useful when you need to compare or bit shift java
/*
* Following utilities are useful when you need to compare or bit shift java
- * primitive type variable which are inerently signed
+ * primitive type variable which are in
h
erently signed
*/
/**
* Returns the unsigned value of the passed byte variable
*/
/**
* Returns the unsigned value of the passed byte variable
@@
-473,7
+482,7
@@
public abstract class NetUtils {
* @return the int variable containing the unsigned byte value
*/
public static int getUnsignedByte(byte b) {
* @return the int variable containing the unsigned byte value
*/
public static int getUnsignedByte(byte b) {
- return
(b > 0) ? (int) b : (b & 0x7F | 0x80)
;
+ return
b & 0xFF
;
}
/**
}
/**
@@
-484,7
+493,7
@@
public abstract class NetUtils {
* @return the int variable containing the unsigned short value
*/
public static int getUnsignedShort(short s) {
* @return the int variable containing the unsigned short value
*/
public static int getUnsignedShort(short s) {
- return
(s > 0) ? (int) s : (s & 0x7FFF | 0x8000)
;
+ return
s & 0xFFFF
;
}
/**
}
/**
@@
-502,4
+511,13
@@
public abstract class NetUtils {
return null;
}
}
return null;
}
}
+
+ /**
+ * Returns Broadcast MAC Address
+ *
+ * @return the byte array containing broadcast mac address
+ */
+ public static byte[] getBroadcastMACAddr() {
+ return Arrays.copyOf(BroadcastMACAddr, BroadcastMACAddr.length);
+ }
}
}