[freenet-cvs] r18486 - in trunk/freenet/src/freenet/node: . simulator

[t...@freenetproject.org]

Author: toad
Date: 2008-03-12 18:08:58 +0000 (Wed, 12 Mar 2008)
New Revision: 18486

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
Log:
Logging

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-03-12 
13:38:27 UTC (rev 18485)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-03-12 
18:08:58 UTC (rev 18486)
@@ -221,10 +221,13 @@
                if(opn != null) {
                        if(logMINOR) Logger.minor(this, "Trying exact match");
                        if(length > HEADERS_LENGTH_MINIMUM) {
+                               if(logMINOR) Logger.minor(this, "Trying current 
key tracker");
                                if(tryProcess(buf, offset, length, 
opn.getCurrentKeyTracker(), now)) return;
                                // Try with old key
+                               if(logMINOR) Logger.minor(this, "Trying 
previous key tracker");
                                if(tryProcess(buf, offset, length, 
opn.getPreviousKeyTracker(), now)) return;
                                // Try with unverified key
+                               if(logMINOR) Logger.minor(this, "Trying 
unverified key tracker");
                                if(tryProcess(buf, offset, length, 
opn.getUnverifiedKeyTracker(), now)) return;
                        }
                        if(length > Node.SYMMETRIC_KEY_LENGTH /* iv */ + 
HASH_LENGTH + 2 && !node.isStopping()) {

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-03-12 13:38:27 UTC 
(rev 18485)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-03-12 18:08:58 UTC 
(rev 18486)
@@ -2290,6 +2290,7 @@
                        long t = tracker.getNextUrgentTime();
                        if(t < now || forceSendPrimary) {
                                try {
+                                       if(logMINOR) Logger.minor(this, 
"Sending urgent notifications for current tracker on "+shortToString());
                                        int size = 
outgoingMangler.processOutgoing(null, 0, 0, tracker, 0, DMT.PRIORITY_NOW);
                                        
node.nodeStats.reportNotificationOnlyPacketSent(size);
                                } catch(NotConnectedException e) {
@@ -2306,6 +2307,7 @@
                        long t = tracker.getNextUrgentTime();
                        if(t < now)
                                try {
+                                       if(logMINOR) Logger.minor(this, 
"Sending urgent notifications for previous tracker on "+shortToString());
                                        int size = 
outgoingMangler.processOutgoing(null, 0, 0, tracker, 0, DMT.PRIORITY_NOW);
                                        
node.nodeStats.reportNotificationOnlyPacketSent(size);
                                } catch(NotConnectedException e) {

Modified: 
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-03-12 13:38:27 UTC (rev 18485)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-03-12 18:08:58 UTC (rev 18486)
@@ -59,8 +59,8 @@
         wd.mkdir();
         //NOTE: globalTestInit returns in ignored random source
         //NodeStarter.globalTestInit(name, false, Logger.ERROR, 
"freenet.node.Location:normal,freenet.node.simulator.RealNode:minor,freenet.node.Insert:MINOR,freenet.node.Request:MINOR,freenet.node.Node:MINOR");
-        NodeStarter.globalTestInit(name, false, Logger.ERROR, 
"freenet.node.Location:MINOR,freenet.io.comm:MINOR,freenet.node.NodeDispatcher:MINOR,freenet.node.simulator:MINOR,freenet.node.PeerManager:MINOR,freenet.node.RequestSender:MINOR");
-        //NodeStarter.globalTestInit(name, false, Logger.ERROR, "");
+        //NodeStarter.globalTestInit(name, false, Logger.ERROR, 
"freenet.node.Location:MINOR,freenet.io.comm:MINOR,freenet.node.NodeDispatcher:MINOR,freenet.node.simulator:MINOR,freenet.node.PeerManager:MINOR,freenet.node.RequestSender:MINOR");
+        NodeStarter.globalTestInit(name, false, Logger.ERROR, 
"freenet.node.FNP:MINOR,freenet.node.Packet:MINOR,freenet.io.comm:MINOR,freenet.node.PeerNode:MINOR");
         System.out.println("Insert/retrieve test");
         System.out.println();
         DummyRandomSource random = new DummyRandomSource();