From 394943c36f74b685049b0f8d424e709ae2592e8c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 26 Feb 2012 21:15:31 +0000
Subject: [PATCH] debug output of LS encryption key to correlate with SKM debug
page
---
.../java/src/net/i2p/router/web/NetDbRenderer.java | 10 +++++++---
.../src/net/i2p/crypto/TransientSessionKeyManager.java | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
index 6b54c2988e..ebdacbfd69 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
@@ -106,7 +106,10 @@ public class NetDbRenderer {
StringBuilder buf = new StringBuilder(4*1024);
buf.append("<h2>" + _("Network Database Contents") + "</h2>\n");
buf.append("<a href=\"netdb\">" + _("View RouterInfo") + "</a>");
- buf.append("<h3>").append(_("LeaseSets")).append("</h3>\n");
+ buf.append("<h3>").append(_("LeaseSets"));
+ if (debug)
+ buf.append(" - Debug mode - Sorted by hash distance, closest first");
+ buf.append("</h3>\n");
Hash ourRKey;
Set<LeaseSet> leases;
DecimalFormat fmt;
@@ -169,9 +172,10 @@ public class NetDbRenderer {
if (c++ == medianCount)
median = dist;
}
- buf.append(" Dist: <b>").append(fmt.format(biLog2(dist))).append("</b>");
- buf.append(" RKey: ").append(ls.getRoutingKey().toBase64());
+ buf.append(" Dist: <b>").append(fmt.format(biLog2(dist))).append("</b><br>");
+ buf.append("Routing Key: ").append(ls.getRoutingKey().toBase64());
buf.append("<br>");
+ buf.append("Encryption Key: ").append(ls.getEncryptionKey().toBase64().substring(0, 20)).append("...<br>");
}
for (int i = 0; i < ls.getLeaseCount(); i++) {
buf.append(_("Lease")).append(' ').append(i + 1).append(": " + _("Gateway") + ' ');
diff --git a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
index e17802042b..7959c68e93 100644
--- a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
+++ b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
@@ -625,7 +625,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
OutboundSession sess = iter.next();
Set<TagSet> sets = new TreeSet(new TagSetComparator());
sets.addAll(sess.getTagSets());
- buf.append("<tr><td><b>Target key:</b> ").append(sess.getTarget().toBase64().substring(0, 64)).append("<br>" +
+ buf.append("<tr><td><b>Target public key:</b> ").append(sess.getTarget().toBase64().substring(0, 20)).append("...<br>" +
"<b>Established:</b> ").append(DataHelper.formatDuration(now - sess.getEstablishedDate())).append(" ago<br>" +
"<b>Last Used:</b> ").append(DataHelper.formatDuration(now - sess.getLastUsedDate())).append(" ago<br>" +
"<b>Session key:</b> ").append(sess.getCurrentKey().toBase64()).append("</td>" +
--
GitLab