From 3a0873c9918f69e8e1ab9726c1d17dd228dae460 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 23 Jul 2019 21:08:30 +0000
Subject: [PATCH] streaming debug log tweak and notes on ID mismatch

---
 .../java/src/net/i2p/client/streaming/impl/Connection.java     | 2 +-
 .../net/i2p/client/streaming/impl/ConnectionPacketHandler.java | 3 ++-
 .../java/src/net/i2p/client/streaming/impl/PacketHandler.java  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
index 69242acfa..a06a48809 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
@@ -1342,7 +1342,7 @@ class Connection {
         else
             buf.append(" to ");
         if (_remotePeer != null)
-            buf.append(_remotePeer.calculateHash().toBase64().substring(0,4));
+            buf.append(_remotePeer.toBase32());
         else
             buf.append("unknown");
         buf.append(" up ").append(DataHelper.formatDuration(_context.clock().now() - _createdOn));
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java
index cf62193ec..4c5708ad2 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java
@@ -50,6 +50,7 @@ class ConnectionPacketHandler {
         boolean ok = verifyPacket(packet, con);
         if (!ok) {
             boolean isTooFast = con.getSendStreamId() <= 0;
+            // Apparently an i2pd bug... see verifyPacket()
             if ( (!packet.isFlagSet(Packet.FLAG_RESET)) && (!isTooFast) && (_log.shouldLog(Log.WARN)) )
                 _log.warn("Packet does NOT verify: " + packet + " on " + con);
             packet.releasePayload();
@@ -543,7 +544,7 @@ class ConnectionPacketHandler {
                     }
                 }
             } else {
-                // getting a lot of these - why? mostly/all for acks...
+                // Apparently an i2pd bug...
                 if (con.getSendStreamId() != packet.getReceiveStreamId()) {
                     if (_log.shouldLog(Log.WARN))
                         _log.warn("Packet received with the wrong reply stream id: " 
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
index 6e74afed9..068efbf71 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
@@ -191,6 +191,7 @@ class PacketHandler {
                         } else if (oldId == packet.getReceiveStreamId()) {
                             // ok, as expected...
                         } else {
+                            // Apparently an i2pd bug...
                             if (_log.shouldLog(Log.WARN))
                                 _log.warn("Received a syn with the wrong IDs, con=" + con + " packet=" + packet);
                             sendReset(packet);