From c1adcfcc19cf8b345e292eb9c781e3dc078d575d Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 10 May 2019 17:33:39 +0000
Subject: [PATCH] NetDB: Use expl. tunnels to verify Meta LS2 (proposal #123)

---
 .../networkdb/kademlia/FloodfillVerifyStoreJob.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
index 12a6b2cf3..4edca5606 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
@@ -103,7 +103,8 @@ class FloodfillVerifyStoreJob extends JobImpl {
 
         boolean isInboundExploratory;
         TunnelInfo replyTunnelInfo;
-        if (_isRouterInfo || getContext().keyRing().get(_key) != null) {
+        if (_isRouterInfo || getContext().keyRing().get(_key) != null ||
+            _type == DatabaseEntry.KEY_TYPE_META_LS2) {
             replyTunnelInfo = getContext().tunnelManager().selectInboundExploratoryTunnel(_target);
             isInboundExploratory = true;
         } else {
@@ -122,10 +123,12 @@ class FloodfillVerifyStoreJob extends JobImpl {
         // to avoid association by the exploratory tunnel OBEP.
         // Unless it is an encrypted leaseset.
         TunnelInfo outTunnel;
-        if (_isRouterInfo || getContext().keyRing().get(_key) != null)
+        if (_isRouterInfo || getContext().keyRing().get(_key) != null ||
+            _type == DatabaseEntry.KEY_TYPE_META_LS2) {
             outTunnel = getContext().tunnelManager().selectOutboundExploratoryTunnel(_target);
-        else
+        } else {
             outTunnel = getContext().tunnelManager().selectOutboundTunnel(_client, _target);
+        }
         if (outTunnel == null) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("No outbound tunnels to verify a store");