Author: toad
Date: 2009-01-22 18:59:21 +0000 (Thu, 22 Jan 2009)
New Revision: 25220
Modified:
branches/db4o/freenet/
branches/db4o/freenet/src/freenet/io/AddressTracker.java
branches/db4o/freenet/src/freenet/io/comm/FreenetInetAddress.java
branches/db4o/freenet/src/freenet/io/comm/Peer.java
branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
branches/db4o/freenet/src/freenet/node/PeerNode.java
branches/db4o/freenet/src/freenet/node/SeedServerPeerNode.java
branches/db4o/freenet/src/freenet/node/Version.java
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
branches/db4o/freenet/src/freenet/support/BloomFilter.java
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
Log:
Merge up to 25209 (1204)
Property changes on: branches/db4o/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet:19964-25205
+ /trunk/freenet:19964-25209
Modified: branches/db4o/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- branches/db4o/freenet/src/freenet/io/AddressTracker.java 2009-01-22
18:57:06 UTC (rev 25219)
+++ branches/db4o/freenet/src/freenet/io/AddressTracker.java 2009-01-22
18:59:21 UTC (rev 25220)
@@ -139,6 +139,10 @@
private void packetTo(Peer peer, boolean sent) {
peer = peer.dropHostName();
+ if(peer == null) {
+ Logger.error(this, "Impossible: No host name in
AddressTracker.packetTo for "+peer);
+ return;
+ }
InetAddress ip = peer.getAddress();
long now = System.currentTimeMillis();
synchronized(this) {
Modified: branches/db4o/freenet/src/freenet/io/comm/FreenetInetAddress.java
===================================================================
--- branches/db4o/freenet/src/freenet/io/comm/FreenetInetAddress.java
2009-01-22 18:57:06 UTC (rev 25219)
+++ branches/db4o/freenet/src/freenet/io/comm/FreenetInetAddress.java
2009-01-22 18:59:21 UTC (rev 25220)
@@ -370,8 +370,10 @@
}
public FreenetInetAddress dropHostname() {
- if(_address == null)
- throw new IllegalStateException("Can't dropHostname()
if no address!");
+ if(_address == null) {
+ Logger.error(this, "Can't dropHostname() if no
address!");
+ return null;
+ }
if(hostname != null) {
return new FreenetInetAddress(_address);
} else return this;
Modified: branches/db4o/freenet/src/freenet/io/comm/Peer.java
===================================================================
--- branches/db4o/freenet/src/freenet/io/comm/Peer.java 2009-01-22 18:57:06 UTC
(rev 25219)
+++ branches/db4o/freenet/src/freenet/io/comm/Peer.java 2009-01-22 18:59:21 UTC
(rev 25220)
@@ -251,6 +251,7 @@
public Peer dropHostName() {
FreenetInetAddress newAddr = addr.dropHostname();
+ if(newAddr == null) return null;
if(addr != newAddr) {
return new Peer(newAddr, _port);
} else return this;
Modified: branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2009-01-22 18:57:06 UTC (rev 25219)
+++ branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2009-01-22 18:59:21 UTC (rev 25220)
@@ -2855,6 +2855,13 @@
pn.couldNotSendHandshake(notRegistered);
return;
}
+ Peer oldPeer = peer;
+ peer = peer.dropHostName();
+ if(peer == null) {
+ Logger.error(this, "No address for peer "+oldPeer+" so
cannot send handshake");
+ pn.couldNotSendHandshake(notRegistered);
+ return;
+ }
sendJFKMessage1(pn, peer, pn.handshakeUnknownInitiator(),
pn.handshakeSetupType(), negType);
if(logMINOR)
Logger.minor(this, "Sending handshake to "+peer+" for
"+pn);
Modified: branches/db4o/freenet/src/freenet/node/PeerNode.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PeerNode.java 2009-01-22
18:57:06 UTC (rev 25219)
+++ branches/db4o/freenet/src/freenet/node/PeerNode.java 2009-01-22
18:59:21 UTC (rev 25220)
@@ -1673,6 +1673,12 @@
private void setDetectedPeer(Peer newPeer) {
// Only clear lastAttemptedHandshakeIPUpdateTime if we have a
new IP.
// Also, we need to call .equals() to propagate any DNS lookups
that have been done if the two have the same domain.
+ Peer p = newPeer;
+ newPeer = newPeer.dropHostName();
+ if(newPeer == null) {
+ Logger.error(this, "Impossible: No address for detected
peer! "+p+" on "+this);
+ return;
+ }
synchronized(this) {
Peer oldPeer = detectedPeer;
if((newPeer != null) && ((oldPeer == null) ||
!oldPeer.equals(newPeer))) {
Modified: branches/db4o/freenet/src/freenet/node/SeedServerPeerNode.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SeedServerPeerNode.java
2009-01-22 18:57:06 UTC (rev 25219)
+++ branches/db4o/freenet/src/freenet/node/SeedServerPeerNode.java
2009-01-22 18:59:21 UTC (rev 25220)
@@ -6,6 +6,7 @@
import java.net.InetAddress;
import java.util.ArrayList;
+import freenet.io.comm.FreenetInetAddress;
import freenet.io.comm.Peer;
import freenet.io.comm.PeerParseException;
import freenet.io.comm.ReferenceSignatureVerificationException;
@@ -93,10 +94,15 @@
Peer[] peers = getHandshakeIPs();
ArrayList<InetAddress> v = new ArrayList<InetAddress>();
for(int i=0;i<peers.length;i++) {
- InetAddress ia =
peers[i].getFreenetAddress().dropHostname().getAddress();
+ FreenetInetAddress fa =
peers[i].getFreenetAddress().dropHostname();
+ if(fa == null) continue;
+ InetAddress ia = fa.getAddress();
if(v.contains(ia)) continue;
v.add(ia);
}
+ if(v.isEmpty()) {
+ Logger.error(this, "No valid addresses for seed node
"+this);
+ }
return v.toArray(new InetAddress[v.size()]);
}
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2009-01-22 18:57:06 UTC
(rev 25219)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2009-01-22 18:59:21 UTC
(rev 25220)
@@ -24,7 +24,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1203;
+ private static final int buildNumber = 1204;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 1197;
Property changes on:
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-25205
+ /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-25209
Property changes on: branches/db4o/freenet/src/freenet/support/BloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BloomFilter.java:22002-25205
+ /trunk/freenet/src/freenet/support/BloomFilter.java:22002-25209
Property changes on:
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-25205
+ /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-25209
Property changes on:
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-25205
+ /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-25209
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
