From e16c80516d331a4056867512d0fe4292911f7977 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Mon, 5 Apr 2021 08:37:28 -0400
Subject: [PATCH] I2NP: Add msg ID to all build msg toString()

---
 .../java/src/net/i2p/data/i2np/InboundTunnelBuildMessage.java  | 3 ++-
 .../src/net/i2p/data/i2np/OutboundTunnelBuildReplyMessage.java | 3 ++-
 router/java/src/net/i2p/data/i2np/ShortTunnelBuildMessage.java | 3 ++-
 .../java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java | 3 ++-
 .../src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/router/java/src/net/i2p/data/i2np/InboundTunnelBuildMessage.java b/router/java/src/net/i2p/data/i2np/InboundTunnelBuildMessage.java
index 77f9a6b945..29f95483a3 100644
--- a/router/java/src/net/i2p/data/i2np/InboundTunnelBuildMessage.java
+++ b/router/java/src/net/i2p/data/i2np/InboundTunnelBuildMessage.java
@@ -120,7 +120,8 @@ public class InboundTunnelBuildMessage extends TunnelBuildMessage {
     public String toString() {
         StringBuilder buf = new StringBuilder(64);
         buf.append("[InboundTunnelBuildMessage: " +
-                   "\n\tRecords: ").append(getRecordCount())
+                   "\n\tID: ").append(getUniqueId())
+           .append("\n\tRecords: ").append(getRecordCount())
            .append(']');
         return buf.toString();
     }
diff --git a/router/java/src/net/i2p/data/i2np/OutboundTunnelBuildReplyMessage.java b/router/java/src/net/i2p/data/i2np/OutboundTunnelBuildReplyMessage.java
index ba8b6a513b..415b1ce1f3 100644
--- a/router/java/src/net/i2p/data/i2np/OutboundTunnelBuildReplyMessage.java
+++ b/router/java/src/net/i2p/data/i2np/OutboundTunnelBuildReplyMessage.java
@@ -120,7 +120,8 @@ public class OutboundTunnelBuildReplyMessage extends TunnelBuildReplyMessage {
     public String toString() {
         StringBuilder buf = new StringBuilder(64);
         buf.append("[OutboundTunnelBuildReplyMessage: " +
-                   "\n\tRecords: ").append(getRecordCount())
+                   "\n\tID: ").append(getUniqueId())
+           .append("\n\tRecords: ").append(getRecordCount())
            .append(']');
         return buf.toString();
     }
diff --git a/router/java/src/net/i2p/data/i2np/ShortTunnelBuildMessage.java b/router/java/src/net/i2p/data/i2np/ShortTunnelBuildMessage.java
index 36821607f4..e427690f52 100644
--- a/router/java/src/net/i2p/data/i2np/ShortTunnelBuildMessage.java
+++ b/router/java/src/net/i2p/data/i2np/ShortTunnelBuildMessage.java
@@ -66,7 +66,8 @@ public class ShortTunnelBuildMessage extends TunnelBuildMessage {
     public String toString() {
         StringBuilder buf = new StringBuilder(64);
         buf.append("[ShortTunnelBuildMessage: " +
-                   "\n\tRecords: ").append(getRecordCount())
+                   "\n\tID: ").append(getUniqueId())
+           .append("\n\tRecords: ").append(getRecordCount())
            .append(']');
         return buf.toString();
     }
diff --git a/router/java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java b/router/java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java
index 3682a986e3..515b06d6ef 100644
--- a/router/java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java
+++ b/router/java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java
@@ -59,7 +59,8 @@ public class VariableTunnelBuildMessage extends TunnelBuildMessage {
     public String toString() {
         StringBuilder buf = new StringBuilder(64);
         buf.append("[VariableTunnelBuildMessage: " +
-                   "\n\tRecords: ").append(getRecordCount())
+                   "\n\tID: ").append(getUniqueId())
+           .append("\n\tRecords: ").append(getRecordCount())
            .append(']');
         return buf.toString();
     }
diff --git a/router/java/src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java b/router/java/src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java
index 32b4385531..b78557add0 100644
--- a/router/java/src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java
+++ b/router/java/src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java
@@ -62,7 +62,8 @@ public class VariableTunnelBuildReplyMessage extends TunnelBuildReplyMessage {
     public String toString() {
         StringBuilder buf = new StringBuilder(64);
         buf.append("[VariableTunnelBuildReplyMessage: " +
-                   "\n\tRecords: ").append(getRecordCount())
+                   "\n\tID: ").append(getUniqueId())
+           .append("\n\tRecords: ").append(getRecordCount())
            .append(']');
         return buf.toString();
     }
-- 
GitLab