bug fix: str2Ip value is not correct under some ips

starfalling · starfalling · commit 697a6574797d · 2016-05-11T17:55:38.000+08:00
diff --git a/IP.java b/IP.java
@@ -1,7 +1,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
@@ -188,15 +187,13 @@ private static long bytesToLong(byte a, byte b, byte c, byte d) {
     }
 
     private static int str2Ip(String ip)  {
-        try {
-            byte[] bytes = java.net.InetAddress.getByName(ip).getAddress();
-
-            return ((bytes[0] & 0xFF) << 24) |
-                    ((bytes[1] & 0xFF) << 16) |
-                    ((bytes[2] & 0xFF) << 8) |
-                    bytes[3];
-        } catch (UnknownHostException e) {}
-        return 0;
+        String[] ss = ip.split("\\.");
+        int a, b, c, d;
+        a = Integer.parseInt(ss[0]);
+        b = Integer.parseInt(ss[1]);
+        c = Integer.parseInt(ss[2]);
+        d = Integer.parseInt(ss[3]);
+        return (a << 24) | (b << 16) | (c << 8) | d;
     }
 
     private static long ip2long(String ip)  {
diff --git a/TestMain.java b/TestMain.java
@@ -22,6 +22,10 @@ public static void main(String[] args){
       for(int i=0; i<testSize; i++){
         ips[i] = IP.randomIp();
       }
+      ips[0] = "119.147.158.186";
+      ips[1] = "223.136.200.228";
+      ips[2] = "68.104.105.223";
+      ips[3] = "1.64.29.228";
       System.out.println("ip random completed");
       
       

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,10 @@ public static void main(String[] args){`
`22`	`22`	`for(int i=0; i<testSize; i++){`
`23`	`23`	`ips[i] = IP.randomIp();`
`24`	`24`	`}`
	`25`	`+ ips[0] = "119.147.158.186";`
	`26`	`+ ips[1] = "223.136.200.228";`
	`27`	`+ ips[2] = "68.104.105.223";`
	`28`	`+ ips[3] = "1.64.29.228";`
`25`	`29`	`System.out.println("ip random completed");`
`26`	`30`
`27`	`31`