From e21a172e956f3601785ccaf77575850332fa30d2 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 17 Oct 2009 02:21:08 +0000 Subject: [PATCH 01/15] javadoc fix --- .../src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java index 14ee5317e2..69d5f11ce5 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java @@ -78,7 +78,7 @@ public class PeerManagerFacadeImpl implements PeerManagerFacade { return _manager.getPeersByCapability(capability); } - /** @deprecated, moved to routerconsole */ + /** @deprecated moved to routerconsole */ public void renderStatusHTML(Writer out) throws IOException { } From 001c3613381747b56e0ceb7b267badf964e31624 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 17 Oct 2009 02:21:38 +0000 Subject: [PATCH 02/15] MessageHistory cleanups --- .../src/net/i2p/router/MessageHistory.java | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java index a116aaca7c..ed5f9fc6d1 100644 --- a/router/java/src/net/i2p/router/MessageHistory.java +++ b/router/java/src/net/i2p/router/MessageHistory.java @@ -39,9 +39,8 @@ public class MessageHistory { private final static byte[] NL = System.getProperty("line.separator").getBytes(); private final static int FLUSH_SIZE = 1000; // write out at least once every 1000 entries - /** config property determining whether we want to debug with the message history */ + /** config property determining whether we want to debug with the message history - default false */ public final static String PROP_KEEP_MESSAGE_HISTORY = "router.keepHistory"; - public final static boolean DEFAULT_KEEP_MESSAGE_HISTORY = false; /** config property determining where we want to log the message history, if we're keeping one */ public final static String PROP_MESSAGE_HISTORY_FILENAME = "router.historyFilename"; public final static String DEFAULT_MESSAGE_HISTORY_FILENAME = "messageHistory.txt"; @@ -67,19 +66,8 @@ public class MessageHistory { String getFilename() { return _historyFile; } private void updateSettings() { - String keepHistory = _context.router().getConfigSetting(PROP_KEEP_MESSAGE_HISTORY); - if (keepHistory != null) { - _doLog = Boolean.TRUE.toString().equalsIgnoreCase(keepHistory); - } else { - _doLog = DEFAULT_KEEP_MESSAGE_HISTORY; - } - - String filename = null; - if (_doLog) { - filename = _context.router().getConfigSetting(PROP_MESSAGE_HISTORY_FILENAME); - if ( (filename == null) || (filename.trim().length() <= 0) ) - filename = DEFAULT_MESSAGE_HISTORY_FILENAME; - } + _doLog = Boolean.valueOf(_context.getProperty(PROP_KEEP_MESSAGE_HISTORY)).booleanValue(); + _historyFile = _context.getProperty(PROP_MESSAGE_HISTORY_FILENAME, DEFAULT_MESSAGE_HISTORY_FILENAME); } /** @@ -96,13 +84,6 @@ public class MessageHistory { _reinitializeJob.getTiming().setStartAfter(_context.clock().now()+5000); _context.jobQueue().addJob(_reinitializeJob); } else { - String filename = null; - filename = _context.router().getConfigSetting(PROP_MESSAGE_HISTORY_FILENAME); - if ( (filename == null) || (filename.trim().length() <= 0) ) - filename = DEFAULT_MESSAGE_HISTORY_FILENAME; - - _doLog = DEFAULT_KEEP_MESSAGE_HISTORY; - _historyFile = filename; _localIdent = getName(_context.routerHash()); // _unwrittenEntries = new ArrayList(64); updateSettings(); From 219095404a30725bfcb99c567735b3d822b3b390 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 17 Oct 2009 02:22:35 +0000 Subject: [PATCH 03/15] dont dump the whole JVM if we cant open the log file --- core/java/src/net/i2p/util/LogWriter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java index 1437b9f4ae..829b91d7b2 100644 --- a/core/java/src/net/i2p/util/LogWriter.java +++ b/core/java/src/net/i2p/util/LogWriter.java @@ -153,13 +153,13 @@ class LogWriter implements Runnable { if (!parent.exists()) { boolean ok = parent.mkdirs(); if (!ok) { - System.err.println("Unable to create the parent directy: " + parent.getAbsolutePath()); - System.exit(0); + System.err.println("Unable to create the parent directory: " + parent.getAbsolutePath()); + //System.exit(0); } } if (!parent.isDirectory()) { System.err.println("wtf, we cannot put the logs in a subdirectory of a plain file! we want to stre the log as " + f.getAbsolutePath()); - System.exit(0); + //System.exit(0); } } try { From 011a32f74158aa8dbfd3d658b123affe0c63dc41 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 17 Oct 2009 23:16:53 +0000 Subject: [PATCH 04/15] move NetDb renderStatusHTML() to routerconsole --- .../src/net/i2p/router/web/NetDbHelper.java | 13 +- .../src/net/i2p/router/web/NetDbRenderer.java | 271 ++++++++++++++++++ .../router/DummyNetworkDatabaseFacade.java | 2 - .../net/i2p/router/NetworkDatabaseFacade.java | 10 +- .../KademliaNetworkDatabaseFacade.java | 245 +--------------- 5 files changed, 291 insertions(+), 250 deletions(-) create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java index cffe6f1a78..fd49aa7ad0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java @@ -17,23 +17,24 @@ public class NetDbHelper extends HelperBase { public void setLease(String l) { _lease = "1".equals(l); } public String getNetDbSummary() { + NetDbRenderer renderer = new NetDbRenderer(_context); try { if (_out != null) { if (_routerPrefix != null) - _context.netDb().renderRouterInfoHTML(_out, _routerPrefix); + renderer.renderRouterInfoHTML(_out, _routerPrefix); else if (_lease) - _context.netDb().renderLeaseSetHTML(_out); + renderer.renderLeaseSetHTML(_out); else - _context.netDb().renderStatusHTML(_out, _full); + renderer.renderStatusHTML(_out, _full); return ""; } else { ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024); if (_routerPrefix != null) - _context.netDb().renderRouterInfoHTML(new OutputStreamWriter(baos), _routerPrefix); + renderer.renderRouterInfoHTML(new OutputStreamWriter(baos), _routerPrefix); else if (_lease) - _context.netDb().renderLeaseSetHTML(new OutputStreamWriter(baos)); + renderer.renderLeaseSetHTML(new OutputStreamWriter(baos)); else - _context.netDb().renderStatusHTML(new OutputStreamWriter(baos), _full); + renderer.renderStatusHTML(new OutputStreamWriter(baos), _full); return new String(baos.toByteArray()); } } catch (IOException ioe) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java new file mode 100644 index 0000000000..1e3e6dcc84 --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -0,0 +1,271 @@ +package net.i2p.router.web; +/* + * free (adj.): unencumbered; not under the control of others + * Written by jrandom in 2003 and released into the public domain + * with no warranty of any kind, either expressed or implied. + * It probably won't make your computer catch on fire, or eat + * your children, but it might. Use at your own risk. + * + */ + +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.data.Hash; +import net.i2p.data.LeaseSet; +import net.i2p.data.RouterAddress; +import net.i2p.data.RouterInfo; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelPoolSettings; +import net.i2p.util.ObjectCounter; + +public class NetDbRenderer { + private RouterContext _context; + + public NetDbRenderer (RouterContext ctx) { + _context = ctx; + } + + private class LeaseSetComparator implements Comparator { + public int compare(Object l, Object r) { + Destination dl = ((LeaseSet)l).getDestination(); + Destination dr = ((LeaseSet)r).getDestination(); + boolean locall = _context.clientManager().isLocal(dl); + boolean localr = _context.clientManager().isLocal(dr); + if (locall && !localr) return -1; + if (localr && !locall) return 1; + return dl.calculateHash().toBase64().compareTo(dr.calculateHash().toBase64()); + } + } + + private static class RouterInfoComparator implements Comparator { + public int compare(Object l, Object r) { + return ((RouterInfo)l).getIdentity().getHash().toBase64().compareTo(((RouterInfo)r).getIdentity().getHash().toBase64()); + } + } + + public void renderRouterInfoHTML(Writer out, String routerPrefix) throws IOException { + StringBuilder buf = new StringBuilder(4*1024); + buf.append("

Network Database RouterInfo Lookup

\n"); + if (".".equals(routerPrefix)) { + renderRouterInfo(buf, _context.router().getRouterInfo(), true, true); + } else { + boolean notFound = true; + Set routers = _context.netDb().getRouters(); + for (Iterator iter = routers.iterator(); iter.hasNext(); ) { + RouterInfo ri = (RouterInfo)iter.next(); + Hash key = ri.getIdentity().getHash(); + if (key.toBase64().startsWith(routerPrefix)) { + renderRouterInfo(buf, ri, false, true); + notFound = false; + } + } + if (notFound) + buf.append("Router ").append(routerPrefix).append(" not found in network database"); + } + out.write(buf.toString()); + out.flush(); + } + + public void renderStatusHTML(Writer out) throws IOException { + renderStatusHTML(out, true); + } + + public void renderLeaseSetHTML(Writer out) throws IOException { + StringBuilder buf = new StringBuilder(4*1024); + buf.append("

Network Database Contents

\n"); + buf.append("View RouterInfo"); + buf.append("

LeaseSets

\n"); + Set leases = new TreeSet(new LeaseSetComparator()); + leases.addAll(_context.netDb().getLeases()); + long now = _context.clock().now(); + for (Iterator iter = leases.iterator(); iter.hasNext(); ) { + LeaseSet ls = (LeaseSet)iter.next(); + Destination dest = ls.getDestination(); + Hash key = dest.calculateHash(); + buf.append("LeaseSet: ").append(key.toBase64()); + if (_context.clientManager().isLocal(dest)) { + buf.append(" (Local "); + if (! _context.clientManager().shouldPublishLeaseSet(key)) + buf.append("Unpublished "); + buf.append("Destination "); + TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(key); + if (in != null && in.getDestinationNickname() != null) + buf.append(in.getDestinationNickname()); + else + buf.append(dest.toBase64().substring(0, 6)); + } else { + buf.append(" (Destination "); + String host = _context.namingService().reverseLookup(dest); + if (host != null) + buf.append(host); + else + buf.append(dest.toBase64().substring(0, 6)); + } + buf.append(")
\n"); + long exp = ls.getEarliestLeaseDate()-now; + if (exp > 0) + buf.append("Expires in ").append(DataHelper.formatDuration(exp)).append("
\n"); + else + buf.append("Expired ").append(DataHelper.formatDuration(0-exp)).append(" ago
\n"); + for (int i = 0; i < ls.getLeaseCount(); i++) { + buf.append("Lease ").append(i + 1).append(": Gateway "); + buf.append(_context.commSystem().renderPeerHTML(ls.getLease(i).getGateway())); + buf.append(" Tunnel ").append(ls.getLease(i).getTunnelId().getTunnelId()).append("
\n"); + } + buf.append("
\n"); + out.write(buf.toString()); + buf.setLength(0); + } + out.write(buf.toString()); + out.flush(); + } + + public void renderStatusHTML(Writer out, boolean full) throws IOException { + int size = _context.netDb().getKnownRouters() * 512; + if (full) + size *= 4; + StringBuilder buf = new StringBuilder(size); + out.write("

Network Database Contents (View LeaseSets)

\n"); + if (!_context.netDb().isInitialized()) { + buf.append("Not initialized\n"); + out.write(buf.toString()); + out.flush(); + return; + } + + Hash us = _context.routerHash(); + out.write("

Routers (view without"); + else + out.write("?f=1#routers\" >view with"); + out.write(" stats)

\n"); + + RouterInfo ourInfo = _context.router().getRouterInfo(); + renderRouterInfo(buf, ourInfo, true, true); + out.write(buf.toString()); + buf.setLength(0); + + ObjectCounter versions = new ObjectCounter(); + ObjectCounter countries = new ObjectCounter(); + + Set routers = new TreeSet(new RouterInfoComparator()); + routers.addAll(_context.netDb().getRouters()); + for (Iterator iter = routers.iterator(); iter.hasNext(); ) { + RouterInfo ri = (RouterInfo)iter.next(); + Hash key = ri.getIdentity().getHash(); + boolean isUs = key.equals(us); + if (!isUs) { + renderRouterInfo(buf, ri, false, full); + out.write(buf.toString()); + buf.setLength(0); + String routerVersion = ri.getOption("router.version"); + if (routerVersion != null) + versions.increment(routerVersion); + String country = _context.commSystem().getCountry(key); + if(country != null) + countries.increment(country); + } + } + + buf.append("
"); + List versionList = new ArrayList(versions.objects()); + if (versionList.size() > 0) { + Collections.sort(versionList, Collections.reverseOrder()); + buf.append("\n"); + buf.append("\n"); + for (String routerVersion : versionList) { + int num = versions.count(routerVersion); + buf.append("\n"); + } + buf.append("
VersionCount
").append(DataHelper.stripHTML(routerVersion)); + buf.append("").append(num).append("
\n"); + } + buf.append("		"); + out.write(buf.toString()); + buf.setLength(0); + + List countryList = new ArrayList(countries.objects()); + if (countryList.size() > 0) { + Collections.sort(countryList); + buf.append("\n"); + buf.append("\n"); + for (String country : countryList) { + int num = countries.count(country); + buf.append("\n"); + } + buf.append("
CountryCount
\"").append(country.toUpperCase()).append("\""); "); + buf.append(_context.commSystem().getCountryName(country)); + buf.append("").append(num).append("
\n"); + } + buf.append("
"); + out.write(buf.toString()); + out.flush(); + } + + /** + * Be careful to use stripHTML for any displayed routerInfo data + * to prevent vulnerabilities + */ + private void renderRouterInfo(StringBuilder buf, RouterInfo info, boolean isUs, boolean full) { + String hash = info.getIdentity().getHash().toBase64(); + buf.append("\n"); + if (full) { + buf.append("\n"); + } else { + } + buf.append("\n"); + } + +} diff --git a/router/java/src/net/i2p/router/DummyNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/DummyNetworkDatabaseFacade.java index e192e7752c..5c5e5a0a45 100644 --- a/router/java/src/net/i2p/router/DummyNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/DummyNetworkDatabaseFacade.java @@ -60,6 +60,4 @@ class DummyNetworkDatabaseFacade extends NetworkDatabaseFacade { public Set getAllRouters() { return new HashSet(_routers.keySet()); } public Set findNearestRouters(Hash key, int maxNumRouters, Set peersToIgnore) { return new HashSet(_routers.values()); } - - public void renderStatusHTML(Writer out) throws IOException {} } diff --git a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java index 865fbf8ecc..3885ea6d53 100644 --- a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java @@ -10,6 +10,7 @@ package net.i2p.router; import java.io.IOException; import java.io.Writer; +import java.util.Collections; import java.util.Set; import net.i2p.data.Hash; @@ -60,7 +61,10 @@ public abstract class NetworkDatabaseFacade implements Service { public int getKnownLeaseSets() { return 0; } public boolean isInitialized() { return true; } public void rescan() {} - public void renderRouterInfoHTML(Writer out, String s) throws IOException {} - public void renderLeaseSetHTML(Writer out) throws IOException {} - public void renderStatusHTML(Writer out, boolean b) throws IOException {} + /** @deprecated moved to router console */ + public void renderStatusHTML(Writer out) throws IOException {} + /** public for NetDbRenderer in routerconsole */ + public Set getLeases() { return Collections.EMPTY_SET; } + /** public for NetDbRenderer in routerconsole */ + public Set getRouters() { return Collections.EMPTY_SET; } } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index 491b823a7b..be55c3da6d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -848,7 +848,9 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { return searchJob; } - private Set getLeases() { + /** public for NetDbRenderer in routerconsole */ + @Override + public Set getLeases() { if (!_initialized) return null; Set leases = new HashSet(); Set keys = getDataStore().getKeys(); @@ -860,7 +862,9 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { } return leases; } - private Set getRouters() { + /** public for NetDbRenderer in routerconsole */ + @Override + public Set getRouters() { if (!_initialized) return null; Set routers = new HashSet(); Set keys = getDataStore().getKeys(); @@ -897,241 +901,4 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { } _context.jobQueue().addJob(new StoreJob(_context, this, key, ds, onSuccess, onFailure, sendTimeout, toIgnore)); } - - class LeaseSetComparator implements Comparator { - public int compare(Object l, Object r) { - Destination dl = ((LeaseSet)l).getDestination(); - Destination dr = ((LeaseSet)r).getDestination(); - boolean locall = _context.clientManager().isLocal(dl); - boolean localr = _context.clientManager().isLocal(dr); - if (locall && !localr) return -1; - if (localr && !locall) return 1; - return dl.calculateHash().toBase64().compareTo(dr.calculateHash().toBase64()); - } - } - - class RouterInfoComparator implements Comparator { - public int compare(Object l, Object r) { - return ((RouterInfo)l).getIdentity().getHash().toBase64().compareTo(((RouterInfo)r).getIdentity().getHash().toBase64()); - } - } - - @Override - public void renderRouterInfoHTML(Writer out, String routerPrefix) throws IOException { - StringBuilder buf = new StringBuilder(4*1024); - buf.append("

Network Database RouterInfo Lookup

\n"); - if (".".equals(routerPrefix)) { - renderRouterInfo(buf, _context.router().getRouterInfo(), true, true); - } else { - boolean notFound = true; - Set routers = getRouters(); - for (Iterator iter = routers.iterator(); iter.hasNext(); ) { - RouterInfo ri = (RouterInfo)iter.next(); - Hash key = ri.getIdentity().getHash(); - if (key.toBase64().startsWith(routerPrefix)) { - renderRouterInfo(buf, ri, false, true); - notFound = false; - } - } - if (notFound) - buf.append("Router ").append(routerPrefix).append(" not found in network database"); - } - out.write(buf.toString()); - out.flush(); - } - - public void renderStatusHTML(Writer out) throws IOException { - renderStatusHTML(out, true); - } - - @Override - public void renderLeaseSetHTML(Writer out) throws IOException { - StringBuilder buf = new StringBuilder(4*1024); - buf.append("

Network Database Contents

\n"); - buf.append("View RouterInfo"); - buf.append("

LeaseSets

\n"); - Set leases = new TreeSet(new LeaseSetComparator()); - leases.addAll(getLeases()); - long now = _context.clock().now(); - for (Iterator iter = leases.iterator(); iter.hasNext(); ) { - LeaseSet ls = (LeaseSet)iter.next(); - Destination dest = ls.getDestination(); - Hash key = dest.calculateHash(); - buf.append("LeaseSet: ").append(key.toBase64()); - if (_context.clientManager().isLocal(dest)) { - buf.append(" (Local "); - if (! _context.clientManager().shouldPublishLeaseSet(key)) - buf.append("Unpublished "); - buf.append("Destination "); - TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(key); - if (in != null && in.getDestinationNickname() != null) - buf.append(in.getDestinationNickname()); - else - buf.append(dest.toBase64().substring(0, 6)); - } else { - buf.append(" (Destination "); - String host = _context.namingService().reverseLookup(dest); - if (host != null) - buf.append(host); - else - buf.append(dest.toBase64().substring(0, 6)); - } - buf.append(")
\n"); - long exp = ls.getEarliestLeaseDate()-now; - if (exp > 0) - buf.append("Expires in ").append(DataHelper.formatDuration(exp)).append("
\n"); - else - buf.append("Expired ").append(DataHelper.formatDuration(0-exp)).append(" ago
\n"); - for (int i = 0; i < ls.getLeaseCount(); i++) { - buf.append("Lease ").append(i + 1).append(": Gateway "); - buf.append(_context.commSystem().renderPeerHTML(ls.getLease(i).getGateway())); - buf.append(" Tunnel ").append(ls.getLease(i).getTunnelId().getTunnelId()).append("
\n"); - } - buf.append("
\n"); - out.write(buf.toString()); - buf.setLength(0); - } - out.write(buf.toString()); - out.flush(); - } - - @Override - public void renderStatusHTML(Writer out, boolean full) throws IOException { - int size = getKnownRouters() * 512; - if (full) - size *= 4; - StringBuilder buf = new StringBuilder(size); - out.write("

Network Database Contents (View LeaseSets)

\n"); - if (!_initialized) { - buf.append("Not initialized\n"); - out.write(buf.toString()); - out.flush(); - return; - } - - Hash us = _context.routerHash(); - out.write("

Routers (view without"); - else - out.write("?f=1#routers\" >view with"); - out.write(" stats)

\n"); - - RouterInfo ourInfo = _context.router().getRouterInfo(); - renderRouterInfo(buf, ourInfo, true, true); - out.write(buf.toString()); - buf.setLength(0); - - ObjectCounter versions = new ObjectCounter(); - ObjectCounter countries = new ObjectCounter(); - - Set routers = new TreeSet(new RouterInfoComparator()); - routers.addAll(getRouters()); - for (Iterator iter = routers.iterator(); iter.hasNext(); ) { - RouterInfo ri = (RouterInfo)iter.next(); - Hash key = ri.getIdentity().getHash(); - boolean isUs = key.equals(us); - if (!isUs) { - renderRouterInfo(buf, ri, false, full); - out.write(buf.toString()); - buf.setLength(0); - String routerVersion = ri.getOption("router.version"); - if (routerVersion != null) - versions.increment(routerVersion); - String country = _context.commSystem().getCountry(key); - if(country != null) - countries.increment(country); - } - } - - buf.append("
"); + if (isUs) { + buf.append("Our info: ").append(hash).append("
\n"); + } else { + buf.append("Peer info for: ").append(hash).append("\n"); + if (full) { + buf.append("[Back]
\n"); + } else { + buf.append("[Full entry]
\n"); + } + } + + long age = _context.clock().now() - info.getPublished(); + if (isUs && _context.router().isHidden()) + buf.append("Hidden, Updated: ").append(DataHelper.formatDuration(age)).append(" ago
\n"); + else if (age > 0) + buf.append("Published: ").append(DataHelper.formatDuration(age)).append(" ago
\n"); + else + buf.append("Published: in ").append(DataHelper.formatDuration(0-age)).append("???
\n"); + buf.append("Address(es): "); + String country = _context.commSystem().getCountry(info.getIdentity().getHash()); + if(country != null) { + buf.append("\"").append(country.toUpperCase()).append("\""); "); + } + for (Iterator iter = info.getAddresses().iterator(); iter.hasNext(); ) { + RouterAddress addr = (RouterAddress)iter.next(); + buf.append(DataHelper.stripHTML(addr.getTransportStyle())).append(": "); + for (Iterator optIter = addr.getOptions().keySet().iterator(); optIter.hasNext(); ) { + String name = (String)optIter.next(); + String val = addr.getOptions().getProperty(name); + buf.append('[').append(DataHelper.stripHTML(name)).append('=').append(DataHelper.stripHTML(val)).append("] "); + } + } + buf.append("
Stats:
\n"); + for (Iterator iter = info.getOptions().keySet().iterator(); iter.hasNext(); ) { + String key = (String)iter.next(); + String val = info.getOption(key); + buf.append(DataHelper.stripHTML(key)).append(" = ").append(DataHelper.stripHTML(val)).append("
\n"); + } + buf.append("
"); - List versionList = new ArrayList(versions.objects()); - if (versionList.size() > 0) { - Collections.sort(versionList, Collections.reverseOrder()); - buf.append("\n"); - buf.append("\n"); - for (String routerVersion : versionList) { - int num = versions.count(routerVersion); - buf.append("\n"); - } - buf.append("
VersionCount
").append(DataHelper.stripHTML(routerVersion)); - buf.append("").append(num).append("
\n"); - } - buf.append("		"); - out.write(buf.toString()); - buf.setLength(0); - - List countryList = new ArrayList(countries.objects()); - if (countryList.size() > 0) { - Collections.sort(countryList); - buf.append("\n"); - buf.append("\n"); - for (String country : countryList) { - int num = countries.count(country); - buf.append("\n"); - } - buf.append("
CountryCount
\"").append(country.toUpperCase()).append("\""); "); - buf.append(_context.commSystem().getCountryName(country)); - buf.append("").append(num).append("
\n"); - } - buf.append("
"); - out.write(buf.toString()); - out.flush(); - } - - /** - * Be careful to use stripHTML for any displayed routerInfo data - * to prevent vulnerabilities - */ - private void renderRouterInfo(StringBuilder buf, RouterInfo info, boolean isUs, boolean full) { - String hash = info.getIdentity().getHash().toBase64(); - buf.append("\n"); - if (full) { - buf.append("\n"); - } else { - } - buf.append("\n"); - } - } From 10b84418c30e3278385b8c42f5441f8e8e01cf75 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 17 Oct 2009 23:49:59 +0000 Subject: [PATCH 05/15] move TunnelPoolManager renderStatusHTML to routerconsole --- .../src/net/i2p/router/web/TunnelHelper.java | 5 +- .../net/i2p/router/web/TunnelRenderer.java | 313 ++++++++++++++++++ .../i2p/router/DummyTunnelManagerFacade.java | 9 + .../net/i2p/router/TunnelManagerFacade.java | 13 + .../router/tunnel/pool/TunnelPoolManager.java | 267 +-------------- 5 files changed, 356 insertions(+), 251 deletions(-) create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java index b605cbf361..db64f77c25 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java @@ -9,13 +9,14 @@ public class TunnelHelper extends HelperBase { public TunnelHelper() {} public String getTunnelSummary() { + TunnelRenderer renderer = new TunnelRenderer(_context); try { if (_out != null) { - _context.tunnelManager().renderStatusHTML(_out); + renderer.renderStatusHTML(_out); return ""; } else { ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024); - _context.tunnelManager().renderStatusHTML(new OutputStreamWriter(baos)); + renderer.renderStatusHTML(new OutputStreamWriter(baos)); return new String(baos.toByteArray()); } } catch (IOException ioe) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java new file mode 100644 index 0000000000..656068f11c --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -0,0 +1,313 @@ +package net.i2p.router.web; + +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.i2p.data.DataHelper; +import net.i2p.data.Destination; +import net.i2p.data.Hash; +import net.i2p.data.RouterInfo; +import net.i2p.data.TunnelId; +import net.i2p.router.Router; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; +import net.i2p.router.TunnelPoolSettings; +import net.i2p.router.tunnel.HopConfig; +import net.i2p.router.tunnel.pool.TunnelPool; +import net.i2p.stat.RateStat; +import net.i2p.util.ObjectCounter; + +/** + * + */ +public class TunnelRenderer { + private RouterContext _context; + + public TunnelRenderer(RouterContext ctx) { + _context = ctx; + } + + public void renderStatusHTML(Writer out) throws IOException { + out.write("

Exploratory tunnels (config):

\n"); + renderPool(out, _context.tunnelManager().getInboundExploratoryPool(), _context.tunnelManager().getOutboundExploratoryPool()); + + List destinations = null; + Map clientInboundPools = _context.tunnelManager().getInboundClientPools(); + Map clientOutboundPools = _context.tunnelManager().getOutboundClientPools(); + destinations = new ArrayList(clientInboundPools.keySet()); + for (int i = 0; i < destinations.size(); i++) { + Hash client = destinations.get(i); + TunnelPool in = null; + TunnelPool outPool = null; + in = clientInboundPools.get(client); + outPool = clientOutboundPools.get(client); + String name = (in != null ? in.getSettings().getDestinationNickname() : null); + if ( (name == null) && (outPool != null) ) + name = outPool.getSettings().getDestinationNickname(); + if (name == null) + name = client.toBase64().substring(0,4); + out.write("

Client tunnels for " + name); + if (_context.clientManager().isLocal(client)) + out.write(" (config):

\n"); + else + out.write(" (dead):\n"); + renderPool(out, in, outPool); + } + + List participating = _context.tunnelDispatcher().listParticipatingTunnels(); + Collections.sort(participating, new TunnelComparator()); + out.write("

Participating tunnels:

"); - if (isUs) { - buf.append("Our info: ").append(hash).append("
\n"); - } else { - buf.append("Peer info for: ").append(hash).append("\n"); - if (full) { - buf.append("[Back]
\n"); - } else { - buf.append("[Full entry]
\n"); - } - } - - long age = _context.clock().now() - info.getPublished(); - if (isUs && _context.router().isHidden()) - buf.append("Hidden, Updated: ").append(DataHelper.formatDuration(age)).append(" ago
\n"); - else if (age > 0) - buf.append("Published: ").append(DataHelper.formatDuration(age)).append(" ago
\n"); - else - buf.append("Published: in ").append(DataHelper.formatDuration(0-age)).append("???
\n"); - buf.append("Address(es): "); - String country = _context.commSystem().getCountry(info.getIdentity().getHash()); - if(country != null) { - buf.append("\"").append(country.toUpperCase()).append("\""); "); - } - for (Iterator iter = info.getAddresses().iterator(); iter.hasNext(); ) { - RouterAddress addr = (RouterAddress)iter.next(); - buf.append(DataHelper.stripHTML(addr.getTransportStyle())).append(": "); - for (Iterator optIter = addr.getOptions().keySet().iterator(); optIter.hasNext(); ) { - String name = (String)optIter.next(); - String val = addr.getOptions().getProperty(name); - buf.append('[').append(DataHelper.stripHTML(name)).append('=').append(DataHelper.stripHTML(val)).append("] "); - } - } - buf.append("
Stats:
\n"); - for (Iterator iter = info.getOptions().keySet().iterator(); iter.hasNext(); ) { - String key = (String)iter.next(); - String val = info.getOption(key); - buf.append(DataHelper.stripHTML(key)).append(" = ").append(DataHelper.stripHTML(val)).append("
\n"); - } - buf.append("
\n"); + out.write("" + + "\n"); + long processed = 0; + RateStat rs = _context.statManager().getRate("tunnel.participatingMessageCount"); + if (rs != null) + processed = (long)rs.getRate(10*60*1000).getLifetimeTotalValue(); + int inactive = 0; + for (int i = 0; i < participating.size(); i++) { + HopConfig cfg = (HopConfig)participating.get(i); + if (cfg.getProcessedMessagesCount() <= 0) { + inactive++; + continue; + } + out.write(""); + if (cfg.getReceiveTunnel() != null) + out.write(" "); + else + out.write(" "); + if (cfg.getReceiveFrom() != null) + out.write(" "); + else + out.write(" "); + if (cfg.getSendTunnel() != null) + out.write(" "); + else + out.write(" "); + if (cfg.getSendTo() != null) + out.write(" "); + else +// out.write(" "); + out.write(" "); + long timeLeft = cfg.getExpiration()-_context.clock().now(); + if (timeLeft > 0) + out.write(" "); + else + out.write(" "); + out.write(" "); + int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000); + if (lifetime <= 0) + lifetime = 1; + if (lifetime > 10*60) + lifetime = 10*60; + int bps = 1024 * (int) cfg.getProcessedMessagesCount() / lifetime; + out.write(" "); + if (cfg.getSendTo() == null) + out.write(" "); + else if (cfg.getReceiveFrom() == null) + out.write(" "); + else + out.write(" "); + out.write("\n"); + processed += cfg.getProcessedMessagesCount(); + } + out.write("
Receive onFrom" + + "Send onToExpirationUsageRateRole
" + cfg.getReceiveTunnel().getTunnelId() +"n/a" + netDbLink(cfg.getReceiveFrom()) +" " + cfg.getSendTunnel().getTunnelId() +" " + netDbLink(cfg.getSendTo()) +"  " + DataHelper.formatDuration(timeLeft) + "(grace period)" + cfg.getProcessedMessagesCount() + "KB" + bps + "BpsOutbound EndpointInbound GatewayParticipant
\n"); + out.write("
Inactive participating tunnels: " + inactive + "
\n"); + out.write("
Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B
\n"); + renderPeers(out); + } + + private static class TunnelComparator implements Comparator { + public int compare(Object l, Object r) { + return (int) (((HopConfig)r).getProcessedMessagesCount() - ((HopConfig)l).getProcessedMessagesCount()); + } + } + + private void renderPool(Writer out, TunnelPool in, TunnelPool outPool) throws IOException { + List tunnels = null; + if (in == null) + tunnels = new ArrayList(); + else + tunnels = in.listTunnels(); + if (outPool != null) + tunnels.addAll(outPool.listTunnels()); + + long processedIn = (in != null ? in.getLifetimeProcessed() : 0); + long processedOut = (outPool != null ? outPool.getLifetimeProcessed() : 0); + + int live = 0; + int maxLength = 1; + for (int i = 0; i < tunnels.size(); i++) { + TunnelInfo info = tunnels.get(i); + if (info.getLength() > maxLength) + maxLength = info.getLength(); + } + out.write(""); + if (maxLength > 3) { + out.write(""); + } + else if (maxLength == 3) { + out.write(""); + } + if (maxLength > 1) { + out.write(""); + } + out.write("\n"); + for (int i = 0; i < tunnels.size(); i++) { + TunnelInfo info = tunnels.get(i); + long timeLeft = info.getExpiration()-_context.clock().now(); + if (timeLeft <= 0) + continue; // don't display tunnels in their grace period + live++; + if (info.isInbound()) + out.write(""); + else + out.write(""); + out.write(" \n"); + out.write(" \n"); + for (int j = 0; j < info.getLength(); j++) { + Hash peer = info.getPeer(j); + TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j)); + if (_context.routerHash().equals(peer)) { + out.write(" "); + } else { + String cap = getCapacity(peer); + out.write(" "); + } + if (info.getLength() < maxLength && (info.getLength() == 1 || j == info.getLength() - 2)) { + for (int k = info.getLength(); k < maxLength; k++) + out.write(" "); + } + } + out.write("\n"); + + if (info.isInbound()) + processedIn += info.getProcessedMessagesCount(); + else + processedOut += info.getProcessedMessagesCount(); + } + out.write("
In/OutExpiryUsageGatewayParticipantsParticipantEndpoint
\"Inbound\"
\"Outbound\"" + DataHelper.formatDuration(timeLeft) + "" + info.getProcessedMessagesCount() + "KB" + (id == null ? "" : "" + id) + "" + netDbLink(peer) + (id == null ? "" : " " + id) + cap + " 
\n"); + if (in != null) { + List pending = in.listPending(); + if (pending.size() > 0) + out.write("
Build in progress: " + pending.size() + " inbound
\n"); + live += pending.size(); + } + if (outPool != null) { + List pending = outPool.listPending(); + if (pending.size() > 0) + out.write("
Build in progress: " + pending.size() + " outbound
\n"); + live += pending.size(); + } + if (live <= 0) + out.write("
No tunnels; waiting for the grace period to end.
\n"); + out.write("
Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "B in, " + + DataHelper.formatSize(processedOut*1024) + "B out
"); + } + + private void renderPeers(Writer out) throws IOException { + // count up the peers in the local pools + ObjectCounter lc = new ObjectCounter(); + int tunnelCount = countTunnelsPerPeer(lc); + + // count up the peers in the participating tunnels + ObjectCounter pc = new ObjectCounter(); + int partCount = countParticipatingPerPeer(pc); + + Set peers = new HashSet(lc.objects()); + peers.addAll(pc.objects()); + List peerList = new ArrayList(peers); + Collections.sort(peerList, new HashComparator()); + + out.write("

Tunnel Counts By Peer:

\n"); + out.write("\n"); + for (Hash h : peerList) { + out.write("
PeerExpl. + Client% of totalPart. from + to% of total
"); + out.write(netDbLink(h)); + out.write(" " + lc.count(h)); + out.write(" "); + if (tunnelCount > 0) + out.write("" + (lc.count(h) * 100 / tunnelCount)); + else + out.write('0'); + out.write(" " + pc.count(h)); + out.write(" "); + if (partCount > 0) + out.write("" + (pc.count(h) * 100 / partCount)); + else + out.write('0'); + out.write('\n'); + } + out.write("
Tunnels " + tunnelCount); + out.write("   " + partCount); + out.write("  
\n"); + } + + /* duplicate of that in tunnelPoolManager for now */ + /** @return total number of non-fallback expl. + client tunnels */ + private int countTunnelsPerPeer(ObjectCounter lc) { + List pools = new ArrayList(); + _context.tunnelManager().listPools(pools); + int tunnelCount = 0; + for (TunnelPool tp : pools) { + for (TunnelInfo info : tp.listTunnels()) { + if (info.getLength() > 1) { + tunnelCount++; + for (int j = 0; j < info.getLength(); j++) { + Hash peer = info.getPeer(j); + if (!_context.routerHash().equals(peer)) + lc.increment(peer); + } + } + } + } + return tunnelCount; + } + + /** @return total number of part. tunnels */ + private int countParticipatingPerPeer(ObjectCounter pc) { + List participating = _context.tunnelDispatcher().listParticipatingTunnels(); + for (HopConfig cfg : participating) { + Hash from = cfg.getReceiveFrom(); + if (from != null) + pc.increment(from); + Hash to = cfg.getSendTo(); + if (to != null) + pc.increment(to); + } + return participating.size(); + } + + private static class HashComparator implements Comparator { + public int compare(Object l, Object r) { + return ((Hash)l).toBase64().compareTo(((Hash)r).toBase64()); + } + } + + private String getCapacity(Hash peer) { + RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); + if (info != null) { + String caps = info.getCapabilities(); + for (char c = Router.CAPABILITY_BW12; c <= Router.CAPABILITY_BW256; c++) { + if (caps.indexOf(c) >= 0) + return " " + c; + } + } + return ""; + } + + private String netDbLink(Hash peer) { + return _context.commSystem().renderPeerHTML(peer); + } +} diff --git a/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java b/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java index 3a19cd1178..4b8fb486e4 100644 --- a/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/DummyTunnelManagerFacade.java @@ -10,11 +10,14 @@ package net.i2p.router; import java.io.IOException; import java.io.Writer; +import java.util.List; +import java.util.Map; import java.util.Set; import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.TunnelId; +import net.i2p.router.tunnel.pool.TunnelPool; /** * Build and maintain tunnels throughout the network. @@ -50,4 +53,10 @@ class DummyTunnelManagerFacade implements TunnelManagerFacade { public void restart() {} public void shutdown() {} public void startup() {} + + public void listPools(List out) {} + public Map getInboundClientPools() { return null; } + public Map getOutboundClientPools() { return null; } + public TunnelPool getInboundExploratoryPool() { return null; } + public TunnelPool getOutboundExploratoryPool() { return null; } } diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java index e8bdc31d38..148499a43d 100644 --- a/router/java/src/net/i2p/router/TunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java @@ -8,11 +8,14 @@ package net.i2p.router; * */ +import java.util.List; +import java.util.Map; import java.util.Set; import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.TunnelId; +import net.i2p.router.tunnel.pool.TunnelPool; /** * Build and maintain tunnels throughout the network. @@ -74,4 +77,14 @@ public interface TunnelManagerFacade extends Service { public void setOutboundSettings(TunnelPoolSettings settings); public void setInboundSettings(Hash client, TunnelPoolSettings settings); public void setOutboundSettings(Hash client, TunnelPoolSettings settings); + /** for TunnelRenderer in router console */ + public void listPools(List out); + /** for TunnelRenderer in router console */ + public Map getInboundClientPools(); + /** for TunnelRenderer in router console */ + public Map getOutboundClientPools(); + /** for TunnelRenderer in router console */ + public TunnelPool getInboundExploratoryPool(); + /** for TunnelRenderer in router console */ + public TunnelPool getOutboundExploratoryPool(); } diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index f7c752c8c9..d879750359 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -391,7 +391,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { } /** list of TunnelPool instances currently in play */ - void listPools(List out) { + public void listPools(List out) { synchronized (_clientInboundPools) { out.addAll(_clientInboundPools.values()); } @@ -409,227 +409,8 @@ public class TunnelPoolManager implements TunnelManagerFacade { public int getInboundBuildQueueSize() { return _executor.getInboundBuildQueueSize(); } - + /** @deprecated moved to routerconsole */ public void renderStatusHTML(Writer out) throws IOException { - out.write("

Exploratory tunnels (config):

\n"); - renderPool(out, _inboundExploratory, _outboundExploratory); - - List destinations = null; - synchronized (_clientInboundPools) { - destinations = new ArrayList(_clientInboundPools.keySet()); - } - for (int i = 0; i < destinations.size(); i++) { - Hash client = destinations.get(i); - TunnelPool in = null; - TunnelPool outPool = null; - synchronized (_clientInboundPools) { - in = _clientInboundPools.get(client); - } - synchronized (_clientOutboundPools) { - outPool = _clientOutboundPools.get(client); - } - String name = (in != null ? in.getSettings().getDestinationNickname() : null); - if ( (name == null) && (outPool != null) ) - name = outPool.getSettings().getDestinationNickname(); - if (name == null) - name = client.toBase64().substring(0,4); - out.write("

Client tunnels for " + name); - if (_context.clientManager().isLocal(client)) - out.write(" (config):

\n"); - else - out.write(" (dead):\n"); - renderPool(out, in, outPool); - } - - List participating = _context.tunnelDispatcher().listParticipatingTunnels(); - Collections.sort(participating, new TunnelComparator()); - out.write("

Participating tunnels:

\n"); - out.write("" - + "\n"); - long processed = 0; - RateStat rs = _context.statManager().getRate("tunnel.participatingMessageCount"); - if (rs != null) - processed = (long)rs.getRate(10*60*1000).getLifetimeTotalValue(); - int inactive = 0; - for (int i = 0; i < participating.size(); i++) { - HopConfig cfg = (HopConfig)participating.get(i); - if (cfg.getProcessedMessagesCount() <= 0) { - inactive++; - continue; - } - out.write(""); - if (cfg.getReceiveTunnel() != null) - out.write(" "); - else - out.write(" "); - if (cfg.getReceiveFrom() != null) - out.write(" "); - else - out.write(" "); - if (cfg.getSendTunnel() != null) - out.write(" "); - else - out.write(" "); - if (cfg.getSendTo() != null) - out.write(" "); - else -// out.write(" "); - out.write(" "); - long timeLeft = cfg.getExpiration()-_context.clock().now(); - if (timeLeft > 0) - out.write(" "); - else - out.write(" "); - out.write(" "); - int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000); - if (lifetime <= 0) - lifetime = 1; - if (lifetime > 10*60) - lifetime = 10*60; - int bps = 1024 * (int) cfg.getProcessedMessagesCount() / lifetime; - out.write(" "); - if (cfg.getSendTo() == null) - out.write(" "); - else if (cfg.getReceiveFrom() == null) - out.write(" "); - else - out.write(" "); - out.write("\n"); - processed += cfg.getProcessedMessagesCount(); - } - out.write("
Receive onFrom" - + "Send onToExpirationUsageRateRole
" + cfg.getReceiveTunnel().getTunnelId() +"n/a" + netDbLink(cfg.getReceiveFrom()) +" " + cfg.getSendTunnel().getTunnelId() +" " + netDbLink(cfg.getSendTo()) +"  " + DataHelper.formatDuration(timeLeft) + "(grace period)" + cfg.getProcessedMessagesCount() + "KB" + bps + "BpsOutbound EndpointInbound GatewayParticipant
\n"); - out.write("
Inactive participating tunnels: " + inactive + "
\n"); - out.write("
Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B
\n"); - renderPeers(out); - } - - class TunnelComparator implements Comparator { - public int compare(Object l, Object r) { - return (int) (((HopConfig)r).getProcessedMessagesCount() - ((HopConfig)l).getProcessedMessagesCount()); - } - } - - private void renderPool(Writer out, TunnelPool in, TunnelPool outPool) throws IOException { - List tunnels = null; - if (in == null) - tunnels = new ArrayList(); - else - tunnels = in.listTunnels(); - if (outPool != null) - tunnels.addAll(outPool.listTunnels()); - - long processedIn = (in != null ? in.getLifetimeProcessed() : 0); - long processedOut = (outPool != null ? outPool.getLifetimeProcessed() : 0); - - int live = 0; - int maxLength = 1; - for (int i = 0; i < tunnels.size(); i++) { - TunnelInfo info = tunnels.get(i); - if (info.getLength() > maxLength) - maxLength = info.getLength(); - } - out.write(""); - if (maxLength > 3) { - out.write(""); - } - else if (maxLength == 3) { - out.write(""); - } - if (maxLength > 1) { - out.write(""); - } - out.write("\n"); - for (int i = 0; i < tunnels.size(); i++) { - TunnelInfo info = tunnels.get(i); - long timeLeft = info.getExpiration()-_context.clock().now(); - if (timeLeft <= 0) - continue; // don't display tunnels in their grace period - live++; - if (info.isInbound()) - out.write(""); - else - out.write(""); - out.write(" \n"); - out.write(" \n"); - for (int j = 0; j < info.getLength(); j++) { - Hash peer = info.getPeer(j); - TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j)); - if (_context.routerHash().equals(peer)) { - out.write(" "); - } else { - String cap = getCapacity(peer); - out.write(" "); - } - if (info.getLength() < maxLength && (info.getLength() == 1 || j == info.getLength() - 2)) { - for (int k = info.getLength(); k < maxLength; k++) - out.write(" "); - } - } - out.write("\n"); - - if (info.isInbound()) - processedIn += info.getProcessedMessagesCount(); - else - processedOut += info.getProcessedMessagesCount(); - } - out.write("
In/OutExpiryUsageGatewayParticipantsParticipantEndpoint
\"Inbound\"
\"Outbound\"" + DataHelper.formatDuration(timeLeft) + "" + info.getProcessedMessagesCount() + "KB" + (id == null ? "" : "" + id) + "" + netDbLink(peer) + (id == null ? "" : " " + id) + cap + " 
\n"); - if (in != null) { - List pending = in.listPending(); - if (pending.size() > 0) - out.write("
Build in progress: " + pending.size() + " inbound
\n"); - live += pending.size(); - } - if (outPool != null) { - List pending = outPool.listPending(); - if (pending.size() > 0) - out.write("
Build in progress: " + pending.size() + " outbound
\n"); - live += pending.size(); - } - if (live <= 0) - out.write("
No tunnels; waiting for the grace period to end.
\n"); - out.write("
Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "B in, " + - DataHelper.formatSize(processedOut*1024) + "B out
"); - } - - private void renderPeers(Writer out) throws IOException { - // count up the peers in the local pools - ObjectCounter lc = new ObjectCounter(); - int tunnelCount = countTunnelsPerPeer(lc); - - // count up the peers in the participating tunnels - ObjectCounter pc = new ObjectCounter(); - int partCount = countParticipatingPerPeer(pc); - - Set peers = new HashSet(lc.objects()); - peers.addAll(pc.objects()); - List peerList = new ArrayList(peers); - Collections.sort(peerList, new HashComparator()); - - out.write("

Tunnel Counts By Peer:

\n"); - out.write("\n"); - for (Hash h : peerList) { - out.write("
PeerExpl. + Client% of totalPart. from + to% of total
"); - out.write(netDbLink(h)); - out.write(" " + lc.count(h)); - out.write(" "); - if (tunnelCount > 0) - out.write("" + (lc.count(h) * 100 / tunnelCount)); - else - out.write('0'); - out.write(" " + pc.count(h)); - out.write(" "); - if (partCount > 0) - out.write("" + (pc.count(h) * 100 / partCount)); - else - out.write('0'); - out.write('\n'); - } - out.write("
Tunnels " + tunnelCount); - out.write("   " + partCount); - out.write("  
\n"); } /** @return total number of non-fallback expl. + client tunnels */ @@ -682,39 +463,27 @@ public class TunnelPoolManager implements TunnelManagerFacade { return rv; } - /** @return total number of part. tunnels */ - private int countParticipatingPerPeer(ObjectCounter pc) { - List participating = _context.tunnelDispatcher().listParticipatingTunnels(); - for (HopConfig cfg : participating) { - Hash from = cfg.getReceiveFrom(); - if (from != null) - pc.increment(from); - Hash to = cfg.getSendTo(); - if (to != null) - pc.increment(to); - } - return participating.size(); - } - - class HashComparator implements Comparator { - public int compare(Object l, Object r) { - return ((Hash)l).toBase64().compareTo(((Hash)r).toBase64()); + /** for TunnelRenderer in router console */ + public Map getInboundClientPools() { + synchronized (_clientInboundPools) { + return new HashMap(_clientInboundPools); } } - private String getCapacity(Hash peer) { - RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); - if (info != null) { - String caps = info.getCapabilities(); - for (char c = Router.CAPABILITY_BW12; c <= Router.CAPABILITY_BW256; c++) { - if (caps.indexOf(c) >= 0) - return " " + c; - } + /** for TunnelRenderer in router console */ + public Map getOutboundClientPools() { + synchronized (_clientOutboundPools) { + return new HashMap(_clientOutboundPools); } - return ""; } - private String netDbLink(Hash peer) { - return _context.commSystem().renderPeerHTML(peer); + /** for TunnelRenderer in router console */ + public TunnelPool getInboundExploratoryPool() { + return _inboundExploratory; + } + + /** for TunnelRenderer in router console */ + public TunnelPool getOutboundExploratoryPool() { + return _outboundExploratory; } } From 44974637783e5b20b21c42de958fedbb2768c926 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 18 Oct 2009 14:06:07 +0000 Subject: [PATCH 06/15] * Router Console translation infrastructure: - Persistent lang setting with routerconsole.lang=xx - Loading any page with ?lang=xx changes the persistent setting - Add a custom Jetty handler to load foo_xx.jsp if it exists for language xx. This is for jsp files with lots of text in them. Otherwise use inline translate methods. Not for included jsps. - Add a script to create and update messages_xx.po translation files, and create ResourceBundles from them - Add class to translate strings from cached ResourceBundles - Add translate wrappers to HelperBase, FormHandler, and *Renderer, so calls can be made from both jsp and java files - Add two example translations on configupdate.jsp - one in the jsp itself and one in the helper. - This is for strings in routerconsole only. Will be expanded to other webapps and the router later. --- apps/routerconsole/java/build.xml | 13 ++++ apps/routerconsole/java/bundle-messages.sh | 51 ++++++++++++ .../src/net/i2p/router/web/CSSHelper.java | 6 ++ .../i2p/router/web/ConfigUpdateHelper.java | 2 +- .../src/net/i2p/router/web/ContentHelper.java | 13 +++- .../src/net/i2p/router/web/FormHandler.java | 4 + .../src/net/i2p/router/web/HelperBase.java | 5 ++ .../i2p/router/web/LocaleWebAppHandler.java | 69 ++++++++++++++++ .../java/src/net/i2p/router/web/Messages.java | 78 +++++++++++++++++++ .../src/net/i2p/router/web/NetDbRenderer.java | 4 + .../router/web/ProfileOrganizerRenderer.java | 5 ++ .../i2p/router/web/RouterConsoleRunner.java | 1 + .../net/i2p/router/web/StatsGenerator.java | 5 ++ .../net/i2p/router/web/TunnelRenderer.java | 5 ++ apps/routerconsole/jsp/configupdate.jsp | 2 +- apps/routerconsole/jsp/css.jsp | 3 + apps/routerconsole/jsp/index.jsp | 1 + apps/routerconsole/locale/messages_de.po | 25 ++++++ apps/routerconsole/locale/messages_zh.po | 25 ++++++ 19 files changed, 311 insertions(+), 6 deletions(-) create mode 100755 apps/routerconsole/java/bundle-messages.sh create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/Messages.java create mode 100644 apps/routerconsole/locale/messages_de.po create mode 100644 apps/routerconsole/locale/messages_zh.po diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index f77a14387a..f804d2fbac 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -73,6 +73,15 @@ + + + + + + + @@ -115,6 +124,7 @@ @@ -133,10 +143,13 @@ + + diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh new file mode 100755 index 0000000000..6b2fe8cece --- /dev/null +++ b/apps/routerconsole/java/bundle-messages.sh @@ -0,0 +1,51 @@ +# +# Update messages_xx.po and messages_xx.class files, +# from both java and jsp sources. +# Requires installed programs xgettext, msgfmt, and find. +# zzz - public domain +# +CLASS=net.i2p.router.web.messages +TMPFILE=build/javafiles.txt + +for i in ../locale/messages_*.po +do + # get language + LG=${i#../locale/messages_} + LG=${LG%.po} + + # make list of java files newer than the .po file + find src ../jsp/WEB-INF -name *.java -newer $i > $TMPFILE + if [ -s build/obj/net/i2p/router/web/messages_$LG.class -a ! -s $TMPFILE ] + then + continue + fi + + echo "Generating ${CLASS}_$LG ResourceBundle..." + + # extract strings from java and jsp files, and update messages.po files + # translate calls must be one of the forms: + # _("foo") + # cssHelper._("foo") + # handler._("foo") + # formhandler._("foo") + # In a jsp, you must use a helper or handler that has the context set. + # To start a new translation, copy the header from an old translation to the new .po file, + # then ant distclean updater. + xgettext -f build/javafiles.txt -F -L java --keyword=_ --keyword=cssHelper._ --keyword=handler._ --keyword=formhandler._ -o $i -j + if [ $? -ne 0 ] + then + echo 'Warning - xgettext failed, not updating translations' + break + fi + + # convert to class files in build/obj + msgfmt --java -r $CLASS -l $LG -d build/obj $i + if [ $? -ne 0 ] + then + echo 'Warning - xgettext failed, not updating translations' + break + fi +done +rm -f $TMPFILE +# todo: return failure +exit 0 diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java index a2f3341f9d..d12259e95b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java @@ -22,4 +22,10 @@ public class CSSHelper extends HelperBase { } return url; } + + /** change default language for the router but don't save it */ + public void setLang(String lang) { + if (lang != null && lang.length() > 0) + _context.router().setConfigSetting(Messages.PROP_LANG, lang); + } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java index 82d8461f15..164ac8df20 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -87,7 +87,7 @@ public class ConfigUpdateHelper extends HelperBase { buf.append(""> Refresh frequency: - Update policy: + <%=formhandler._("Update policy")%>: Update through the eepProxy? diff --git a/apps/routerconsole/jsp/css.jsp b/apps/routerconsole/jsp/css.jsp index ed86750308..865e907235 100644 --- a/apps/routerconsole/jsp/css.jsp +++ b/apps/routerconsole/jsp/css.jsp @@ -25,5 +25,8 @@ " /> +<% + cssHelper.setLang(request.getParameter("lang")); +%> console.css" rel="stylesheet" type="text/css"> diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp index b14f8e3525..d2ce8ffc2d 100644 --- a/apps/routerconsole/jsp/index.jsp +++ b/apps/routerconsole/jsp/index.jsp @@ -29,5 +29,6 @@ if (System.getProperty("router.consoleNonce") == null) { " /> + " /> diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po new file mode 100644 index 0000000000..5293b999f0 --- /dev/null +++ b/apps/routerconsole/locale/messages_de.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-18 10:03-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:441 +msgid "Update policy" +msgstr "Update policy in german foobarbaz" + +#: src/net/i2p/router/web/ConfigUpdateHelper.java:90 +msgid "Notify only" +msgstr "Notify only in german" diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po new file mode 100644 index 0000000000..9e88187303 --- /dev/null +++ b/apps/routerconsole/locale/messages_zh.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-18 10:03-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:441 +msgid "Update policy" +msgstr "" + +#: src/net/i2p/router/web/ConfigUpdateHelper.java:90 +msgid "Notify only" +msgstr "" From cf10451d143234f6a472dfa2a69af24f312fbb69 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 19 Oct 2009 13:37:13 +0000 Subject: [PATCH 07/15] po script update, dont include java files in war --- apps/routerconsole/java/build.xml | 2 +- apps/routerconsole/java/bundle-messages.sh | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index f804d2fbac..9e9b697b66 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -86,7 +86,7 @@ + basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, web-fragment.xml"> diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh index 6b2fe8cece..870bbcb502 100755 --- a/apps/routerconsole/java/bundle-messages.sh +++ b/apps/routerconsole/java/bundle-messages.sh @@ -1,11 +1,12 @@ # # Update messages_xx.po and messages_xx.class files, # from both java and jsp sources. -# Requires installed programs xgettext, msgfmt, and find. +# Requires installed programs xgettext, msgfmt, msgmerge, and find. # zzz - public domain # CLASS=net.i2p.router.web.messages TMPFILE=build/javafiles.txt +export TZ=UTC for i in ../locale/messages_*.po do @@ -31,12 +32,24 @@ do # In a jsp, you must use a helper or handler that has the context set. # To start a new translation, copy the header from an old translation to the new .po file, # then ant distclean updater. - xgettext -f build/javafiles.txt -F -L java --keyword=_ --keyword=cssHelper._ --keyword=handler._ --keyword=formhandler._ -o $i -j + find src ../jsp/WEB-INF -name *.java > $TMPFILE + xgettext -f $TMPFILE -F -L java --keyword=_ --keyword=cssHelper._ --keyword=handler._ --keyword=formhandler._ -o ${i}t if [ $? -ne 0 ] then echo 'Warning - xgettext failed, not updating translations' + rm -f ${i}t break fi + msgmerge -U --backup=none $i ${i}t + if [ $? -ne 0 ] + then + echo 'Warning - msgmerge failed, not updating translations' + rm -f ${i}t + break + fi + rm -f ${i}t + # so we don't do this again + touch $i # convert to class files in build/obj msgfmt --java -r $CLASS -l $LG -d build/obj $i From 83cacaad05b3b10716008498798e48b759c06734 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 19 Oct 2009 13:49:47 +0000 Subject: [PATCH 08/15] * summarynoframe.jsp: - Refactor to SummaryBarRenderer (saves 100KB) - Add translate tags - Use context RNG for nonces - Transitional HTML style for input tags --- .../i2p/router/web/SummaryBarRenderer.java | 411 ++++++++++++++++++ .../src/net/i2p/router/web/SummaryHelper.java | 25 ++ apps/routerconsole/jsp/summarynoframe.jsp | 128 +----- apps/routerconsole/locale/messages_de.po | 273 +++++++++++- apps/routerconsole/locale/messages_zh.po | 273 +++++++++++- 5 files changed, 967 insertions(+), 143 deletions(-) create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java new file mode 100644 index 0000000000..59a6ecd21c --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -0,0 +1,411 @@ +package net.i2p.router.web; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; + +import net.i2p.router.RouterContext; + +/** + * Refactored from summarynoframe.jsp to save ~100KB + * + */ +public class SummaryBarRenderer { + private RouterContext _context; + private SummaryHelper _helper; + + public SummaryBarRenderer(RouterContext context, SummaryHelper helper) { + _context = context; + _helper = helper; + } + + public void renderSummaryHTML(Writer out) throws IOException { + StringBuilder buf = new StringBuilder(8*1024); + + buf.append("\"")
"); + + File lpath = new File(_context.getBaseDir(), "docs/toolbar.html"); + // you better have target="_top" for the links in there... + if (lpath.exists()) { + ContentHelper linkhelper = new ContentHelper(); + linkhelper.setPage(lpath.getAbsolutePath()); + linkhelper.setMaxLines("100"); + buf.append(linkhelper.getContent()); + } else { + buf.append("

") + .append(_("I2P Services")) + .append("

\n" + + + "
" + + + "
") + .append(_("Addressbook")) + .append("\n" + + + "") + .append(_("Torrents")) + .append("\n" + + + "") + .append(_("Webmail")) + .append("\n" + + + "") + .append(_("Webserver")) + .append("
\n" + + + "

") + .append(_("I2P Internals")) + .append("

\n" + + + "
\n" + + + "") + .append(_("Tunnels")) + .append("\n" + + + "") + .append(_("Peers")) + .append("\n" + + + "") + .append(_("Profiles")) + .append("\n" + + + "") + .append(_("NetDB")) + .append("\n" + + + "") + .append(_("Logs")) + .append("\n" + + + "") + .append(_("Jobs")) + .append("\n" + + + "") + .append(_("Graphs")) + .append("\n" + + + "") + .append(_("Stats")) + .append("
\n"); + + out.write(buf.toString()); + buf.setLength(0); + } + + + + buf.append("

") + .append(_("General")) + .append("

" + + "

") + .append(_("Local Identity")) + .append("

\n" + + + "" + + "\n" + + + "" + + "" + + "
" + + "") + .append(_("Version")) + .append(":") + .append(_helper.getVersion()) + .append("
") + .append(_("Uptime")) + .append(":") + .append(_helper.getUptime()) + .append("
\n" + + + "

") + .append(_helper.getReachability()) + .append("

\n"); + + + if (_helper.updateAvailable() || _helper.unsignedUpdateAvailable()) { + // display all the time so we display the final failure message + buf.append("
").append(UpdateHandler.getStatus()); + if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress"))) { + // nothing + } else if( + // isDone() is always false for now, see UpdateHandler + // ((!update.isDone()) && + _helper.getAction() == null && + _helper.getUpdateNonce() == null && + ConfigRestartBean.getRestartTimeRemaining() > 12*60*1000) { + long nonce = _context.random().nextLong(); + String prev = System.getProperty("net.i2p.router.web.UpdateHandler.nonce"); + if (prev != null) + System.setProperty("net.i2p.router.web.UpdateHandler.noncePrev", prev); + System.setProperty("net.i2p.router.web.UpdateHandler.nonce", nonce+""); + String uri = _helper.getRequestURI(); + buf.append("
\n"); + buf.append("\n"); + if (_helper.updateAvailable()) { + buf.append("\n"); + } + if (_helper.unsignedUpdateAvailable()) { + buf.append("\n"); + } + buf.append("
\n"); + } + } + + + + + buf.append("

") + .append(ConfigRestartBean.renderStatus(_helper.getRequestURI(), _helper.getAction(), _helper.getConsoleNonce())) + + .append("

") + .append(_("Peers")) + .append("

\n" + + + "\n" + + + "\n" + + + "\n" + + + "\n" + + + "\n" + + + "\n" + + + "
") + .append(_("Active")) + .append(":") + .append(_helper.getActivePeers()) + .append('/') + .append(_helper.getActiveProfiles()) + .append("
") + .append(_("Fast")) + .append(":") + .append(_helper.getFastPeers()) + .append("
") + .append(_("High capacity")) + .append(":") + .append(_helper.getHighCapacityPeers()) + .append("
") + .append(_("Integrated")) + .append(":") + .append(_helper.getWellIntegratedPeers()) + .append("
") + .append(_("Known")) + .append(":") + .append(_helper.getAllPeers()) + .append("
\n"); + + + out.write(buf.toString()); + buf.setLength(0); + + + if (_helper.showFirewallWarning()) { + buf.append("

") + .append(_("Check NAT/firewall")) + .append("

"); + } + + boolean reseedInProgress = Boolean.valueOf(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress")).booleanValue(); + // If showing the reseed link is allowed + if (_helper.allowReseed()) { + if (reseedInProgress) { + // While reseed occurring, show status message instead + buf.append("").append(System.getProperty("net.i2p.router.web.ReseedHandler.statusMessage","")).append("
"); + } else { + // While no reseed occurring, show reseed link + long nonce = _context.random().nextLong(); + String prev = System.getProperty("net.i2p.router.web.ReseedHandler.nonce"); + if (prev != null) System.setProperty("net.i2p.router.web.ReseedHandler.noncePrev", prev); + System.setProperty("net.i2p.router.web.ReseedHandler.nonce", nonce+""); + String uri = _helper.getRequestURI(); + buf.append("
\n"); + buf.append("\n"); + buf.append("
\n"); + } + } + // If a new reseed ain't running, and the last reseed had errors, show error message + if (!reseedInProgress) { + String reseedErrorMessage = System.getProperty("net.i2p.router.web.ReseedHandler.errorMessage",""); + if (reseedErrorMessage.length() > 0) { + buf.append("").append(reseedErrorMessage).append("
"); + } + } + + + + buf.append("

") + .append(_("Bandwidth in/out")) + .append("

" + + "\n" + + + "\n" + + + "\n" + + + "\n" + + + "
1s:") + .append(_helper.getInboundSecondKBps()) + .append('/') + .append(_helper.getOutboundSecondKBps()) + .append("K/s
5m:") + .append(_helper.getInboundFiveMinuteKBps()) + .append('/') + .append(_helper.getOutboundFiveMinuteKBps()) + .append("K/s
") + .append(_("Total")) + .append(":") + .append(_helper.getInboundLifetimeKBps()) + .append('/') + .append(_helper.getOutboundLifetimeKBps()) + .append("K/s
") + .append(_("Used")) + .append(":") + .append(_helper.getInboundTransferred()) + .append('/') + .append(_helper.getOutboundTransferred()) + .append("
\n" + + + "

") + .append(_("Tunnels in/out")) + .append("

" + + "\n" + + + "\n" + + + "\n" + + + "\n" + + + "
") + .append(_("Exploratory")) + .append(":") + .append(_helper.getInboundTunnels()) + .append('/') + .append(_helper.getOutboundTunnels()) + .append("
") + .append(_("Client")) + .append(":") + .append(_helper.getInboundClientTunnels()) + .append('/') + .append(_helper.getOutboundClientTunnels()) + .append("
") + .append(_("Participating")) + .append(":") + .append(_helper.getParticipatingTunnels()) + .append("

") + .append(_("Congestion")) + .append("

" + + "\n" + + + "\n" + + + "\n" + + + "\n" + + + "\n" + + + "
") + .append(_("Job lag")) + .append(":") + .append(_helper.getJobLag()) + .append("
") + .append(_("Message delay")) + .append(":") + .append(_helper.getMessageDelay()) + .append("
") + .append(_("Tunnel lag")) + .append(":") + .append(_helper.getTunnelLag()) + .append("
") + .append(_("Backlog")) + .append(":") + .append(_helper.getInboundBacklog()) + .append("

") + .append(_helper.getTunnelStatus()) + .append("

\n") + .append(_helper.getDestinations()); + + + out.write(buf.toString()); + } + + /** translate a string */ + private String _(String s) { + return Messages.getString(s, _context); + } +} diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index 369d24770d..fa366927a5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -1,5 +1,6 @@ package net.i2p.router.web; +import java.io.IOException; import java.text.Collator; import java.text.DecimalFormat; import java.util.ArrayList; @@ -563,4 +564,28 @@ public class SummaryHelper extends HelperBase { public String getUnsignedUpdateVersion() { return NewsFetcher.getInstance(_context).unsignedUpdateVersion(); } + + /** output the summary bar to _out */ + public void renderSummaryBar() throws IOException { + SummaryBarRenderer renderer = new SummaryBarRenderer(_context, this); + renderer.renderSummaryHTML(_out); + } + + /* below here is stuff we need to get from summarynoframe.jsp to SummaryBarRenderer */ + + private String _action; + public void setAction(String s) { _action = s; } + public String getAction() { return _action; } + + private String _consoleNonce; + public void setConsoleNonce(String s) { _consoleNonce = s; } + public String getConsoleNonce() { return _consoleNonce; } + + private String _updateNonce; + public void setUpdateNonce(String s) { _updateNonce = s; } + public String getUpdateNonce() { return _updateNonce; } + + private String _requestURI; + public void setRequestURI(String s) { _requestURI = s; } + public String getRequestURI() { return _requestURI; } } diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp index c772a8ffc6..0279a038a3 100644 --- a/apps/routerconsole/jsp/summarynoframe.jsp +++ b/apps/routerconsole/jsp/summarynoframe.jsp @@ -7,126 +7,12 @@ %> " /> - - - - -" /> -I2P Router Console
-<% java.io.File lpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/toolbar.html"); - // you better have target="_top" for the links in there... - if (lpath.exists()) { %> - - - - -<% } else { %> -

I2P Services

-
-
Addressbook -Torrents -Webmail -Webserver
-

I2P Internals

-
-Tunnels -Peers -Profiles -NetDB -Logs -Jobs -Graphs -Stats
-<% } %> -

General

-

, never reveal it to anyone" href="netdb.jsp?r=." target="_top">Local Identity

- - - - -
-Version:
Uptime: -
-

+" /> +" /> +" /> + + <% - if (helper.updateAvailable() || helper.unsignedUpdateAvailable()) { - // display all the time so we display the final failure message - out.print("
" + net.i2p.router.web.UpdateHandler.getStatus()); - if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress"))) { - } else if((!update.isDone()) && - request.getParameter("action") == null && - request.getParameter("updateNonce") == null && - net.i2p.router.web.ConfigRestartBean.getRestartTimeRemaining() > 12*60*1000) { - long nonce = new java.util.Random().nextLong(); - String prev = System.getProperty("net.i2p.router.web.UpdateHandler.nonce"); - if (prev != null) System.setProperty("net.i2p.router.web.UpdateHandler.noncePrev", prev); - System.setProperty("net.i2p.router.web.UpdateHandler.nonce", nonce+""); - String uri = request.getRequestURI(); - out.print("
\n"); - out.print("\n"); - if (helper.updateAvailable()) - out.print("\n"); - if (helper.unsignedUpdateAvailable()) - out.print("\n"); - out.print("
\n"); - } - } + // moved to java for ease of translation and to avoid 30 copies + helper.renderSummaryBar(); %> -

-<%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%> -

Peers

- - - - - - -
Active:/
Fast:
High capacity:
Integrated:
Known:
-<% - if (helper.showFirewallWarning()) { - %>

Check NAT/firewall

<% - } - boolean reseedInProgress = Boolean.valueOf(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress")).booleanValue(); - // If showing the reseed link is allowed - if (helper.allowReseed()) { - if (reseedInProgress) { - // While reseed occurring, show status message instead - out.print("" + System.getProperty("net.i2p.router.web.ReseedHandler.statusMessage","") + "
"); - } else { - // While no reseed occurring, show reseed link - long nonce = new java.util.Random().nextLong(); - String prev = System.getProperty("net.i2p.router.web.ReseedHandler.nonce"); - if (prev != null) System.setProperty("net.i2p.router.web.ReseedHandler.noncePrev", prev); - System.setProperty("net.i2p.router.web.ReseedHandler.nonce", nonce+""); - String uri = request.getRequestURI(); - out.print("
\n"); - out.print("\n"); - out.print("
\n"); - } - } - // If a new reseed ain't running, and the last reseed had errors, show error message - if (!reseedInProgress) { - String reseedErrorMessage = System.getProperty("net.i2p.router.web.ReseedHandler.errorMessage",""); - if (reseedErrorMessage.length() > 0) { - out.print("" + reseedErrorMessage + "
"); - } - } - %> -

Bandwidth in/out

- - - - -
1s:/K/s
5m:/K/s
Total:/K/s
Used:/
-

Tunnels in/out

- - - - -
Exploratory:/
Client:/
Participating:

Congestion

- - - - - -
Job lag:
Message delay:
Tunnel lag:
Backlog:

diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index 5293b999f0..a5d3146137 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -1,25 +1,276 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# foo , 2009. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-18 10:03-0400\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2009-10-19 13:41+0000\n" +"PO-Revision-Date: 2009-10-19 12:50+0000\n" +"Last-Translator: foo \n" +"Language-Team: foo \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: German\n" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:441 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:293 msgid "Update policy" msgstr "Update policy in german foobarbaz" #: src/net/i2p/router/web/ConfigUpdateHelper.java:90 msgid "Notify only" msgstr "Notify only in german" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:26 +#: src/net/i2p/router/web/SummaryBarRenderer.java:28 +msgid "I2P Router Console" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:42 +msgid "I2P Services" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:48 +msgid "Manage your I2P hosts file here (I2P domain name resolution)" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:50 +msgid "Addressbook" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:54 +msgid "Built-in anonymous BitTorrent Client" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:56 +msgid "Torrents" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:60 +msgid "Anonymous webmail client" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:62 +msgid "Webmail" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:66 +msgid "Anonymous resident webserver" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:68 +msgid "Webserver" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:72 +msgid "Configure I2P Router" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:74 +msgid "I2P Internals" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:80 +#: src/net/i2p/router/web/SummaryBarRenderer.java:339 +msgid "View existing tunnels and tunnel build status" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:82 +msgid "Tunnels" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:86 +#: src/net/i2p/router/web/SummaryBarRenderer.java:221 +msgid "Show all current peer connections" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:88 +#: src/net/i2p/router/web/SummaryBarRenderer.java:223 +msgid "Peers" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:92 +msgid "Show recent peer performance profiles" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:94 +msgid "Profiles" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:98 +msgid "Show list of all known I2P routers" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:100 +msgid "NetDB" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:104 +msgid "Health Report" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:106 +msgid "Logs" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:110 +msgid "Show the router's workload, and how it's performing" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:112 +msgid "Jobs" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:116 +msgid "Graph router performance" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:118 +msgid "Graphs" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:122 +msgid "Textual router performance statistics" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:124 +msgid "Stats" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:134 +msgid "I2P Router Help" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:136 +msgid "General" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:139 +msgid "Your unique I2P router identity is" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:143 +msgid "never reveal it to anyone" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:145 +msgid "Local Identity" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:150 +msgid "Version" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:157 +msgid "How long we've been running for this session" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:160 +msgid "Uptime" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:167 +msgid "" +"Help with configuring your firewall and router for optimal I2P performance" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:194 +msgid "Download" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: src/net/i2p/router/web/SummaryBarRenderer.java:207 +msgid "Update" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:203 +msgid "Download Unsigned" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:229 +msgid "Active" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:237 +msgid "Fast" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:243 +msgid "High capacity" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:249 +msgid "Integrated" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:255 +msgid "Known" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:269 +msgid "Help with firewall configuration" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:271 +msgid "Check NAT/firewall" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:304 +msgid "Configure router bandwidth allocation" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:306 +msgid "Bandwidth in/out" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:323 +msgid "Total" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:331 +msgid "Used" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:341 +msgid "Tunnels in/out" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:346 +msgid "Exploratory" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:354 +msgid "Client" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:362 +msgid "Participating" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:368 +msgid "What's in the router's job queue?" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:370 +msgid "Congestion" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:375 +msgid "Job lag" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:381 +msgid "Message delay" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:387 +msgid "Tunnel lag" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:393 +msgid "Backlog" +msgstr "" diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po index 9e88187303..953f13adf9 100644 --- a/apps/routerconsole/locale/messages_zh.po +++ b/apps/routerconsole/locale/messages_zh.po @@ -1,25 +1,276 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# I2P +# Copyright (C) 2009 The I2P Project +# This file is distributed under the same license as the routerconsole package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# foo , 2009. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-18 10:03-0400\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2009-10-19 13:41+0000\n" +"PO-Revision-Date: 2009-10-19 12:59+0000\n" +"Last-Translator: foo \n" +"Language-Team: foo \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Chinese\n" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:441 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:293 msgid "Update policy" msgstr "" #: src/net/i2p/router/web/ConfigUpdateHelper.java:90 msgid "Notify only" msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:26 +#: src/net/i2p/router/web/SummaryBarRenderer.java:28 +msgid "I2P Router Console" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:42 +msgid "I2P Services" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:48 +msgid "Manage your I2P hosts file here (I2P domain name resolution)" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:50 +msgid "Addressbook" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:54 +msgid "Built-in anonymous BitTorrent Client" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:56 +msgid "Torrents" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:60 +msgid "Anonymous webmail client" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:62 +msgid "Webmail" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:66 +msgid "Anonymous resident webserver" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:68 +msgid "Webserver" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:72 +msgid "Configure I2P Router" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:74 +msgid "I2P Internals" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:80 +#: src/net/i2p/router/web/SummaryBarRenderer.java:339 +msgid "View existing tunnels and tunnel build status" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:82 +msgid "Tunnels" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:86 +#: src/net/i2p/router/web/SummaryBarRenderer.java:221 +msgid "Show all current peer connections" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:88 +#: src/net/i2p/router/web/SummaryBarRenderer.java:223 +msgid "Peers" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:92 +msgid "Show recent peer performance profiles" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:94 +msgid "Profiles" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:98 +msgid "Show list of all known I2P routers" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:100 +msgid "NetDB" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:104 +msgid "Health Report" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:106 +msgid "Logs" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:110 +msgid "Show the router's workload, and how it's performing" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:112 +msgid "Jobs" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:116 +msgid "Graph router performance" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:118 +msgid "Graphs" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:122 +msgid "Textual router performance statistics" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:124 +msgid "Stats" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:134 +msgid "I2P Router Help" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:136 +msgid "General" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:139 +msgid "Your unique I2P router identity is" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:143 +msgid "never reveal it to anyone" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:145 +msgid "Local Identity" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:150 +msgid "Version" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:157 +msgid "How long we've been running for this session" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:160 +msgid "Uptime" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:167 +msgid "" +"Help with configuring your firewall and router for optimal I2P performance" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:194 +msgid "Download" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: src/net/i2p/router/web/SummaryBarRenderer.java:207 +msgid "Update" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:203 +msgid "Download Unsigned" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:229 +msgid "Active" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:237 +msgid "Fast" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:243 +msgid "High capacity" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:249 +msgid "Integrated" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:255 +msgid "Known" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:269 +msgid "Help with firewall configuration" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:271 +msgid "Check NAT/firewall" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:304 +msgid "Configure router bandwidth allocation" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:306 +msgid "Bandwidth in/out" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:323 +msgid "Total" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:331 +msgid "Used" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:341 +msgid "Tunnels in/out" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:346 +msgid "Exploratory" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:354 +msgid "Client" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:362 +msgid "Participating" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:368 +msgid "What's in the router's job queue?" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:370 +msgid "Congestion" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:375 +msgid "Job lag" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:381 +msgid "Message delay" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:387 +msgid "Tunnel lag" +msgstr "" + +#: src/net/i2p/router/web/SummaryBarRenderer.java:393 +msgid "Backlog" +msgstr "" From eacf46b367a8b75407fc4def4da15fd9b54b6036 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 19 Oct 2009 18:45:39 +0000 Subject: [PATCH 09/15] remove some remnants of the pre-0.6.1.30 tunnel build method --- .../src/net/i2p/data/i2np/I2NPMessageImpl.java | 8 ++++---- .../src/net/i2p/router/InNetMessagePool.java | 18 +++++++++--------- .../src/net/i2p/router/MessageHistory.java | 4 ++++ .../net/i2p/data/i2np/TunnelCreateMessage.java | 0 .../data/i2np/TunnelCreateStatusMessage.java | 0 5 files changed, 17 insertions(+), 13 deletions(-) rename router/java/{src => test}/net/i2p/data/i2np/TunnelCreateMessage.java (100%) rename router/java/{src => test}/net/i2p/data/i2np/TunnelCreateStatusMessage.java (100%) diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java index e241ff1f4a..757549e49a 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java @@ -362,10 +362,10 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM return new TunnelGatewayMessage(context); case DataMessage.MESSAGE_TYPE: return new DataMessage(context); - case TunnelCreateMessage.MESSAGE_TYPE: - return new TunnelCreateMessage(context); - case TunnelCreateStatusMessage.MESSAGE_TYPE: - return new TunnelCreateStatusMessage(context); + //case TunnelCreateMessage.MESSAGE_TYPE: + // return new TunnelCreateMessage(context); + //case TunnelCreateStatusMessage.MESSAGE_TYPE: + // return new TunnelCreateStatusMessage(context); case TunnelBuildMessage.MESSAGE_TYPE: return new TunnelBuildMessage(context); case TunnelBuildReplyMessage.MESSAGE_TYPE: diff --git a/router/java/src/net/i2p/router/InNetMessagePool.java b/router/java/src/net/i2p/router/InNetMessagePool.java index 802aedec0a..1d3cac39dd 100644 --- a/router/java/src/net/i2p/router/InNetMessagePool.java +++ b/router/java/src/net/i2p/router/InNetMessagePool.java @@ -18,8 +18,8 @@ import net.i2p.data.i2np.DatabaseLookupMessage; import net.i2p.data.i2np.DatabaseSearchReplyMessage; import net.i2p.data.i2np.DeliveryStatusMessage; import net.i2p.data.i2np.I2NPMessage; -import net.i2p.data.i2np.TunnelCreateMessage; -import net.i2p.data.i2np.TunnelCreateStatusMessage; +//import net.i2p.data.i2np.TunnelCreateMessage; +//import net.i2p.data.i2np.TunnelCreateStatusMessage; import net.i2p.data.i2np.TunnelDataMessage; import net.i2p.data.i2np.TunnelGatewayMessage; import net.i2p.util.I2PThread; @@ -74,7 +74,7 @@ public class InNetMessagePool implements Service { _context.statManager().createRateStat("inNetPool.dropped", "How often do we drop a message", "InNetPool", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); _context.statManager().createRateStat("inNetPool.droppedDeliveryStatusDelay", "How long after a delivery status message is created do we receive it back again (for messages that are too slow to be handled)", "InNetPool", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); _context.statManager().createRateStat("inNetPool.duplicate", "How often do we receive a duplicate message", "InNetPool", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); - _context.statManager().createRateStat("inNetPool.droppedTunnelCreateStatusMessage", "How often we drop a slow-to-arrive tunnel request response", "InNetPool", new long[] { 60*60*1000l, 24*60*60*1000l }); + //_context.statManager().createRateStat("inNetPool.droppedTunnelCreateStatusMessage", "How often we drop a slow-to-arrive tunnel request response", "InNetPool", new long[] { 60*60*1000l, 24*60*60*1000l }); _context.statManager().createRateStat("inNetPool.droppedDbLookupResponseMessage", "How often we drop a slow-to-arrive db search response", "InNetPool", new long[] { 60*60*1000l, 24*60*60*1000l }); _context.statManager().createRateStat("pool.dispatchDataTime", "How long a tunnel dispatch takes", "Tunnels", new long[] { 10*60*1000l, 60*60*1000l, 24*60*60*1000l }); _context.statManager().createRateStat("pool.dispatchGatewayTime", "How long a tunnel gateway dispatch takes", "Tunnels", new long[] { 10*60*1000l, 60*60*1000l, 24*60*60*1000l }); @@ -125,8 +125,8 @@ public class InNetMessagePool implements Service { if (invalidReason != null) { int level = Log.WARN; - if (messageBody instanceof TunnelCreateMessage) - level = Log.INFO; + //if (messageBody instanceof TunnelCreateMessage) + // level = Log.INFO; if (_log.shouldLog(level)) _log.log(level, "Duplicate message received [" + messageBody.getUniqueId() + " expiring on " + exp + "]: " + messageBody.getClass().getName() + ": " + invalidReason @@ -195,10 +195,10 @@ public class InNetMessagePool implements Service { _log.warn("Dropping unhandled delivery status message created " + timeSinceSent + "ms ago: " + messageBody); _context.statManager().addRateData("inNetPool.droppedDeliveryStatusDelay", timeSinceSent, timeSinceSent); } - } else if (type == TunnelCreateStatusMessage.MESSAGE_TYPE) { - if (_log.shouldLog(Log.INFO)) - _log.info("Dropping slow tunnel create request response: " + messageBody); - _context.statManager().addRateData("inNetPool.droppedTunnelCreateStatusMessage", 1, 0); + //} else if (type == TunnelCreateStatusMessage.MESSAGE_TYPE) { + // if (_log.shouldLog(Log.INFO)) + // _log.info("Dropping slow tunnel create request response: " + messageBody); + // _context.statManager().addRateData("inNetPool.droppedTunnelCreateStatusMessage", 1, 0); } else if (type == DatabaseSearchReplyMessage.MESSAGE_TYPE) { if (_log.shouldLog(Log.INFO)) _log.info("Dropping slow db lookup response: " + messageBody); diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java index ed5f9fc6d1..4db6c47c68 100644 --- a/router/java/src/net/i2p/router/MessageHistory.java +++ b/router/java/src/net/i2p/router/MessageHistory.java @@ -123,6 +123,7 @@ public class MessageHistory { * @param replyTunnel the tunnel sourceRoutePeer should forward the source routed message to * @param replyThrough the gateway of the tunnel that the sourceRoutePeer will be sending to */ +/******** public void requestTunnelCreate(TunnelId createTunnel, TunnelId outTunnel, Hash peerRequested, Hash nextPeer, TunnelId replyTunnel, Hash replyThrough) { if (!_doLog) return; StringBuilder buf = new StringBuilder(128); @@ -137,6 +138,7 @@ public class MessageHistory { buf.append("who forwards it through [").append(replyTunnel.getTunnelId()).append("] on [").append(getName(replyThrough)).append("]"); addEntry(buf.toString()); } +*********/ /** * The local router has received a request to join the createTunnel with the next hop being nextPeer, @@ -148,6 +150,7 @@ public class MessageHistory { * @param ok whether we will join the tunnel * @param sourceRoutePeer peer through whom we should send our garlic routed ok through */ +/********* public void receiveTunnelCreate(TunnelId createTunnel, Hash nextPeer, Date expire, boolean ok, Hash sourceRoutePeer) { if (!_doLog) return; StringBuilder buf = new StringBuilder(128); @@ -158,6 +161,7 @@ public class MessageHistory { buf.append("ok? ").append(ok).append(" expiring on [").append(getTime(expire.getTime())).append("]"); addEntry(buf.toString()); } +*********/ /** * The local router has joined the given tunnel operating in the given state. diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java b/router/java/test/net/i2p/data/i2np/TunnelCreateMessage.java similarity index 100% rename from router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java rename to router/java/test/net/i2p/data/i2np/TunnelCreateMessage.java diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java b/router/java/test/net/i2p/data/i2np/TunnelCreateStatusMessage.java similarity index 100% rename from router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java rename to router/java/test/net/i2p/data/i2np/TunnelCreateStatusMessage.java From eba9f3c03b83bf09bb18e87fb217026633be5850 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 19 Oct 2009 21:37:59 +0000 Subject: [PATCH 10/15] drop msgs expiring too far in the future --- .../net/i2p/router/tunnel/TunnelDispatcher.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 147dd2f764..3cb4fc9ab2 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -374,6 +374,9 @@ public class TunnelDispatcher implements Service { _context.statManager().addRateData("tunnel.dispatchDataTime", dispatchTime, dispatchTime); } + /** High for now, just to prevent long-lived-message attacks */ + private static final long MAX_FUTURE_EXPIRATION = 3*60*1000 + Router.CLOCK_FUDGE_FACTOR; + /** * We are the inbound tunnel gateway, so encrypt it as necessary and forward * it on. @@ -385,7 +388,10 @@ public class TunnelDispatcher implements Service { if (gw != null) { if (_log.shouldLog(Log.DEBUG)) _log.debug("dispatch where we are the inbound gateway: " + gw + ": " + msg); - if ( (msg.getMessageExpiration() < before - Router.CLOCK_FUDGE_FACTOR) || (msg.getMessage().getMessageExpiration() < before - Router.CLOCK_FUDGE_FACTOR) ) { + long minTime = before - Router.CLOCK_FUDGE_FACTOR; + long maxTime = before + MAX_FUTURE_EXPIRATION; + if ( (msg.getMessageExpiration() < minTime) || (msg.getMessage().getMessageExpiration() < minTime) || + (msg.getMessageExpiration() > maxTime) || (msg.getMessage().getMessageExpiration() > maxTime) ) { if (_log.shouldLog(Log.ERROR)) _log.error("Not dispatching a gateway message for tunnel " + msg.getTunnelId().getTunnelId() + " as the wrapper's expiration is in " + DataHelper.formatDuration(msg.getMessageExpiration()-before) @@ -463,6 +469,12 @@ public class TunnelDispatcher implements Service { _log.warn("why are you sending a tunnel message that expired " + (before-msg.getMessageExpiration()) + "ms ago? " + msg, new Exception("cause")); + } else if (msg.getMessageExpiration() > before + MAX_FUTURE_EXPIRATION) { + if (_log.shouldLog(Log.ERROR)) + _log.error("why are you sending a tunnel message that expires " + + (msg.getMessageExpiration() - before) + "ms from now? " + + msg, new Exception("cause")); + return; } long tid1 = outboundTunnel.getTunnelId(); long tid2 = (targetTunnel != null ? targetTunnel.getTunnelId() : -1); From 8a647b42d5ae08564436521a9c4fb499ee4f43e4 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 19 Oct 2009 21:38:37 +0000 Subject: [PATCH 11/15] javadoc update --- .../java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java index e01b28fb04..fb2589b52b 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java @@ -673,6 +673,8 @@ class I2PSocketManagerImpl implements I2PSocketManager, I2PSessionListener { * Ping the specified peer, returning true if they replied to the ping within * the timeout specified, false otherwise. This call blocks. * + * @deprecated timeout is ignored - use I2PSocketManagerFull.ping() + * @param timeoutMs ignored */ public boolean ping(Destination peer, long timeoutMs) { try { From 27693826a2a78977c7954b0871d080a11d689c86 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 19 Oct 2009 21:40:14 +0000 Subject: [PATCH 12/15] summary bar post-refactor fixups --- .../i2p/router/web/SummaryBarRenderer.java | 176 +++++++++--------- apps/routerconsole/jsp/summarynoframe.jsp | 17 ++ apps/routerconsole/locale/messages_de.po | 38 ++-- apps/routerconsole/locale/messages_zh.po | 38 ++-- 4 files changed, 146 insertions(+), 123 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index 59a6ecd21c..e7d6ee4126 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -264,12 +264,14 @@ public class SummaryBarRenderer { buf.setLength(0); + boolean anotherLine = false; if (_helper.showFirewallWarning()) { buf.append("

") .append(_("Check NAT/firewall")) .append("

"); + anotherLine = true; } boolean reseedInProgress = Boolean.valueOf(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress")).booleanValue(); @@ -289,116 +291,120 @@ public class SummaryBarRenderer { buf.append("\n"); buf.append("\n"); } + anotherLine = true; } // If a new reseed ain't running, and the last reseed had errors, show error message if (!reseedInProgress) { String reseedErrorMessage = System.getProperty("net.i2p.router.web.ReseedHandler.errorMessage",""); if (reseedErrorMessage.length() > 0) { buf.append("").append(reseedErrorMessage).append("
"); + anotherLine = true; } } + if (anotherLine) + buf.append("
"); + buf.append("

") + .append(_("Bandwidth in/out")) + .append("

" + + "\n" + - buf.append("

") - .append(_("Bandwidth in/out")) - .append("

" + - "
\n" + + "\n" + - "\n" + + "\n" + - "\n" + + "\n" + - "\n" + + "
1s:") + .append(_helper.getInboundSecondKBps()) + .append('/') + .append(_helper.getOutboundSecondKBps()) + .append("K/s
1s:") - .append(_helper.getInboundSecondKBps()) - .append('/') - .append(_helper.getOutboundSecondKBps()) - .append("K/s
5m:") + .append(_helper.getInboundFiveMinuteKBps()) + .append('/') + .append(_helper.getOutboundFiveMinuteKBps()) + .append("K/s
5m:") - .append(_helper.getInboundFiveMinuteKBps()) - .append('/') - .append(_helper.getOutboundFiveMinuteKBps()) - .append("K/s
") + .append(_("Total")) + .append(":") + .append(_helper.getInboundLifetimeKBps()) + .append('/') + .append(_helper.getOutboundLifetimeKBps()) + .append("K/s
") - .append(_("Total")) - .append(":") - .append(_helper.getInboundLifetimeKBps()) - .append('/') - .append(_helper.getOutboundLifetimeKBps()) - .append("K/s
") + .append(_("Used")) + .append(":") + .append(_helper.getInboundTransferred()) + .append('/') + .append(_helper.getOutboundTransferred()) + .append("
\n" + - "") - .append(_("Used")) - .append(":") - .append(_helper.getInboundTransferred()) - .append('/') - .append(_helper.getOutboundTransferred()) - .append("\n" + + "

") + .append(_("Tunnels in/out")) + .append("

" + + "\n" + - "

") - .append(_("Tunnels in/out")) - .append("

" + - "
\n" + + "\n" + - "\n" + + "\n" + - "\n" + + "\n" + - "\n" + + "
") + .append(_("Exploratory")) + .append(":") + .append(_helper.getInboundTunnels()) + .append('/') + .append(_helper.getOutboundTunnels()) + .append("
") - .append(_("Exploratory")) - .append(":") - .append(_helper.getInboundTunnels()) - .append('/') - .append(_helper.getOutboundTunnels()) - .append("
") + .append(_("Client")) + .append(":") + .append(_helper.getInboundClientTunnels()) + .append('/') + .append(_helper.getOutboundClientTunnels()) + .append("
") - .append(_("Client")) - .append(":") - .append(_helper.getInboundClientTunnels()) - .append('/') - .append(_helper.getOutboundClientTunnels()) - .append("
") + .append(_("Participating")) + .append(":") + .append(_helper.getParticipatingTunnels()) + .append("
") - .append(_("Participating")) - .append(":") - .append(_helper.getParticipatingTunnels()) - .append("

") + .append(_("Congestion")) + .append("

" + + "\n" + - "

") - .append(_("Congestion")) - .append("

" + - "\n" + + "\n" + - "\n" + + "\n" + - "\n" + + "\n" + - "\n" + + "\n" + - "\n" + + "
") + .append(_("Job lag")) + .append(":") + .append(_helper.getJobLag()) + .append("
") - .append(_("Job lag")) - .append(":") - .append(_helper.getJobLag()) - .append("
") + .append(_("Message delay")) + .append(":") + .append(_helper.getMessageDelay()) + .append("
") - .append(_("Message delay")) - .append(":") - .append(_helper.getMessageDelay()) - .append("
") + .append(_("Tunnel lag")) + .append(":") + .append(_helper.getTunnelLag()) + .append("
") - .append(_("Tunnel lag")) - .append(":") - .append(_helper.getTunnelLag()) - .append("
") + .append(_("Backlog")) + .append(":") + .append(_helper.getInboundBacklog()) + .append("
") - .append(_("Backlog")) - .append(":") - .append(_helper.getInboundBacklog()) - .append("

") + .append(_helper.getTunnelStatus()) + .append("

\n") + .append(_helper.getDestinations()); - "

") - .append(_helper.getTunnelStatus()) - .append("

\n") - .append(_helper.getDestinations()); out.write(buf.toString()); diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp index 0279a038a3..33a029e765 100644 --- a/apps/routerconsole/jsp/summarynoframe.jsp +++ b/apps/routerconsole/jsp/summarynoframe.jsp @@ -12,6 +12,23 @@ " /> +<% +/* + * The following is required for the reseed button to work, although we probably + * only need the reseedNonce property. + */ +%> + + +<% +/* + * The following is required for the update buttons to work, although we probably + * only need the updateNonce property. + */ +%> + + +" /> <% // moved to java for ease of translation and to avoid 30 copies helper.renderSummaryBar(); diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index a5d3146137..75cbc0d560 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-19 13:41+0000\n" +"POT-Creation-Date: 2009-10-19 21:30+0000\n" "PO-Revision-Date: 2009-10-19 12:50+0000\n" "Last-Translator: foo \n" "Language-Team: foo \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:332 msgid "Update policy" msgstr "Update policy in german foobarbaz" @@ -75,7 +75,7 @@ msgid "I2P Internals" msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:80 -#: src/net/i2p/router/web/SummaryBarRenderer.java:339 +#: src/net/i2p/router/web/SummaryBarRenderer.java:344 msgid "View existing tunnels and tunnel build status" msgstr "" @@ -211,66 +211,66 @@ msgstr "" msgid "Known" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:269 +#: src/net/i2p/router/web/SummaryBarRenderer.java:270 msgid "Help with firewall configuration" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:271 +#: src/net/i2p/router/web/SummaryBarRenderer.java:272 msgid "Check NAT/firewall" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:304 +#: src/net/i2p/router/web/SummaryBarRenderer.java:309 msgid "Configure router bandwidth allocation" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "Bandwidth in/out" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Total" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:331 +#: src/net/i2p/router/web/SummaryBarRenderer.java:336 msgid "Used" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:341 +#: src/net/i2p/router/web/SummaryBarRenderer.java:346 msgid "Tunnels in/out" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Exploratory" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:354 +#: src/net/i2p/router/web/SummaryBarRenderer.java:359 msgid "Client" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:362 +#: src/net/i2p/router/web/SummaryBarRenderer.java:367 msgid "Participating" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:368 +#: src/net/i2p/router/web/SummaryBarRenderer.java:373 msgid "What's in the router's job queue?" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:370 +#: src/net/i2p/router/web/SummaryBarRenderer.java:375 msgid "Congestion" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:375 +#: src/net/i2p/router/web/SummaryBarRenderer.java:380 msgid "Job lag" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:381 +#: src/net/i2p/router/web/SummaryBarRenderer.java:386 msgid "Message delay" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:387 +#: src/net/i2p/router/web/SummaryBarRenderer.java:392 msgid "Tunnel lag" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:393 +#: src/net/i2p/router/web/SummaryBarRenderer.java:398 msgid "Backlog" msgstr "" diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po index 953f13adf9..805d2b8cb5 100644 --- a/apps/routerconsole/locale/messages_zh.po +++ b/apps/routerconsole/locale/messages_zh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-19 13:41+0000\n" +"POT-Creation-Date: 2009-10-19 21:30+0000\n" "PO-Revision-Date: 2009-10-19 12:59+0000\n" "Last-Translator: foo \n" "Language-Team: foo \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Chinese\n" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:332 msgid "Update policy" msgstr "" @@ -75,7 +75,7 @@ msgid "I2P Internals" msgstr "" #: src/net/i2p/router/web/SummaryBarRenderer.java:80 -#: src/net/i2p/router/web/SummaryBarRenderer.java:339 +#: src/net/i2p/router/web/SummaryBarRenderer.java:344 msgid "View existing tunnels and tunnel build status" msgstr "" @@ -211,66 +211,66 @@ msgstr "" msgid "Known" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:269 +#: src/net/i2p/router/web/SummaryBarRenderer.java:270 msgid "Help with firewall configuration" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:271 +#: src/net/i2p/router/web/SummaryBarRenderer.java:272 msgid "Check NAT/firewall" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:304 +#: src/net/i2p/router/web/SummaryBarRenderer.java:309 msgid "Configure router bandwidth allocation" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "Bandwidth in/out" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Total" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:331 +#: src/net/i2p/router/web/SummaryBarRenderer.java:336 msgid "Used" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:341 +#: src/net/i2p/router/web/SummaryBarRenderer.java:346 msgid "Tunnels in/out" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Exploratory" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:354 +#: src/net/i2p/router/web/SummaryBarRenderer.java:359 msgid "Client" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:362 +#: src/net/i2p/router/web/SummaryBarRenderer.java:367 msgid "Participating" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:368 +#: src/net/i2p/router/web/SummaryBarRenderer.java:373 msgid "What's in the router's job queue?" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:370 +#: src/net/i2p/router/web/SummaryBarRenderer.java:375 msgid "Congestion" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:375 +#: src/net/i2p/router/web/SummaryBarRenderer.java:380 msgid "Job lag" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:381 +#: src/net/i2p/router/web/SummaryBarRenderer.java:386 msgid "Message delay" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:387 +#: src/net/i2p/router/web/SummaryBarRenderer.java:392 msgid "Tunnel lag" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:393 +#: src/net/i2p/router/web/SummaryBarRenderer.java:398 msgid "Backlog" msgstr "" From dc6d6ead694104b8dedc5909acc2f3f54c079e05 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 20 Oct 2009 11:27:40 +0000 Subject: [PATCH 13/15] fix bundle caching --- apps/routerconsole/java/src/net/i2p/router/web/Messages.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java index 9837f010e3..df7c5319f3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java @@ -69,6 +69,8 @@ public class Messages { // Would it be faster to specify a class loader? // No matter we only do this once per lang. rv = ResourceBundle.getBundle(BUNDLE_NAME, new Locale(lang)); + if (rv != null) + _bundles.put(lang, rv); } catch (MissingResourceException e) { _missing.add(lang); } From 45a59f009ba28849b97dc258ed89da433a3c330d Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 20 Oct 2009 12:12:26 +0000 Subject: [PATCH 14/15] add a common method for title formatting and translation --- apps/routerconsole/java/bundle-messages.sh | 5 ++++- .../src/net/i2p/router/web/CSSHelper.java | 11 +++++++++++ apps/routerconsole/jsp/configupdate.jsp | 3 ++- apps/routerconsole/locale/messages_de.po | 17 +++++++++++------ apps/routerconsole/locale/messages_zh.po | 19 ++++++++++++------- 5 files changed, 40 insertions(+), 15 deletions(-) diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh index 870bbcb502..629fc95f05 100755 --- a/apps/routerconsole/java/bundle-messages.sh +++ b/apps/routerconsole/java/bundle-messages.sh @@ -27,13 +27,16 @@ do # translate calls must be one of the forms: # _("foo") # cssHelper._("foo") + # cssHelper.title("foo") # handler._("foo") # formhandler._("foo") # In a jsp, you must use a helper or handler that has the context set. # To start a new translation, copy the header from an old translation to the new .po file, # then ant distclean updater. find src ../jsp/WEB-INF -name *.java > $TMPFILE - xgettext -f $TMPFILE -F -L java --keyword=_ --keyword=cssHelper._ --keyword=handler._ --keyword=formhandler._ -o ${i}t + xgettext -f $TMPFILE -F -L java \ + --keyword=_ --keyword=cssHelper._ --keyword=cssHelper.title --keyword=handler._ --keyword=formhandler._ \ + -o ${i}t if [ $? -ne 0 ] then echo 'Warning - xgettext failed, not updating translations' diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java index d12259e95b..715c800931 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java @@ -28,4 +28,15 @@ public class CSSHelper extends HelperBase { if (lang != null && lang.length() > 0) _context.router().setConfigSetting(Messages.PROP_LANG, lang); } + + /** translate the title and display consistently */ + public String title(String s) { + StringBuilder buf = new StringBuilder(128); + buf.append("") + .append(_("I2P Router Console")) + .append(" - ") + .append(_(s)) + .append(""); + return buf.toString(); + } } diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index 99842aa10b..e7562de9f7 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -2,8 +2,9 @@ <%@page pageEncoding="UTF-8"%> -I2P Router Console - config update + <%@include file="css.jsp" %> +<%=cssHelper.title("config update")%> <%@include file="summary.jsp" %> diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index 75cbc0d560..905828c4d0 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-19 21:30+0000\n" +"POT-Creation-Date: 2009-10-20 11:55+0000\n" "PO-Revision-Date: 2009-10-19 12:50+0000\n" "Last-Translator: foo \n" "Language-Team: foo \n" @@ -17,19 +17,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:95 +msgid "config update" +msgstr "config update in german test test test" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334 msgid "Update policy" msgstr "Update policy in german foobarbaz" -#: src/net/i2p/router/web/ConfigUpdateHelper.java:90 -msgid "Notify only" -msgstr "Notify only in german" - +#: src/net/i2p/router/web/CSSHelper.java:36 #: src/net/i2p/router/web/SummaryBarRenderer.java:26 #: src/net/i2p/router/web/SummaryBarRenderer.java:28 msgid "I2P Router Console" msgstr "" +#: src/net/i2p/router/web/ConfigUpdateHelper.java:90 +msgid "Notify only" +msgstr "Notify only in german" + #: src/net/i2p/router/web/SummaryBarRenderer.java:42 msgid "I2P Services" msgstr "" diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po index 805d2b8cb5..8456438ca9 100644 --- a/apps/routerconsole/locale/messages_zh.po +++ b/apps/routerconsole/locale/messages_zh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-19 21:30+0000\n" +"POT-Creation-Date: 2009-10-20 11:55+0000\n" "PO-Revision-Date: 2009-10-19 12:59+0000\n" "Last-Translator: foo \n" "Language-Team: foo \n" @@ -17,19 +17,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Chinese\n" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:95 +msgid "config update" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334 msgid "Update policy" msgstr "" +#: src/net/i2p/router/web/CSSHelper.java:36 +#: src/net/i2p/router/web/SummaryBarRenderer.java:26 +#: src/net/i2p/router/web/SummaryBarRenderer.java:28 +msgid "I2P Router Console" +msgstr "" + #: src/net/i2p/router/web/ConfigUpdateHelper.java:90 msgid "Notify only" msgstr "" -#: src/net/i2p/router/web/SummaryBarRenderer.java:26 -#: src/net/i2p/router/web/SummaryBarRenderer.java:28 -msgid "I2P Router Console" -msgstr "" - #: src/net/i2p/router/web/SummaryBarRenderer.java:42 msgid "I2P Services" msgstr "" From 77d45e7a3a8b19bbea51314addcc2c65b7ab8268 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 20 Oct 2009 16:00:57 +0000 Subject: [PATCH 15/15] stub for windows gettext script --- apps/routerconsole/java/build.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index 9e9b697b66..61d1ddc85f 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -75,11 +75,17 @@ - + We need to supply the bat file for windows, and then change the fail property to true --> + + + + + + + +