echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ratchet: Fix sorting for sessions on /debug

Browse Source
This commit is contained in:
zzz
2020-04-06 13:22:58 +00:00
parent 2482df7121
commit f9f64a441b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
router/java/src/net/i2p/router/crypto/ratchet/RatchetSKM.java
View File

@ -737,11 +737,13 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
int total = 0; int total = 0;
int totalSets = 0; int totalSets = 0;
long now = _context.clock().now(); long now = _context.clock().now();
Set<RatchetTagSet> sets = new TreeSet<RatchetTagSet>(new RatchetTagSetComparator()); Comparator<RatchetTagSet> comp = new RatchetTagSetComparator();
List<RatchetTagSet> sets = new ArrayList<RatchetTagSet>();
for (Map.Entry<PublicKey, Set<RatchetTagSet>> e : inboundSets.entrySet()) { for (Map.Entry<PublicKey, Set<RatchetTagSet>> e : inboundSets.entrySet()) {
PublicKey skey = e.getKey(); PublicKey skey = e.getKey();
sets.clear(); sets.clear();
sets.addAll(e.getValue()); sets.addAll(e.getValue());
Collections.sort(sets, comp);
totalSets += sets.size(); totalSets += sets.size();
buf.append("<tr><td><b>Public key:</b> ").append(skey.toBase64()).append("</td>" + buf.append("<tr><td><b>Public key:</b> ").append(skey.toBase64()).append("</td>" +
"<td><b>Sets:</b> ").append(sets.size()).append("</td></tr>" + "<td><b>Sets:</b> ").append(sets.size()).append("</td></tr>" +
@ -779,6 +781,7 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
for (OutboundSession sess : outbound) { for (OutboundSession sess : outbound) {
sets.clear(); sets.clear();
sets.addAll(sess.getTagSets()); sets.addAll(sess.getTagSets());
Collections.sort(sets, comp);
totalSets += sets.size(); totalSets += sets.size();
buf.append("<tr class=\"debug_outboundtarget\"><td><div class=\"debug_targetinfo\"><b>Target public key:</b> ").append(toString(sess.getTarget())).append("<br>" + buf.append("<tr class=\"debug_outboundtarget\"><td><div class=\"debug_targetinfo\"><b>Target public key:</b> ").append(toString(sess.getTarget())).append("<br>" +
"<b>Established:</b> ").append(DataHelper.formatDuration2(now - sess.getEstablishedDate())).append(" ago<br>" + "<b>Established:</b> ").append(DataHelper.formatDuration2(now - sess.getEstablishedDate())).append(" ago<br>" +
@ -828,7 +831,7 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
*/ */
private static class RatchetTagSetComparator implements Comparator<RatchetTagSet>, Serializable { private static class RatchetTagSetComparator implements Comparator<RatchetTagSet>, Serializable {
public int compare(RatchetTagSet l, RatchetTagSet r) { public int compare(RatchetTagSet l, RatchetTagSet r) {
return l.getID() - r.getID(); return l.getDebugID() - r.getDebugID();
} }
} }