debug output of LS encryption key to correlate with SKM debug page

This commit is contained in:
zzz
2012-02-26 21:15:31 +00:00
parent 6ee9b79e45
commit 394943c36f
2 changed files with 8 additions and 4 deletions

View File

@ -106,7 +106,10 @@ public class NetDbRenderer {
StringBuilder buf = new StringBuilder(4*1024); StringBuilder buf = new StringBuilder(4*1024);
buf.append("<h2>" + _("Network Database Contents") + "</h2>\n"); buf.append("<h2>" + _("Network Database Contents") + "</h2>\n");
buf.append("<a href=\"netdb\">" + _("View RouterInfo") + "</a>"); 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; Hash ourRKey;
Set<LeaseSet> leases; Set<LeaseSet> leases;
DecimalFormat fmt; DecimalFormat fmt;
@ -169,9 +172,10 @@ public class NetDbRenderer {
if (c++ == medianCount) if (c++ == medianCount)
median = dist; median = dist;
} }
buf.append(" Dist: <b>").append(fmt.format(biLog2(dist))).append("</b>"); buf.append(" Dist: <b>").append(fmt.format(biLog2(dist))).append("</b><br>");
buf.append(" RKey: ").append(ls.getRoutingKey().toBase64()); buf.append("Routing Key: ").append(ls.getRoutingKey().toBase64());
buf.append("<br>"); buf.append("<br>");
buf.append("Encryption Key: ").append(ls.getEncryptionKey().toBase64().substring(0, 20)).append("...<br>");
} }
for (int i = 0; i < ls.getLeaseCount(); i++) { for (int i = 0; i < ls.getLeaseCount(); i++) {
buf.append(_("Lease")).append(' ').append(i + 1).append(": " + _("Gateway") + ' '); buf.append(_("Lease")).append(' ').append(i + 1).append(": " + _("Gateway") + ' ');

View File

@ -625,7 +625,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
OutboundSession sess = iter.next(); OutboundSession sess = iter.next();
Set<TagSet> sets = new TreeSet(new TagSetComparator()); Set<TagSet> sets = new TreeSet(new TagSetComparator());
sets.addAll(sess.getTagSets()); 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>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>Last Used:</b> ").append(DataHelper.formatDuration(now - sess.getLastUsedDate())).append(" ago<br>" +
"<b>Session key:</b> ").append(sess.getCurrentKey().toBase64()).append("</td>" + "<b>Session key:</b> ").append(sess.getCurrentKey().toBase64()).append("</td>" +