*) fixed hello reporting yourip=UNRESOLVED_PATTERN

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3200 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Jan 14, 2007 · 9699b09 · 9699b09
1 parent 45ddaf4
commit 9699b09
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/htroot/yacy/hello.java b/htroot/yacy/hello.java
@@ -107,14 +107,20 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
 
         // if the previous attempt (using the reported ip address) was not successful, try the ip where 
         // the request came from
-        if ((urls < 0) && (serverCore.portForwardingEnabled || serverCore.useStaticIP) && (serverCore.isNotLocal(clientip))) {
-            // we are only allowed to connect to the client IP address if it's not our own address
+        if (urls < 0) {
+        	boolean isNotLocal = true;
+
+        	// we are only allowed to connect to the client IP address if it's not our own address
+        	if(serverCore.portForwardingEnabled || serverCore.useStaticIP)
+        		isNotLocal = serverCore.isNotLocal(clientip);
 
-            serverCore.checkInterruption();
+        	if(isNotLocal) {
+        		serverCore.checkInterruption();
 
-            prop.put(yacySeed.YOURIP, clientip);
-            remoteSeed.put(yacySeed.IP, clientip);
-            urls = yacyClient.queryUrlCount(remoteSeed);
+                prop.put(yacySeed.YOURIP, clientip);
+                remoteSeed.put(yacySeed.IP, clientip);
+                urls = yacyClient.queryUrlCount(remoteSeed);
+        	}
         }
 
 //      System.out.println("YACYHELLO: YOUR IP=" + clientip);