From 9699b094e855976f6f22f93ff48e821b59a29b8d Mon Sep 17 00:00:00 2001 From: auron_x Date: Sun, 14 Jan 2007 16:57:24 +0000 Subject: [PATCH] *) fixed hello reporting yourip=UNRESOLVED_PATTERN git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3200 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/yacy/hello.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/htroot/yacy/hello.java b/htroot/yacy/hello.java index f72ec1f98..9689eb3ed 100644 --- a/htroot/yacy/hello.java +++ b/htroot/yacy/hello.java @@ -107,14 +107,20 @@ public final class hello { // 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);