On Tuesday 12 August 2008 21:58, [EMAIL PROTECTED] wrote: > Author: nextgens > Date: 2008-08-12 20:58:42 +0000 (Tue, 12 Aug 2008) > New Revision: 21775 > > Modified: > trunk/freenet/src/freenet/node/NodeCrypto.java > trunk/freenet/src/freenet/node/simulator/BootstrapPullTest.java > trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java > trunk/freenet/src/freenet/node/simulator/BootstrapSeedTest.java > trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java > Log: > Enable "group stripping" every time a compressed noderef is required. > > Reenable it in tests too
IIRC if setup is set and heavySetup isn't, we don't include the group at all.
Right?
>
> Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/NodeCrypto.java 2008-08-12 20:45:33 UTC
(rev 21774)
> +++ trunk/freenet/src/freenet/node/NodeCrypto.java 2008-08-12 20:58:42 UTC
(rev 21775)
> @@ -32,7 +32,6 @@
> import freenet.keys.InsertableClientSSK;
> import freenet.support.Base64;
> import freenet.support.Fields;
> -import freenet.support.HexUtil;
> import freenet.support.IllegalBase64Exception;
> import freenet.support.Logger;
> import freenet.support.SimpleFieldSet;
> @@ -366,13 +365,9 @@
> }
> }
>
> - public static boolean DISABLE_GROUP_STRIP = false;
> -
> private byte[] myCompressedRef(boolean setup, boolean heavySetup,
> boolean
forARK) {
> SimpleFieldSet fs = exportPublicFieldSet(setup, heavySetup,
> forARK);
> - // TODO: we should change that to ((setup || heavySetup) &&
> !forARK) when
all the nodes have the new code
> - boolean shouldStripGroup = heavySetup &&
Global.DSAgroupBigA.equals(cryptoGroup);
> - if(DISABLE_GROUP_STRIP) shouldStripGroup = false;
> + boolean shouldStripGroup = ((setup || heavySetup) && !forARK)
> &&
Global.DSAgroupBigA.equals(cryptoGroup);
> if(shouldStripGroup)
> fs.removeSubset("dsaGroup");
>
>
> Modified: trunk/freenet/src/freenet/node/simulator/BootstrapPullTest.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/simulator/BootstrapPullTest.java
2008-08-12 20:45:33 UTC (rev 21774)
> +++ trunk/freenet/src/freenet/node/simulator/BootstrapPullTest.java
2008-08-12 20:58:42 UTC (rev 21775)
> @@ -17,7 +17,6 @@
> import freenet.crypt.RandomSource;
> import freenet.keys.FreenetURI;
> import freenet.node.Node;
> -import freenet.node.NodeCrypto;
> import freenet.node.NodeInitException;
> import freenet.node.NodeStarter;
> import freenet.support.Logger;
> @@ -71,7 +70,6 @@
> FileInputStream fis = new FileInputStream(seednodes);
> FileUtil.writeTo(fis, new File(secondInnerDir, "seednodes.fref"));
> fis.close();
> - NodeCrypto.DISABLE_GROUP_STRIP = true;
>
> // Create the test data
> System.out.println("Creating test data.");
>
> Modified:
trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
2008-08-12 20:45:33 UTC (rev 21774)
> +++ trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
2008-08-12 20:58:42 UTC (rev 21775)
> @@ -2,7 +2,6 @@
>
> import java.io.File;
> import java.io.FileInputStream;
> -import java.io.FileNotFoundException;
> import java.io.IOException;
> import java.io.OutputStream;
>
> @@ -14,7 +13,6 @@
> import freenet.crypt.RandomSource;
> import freenet.keys.FreenetURI;
> import freenet.node.Node;
> -import freenet.node.NodeCrypto;
> import freenet.node.NodeInitException;
> import freenet.node.NodeStarter;
> import freenet.support.Executor;
> @@ -50,7 +48,6 @@
> FileUtil.writeTo(fis, new File(innerDir, "seednodes.fref"));
> fis.close();
> // Create one node
> - NodeCrypto.DISABLE_GROUP_STRIP = true;
> Executor executor = new PooledExecutor();
> Node node = NodeStarter.createTestNode(5000, 5001, dir.getPath(),
true, false, false, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000,
5*1024*1024, true, true, true, true, true, true, true, 12*1024, false, true);
> //NodeCrypto.DISABLE_GROUP_STRIP = true;
>
> Modified: trunk/freenet/src/freenet/node/simulator/BootstrapSeedTest.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/simulator/BootstrapSeedTest.java
2008-08-12 20:45:33 UTC (rev 21774)
> +++ trunk/freenet/src/freenet/node/simulator/BootstrapSeedTest.java
2008-08-12 20:58:42 UTC (rev 21775)
> @@ -6,7 +6,6 @@
>
> import freenet.crypt.RandomSource;
> import freenet.node.Node;
> -import freenet.node.NodeCrypto;
> import freenet.node.NodeInitException;
> import freenet.node.NodeStarter;
> import freenet.support.Executor;
> @@ -44,7 +43,6 @@
> FileUtil.writeTo(fis, new File(innerDir, "seednodes.fref"));
> fis.close();
> // Create one node
> - NodeCrypto.DISABLE_GROUP_STRIP = true;
> Executor executor = new PooledExecutor();
> Node node = NodeStarter.createTestNode(5000,
5001, "bootstrap-test", true, false, false, Node.DEFAULT_MAX_HTL, 0, random,
executor, 1000, 5*1024*1024, true, true, true, true, true, true, true,
12*1024, false, true);
> //NodeCrypto.DISABLE_GROUP_STRIP = true;
>
> Modified: trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
2008-08-12 20:45:33 UTC (rev 21774)
> +++ trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
2008-08-12 20:58:42 UTC (rev 21775)
> @@ -10,7 +10,6 @@
> import freenet.node.Announcer;
> import freenet.node.FSParseException;
> import freenet.node.Node;
> -import freenet.node.NodeCrypto;
> import freenet.node.NodeInitException;
> import freenet.node.NodeStarter;
> import freenet.node.OpennetDisabledException;
> @@ -39,7 +38,6 @@
> // Create one node
> Executor executor = new PooledExecutor();
> Node node = NodeStarter.createTestNode(5000, 5001, "seednode-pingtest",
true, false, false, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000,
5*1024*1024, true, false, false, false, false, false, false, 0, false,
false);
> - NodeCrypto.DISABLE_GROUP_STRIP = true;
> // Connect & ping
> Vector<SeedServerTestPeerNode> seedNodes = new
Vector<SeedServerTestPeerNode>();
> Vector<SimpleFieldSet> seedNodesAsSFS = Announcer.readSeednodes(new
File("/tmp/"));
>
> _______________________________________________
> cvs mailing list
> [EMAIL PROTECTED]
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
>
>
pgp2zQsvKnTfx.pgp
Description: PGP signature
_______________________________________________ Devl mailing list [email protected] http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
