You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2016/04/20 10:38:39 UTC
[1/2] brooklyn-server git commit: Fix conversion of unsigned bytes to
IP addresses
Repository: brooklyn-server
Updated Branches:
refs/heads/master 3b746e3ec -> 9fb41938f
Fix conversion of unsigned bytes to IP addresses
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e500b191
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e500b191
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e500b191
Branch: refs/heads/master
Commit: e500b191e58099bf437ae15239e8ad3514177f9d
Parents: 3b746e3
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Wed Apr 20 08:20:41 2016 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Wed Apr 20 08:20:41 2016 +0100
----------------------------------------------------------------------
.../apache/brooklyn/util/net/Networking.java | 4 ++--
.../brooklyn/util/net/NetworkingUtilsTest.java | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e500b191/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java b/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java
index 85c87a0..00eb06c 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java
@@ -332,7 +332,7 @@ public class Networking {
StringBuilder name = new StringBuilder();
for (byte part : ip) {
if (name.length() > 0) name.append(".");
- name.append(part);
+ name.append(UnsignedBytes.toString(part));
}
return InetAddress.getByAddress(name.toString(), ip);
} catch (UnknownHostException e) {
@@ -375,7 +375,7 @@ public class Networking {
String[] parts = hostnameOrIp.split("\\.");
assert parts.length == 4 : "val="+hostnameOrIp+"; split="+Arrays.toString(parts)+"; length="+parts.length;
for (int i = 0; i < parts.length; i++) {
- ip[i] = (byte)Integer.parseInt(parts[i]);
+ ip[i] = UnsignedBytes.parseUnsignedByte(parts[i]);
}
return InetAddress.getByAddress(hostnameOrIp, ip);
} else {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e500b191/utils/common/src/test/java/org/apache/brooklyn/util/net/NetworkingUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/net/NetworkingUtilsTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/net/NetworkingUtilsTest.java
index 811c712..524d160 100644
--- a/utils/common/src/test/java/org/apache/brooklyn/util/net/NetworkingUtilsTest.java
+++ b/utils/common/src/test/java/org/apache/brooklyn/util/net/NetworkingUtilsTest.java
@@ -61,28 +61,32 @@ public class NetworkingUtilsTest {
assertFalse(Networking.isValidIp4("127.0.0."));
assertFalse(Networking.isValidIp4("127.0.0.9f"));
assertFalse(Networking.isValidIp4("127.0.0.1."));
+ assertFalse(Networking.isValidIp4("255.255.255.255."));
}
-
+
@Test
public void testGetInetAddressWithFixedNameByIpBytes() throws Exception {
- InetAddress addr = Networking.getInetAddressWithFixedName(new byte[] {1,2,3,4});
- assertEquals(addr.getAddress(), new byte[] {1,2,3,4});
+ InetAddress addr = Networking.getInetAddressWithFixedName(new byte[] { 1, 2, 3, 4 });
+ assertEquals(addr.getAddress(), new byte[] { 1, 2, 3, 4 });
assertEquals(addr.getHostName(), "1.2.3.4");
+
+ InetAddress addr2 = Networking.getInetAddressWithFixedName(new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255 });
+ assertEquals(addr2.getAddress(), new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255 });
+ assertEquals(addr2.getHostName(), "255.255.255.255");
}
@Test
public void testGetInetAddressWithFixedNameByIp() throws Exception {
InetAddress addr = Networking.getInetAddressWithFixedName("1.2.3.4");
- assertEquals(addr.getAddress(), new byte[] {1,2,3,4});
+ assertEquals(addr.getAddress(), new byte[] { 1, 2, 3, 4 });
assertEquals(addr.getHostName(), "1.2.3.4");
-
+
InetAddress addr2 = Networking.getInetAddressWithFixedName("255.255.255.255");
- assertEquals(addr2.getAddress(), new byte[] {(byte)(int)255,(byte)(int)255,(byte)(int)255,(byte)(int)255});
+ assertEquals(addr2.getAddress(), new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255 });
assertEquals(addr2.getHostName(), "255.255.255.255");
-
+
InetAddress addr3 = Networking.getInetAddressWithFixedName("localhost");
assertEquals(addr3.getHostName(), "localhost");
-
}
@Test(groups="Integration")
[2/2] brooklyn-server git commit: This closes #117
Posted by gr...@apache.org.
This closes #117
* github/pr/117:
Fix conversion of unsigned bytes to IP addresses
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9fb41938
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9fb41938
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9fb41938
Branch: refs/heads/master
Commit: 9fb41938fbd0f4c81a54a0aefcf35c009083510c
Parents: 3b746e3 e500b19
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Wed Apr 20 09:38:29 2016 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Wed Apr 20 09:38:29 2016 +0100
----------------------------------------------------------------------
.../apache/brooklyn/util/net/Networking.java | 4 ++--
.../brooklyn/util/net/NetworkingUtilsTest.java | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------