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

[toad at freenetproject.org]

Author: toad
Date: 2008-04-01 17:43:18 +0000 (Tue, 01 Apr 2008)
New Revision: 18892

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
Check against 1280 bytes and against max packet size: if we can fit within the limit, do so.

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java	2008-04-01 15:10:46 UTC (rev 18891)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java	2008-04-01 17:43:18 UTC (rev 18892)
@@ -2376,6 +2376,8 @@
 			paddedLen = ((packetLength + 63) / 64) * 64;
 			paddedLen += node.fastWeakRandom.nextInt(64);
 			if(packetLength <= 1280 && paddedLen > 1280) paddedLen = 1280;
+			int maxPacketSize = sock.getMaxPacketSize();
+			if(packetLength <= maxPacketSize && paddedLen > maxPacketSize) paddedLen = maxPacketSize;
 			packetLength -= 32;
 			paddedLen -= 32;
 		}