Author: toad
Date: 2007-11-28 15:21:57 +0000 (Wed, 28 Nov 2007)
New Revision: 16015
Modified:
trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
trunk/freenet/src/freenet/io/AddressTracker.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Show minimum tunnel length
Modified: trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
2007-11-28 15:18:38 UTC (rev 16014)
+++ trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
2007-11-28 15:21:57 UTC (rev 16015)
@@ -76,7 +76,7 @@
for(int i=0;i<handlers.length;i++) {
// Peers
AddressTracker tracker =
handlers[i].getAddressTracker();
- HTMLNode portsBox =
pageMaker.getInfobox(L10n.getString("ConnectivityToadlet.byPortTitle", new
String[] { "port", "status" }, new String[] { handlers[i].getName(),
AddressTracker.statusString(tracker.getPortForwardStatus()) }));
+ HTMLNode portsBox =
pageMaker.getInfobox(L10n.getString("ConnectivityToadlet.byPortTitle", new
String[] { "port", "status", "tunnelLength" }, new String[] {
handlers[i].getName(),
AddressTracker.statusString(tracker.getPortForwardStatus()),
TimeUtil.formatTime(tracker.getLongestSendReceiveGap()) }));
contentNode.addChild(portsBox);
HTMLNode portsContent =
pageMaker.getContentNode(portsBox);
PeerAddressTrackerItem[] items =
tracker.getPeerAddressTrackerItems();
@@ -112,7 +112,7 @@
}
// IPs
- portsBox =
pageMaker.getInfobox(L10n.getString("ConnectivityToadlet.byIPTitle", new
String[] { "ip", "status" }, new String[] { handlers[i].getName(),
AddressTracker.statusString(tracker.getPortForwardStatus()) }));
+ portsBox =
pageMaker.getInfobox(L10n.getString("ConnectivityToadlet.byIPTitle", new
String[] { "ip", "status", "tunnelLength" }, new String[] {
handlers[i].getName(),
AddressTracker.statusString(tracker.getPortForwardStatus()),
TimeUtil.formatTime(tracker.getLongestSendReceiveGap()) }));
contentNode.addChild(portsBox);
portsContent = pageMaker.getContentNode(portsBox);
InetAddressAddressTrackerItem[] ipItems =
tracker.getInetAddressTrackerItems();
Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java 2007-11-28 15:18:38 UTC
(rev 16014)
+++ trunk/freenet/src/freenet/io/AddressTracker.java 2007-11-28 15:21:57 UTC
(rev 16015)
@@ -193,6 +193,10 @@
/** Time after which we ignore evidence that we are port forwarded */
public static final long HORIZON = 24*60*60*1000L;
+ public long getLongestSendReceiveGap() {
+ return getLongestSendReceiveGap(HORIZON);
+ }
+
/**
* Find the longest send/known-no-packets-sent ... receive gap.
* It is highly unlikely that we are behind a NAT or symmetric
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-11-28
15:18:38 UTC (rev 16014)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-11-28
15:21:57 UTC (rev 16015)
@@ -87,7 +87,7 @@
ConfigToadlet.true=true
ConfigurablePersister.doesNotExistCannotCreate=File does not exist and cannot
be created
ConfigurablePersister.existsCannotReadWrite=File exists and cannot read/write
it
-ConnectivityToadlet.byIPTitle=Packets for ${ip} by IP address - ${status}
+ConnectivityToadlet.byIPTitle=Packets for ${ip} by IP address - ${status}
(minimum tunnel length ${tunnelLength})
ConnectivityToadlet.title=Internet connectivity for ${nodeName}
ConnectivityToadlet.connectivity=Internet Connectivity
ConnectivityToadlet.connectivityTitle=Connectivity
@@ -96,7 +96,7 @@
ConnectivityToadlet.localRemoteTitle=Local/remote
ConnectivityToadlet.addressTitle=Address
ConnectivityToadlet.sentReceivedTitle=Sent/received packets
-ConnectivityToadlet.byPortTitle=Packets for ${port} by port - ${status}
+ConnectivityToadlet.byPortTitle=Packets for ${port} by port - ${status}
(minimum tunnel length ${tunnelLength})
ConnectivityToadlet.local=LOCAL
ConnectivityToadlet.remote=REMOTE
ConnectivityToadlet.noreply=NO REPLY
