Author: toad
Date: 2008-12-06 17:40:25 +0000 (Sat, 06 Dec 2008)
New Revision: 24107
Modified:
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/OpennetPeerNode.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Drop excess opennet peers on *any* connection coming in, not just opennet
connections.
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-12-06 17:39:55 UTC
(rev 24106)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-12-06 17:40:25 UTC
(rev 24107)
@@ -773,6 +773,7 @@
*/
@Override
protected void onConnect() {
+ super.onConnect();
sendQueuedN2NMs();
}
@@ -1598,14 +1599,4 @@
return false;
}
- @Override
- public long completedHandshake(long thisBootID, byte[] data, int
offset, int length, BlockCipher encCipher, byte[] encKey, Peer replyTo, boolean
unverified, int negType, long trackerID, boolean isJFK4, boolean jfk4SameAsOld)
{
- long ret = super.completedHandshake(thisBootID, data, offset,
length, encCipher, encKey, replyTo, unverified, negType, trackerID, isJFK4,
jfk4SameAsOld);
- if(ret > 0) {
- OpennetManager om = node.getOpennet();
- if(om != null)
- om.dropExcessPeers();
- }
- return ret;
- }
}
Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-12-06 17:39:55 UTC
(rev 24106)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-12-06 17:40:25 UTC
(rev 24107)
@@ -118,6 +118,7 @@
@Override
protected void onConnect() {
+ super.onConnect();
opennet.crypto.socket.getAddressTracker().setPresumedGuiltyAt(System.currentTimeMillis()+60*60*1000);
}
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-12-06 17:39:55 UTC
(rev 24106)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-12-06 17:40:25 UTC
(rev 24107)
@@ -2027,7 +2027,7 @@
node.peers.disconnected(this);
else if(!wasARekey) {
node.peers.addConnectedPeer(this);
- onConnect();
+ maybeOnConnect();
}
return packets.trackerID;
@@ -2232,6 +2232,7 @@
maybeSendInitialMessages();
setPeerNodeStatus(now);
node.peers.addConnectedPeer(this);
+ maybeOnConnect();
if(completelyDeprecatedTracker != null) {
if(completelyDeprecatedTracker.packets !=
tracker.packets)
completelyDeprecatedTracker.packets.completelyDeprecated(tracker);
@@ -3299,7 +3300,9 @@
* A method to be called once at the beginning of every time
isConnected() is true
*/
protected void onConnect() {
- // Do nothing in the default impl
+ OpennetManager om = node.getOpennet();
+ if(om != null)
+ om.dropExcessPeers();
}
public void onFound(long edition, FetchResult result) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
