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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-31 13:13:23 +0000 (Thu, 31 Jan 2008)
New Revision: 17420

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
shouldRejectSwapRequest() should not be probabilistic. Its whole purpose is to 
prevent DoS.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-01-31 12:15:07 UTC 
(rev 17419)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-01-31 13:13:23 UTC 
(rev 17420)
@@ -1546,14 +1546,7 @@
                                long timeSinceLastTime = now - 
timeLastReceivedSwapRequest;
                                swapRequestsInterval.report(timeSinceLastTime);
                                double averageInterval = 
swapRequestsInterval.currentValue();
-                               if(averageInterval < 
Node.MIN_INTERVAL_BETWEEN_INCOMING_SWAP_REQUESTS) {
-                                       double p =
-                                               
(Node.MIN_INTERVAL_BETWEEN_INCOMING_SWAP_REQUESTS - averageInterval) /
-                                               
Node.MIN_INTERVAL_BETWEEN_INCOMING_SWAP_REQUESTS;
-                                       return node.random.nextDouble() < p;
-                               } else
-                                       return false;
-
+                               return averageInterval < 
Node.MIN_INTERVAL_BETWEEN_INCOMING_SWAP_REQUESTS;
                        }
                        timeLastReceivedSwapRequest = now;
                }