From e5484216d63f4cb85988adfee8c935584c6161ad Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Fri, 22 Dec 2023 07:24:45 -0500
Subject: [PATCH] Router: Minor cleanups from release review
---
core/java/src/net/i2p/client/impl/I2PSessionImpl.java | 1 -
core/java/src/net/i2p/data/DatabaseEntry.java | 5 ++++-
.../src/net/i2p/router/client/ClientConnectionRunner.java | 1 -
router/java/src/net/i2p/router/client/ClientManager.java | 2 +-
.../net/i2p/router/client/ClientManagerFacadeImpl.java | 2 ++
.../net/i2p/router/dummy/DummyClientManagerFacade.java | 8 ++++++++
.../i2p/router/networkdb/kademlia/ExpireLeasesJob.java | 3 ++-
.../kademlia/FloodfillNetworkDatabaseFacade.java | 1 -
.../kademlia/FloodfillNetworkDatabaseSegmentor.java | 2 +-
.../kademlia/HandleFloodfillDatabaseStoreMessageJob.java | 1 -
.../i2p/router/networkdb/kademlia/IterativeSearchJob.java | 1 -
.../networkdb/kademlia/KademliaNetworkDatabaseFacade.java | 3 +--
.../net/i2p/router/networkdb/reseed/ReseedChecker.java | 2 +-
.../java/src/net/i2p/router/startup/BootNetworkDbJob.java | 1 -
.../i2p/router/transport/ntcp/InboundEstablishState.java | 2 +-
.../java/src/net/i2p/router/tunnel/TunnelDispatcher.java | 2 --
16 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
index 07bde4a1a2..b08a3e8b02 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
@@ -11,7 +11,6 @@ package net.i2p.client.impl;
import java.io.BufferedInputStream;
import java.io.EOFException;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/core/java/src/net/i2p/data/DatabaseEntry.java b/core/java/src/net/i2p/data/DatabaseEntry.java
index 8a6b84e275..a0b761ebae 100644
--- a/core/java/src/net/i2p/data/DatabaseEntry.java
+++ b/core/java/src/net/i2p/data/DatabaseEntry.java
@@ -74,12 +74,15 @@ public abstract class DatabaseEntry extends DataStructureImpl {
* The Hash of the local client that received this LS,
* null if the router or unknown.
*
- * @since 0.9.47
+ * @since 0.9.61
*/
public Hash getReceivedBy() {
return _receivedBy;
}
+ /**
+ * @since 0.9.61
+ */
public void setReceivedBy(Hash receivedBy) {
this._receivedBy = receivedBy;
}
diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
index 8648901931..9c0cdd078e 100644
--- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
@@ -448,7 +448,6 @@ class ClientConnectionRunner {
if (id == null)
return;
boolean isPrimary = false;
- Hash dbid = getDestHash();
for (Iterator<SessionParams> iter = _sessions.values().iterator(); iter.hasNext(); ) {
SessionParams sp = iter.next();
if (id.equals(sp.sessionId)) {
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index 5be5cc43c0..d991b7538f 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -788,7 +788,7 @@ class ClientManager {
ClientConnectionRunner runner = getRunner(destHash);
if (runner == null){
if (_log.shouldLog(Log.WARN))
- _log.warn("ClientManager got a null runner in getClientFloodfillNetworkDatabaseFacade for " + destHash);
+ _log.warn("ClientManager got a null runner in getClientFloodfillNetworkDatabaseFacade for " + destHash);
return null;
}
if (_log.shouldLog(Log.DEBUG))
diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
index e4e704d4de..9813511928 100644
--- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
@@ -298,6 +298,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte
*
* @param destHash destination hash associated with the client who's subDb we're looking for
* @return the netdb or null
+ * @since 0.9.61
*/
@Override
public FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Hash destHash) {
@@ -311,6 +312,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte
* get all the primary hashes for all the clients and return them as a set
*
* @return all the hashes or an empty set, non-null
+ * @since 0.9.61
*/
@Override
public Set<Hash> getPrimaryHashes() {
diff --git a/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java
index f93b7f87d2..1e967f1508 100644
--- a/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java
+++ b/router/java/src/net/i2p/router/dummy/DummyClientManagerFacade.java
@@ -53,9 +53,17 @@ public class DummyClientManagerFacade extends ClientManagerFacade {
public SessionKeyManager getClientSessionKeyManager(Hash _dest) { return null; }
public void requestLeaseSet(Hash dest, LeaseSet set) {}
+
+ /**
+ * @since 0.9.61
+ */
public FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Hash dbid) {
return null;
}
+
+ /**
+ * @since 0.9.61
+ */
public Set<Hash> getPrimaryHashes() {
return Collections.emptySet();
}
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java
index 1964fc692c..cea205d812 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java
@@ -47,7 +47,8 @@ class ExpireLeasesJob extends JobImpl {
//_log.info("Lease " + key + " is expiring, so lets look for it again", new Exception("Expire and search"));
//_facade.lookupLeaseSet(key, null, null, RERUN_DELAY_MS);
}
- _log.info("(dbid: " + _facade
+ if (_log.shouldInfo())
+ _log.info("(dbid: " + _facade
+ "; db size: " + _facade.getKnownLeaseSets()
+ ") Leases expired: " + toExpire);
//_facade.queueForExploration(toExpire); // don't do explicit searches, just explore passively
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
index 98c853478b..1f35e4f653 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
@@ -35,7 +35,6 @@ import net.i2p.util.SystemVersion;
*/
public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacade {
public static final char CAPABILITY_FLOODFILL = 'f';
- private static final String MINIMUM_SUBDB_PEERS = "router.subDbMinimumPeers";
private final Map<Hash, FloodSearchJob> _activeFloodQueries;
private boolean _floodfillEnabled;
private final Set<Hash> _verifiesInProgress;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
index e81d766fd5..fe44e17126 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
@@ -117,7 +117,7 @@ public class FloodfillNetworkDatabaseSegmentor extends SegmentedNetworkDatabaseF
* the dbid is null.
*
* @since 0.9.61
- * @return may be null if the client netDb does not exist
+ * @return non-null, the main netDb if the client netDb does not exist
*/
@Override
public NetworkDatabaseFacade clientNetDB(Hash id) {
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java
index dd2910ab44..7c245f7794 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java
@@ -27,7 +27,6 @@ import net.i2p.data.i2np.I2NPMessage;
import net.i2p.data.i2np.TunnelGatewayMessage;
import net.i2p.router.Job;
import net.i2p.router.JobImpl;
-import net.i2p.router.NetworkDatabaseFacade;
import net.i2p.router.OutNetMessage;
import net.i2p.router.Router;
import net.i2p.router.RouterContext;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
index 8ddd61123e..d0ab7470a8 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
@@ -14,7 +14,6 @@ import net.i2p.crypto.EncType;
import net.i2p.crypto.SigType;
import net.i2p.data.Base64;
import net.i2p.data.DataHelper;
-import net.i2p.data.Destination;
import net.i2p.data.Hash;
import net.i2p.data.i2np.DatabaseLookupMessage;
import net.i2p.data.i2np.I2NPMessage;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 0e7918d6e0..e93771ed28 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -8,7 +8,6 @@ package net.i2p.router.networkdb.kademlia;
*
*/
-import java.io.File;
import java.io.IOException;
import java.io.Writer;
import java.util.Collection;
@@ -1160,7 +1159,7 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
throw new IllegalArgumentException("Invalid store attempt - " + err);
if (_log.shouldDebug())
- _log.debug("Storing LS to the persistent data store...");
+ _log.debug("Storing LS to the data store...");
_ds.put(key, leaseSet);
if (encls != null) {
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
index f6e895296c..d3680a1730 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
@@ -43,7 +43,7 @@ public class ReseedChecker {
/**
* All reseeding must be done through this instance.
- * Access through context.netDbSegmentor().reseedChecker(), others should not instantiate
+ * Access through context.netDb().reseedChecker(), others should not instantiate
*
* @since 0.9
*/
diff --git a/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java b/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java
index 79133cf171..a42c5f4084 100644
--- a/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java
+++ b/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java
@@ -10,7 +10,6 @@ package net.i2p.router.startup;
import net.i2p.router.JobImpl;
import net.i2p.router.RouterContext;
-import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseSegmentor;
/** start up the network database */
class BootNetworkDbJob extends JobImpl {
diff --git a/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
index dd6349a627..168fe5be2b 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
@@ -674,7 +674,7 @@ class InboundEstablishState extends EstablishBase implements NTCP2Payload.Payloa
}
_aliceIdent = ri.getIdentity();
Hash h = _aliceIdent.calculateHash();
- // this sets the reasonH
+ // this sets the reason
boolean ok = verifyInbound(h);
if (!ok)
throw new DataFormatException("NTCP2 verifyInbound() fail");
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
index 48ca9e55c1..c1a9095cf6 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
@@ -226,8 +226,6 @@ public class TunnelDispatcher implements Service {
ctx.statManager().createRateStat("tunnel.handleLoadClove", "When do we receive load test cloves", "Tunnels", new long[] { 60*60*1000 });
// following is for PumpedTunnelGateway
ctx.statManager().createRateStat("tunnel.dropGatewayOverflow", "Dropped message at GW, queue full", "Tunnels", new long[] { 60*60*1000 });
- ctx.statManager().createRateStat("tunnel.inboundI2NPGarlicRIDSM", "IBMD Storing Garlic RI DSM",
- "Tunnels", new long[] { 10*60*1000, 60*60*1000 });
ctx.statManager().createRateStat("tunnel.outboundTunnelEndpointFwdRIDSM", "OBTE Forwarding RI DSM",
"Tunnels", new long[] { 10*60*1000, 60*60*1000 });
}
--
GitLab