Author: toad
Date: 2006-05-12 17:42:18 +0000 (Fri, 12 May 2006)
New Revision: 8682

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
702: Omit certain fields from ARK inserts.
This should result in it not inserting a new ARK on every startup, because they 
should collide.
They don't, indicating a lower level bug.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-05-12 17:13:34 UTC (rev 
8681)
+++ trunk/freenet/src/freenet/node/Node.java    2006-05-12 17:42:18 UTC (rev 
8682)
@@ -158,6 +158,11 @@

                        SimpleFieldSet fs = exportPublicFieldSet();

+                       // Remove some unnecessary fields that only cause 
collisions.
+                       fs.remove("ark.number");
+                       fs.remove("location");
+                       //fs.remove("version"); - keep version because of its 
significance in reconnection
+                       
                        String s = fs.toString();

                        byte[] buf;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-12 17:13:34 UTC (rev 
8681)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-12 17:42:18 UTC (rev 
8682)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 701;
+       private static final int buildNumber = 702;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;


Reply via email to