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

Console: Sort RAs in Sybil tool

Browse Source
This commit is contained in:
zzz
2018-10-07 14:52:24 +00:00
parent 477fa9ef3a
commit e2a41b7748
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
View File

@ -805,7 +805,7 @@ class NetDbRenderer {
* Sort by style, then host * Sort by style, then host
* @since 0.9.38 * @since 0.9.38
*/ */
private static class RAComparator implements Comparator<RouterAddress> { static class RAComparator implements Comparator<RouterAddress> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public int compare(RouterAddress l, RouterAddress r) { public int compare(RouterAddress l, RouterAddress r) {

10
apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java
View File

@ -7,6 +7,7 @@ import java.math.BigInteger;
import java.text.Collator; import java.text.Collator;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
@ -912,7 +913,14 @@ class SybilRenderer {
.append(info.getIdentity().getSigningPublicKey().getType().toString()).append("</p>\n"); .append(info.getIdentity().getSigningPublicKey().getType().toString()).append("</p>\n");
buf.append("<p class=\"sybil_filler\">&nbsp;</p>"); buf.append("<p class=\"sybil_filler\">&nbsp;</p>");
buf.append("</div></td></tr><tr><td class=\"sybil_addresses\" colspan=\"3\"><table><tr><td><b>" + _t("Addresses") + ":</b></td><td>"); buf.append("</div></td></tr><tr><td class=\"sybil_addresses\" colspan=\"3\"><table><tr><td><b>" + _t("Addresses") + ":</b></td><td>");
for (RouterAddress addr : info.getAddresses()) { Collection<RouterAddress> addrs = info.getAddresses();
if (addrs.size() > 1) {
// addrs is unmodifiable
List<RouterAddress> laddrs = new ArrayList<RouterAddress>(addrs);
Collections.sort(laddrs, new NetDbRenderer.RAComparator());
addrs = laddrs;
}
for (RouterAddress addr : addrs) {
String style = addr.getTransportStyle(); String style = addr.getTransportStyle();
buf.append("<br><b class=\"netdb_transport\">").append(DataHelper.stripHTML(style)).append(":</b> "); buf.append("<br><b class=\"netdb_transport\">").append(DataHelper.stripHTML(style)).append(":</b> ");
Map<Object, Object> p = addr.getOptionsMap(); Map<Object, Object> p = addr.getOptionsMap();