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

Sybil page date formatting

Browse Source
This commit is contained in:
zzz
2018-12-17 14:43:02 +00:00
parent bf3a7d6ef7
commit 20876ff307
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import java.io.Serializable;
import java.io.Writer; import java.io.Writer;
import java.math.BigInteger; import java.math.BigInteger;
import java.text.Collator; import java.text.Collator;
import java.text.DateFormat;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -45,6 +46,7 @@ import net.i2p.stat.RateStat;
import net.i2p.util.ConvertToHash; import net.i2p.util.ConvertToHash;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.i2p.util.ObjectCounter; import net.i2p.util.ObjectCounter;
import net.i2p.util.SystemVersion;
import net.i2p.util.Translate; import net.i2p.util.Translate;
import net.i2p.util.VersionComparator; import net.i2p.util.VersionComparator;
@ -225,13 +227,15 @@ public class SybilRenderer {
"Select stored analysis: " + "Select stored analysis: " +
"<select name=\"date\">\n"); "<select name=\"date\">\n");
boolean first = true; boolean first = true;
DateFormat dfmt = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
dfmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
for (Long date : dates) { for (Long date : dates) {
buf.append("<option value=\"").append(date).append('\"'); buf.append("<option value=\"").append(date).append('\"');
if (first) { if (first) {
buf.append(" selected=\"selected\""); buf.append(" selected=\"selected\"");
first = false; first = false;
} }
buf.append('>').append(new Date(date.longValue())).append("</option>\n"); buf.append('>').append(dfmt.format(new Date(date.longValue()))).append("</option>\n");
} }
buf.append("</select>\n" + buf.append("</select>\n" +
"<input type=\"submit\" name=\"action\" class=\"go\" value=\"Review analysis\" />" + "<input type=\"submit\" name=\"action\" class=\"go\" value=\"Review analysis\" />" +
@ -247,10 +251,12 @@ public class SybilRenderer {
private void renderFFSummary(Writer out, StringBuilder buf, List<RouterInfo> ris, double avgMinDist) throws IOException { private void renderFFSummary(Writer out, StringBuilder buf, List<RouterInfo> ris, double avgMinDist) throws IOException {
renderRouterInfo(buf, _context.router().getRouterInfo(), null, true, false); renderRouterInfo(buf, _context.router().getRouterInfo(), null, true, false);
buf.append("<h3 id=\"known\" class=\"sybils\">Known Floodfills: ").append(ris.size()).append("</h3>"); buf.append("<h3 id=\"known\" class=\"sybils\">Known Floodfills: ").append(ris.size()).append("</h3>");
DateFormat dfmt = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
dfmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
buf.append("<div id=\"sybils_summary\">\n" + buf.append("<div id=\"sybils_summary\">\n" +
"<b>Average closest floodfill distance:</b> ").append(fmt.format(avgMinDist)).append("<br>\n" + "<b>Average closest floodfill distance:</b> ").append(fmt.format(avgMinDist)).append("<br>\n" +
"<b>Routing Data:</b> \"").append(DataHelper.getUTF8(_context.routerKeyGenerator().getModData())) "<b>Routing Data:</b> \"").append(DataHelper.getUTF8(_context.routerKeyGenerator().getModData()))
.append("\" <b>Last Changed:</b> ").append(new Date(_context.routerKeyGenerator().getLastChanged())).append("<br>\n" + .append("\" <b>Last Changed:</b> ").append(dfmt.format(new Date(_context.routerKeyGenerator().getLastChanged()))).append("<br>\n" +
"<b>Next Routing Data:</b> \"").append(DataHelper.getUTF8(_context.routerKeyGenerator().getNextModData())) "<b>Next Routing Data:</b> \"").append(DataHelper.getUTF8(_context.routerKeyGenerator().getNextModData()))
.append("\" <b>Rotates in:</b> ").append(DataHelper.formatDuration(_context.routerKeyGenerator().getTimeTillMidnight())).append("\n" + .append("\" <b>Rotates in:</b> ").append(DataHelper.formatDuration(_context.routerKeyGenerator().getTimeTillMidnight())).append("\n" +
"</div>\n"); "</div>\n");
@ -393,7 +399,9 @@ public class SybilRenderer {
List<Hash> warns = new ArrayList<Hash>(points.keySet()); List<Hash> warns = new ArrayList<Hash>(points.keySet());
Collections.sort(warns, new PointsComparator(points)); Collections.sort(warns, new PointsComparator(points));
ReasonComparator rcomp = new ReasonComparator(); ReasonComparator rcomp = new ReasonComparator();
buf.append("<h3 id=\"threats\" class=\"sybils\">Routers with Most Threat Points as of " + new Date(date) + "</h3>"); DateFormat dfmt = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
dfmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
buf.append("<h3 id=\"threats\" class=\"sybils\">Routers with Most Threat Points as of " + dfmt.format(new Date(date)) + "</h3>");
for (Hash h : warns) { for (Hash h : warns) {
RouterInfo ri = _context.netDb().lookupRouterInfoLocally(h); RouterInfo ri = _context.netDb().lookupRouterInfoLocally(h);
if (ri == null) if (ri == null)
@ -881,8 +889,9 @@ public class SybilRenderer {
out.write("<h3>Distance to " + from.toBase64() + "</h3>"); out.write("<h3>Distance to " + from.toBase64() + "</h3>");
prev = null; prev = null;
final int limit = Math.min(10, sybils.size()); final int limit = Math.min(10, sybils.size());
DateFormat dfmt = DateFormat.getDateInstance(DateFormat.MEDIUM);
for (int i = start; i <= days; i++) { for (int i = start; i <= days; i++) {
out.write("<h3 class=\"tabletitle\">Distance for " + new Date(now) + out.write("<h3 class=\"tabletitle\">Distance for " + dfmt.format(new Date(now)) +
"</h3><table class=\"sybil_distance\"><tr><th>Hash<th>Distance<th>Distance from previous</tr>\n"); "</h3><table class=\"sybil_distance\"><tr><th>Hash<th>Distance<th>Distance from previous</tr>\n");
Hash rkey = rkgen.getRoutingKey(from, now); Hash rkey = rkgen.getRoutingKey(from, now);
xor = new XORComparator<Hash>(rkey); xor = new XORComparator<Hash>(rkey);