diff options
Diffstat (limited to 'app/src/main/java/se')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/utils/IPAddress.java | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/IPAddress.java b/app/src/main/java/se/leap/bitmaskclient/utils/IPAddress.java index 8b419a2c..2e3ef596 100644 --- a/app/src/main/java/se/leap/bitmaskclient/utils/IPAddress.java +++ b/app/src/main/java/se/leap/bitmaskclient/utils/IPAddress.java @@ -25,8 +25,6 @@ package se.leap.bitmaskclient.utils; * http://www.alfresco.com/legal/licensing" */ -//package net.gqu.utils; - import java.util.StringTokenizer; /** @@ -43,16 +41,14 @@ public class IPAddress { * @param addr String * @return byte[] */ - public final static byte[] asBytes(String addr) { + public static byte[] asBytes(String addr) { // Convert the TCP/IP address string to an integer value - int ipInt = parseNumericAddress(addr); - if ( ipInt == 0) + if (ipInt == 0) return null; // Convert to bytes - byte[] ipByts = new byte[4]; ipByts[3] = (byte) (ipInt & 0xFF); @@ -61,7 +57,6 @@ public class IPAddress { ipByts[0] = (byte) ((ipInt >> 24) & 0xFF); // Return the TCP/IP bytes - return ipByts; } /** @@ -70,37 +65,30 @@ public class IPAddress { * @param ipaddr String * @return int */ - public final static int parseNumericAddress(String ipaddr) { + private static int parseNumericAddress(String ipaddr) { // Check if the string is valid - - if ( ipaddr == null || ipaddr.length() < 7 || ipaddr.length() > 15) + if (ipaddr == null || ipaddr.length() < 7 || ipaddr.length() > 15) return 0; // Check the address string, should be n.n.n.n format - StringTokenizer token = new StringTokenizer(ipaddr,"."); - if ( token.countTokens() != 4) + if (token.countTokens() != 4) return 0; int ipInt = 0; - - while ( token.hasMoreTokens()) { + while (token.hasMoreTokens()) { // Get the current token and convert to an integer value - String ipNum = token.nextToken(); try { - // Validate the current address part - int ipVal = Integer.valueOf(ipNum).intValue(); - if ( ipVal < 0 || ipVal > 255) + if (ipVal < 0 || ipVal > 255) return 0; // Add to the integer address - ipInt = (ipInt << 8) + ipVal; } catch (NumberFormatException ex) { @@ -109,9 +97,6 @@ public class IPAddress { } // Return the integer address - return ipInt; } - - }
\ No newline at end of file |