Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv19746/src/freenet/node/states/request

Modified Files:
        DataPending.java Pending.java 
Log Message:
6277:
Disable outbound request based limiting by default.
Make requestDataNotFound a counting diagnostic process, not continuous.
Reject requests from 6275 and earlier.


Index: DataPending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/DataPending.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- DataPending.java    22 Oct 2003 22:07:16 -0000      1.20
+++ DataPending.java    24 Oct 2003 19:38:19 -0000      1.21
@@ -114,7 +114,7 @@
                                                 (System.currentTimeMillis() -
                                                  routedTime) / hopsToLive);
         }
-       Core.diagnostics.occurrenceContinuous("requestDataNotFound", 1);
+       Core.diagnostics.occurrenceCounting("requestDataNotFound", 1);
         if (!fromLastPeer(dnf)) {
             throw new BadStateException("DataNotFound from the wrong peer! for "+
                                        this);

Index: Pending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/Pending.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -w -r1.76 -r1.77
--- Pending.java        17 Oct 2003 23:02:01 -0000      1.76
+++ Pending.java        24 Oct 2003 19:38:19 -0000      1.77
@@ -637,6 +637,7 @@
         }
        
         // Keep track of outbound requests for rate limiting.
+       if(n.outboundRequestLimit != null)
         n.outboundRequestLimit.inc();
        
         lastPeer = addr;

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to