temporary fix for ONOS-1144: slow IPAddress.toString()

Change-Id: Ia7b9a71bb8c5b90dbc6256c35e8aa5a6567299c8

temporary fix for ONOS-1144: slow IPAddress.toString()
Change-Id: Ia7b9a71bb8c5b90dbc6256c35e8aa5a6567299c8
Brian O'Connor · Gerrit Code Review
Commit 041515f5f23ddab3efc7d6517bb47ead2dc47218 041515f5 1 parent 33bd2302
Showing 1 changed file with 18 additions and 8 deletions
utils/misc/src/main/java/org/onlab/packet/IpAddress.java
--- a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
View file @041515f
+++ b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
View file @041515f
@@ -331,15 +331,25 @@ public class IpAddress implements Comparable<IpAddress> {
      * @see java.lang.Object#toString()
      */
     public String toString() {
-        InetAddress inetAddr = null;
+        // FIXME InetAddress is super slow
-        try {
+        switch (version) {
-            inetAddr = InetAddress.getByAddress(octets);
+            case INET:
-        } catch (UnknownHostException e) {
+                return String.format("%d.%d.%d.%d", octets[0] & 0xff,
-            // Should never happen
+                                                    octets[1] & 0xff,
-            checkState(false, "Internal error: Ip6Address.toString()");
+                                                    octets[2] & 0xff,
-            return "[Invalid IP Address]";
+                                                    octets[3] & 0xff);
+            case INET6:
+            default:
+                InetAddress inetAddr = null;
+                try {
+                    inetAddr = InetAddress.getByAddress(octets);
+                } catch (UnknownHostException e) {
+                    // Should never happen
+                    checkState(false, "Internal error: Ip6Address.toString()");
+                    return "[Invalid IP Address]";
+                }
+                return InetAddresses.toAddrString(inetAddr);
         }
-        return InetAddresses.toAddrString(inetAddr);
     }
     /**