Router: fix broken null check in shouldThrottleBurstLookup

Merge branch 'i2p.i2p.2.4.0-delete-hostname-cli-fix' of i2pgit.org:idk/i2p.i2p into i2p.i2p.2.4.0-test4
Router: fix the deleteHostname cli
2023-10-17 11:48:49 -04:00 · 2023-10-16 21:01:34 -04:00 · 2023-10-16 20:55:34 -04:00
2 changed files with 3 additions and 2 deletions
--- a/core/java/src/net/i2p/client/naming/LookupDest.java
+++ b/core/java/src/net/i2p/client/naming/LookupDest.java
@ -143,8 +143,9 @@ public class LookupDest {
     *  TODO: does not support I2CP options.
     */
    public static void main(String args[]) {
-        if (args.length != 1) {
+        if (args.length < 1) {
            System.err.println("Usage: LookupDest hostname|b32");
+            System.err.println("Usage: LookupDest -d hostname");
            System.exit(1);
        }
        if (args[0].length() == 1) {
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
@ -258,7 +258,7 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad

    boolean shouldThrottleBurstLookup(Hash from, TunnelId id) {
        // null before startup
-        return _lookupThrottler == null || _lookupThrottlerBurst.shouldThrottle(from, id);
+        return _lookupThrottlerBurst == null || _lookupThrottlerBurst.shouldThrottle(from, id);
    }

    /**
Author	SHA1	Message	Date
eyedeekay	eb0f91ece7	Router: fix broken null check in shouldThrottleBurstLookup	2023-10-17 11:48:49 -04:00
eyedeekay	363375f24c	Merge branch 'i2p.i2p.2.4.0-delete-hostname-cli-fix' of i2pgit.org:idk/i2p.i2p into i2p.i2p.2.4.0-test4	2023-10-16 21:01:34 -04:00
eyedeekay	e74d32f11f	Router: fix the deleteHostname cli	2023-10-16 20:55:34 -04:00