clean-up

WebFuzzing · Oct 12, 2023 · b1aa75a · b1aa75a
1 parent 63c99b6
commit b1aa75a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/...ster/client/java/instrumentation/coverage/methodreplacement/ExternalServiceInfoUtils.java b/...ster/client/java/instrumentation/coverage/methodreplacement/ExternalServiceInfoUtils.java
@@ -22,10 +22,6 @@ public static String[] collectExternalServiceInfo(ExternalServiceInfo remoteHost
         // of time the same info gets added again and again. To do this, have to change the
         // data structure of the external service mapping inside ExecutionTracer
 
-        // TODO: Experiment
-//        ExecutionTracer.addHostnameInfo(new HostnameInfo(remoteHostInfo.getHostname(), true));
-
-
         if (!ExecutionTracer.hasExternalMapping(remoteHostInfo.signature())) {
             String signature = remoteHostInfo.signature();
             int connectPort = remotePort;
@@ -38,7 +34,6 @@ public static String[] collectExternalServiceInfo(ExternalServiceInfo remoteHost
                 connectPort = ExternalServiceSharedUtils.getDefaultWMPort(signature);
             }
 
-//            return new String[]{remoteHostInfo.getHostname(), "" + remotePort};
             return new String[]{ExecutionTracer.getExternalMapping(signature), "" + connectPort};
         } else {
             return new String[]{ExecutionTracer.getExternalMapping(remoteHostInfo.signature()), "" + remotePort};
@@ -57,7 +52,7 @@ public static boolean skipHostnameOrIp(String hostname) {
                 || hostname.startsWith("0.0.0")
                 || hostname.startsWith("10.")
                 || hostname.startsWith("docker.socket")
-                || (hostname.startsWith("127.") && !ExecutionTracer.hasLocalAddressReplacement(hostname))) {
+                || (hostname.startsWith("127.") && !ExecutionTracer.hasMappingForLocalAddress(hostname))) {
             return true;
         }
 

diff --git a/.../java/instrumentation/coverage/methodreplacement/classes/InetAddressClassReplacement.java b/.../java/instrumentation/coverage/methodreplacement/classes/InetAddressClassReplacement.java
@@ -40,7 +40,7 @@ public static InetAddress getByName(String host) throws UnknownHostException {
             return InetAddress.getByName(host);
 
         try {
-            if (ExecutionTracer.hasLocalAddress(host)) {
+            if (ExecutionTracer.hasLocalAddressForHost(host)) {
                 String ip = ExecutionTracer.getLocalAddress(host);
                 return InetAddress.getByName(ip);
             }
@@ -71,7 +71,7 @@ public static InetAddress[] getAllByName(String host) throws UnknownHostExceptio
             return InetAddress.getAllByName(host);
 
         try {
-            if (ExecutionTracer.hasLocalAddress(host)) {
+            if (ExecutionTracer.hasLocalAddressForHost(host)) {
                 String ip = ExecutionTracer.getLocalAddress(host);
                 return new InetAddress[]{InetAddress.getByName(ip)};
             }

diff --git a/...lient/java/instrumentation/coverage/methodreplacement/classes/SocketClassReplacement.java b/...lient/java/instrumentation/coverage/methodreplacement/classes/SocketClassReplacement.java
@@ -58,7 +58,7 @@ We MUST NOT call getHostName() anywhere in EM.
                     and if there is a mapping available then Socket will use that value to connect. Otherwise,
                     nothing will happen.
                  */
-                if (ExecutionTracer.hasLocalAddressReplacement(socketAddress.getHostString())) {
+                if (ExecutionTracer.hasMappingForLocalAddress(socketAddress.getHostString())) {
                     String newHostname = ExecutionTracer.getRemoteHostname(socketAddress.getHostString());
                     ExternalServiceInfo remoteHostInfo = new ExternalServiceInfo(
                             ExternalServiceSharedUtils.DEFAULT_SOCKET_CONNECT_PROTOCOL,

diff --git a/.../src/main/java/org/evomaster/client/java/instrumentation/staticstate/ExecutionTracer.java b/.../src/main/java/org/evomaster/client/java/instrumentation/staticstate/ExecutionTracer.java
@@ -709,14 +709,14 @@ public static boolean hasExternalMapping(String signature) {
      * Check whether there is a local IP address available for the given
      * remote hostname.
      */
-    public static boolean hasLocalAddress(String hostname) {
+    public static boolean hasLocalAddressForHost(String hostname) {
         return localAddressMapping.containsKey(hostname);
     }
 
     /**
      * Checks for any replacement available to given local IP address.
      */
-    public static boolean hasLocalAddressReplacement(String localAddress) {
+    public static boolean hasMappingForLocalAddress(String localAddress) {
         return localAddressMapping.containsValue(localAddress);
     }