[freenet-cvs] r12633 - trunk/freenet/src/freenet/node/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-13 15:28:59 +0000 (Fri, 13 Apr 2007)
New Revision: 12633

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
Log:
Seed from client.node.random and use MT to get 128 bits ... might clash if the 
client is null :(

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java        
2007-04-13 15:23:49 UTC (rev 12632)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java        
2007-04-13 15:28:59 UTC (rev 12633)
@@ -9,7 +9,8 @@
 import java.util.Iterator;
 import java.util.Random;

-import freenet.crypt.DummyRandomSource;
+import org.spaceroots.mantissa.random.MersenneTwister;
+
 import freenet.support.HexUtil;
 import freenet.support.Logger;
 import freenet.support.api.BucketFactory;
@@ -33,18 +34,18 @@
                /**
                 * null if not requested.
                 */
-               DDACheckJob(File directory, File readFilename, File 
writeFilename) {
+               DDACheckJob(Random r, File directory, File readFilename, File 
writeFilename) {
                        this.directory = directory;
                        this.readFilename = readFilename;
                        this.writeFilename = writeFilename;

-                       Random r = new DummyRandomSource();
+                       MersenneTwister mt = new MersenneTwister(r.nextInt());
                        byte[] random = new byte[128];

-                       r.nextBytes(random);
+                       mt.nextBytes(random);
                        this.readContent = new 
String(HexUtil.bytesToHex(random));

-                       r.nextBytes(random);
+                       mt.nextBytes(random);
                        this.writeContent = new 
String(HexUtil.bytesToHex(random));
                }
        }
@@ -352,7 +353,7 @@
                        }
                }

-               DDACheckJob result = new DDACheckJob(directory, readFile, 
writeFile);
+               DDACheckJob result = new DDACheckJob(client.core.random, 
directory, readFile, writeFile);
                synchronized (inTestDirectories) {
                        inTestDirectories.put(directory, result);
                }