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

NetDbRenderer.java: fix nonsensical handling of LS1 entries on line 735-750, which should fix issue #493

Browse Source
This commit is contained in:
eyedeekay
2025-01-01 17:47:13 -05:00
parent a2069da48f
commit 09366fb46e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -732,21 +732,21 @@ class NetDbRenderer {
if (myLeaseSet.getType() == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 || _context.keyRing().get(myLeaseSet.getHash()) != null)
buf.append(" <b>(").append(_t("Encrypted")).append(")</b>");
buf.append(_t("Published")).append(" ");
LeaseSet2 ls2 = (LeaseSet2) myLeaseSet;
long exp = 0;
long now = _context.clock().now();
long pub = now - ls2.getPublished();
buf.append(_t("{0} ago", DataHelper.formatDuration2(pub)));
long exp;
if (myLeaseSet.getType() == DatabaseEntry.KEY_TYPE_LEASESET) {
exp = ls2.getLatestLeaseDate() - now;
if (myLeaseSet.getType() != DatabaseEntry.KEY_TYPE_LEASESET) {
LeaseSet2 ls2 = (LeaseSet2) myLeaseSet;
long pub = now - ls2.getPublished();
buf.append(_t("{0} ago", DataHelper.formatDuration2(pub)));
exp = ls2.getExpires()-now;;
buf.append(" - ");
} else {
exp = ls2.getExpires()-now;
exp = myLeaseSet.getLatestLeaseDate() - now;
}
buf.append(" - ");
if (exp > 0)
buf.append(_t("Expires in {0}", DataHelper.formatDuration2(exp)));
else
buf.append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exp)));
buf.append(_t("Expires in {0}", DataHelper.formatDuration2(exp)));
else
buf.append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exp)));
}
buf.append("</th><th></th></tr>\n");
buf.append("\n<tr><td colspan=\"2\"><ul class=\"netdb_leases\">");