[freenet-cvs] r16343 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-12-05 20:38:33 +0000 (Wed, 05 Dec 2007)
New Revision: 16343

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/SeedServerPeerNode.java
Log:
Actually send the seednode connections using the correct protocol.

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2007-12-05 
20:36:46 UTC (rev 16342)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2007-12-05 
20:38:33 UTC (rev 16343)
@@ -2480,7 +2480,7 @@
                                if(logMINOR) Logger.minor(this, "Not sending 
handshake to "+handshakeIPs[i]+" for "+pn.getPeer()+" because it's not a real 
Internet address and metadata.allowLocalAddresses is not true");
                                continue;
                        }
-                       sendJFKMessage1(pn, peer, false, -1);
+                       sendJFKMessage1(pn, peer, 
pn.handshakeUnknownInitiator(), pn.handshakeSetupType());
                        if(logMINOR)
                                Logger.minor(this, "Sending handshake to 
"+peer+" for "+pn+" ("+i+" of "+handshakeIPs.length);
                        pn.sentHandshake();

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-12-05 20:36:46 UTC 
(rev 16342)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-12-05 20:38:33 UTC 
(rev 16343)
@@ -3191,4 +3191,12 @@
                return isOpennet() || node.passOpennetRefsThroughDarknet();
        }

+       public boolean handshakeUnknownInitiator() {
+               return false;
+       }
+
+       public int handshakeSetupType() {
+               return -1;
+       }
+
 }

Modified: trunk/freenet/src/freenet/node/SeedServerPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/SeedServerPeerNode.java      2007-12-05 
20:36:46 UTC (rev 16342)
+++ trunk/freenet/src/freenet/node/SeedServerPeerNode.java      2007-12-05 
20:38:33 UTC (rev 16343)
@@ -77,4 +77,12 @@
                return (InetAddress[]) v.toArray(new InetAddress[v.size()]);
        }

+       public boolean handshakeUnknownInitiator() {
+               return true;
+       }
+
+       public int handshakeSetupType() {
+               return FNPPacketMangler.SETUP_OPENNET_SEEDNODE;
+       }
+
 }