Author: toad
Date: 2007-12-14 15:29:23 +0000 (Fri, 14 Dec 2007)
New Revision: 16545
Modified:
trunk/freenet/src/freenet/node/LocationManager.java
Log:
Turn off swapping UID sub-messages for now:
- Probe requests are better for understanding the topology.
- Often cause oversize packets, which will be consistently dropped by
firewalls, which will cause connectivity problems as well as biasing swap
against bigger nodes.
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2007-12-14 15:27:18 UTC
(rev 16544)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2007-12-14 15:29:23 UTC
(rev 16545)
@@ -352,7 +352,7 @@
// Send our SwapComplete
Message confirm = DMT.createFNPSwapComplete(uid, myValue);
-
confirm.addSubMessage(DMT.createFNPSwapLocations(extractUIDs(friendLocsAndUIDs)));
+
//confirm.addSubMessage(DMT.createFNPSwapLocations(extractUIDs(friendLocsAndUIDs)));
node.usm.send(pn, confirm, null);
@@ -476,7 +476,7 @@
byte[] hisHash =
((ShortBuffer)reply.getObject(DMT.HASH)).getData();
Message confirm = DMT.createFNPSwapCommit(uid, myValue);
-
confirm.addSubMessage(DMT.createFNPSwapLocations(extractUIDs(friendLocsAndUIDs)));
+
//confirm.addSubMessage(DMT.createFNPSwapLocations(extractUIDs(friendLocsAndUIDs)));
filter1.clearOr();
MessageFilter filter3 =
MessageFilter.create().setField(DMT.UID,
uid).setType(DMT.FNPSwapComplete).setTimeout(TIMEOUT).setSource(pn);
