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

lookupByIP: prevent comparing of port parameter if called with port -1 (=unknown)

Browse Source
pull/1/head
reger 13 years ago
parent 06951ef751
commit c1f6b4fb52
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
source/net/yacy/peers/SeedDB.java
Unescape View File

@ -655,7 +655,7 @@ public final class SeedDB implements AlternativeDomainNames {
public Seed lookupByIP( public Seed lookupByIP(
final InetAddress peerIP, final InetAddress peerIP,
final int port, final int port, /* port may be -1 if not significant */
final boolean lookupConnected, final boolean lookupConnected,
final boolean lookupDisconnected, final boolean lookupDisconnected,
final boolean lookupPotential final boolean lookupPotential
@ -679,7 +679,7 @@ public final class SeedDB implements AlternativeDomainNames {
for (byte[] pk: idx) { for (byte[] pk: idx) {
seed = this.getConnected(ASCII.String(pk)); seed = this.getConnected(ASCII.String(pk));
if (seed == null) continue; if (seed == null) continue;
if (seed.getPort() != port) continue; if ((port >= 0) && (seed.getPort() != port)) continue;
//System.out.println("*** found lookupByIP in connected: " + peerIP.toString() + " -> " + seed.getName()); //System.out.println("*** found lookupByIP in connected: " + peerIP.toString() + " -> " + seed.getName());
return seed; return seed;
} }
@ -693,7 +693,7 @@ public final class SeedDB implements AlternativeDomainNames {
for (byte[] pk: idx) { for (byte[] pk: idx) {
seed = this.getDisconnected(ASCII.String(pk)); seed = this.getDisconnected(ASCII.String(pk));
if (seed == null) continue; if (seed == null) continue;
if (seed.getPort() != port) continue; if ((port >= 0) && (seed.getPort() != port)) continue;
//System.out.println("*** found lookupByIP in disconnected: " + peerIP.toString() + " -> " + seed.getName()); //System.out.println("*** found lookupByIP in disconnected: " + peerIP.toString() + " -> " + seed.getName());
return seed; return seed;
} }
@ -707,7 +707,7 @@ public final class SeedDB implements AlternativeDomainNames {
for (byte[] pk: idx) { for (byte[] pk: idx) {
seed = this.getPotential(ASCII.String(pk)); seed = this.getPotential(ASCII.String(pk));
if (seed == null) continue; if (seed == null) continue;
if (seed.getPort() != port) continue; if ((port >= 0) && (seed.getPort() != port)) continue;
//System.out.println("*** found lookupByIP in potential: " + peerIP.toString() + " -> " + seed.getName()); //System.out.println("*** found lookupByIP in potential: " + peerIP.toString() + " -> " + seed.getName());
return seed; return seed;
} }
@ -720,7 +720,7 @@ public final class SeedDB implements AlternativeDomainNames {
String s = this.mySeed.getIP(); String s = this.mySeed.getIP();
if (s == null || !ipString.equals(s)) return null; if (s == null || !ipString.equals(s)) return null;
int p = this.mySeed.getPort(); int p = this.mySeed.getPort();
if (p != port) return null; if ((port >= 0) && (p != port)) return null;
//System.out.println("*** found lookupByIP as my seed: " + peerIP.toString() + " -> " + this.mySeed.getName()); //System.out.println("*** found lookupByIP as my seed: " + peerIP.toString() + " -> " + this.mySeed.getName());
return this.mySeed; return this.mySeed;
} }

Write Preview
Loading…
Cancel
Save