Author: toad
Date: 2007-09-14 19:28:11 +0000 (Fri, 14 Sep 2007)
New Revision: 15179
Modified:
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
Suggest that the user forward both ports
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-09-14
19:24:25 UTC (rev 15178)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-09-14
19:28:11 UTC (rev 15179)
@@ -386,6 +386,7 @@
IPDetectorPluginManager.restricted=Your internet connection appears to be
behind a "restricted cone" NAT (router). You should be able to connect to most
other users.
IPDetectorPluginManager.restrictedTitle=Restricted cone NAT detected
IPDetectorPluginManager.suggestForwardPort= You may want to forward the port
(UDP port number ${port}) manually. (See
http://wiki.freenetproject.org/FirewallAndRouterIssues ).
+IPDetectorPluginManager.suggestForwardTwoPorts= You may want to forward the
ports (UDP port numbers ${port1} and ${port2}) manually. (See
http://wiki.freenetproject.org/FirewallAndRouterIssues ).
IPDetectorPluginManager.suggestForwardPortWithLink= You may want to
${link}forward the port${/link} (UDP port number ${port}) manually (or you may
already have done so, Freenet cannot easily detect this).
IPDetectorPluginManager.symmetric=Your internet connection appears to be
behind a symmetric NAT or firewall. You will probably only be able to connect
to users directly connected to the internet or behind restricted cone NATs.
IPDetectorPluginManager.symmetricTitle=Symmetric firewall detected
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2007-09-14
19:24:25 UTC (rev 15178)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2007-09-14
19:28:11 UTC (rev 15179)
@@ -66,7 +66,17 @@
if(!suggestPortForward) return text;
StringBuffer sb = new StringBuffer();
sb.append(text);
- sb.append(l10n("suggestForwardPort", "port",
Integer.toString(node.getDarknetPortNumber())));
+ // FIXME we should support any number of ports, UDP or
TCP, and pick them up from the node as we do with the forwarding plugin ...
that would be a bit of a pain for L10n though ...
+ int darknetPort = node.getDarknetPortNumber();
+ int opennetPort = node.getOpennetFNPPort();
+ sb.append(" ");
+ if(opennetPort <= 0) {
+ sb.append(l10n("suggestForwardPort", "port",
Integer.toString(darknetPort)));
+ } else {
+ sb.append(l10n("suggestForwardTwoPorts", new
String[] { "port1", "port2" },
+ new String[] {
Integer.toString(darknetPort), Integer.toString(opennetPort) }));
+ }
+
return sb.toString();
}
