use RandomSource instead of Random

i2p · Jun 4, 2023 · 90aacc6 · 90aacc6
1 parent f0df5d1
commit 90aacc6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/router/java/src/net/i2p/router/message/GarlicMessageHandler.java b/router/java/src/net/i2p/router/message/GarlicMessageHandler.java
@@ -8,15 +8,14 @@
  *
  */
 
-import java.util.Random;
-
 import net.i2p.data.Hash;
 import net.i2p.data.router.RouterIdentity;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.Job;
 import net.i2p.router.RouterContext;
+import net.i2p.util.RandomSource;
 
 /**
  * HandlerJobBuilder to build jobs to handle GarlicMessages
@@ -35,9 +34,9 @@ public class GarlicMessageHandler implements HandlerJobBuilder {
 
     public GarlicMessageHandler(RouterContext context) {
         _context = context;
-        _msgIDBloomXorLocal = new Random().nextLong();
-        _msgIDBloomXorRouter = new Random().nextLong();
-        _msgIDBloomXorTunnel = new Random().nextLong();
+        _msgIDBloomXorLocal = RandomSource.getInstance().nextLong();
+        _msgIDBloomXorRouter = RandomSource.getInstance().nextLong();
+        _msgIDBloomXorTunnel = RandomSource.getInstance().nextLong();
     }
 
     public GarlicMessageHandler(RouterContext context, long msgIDBloomXorLocal, long msgIDBloomXorRouter, long msgIDBloomXorTunnel) {

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseLookupMessageHandler.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseLookupMessageHandler.java
@@ -8,8 +8,6 @@
  *
  */
 
-import java.util.Random;
-
 import net.i2p.data.Hash;
 import net.i2p.data.router.RouterIdentity;
 import net.i2p.data.i2np.DatabaseLookupMessage;
@@ -18,6 +16,7 @@
 import net.i2p.router.Job;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
+import net.i2p.util.RandomSource;
 
 /**
  * Build a HandleDatabaseLookupMessageJob whenever a DatabaseLookupMessage arrives
@@ -27,7 +26,7 @@ public class FloodfillDatabaseLookupMessageHandler implements HandlerJobBuilder
     private RouterContext _context;
     private FloodfillNetworkDatabaseFacade _facade;
     private Log _log;
-    private final long _msgIDBloomXor = new Random().nextLong();    
+    private final long _msgIDBloomXor = RandomSource.getInstance().nextLong();    
 
     public FloodfillDatabaseLookupMessageHandler(RouterContext context, FloodfillNetworkDatabaseFacade facade) {
         _context = context;

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseStoreMessageHandler.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseStoreMessageHandler.java
@@ -8,15 +8,14 @@
  *
  */
 
-import java.util.Random;
-
 import net.i2p.data.Hash;
 import net.i2p.data.router.RouterIdentity;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.HandlerJobBuilder;
 import net.i2p.router.Job;
 import net.i2p.router.RouterContext;
+import net.i2p.util.RandomSource;
 
 /**
  * Create a HandleDatabaseStoreMessageJob whenever a DatabaseStoreMessage arrives
@@ -25,7 +24,7 @@
 public class FloodfillDatabaseStoreMessageHandler implements HandlerJobBuilder {
     private RouterContext _context;
     private FloodfillNetworkDatabaseFacade _facade;
-    private final long _msgIDBloomXor = new Random().nextLong();
+    private final long _msgIDBloomXor = RandomSource.getInstance().nextLong();
 
     public FloodfillDatabaseStoreMessageHandler(RouterContext context, FloodfillNetworkDatabaseFacade facade) {
         _context = context;

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java
@@ -9,7 +9,6 @@
  */
 
 import java.util.HashSet;
-import java.util.Random;
 import java.util.Set;
 
 import net.i2p.data.Hash;
@@ -18,6 +17,7 @@
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
+import net.i2p.util.RandomSource;
 import net.i2p.util.SystemVersion;
 
 /**
@@ -59,7 +59,7 @@ class StartExplorersJob extends JobImpl {
     private static final long MAX_LAG = 100;
     private static final long MAX_MSG_DELAY = 1500;
 
-    private final long _msgIDBloomXor = new Random().nextLong();
+    private final long _msgIDBloomXor = RandomSource.getInstance().nextLong();
 
     public StartExplorersJob(RouterContext context, KademliaNetworkDatabaseFacade facade) {
         super(context);

diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
@@ -1,7 +1,5 @@
 package net.i2p.router.tunnel;
 
-import java.util.Random;
-
 import net.i2p.data.DatabaseEntry;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
@@ -25,6 +23,7 @@
 import net.i2p.router.message.GarlicMessageReceiver;
 import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
 import net.i2p.util.Log;
+import net.i2p.util.RandomSource;
 
 /**
  * When a message arrives at the inbound tunnel endpoint, this distributor
@@ -58,7 +57,7 @@ public InboundMessageDistributor(RouterContext ctx, Hash client) {
             _msgIDBloomXor = clienttps.getMsgIdBloomXor();
         } else {
             _clientNickname = "NULL/Expl";
-            _msgIDBloomXor = new Random().nextLong();
+            _msgIDBloomXor = RandomSource.getInstance().nextLong();
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Initializing null or exploratory InboundMessageDistributor");
         }