NetDB: refactor determination of router connection establishment

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

@@ -481,7 +481,6 @@ private void sendAck(Hash storedKey) {
         msg.setMessageId(_message.getReplyToken());
         // Randomize for a little protection against clock-skew fingerprinting.
         // But the "arrival" isn't used for anything, right?
-        // TODO just set to 0?
         // TODO we have no session to garlic wrap this with, needs new message
         msg.setArrival(getContext().clock().now() - getContext().random().nextInt(3*1000));
         // may be null
@@ -536,7 +535,12 @@ private void sendAck(Hash storedKey) {
             }
             return;
         }
-        boolean isEstab = getContext().commSystem().isEstablished(toPeer);
+        DatabaseEntry entry = _message.getEntry();
+        int type = entry.getType();
+        // only send direct for RI replies or non-tunnel
+        boolean isEstab = (type == DatabaseEntry.KEY_TYPE_ROUTERINFO || replyTunnel == null) &&
+                          getContext().commSystem().isEstablished(toPeer);
+/*
         if (!isEstab && replyTunnel != null) {
             DatabaseEntry entry = _message.getEntry();
             int type = entry.getType();
@@ -589,6 +593,7 @@ private void sendAck(Hash storedKey) {
                 }
             }
         }
+*/
         if (isEstab && !_facade.isClientDb()) {
             I2NPMessage out1 = msg;
             I2NPMessage out2 = msg2;