Changeset 9d5e8dd for router

Timestamp:

Jan 20, 2016 4:44:40 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

d82591a

Parents:

07e85e0

Message:

make network ID configurable for testing

Location:

router/java/src/net/i2p/router

Files:

• Router.java (modified) (3 diffs)
• StatisticsManager.java (modified) (3 diffs)
• networkdb/kademlia/FloodfillNetworkDatabaseFacade.java (modified) (1 diff)
• networkdb/kademlia/KademliaNetworkDatabaseFacade.java (modified) (3 diffs)
• networkdb/kademlia/PersistentDataStore.java (modified) (3 diffs)
• transport/udp/EstablishmentManager.java (modified) (4 diffs)
• transport/udp/UDPTransport.java (modified) (3 diffs)

router/java/src/net/i2p/router/Router.java

@@ -101 +101 @@
 
     /** used to differentiate routerInfo files on different networks */
-    public static final int NETWORK_ID = 2;
+    private static final int DEFAULT_NETWORK_ID = 2;
+    private static final String PROP_NETWORK_ID = "router.networkID";
+    private final int _networkID;
     
     /** coalesce stats this often - should be a little less than one minute, so the graphs get updated */
@@ -348 +350 @@
             saveConfig();
         }
+        int id = DEFAULT_NETWORK_ID;
+        String sid = _config.get(PROP_NETWORK_ID);
+        if (sid != null) {
+            try {
+                id = Integer.parseInt(sid);
+            } catch (NumberFormatException nfe) {}
+        }
+        _networkID = id;
         changeState(State.INITIALIZED);
         // *********  Start no threads before here ********* //
@@ -537 +547 @@
         return Math.max(1000, System.currentTimeMillis() - _started);
     }
+
+    /**
+     *  The network ID. Default 2.
+     *  May be changed with the config property router.networkID (restart required).
+     *  Change only if running a test network to prevent cross-network contamination.
+     *  @since 0.9.25
+     */
+    public int getNetworkID() { return _networkID; }
     
     /**

router/java/src/net/i2p/router/StatisticsManager.java

@@ -33 +33 @@
     private final Log _log;
     private final RouterContext _context;
+    private final String _networkID;
     
     public final static String PROP_PUBLISH_RANKINGS = "router.publishPeerRankings";
@@ -47 +48 @@
         _pct = new DecimalFormat("#0.00%", new DecimalFormatSymbols(Locale.UK));
         _log = context.logManager().getLog(StatisticsManager.class);
+        _networkID = Integer.toString(context.router().getNetworkID());
     }
         
@@ -73 +75 @@
         if (CoreVersion.VERSION.equals("0.9.23"))
             stats.setProperty("coreVersion", CoreVersion.VERSION);
-        stats.setProperty(RouterInfo.PROP_NETWORK_ID, Integer.toString(Router.NETWORK_ID));
+        stats.setProperty(RouterInfo.PROP_NETWORK_ID, _networkID);
         stats.setProperty(RouterInfo.PROP_CAPABILITIES, _context.router().getCapabilities());
 

router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java

@@ -480 +480 @@
         // yikes don't do this - stack overflow //  getFloodfillPeers().size() == 0 ||
         // yikes2 don't do this either - deadlock! // getKnownRouters() < MIN_REMAINING_ROUTERS ||
-        if (info.getNetworkId() == Router.NETWORK_ID &&
+        if (info.getNetworkId() == _networkID &&
             (getKBucketSetSize() < MIN_REMAINING_ROUTERS ||
              _context.router().getUptime() < DONT_FAIL_PERIOD ||

router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

@@ -71 +71 @@
     private volatile long _lastRIPublishTime;
     private NegativeLookupCache _negativeCache;
+    protected final int _networkID;
 
     /** 
@@ -157 +158 @@
         _context = context;
         _log = _context.logManager().getLog(getClass());
+        _networkID = context.router().getNetworkID();
         _peerSelector = createPeerSelector();
         _publishingLeaseSets = new HashMap<Hash, RepublishLeaseSetJob>(8);
@@ -890 +892 @@
             return "Invalid routerInfo signature";
         }
-        if (routerInfo.getNetworkId() != Router.NETWORK_ID){
+        if (routerInfo.getNetworkId() != _networkID){
             _context.banlist().banlistRouter(key, "Not in our network");
             if (_log.shouldLog(Log.WARN))

router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java

@@ -55 +55 @@
     private volatile boolean _initialized;
     private final boolean _flat;
+    private final int _networkID;
     
     private final static int READ_DELAY = 2*60*1000;
@@ -66 +67 @@
     public PersistentDataStore(RouterContext ctx, String dbDir, KademliaNetworkDatabaseFacade facade) throws IOException {
         super(ctx);
+        _networkID = ctx.router().getNetworkID();
         _flat = ctx.getBooleanProperty(PROP_FLAT);
         _dbDir = getDbDir(dbDir);
@@ -506 +508 @@
                     RouterInfo ri = new RouterInfo();
                     ri.readBytes(fis, true);  // true = verify sig on read
-                    if (ri.getNetworkId() != Router.NETWORK_ID) {
+                    if (ri.getNetworkId() != _networkID) {
                         corrupt = true;
                         if (_log.shouldLog(Log.ERROR))

router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java

@@ -43 +43 @@
     private final UDPTransport _transport;
     private final PacketBuilder _builder;
+    private final int _networkID;
 
     /** map of RemoteHostId to InboundEstablishState */
@@ -144 +145 @@
         _context = ctx;
         _log = ctx.logManager().getLog(EstablishmentManager.class);
+        _networkID = ctx.router().getNetworkID();
         _transport = transport;
         _builder = new PacketBuilder(ctx, transport);
@@ -253 +255 @@
         RouterIdentity toIdentity = toRouterInfo.getIdentity();
         Hash toHash = toIdentity.calculateHash();
-        if (toRouterInfo.getNetworkId() != Router.NETWORK_ID) {
+        if (toRouterInfo.getNetworkId() != _networkID) {
             _context.banlist().banlistRouter(toHash);
             _transport.markUnreachable(toHash);
@@ -766 +768 @@
             _log.info("Completing to the peer after IB confirm: " + peer);
         DeliveryStatusMessage dsm = new DeliveryStatusMessage(_context);
-        dsm.setArrival(Router.NETWORK_ID); // overloaded, sure, but future versions can check this
+        dsm.setArrival(_networkID); // overloaded, sure, but future versions can check this
                                            // This causes huge values in the inNetPool.droppedDeliveryStatusDelay stat
                                            // so it needs to be caught in InNetMessagePool.

router/java/src/net/i2p/router/transport/udp/UDPTransport.java

@@ -88 +88 @@
     private int _mtu_ipv6;
     private boolean _mismatchLogged;
+    private final int _networkID;
 
     /**
@@ -219 +220 @@
     public UDPTransport(RouterContext ctx, DHSessionKeyBuilder.Factory dh) {
         super(ctx);
+        _networkID = ctx.router().getNetworkID();
         _dhFactory = dh;
         _log = ctx.logManager().getLog(UDPTransport.class);
@@ -1290 +1292 @@
                 return;
             if (entry.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO &&
-                ((RouterInfo) entry).getNetworkId() != Router.NETWORK_ID) {
+                ((RouterInfo) entry).getNetworkId() != _networkID) {
                 // this is pre-0.6.1.10, so it isn't going to happen any more