convert compressed ipv6 to full form v2

RestComm · May 30, 2017 · 6a9c945 · 6a9c945
1 parent 97beb16
commit 6a9c945
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/src/gov/nist/core/Host.java b/src/gov/nist/core/Host.java
@@ -173,7 +173,25 @@ public String getIpAddress() {
                 dbgPrint("Could not resolve hostname " + ex);
             }
         } else {
-            rawIpAddress = hostname;
+            if (addressType == IPV6ADDRESS){
+                try {
+                    String ipv6FullForm = getInetAddress().toString();
+                    int slashIndex = ipv6FullForm.indexOf("/");
+                    if (slashIndex != -1) {
+                        ipv6FullForm = ipv6FullForm.substring(++slashIndex, ipv6FullForm.length());
+                    }
+                    if (hostname.startsWith("[")) {
+                        rawIpAddress = '[' + ipv6FullForm + ']';
+                    } else {
+                        rawIpAddress = ipv6FullForm;
+                    }
+                } catch (UnknownHostException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            } else {
+                rawIpAddress = hostname;
+            }
         }
         return rawIpAddress;
     }
@@ -231,23 +249,6 @@ private void setHost(String host, int type){
                 if( hostname.startsWith("[") && !hostname.endsWith("]"))
                     hostname += ']';
             }
-            if (addressType == IPV6ADDRESS){
-                try {
-                    String ipv6FullForm = getInetAddress().toString();
-                    int slashIndex = ipv6FullForm.indexOf("/");
-                    if (slashIndex != -1) {
-                        ipv6FullForm = ipv6FullForm.substring(++slashIndex, ipv6FullForm.length());
-                    }
-                    if (hostname.startsWith("[")) {
-                        hostname = '[' + ipv6FullForm + ']';
-                    } else {
-                        hostname = ipv6FullForm;
-                    }
-                } catch (UnknownHostException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-            }
         }
     }