boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

removed query to NAT or responder in case that no other peer is there.

Browse Source 
this is not needed any more, there are enough peers

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3486 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 18 years ago
parent 4783a30910
commit 91cdc1493f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File

16
source/de/anomic/yacy/yacyCore.java
Unescape View File

@ -76,7 +76,6 @@ import java.util.TimeZone;
import de.anomic.http.httpc; import de.anomic.http.httpc;
import de.anomic.net.URL; import de.anomic.net.URL;
import de.anomic.net.natLib;
import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.server.serverCore; import de.anomic.server.serverCore;
import de.anomic.server.serverDate; import de.anomic.server.serverDate;
@ -594,7 +593,7 @@ public class yacyCore {
if (newSeeds >= 0) { if (newSeeds >= 0) {
// success! we have published our peer to a senior peer // success! we have published our peer to a senior peer
// update latest news from the other peer // update latest news from the other peer
// log.logInfo("publish: handshaked " + t.seed.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR) + " peer '" + t.seed.getName() + "' at " + t.seed.getAddress()); // log.logInfo("publish: handshaked " + t.seed.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR) + " peer '" + t.seed.getName() + "' at " + t.seed.getAddress());
peerActions.saveMySeed(); peerActions.saveMySeed();
return newSeeds; return newSeeds;
} }
@ -603,17 +602,16 @@ public class yacyCore {
if (seedDB.mySeed.isProper() == null && !force) { return 0; } if (seedDB.mySeed.isProper() == null && !force) { return 0; }
// still no success: ask own NAT or internet responder // still no success: ask own NAT or internet responder
final boolean DI604use = switchboard.getConfig("DI604use", "false").equals("true"); //final boolean DI604use = switchboard.getConfig("DI604use", "false").equals("true");
final String DI604pw = switchboard.getConfig("DI604pw", ""); //final String DI604pw = switchboard.getConfig("DI604pw", "");
String ip = switchboard.getConfig("staticIP", ""); String ip = switchboard.getConfig("staticIP", "");
if (ip.equals("")) { //if (ip.equals("")) ip = natLib.retrieveIP(DI604use, DI604pw);
ip = natLib.retrieveIP(DI604use, DI604pw);
} // yacyCore.log.logDebug("DEBUG: new IP=" + ip);
// yacyCore.log.logDebug("DEBUG: new IP=" + ip);
seedDB.mySeed.put(yacySeed.IP, ip); seedDB.mySeed.put(yacySeed.IP, ip);
if (seedDB.mySeed.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_JUNIOR).equals(yacySeed.PEERTYPE_JUNIOR)) // ??????????????? if (seedDB.mySeed.get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_JUNIOR).equals(yacySeed.PEERTYPE_JUNIOR)) // ???????????????
seedDB.mySeed.put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR); // to start bootstraping, we need to be recognised as PEERTYPE_SENIOR peer seedDB.mySeed.put(yacySeed.PEERTYPE, yacySeed.PEERTYPE_SENIOR); // to start bootstraping, we need to be recognised as PEERTYPE_SENIOR peer
log.logInfo("publish: no recipient found, asked NAT or responder; our address is " + log.logInfo("publish: no recipient found, our address is " +
((seedDB.mySeed.getAddress() == null) ? "unknown" : seedDB.mySeed.getAddress())); ((seedDB.mySeed.getAddress() == null) ? "unknown" : seedDB.mySeed.getAddress()));
peerActions.saveMySeed(); peerActions.saveMySeed();
return 0; return 0;

Write Preview
Loading…
Cancel
Save