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

[t...@freenetproject.org]

Author: toad
Date: 2005-12-01 15:01:33 +0000 (Thu, 01 Dec 2005)
New Revision: 7646

Modified:
   trunk/freenet/src/freenet/node/InsertHandler.java
   trunk/freenet/src/freenet/node/Version.java
Log:
257: (mandatory)
Handle the new failure mode properly in InsertHandler (as an RNF, since that's 
what it is).
Also handle other unknown failure modes properly (don't infinite loop!).

Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java   2005-12-01 14:44:46 UTC 
(rev 7645)
+++ trunk/freenet/src/freenet/node/InsertHandler.java   2005-12-01 15:01:33 UTC 
(rev 7646)
@@ -183,7 +183,7 @@
                 return;
             }

-            if(status == InsertSender.ROUTE_NOT_FOUND) {
+            if(status == InsertSender.ROUTE_NOT_FOUND || status == 
InsertSender.ROUTE_REALLY_NOT_FOUND) {
                 msg = DMT.createFNPRouteNotFound(uid, sender.getHTL());
                 source.send(msg);
                 canCommit = true;
@@ -198,6 +198,12 @@
                 finish();
                 return;
             }
+            
+            // Otherwise...?
+            Logger.error(this, "Unknown status code: 
"+sender.getStatusString());
+            msg = DMT.createFNPRejectedOverload(uid, true);
+            source.send(msg);
+            return;
         }
         } catch (Throwable t) {
             Logger.error(this, "Caught "+t, t);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-01 14:44:46 UTC (rev 
7645)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-01 15:01:33 UTC (rev 
7646)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 256;
+       public static final int buildNumber = 257;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 256;
+       public static final int lastGoodBuild = 257;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;