Author: toad
Date: 2008-04-19 16:46:20 +0000 (Sat, 19 Apr 2008)
New Revision: 19431
Modified:
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
Extra warning for symmetric NATs
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-04-19
16:40:24 UTC (rev 19430)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-04-19
16:46:20 UTC (rev 19431)
@@ -486,6 +486,7 @@
IPDetectorPluginManager.forwardPort=Your node appears to be behind some sort
of NAT (see the connectivity page for details). You should forward UDP (not
TCP) port ${port} if possible to improve connectivity. It is possible you have
already done this; it takes a while for Freenet to detect a port forward. See
${link}here${/link} for some more information.
IPDetectorPluginManager.forwardTwoPorts=Your node appears to be behind some
sort of NAT (see the connectivity page for details). You should forward UDP
(not TCP) ports ${port1} and ${port2} if possible to improve connectivity. It
is possible you have already done this; it takes a while for Freenet to detect
a port forward. See ${link}here${/link} for some more information.
IPDetectorPluginManager.portForwardHelpURL=http://wiki.freenetproject.org/FirewallAndRouterIssues
+IPDetectorPluginManager.symmetricPS=Note that your node is behind a symmetric
NAT or firewall, so if you don't forward the port(s), you may not be able to
connect to most nodes!
IPUndetectedUserAlert.detecting=Freenet is currently attempting to detect your
external IP address. If this takes more than a few minutes there is something
wrong...
IPUndetectedUserAlert.detectingShort=Freenet is currently attempting to detect
your external IP address.
IPUndetectedUserAlert.detectingWithConfigLink=Freenet is currently attempting
to detect your external IP address. If this takes more than a few minutes there
is something wrong and you can use the Temporary IP Address Hint
${link}configuration parameter${/link}.
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
16:40:24 UTC (rev 19430)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
16:46:20 UTC (rev 19431)
@@ -55,16 +55,19 @@
HTMLNode div = new HTMLNode("div");
String url =
HTMLEncoder.encode(l10n("portForwardHelpURL"));
if(portsNotForwarded.length == 1) {
- L10n.addL10nSubstitution(div,
"IPDetectorPluginManager.forwardPortShort",
+ L10n.addL10nSubstitution(div,
"IPDetectorPluginManager.forwardPort",
new String[] { "port", "link",
"/link" },
new String[] {
Integer.toString(portsNotForwarded[0]), "<a href=\""+url+"\">", "</a>" });
} else if(portsNotForwarded.length == 2) {
- L10n.addL10nSubstitution(div,
"IPDetectorPluginManager.forwardTwoPortsShort",
+ L10n.addL10nSubstitution(div,
"IPDetectorPluginManager.forwardTwoPorts",
new String[] { "port1",
"port2", "link", "/link" },
new String[] {
Integer.toString(portsNotForwarded[0]), Integer.toString(portsNotForwarded[1]),
"<a href=\""+url+"\">", "</a>" });
} else {
Logger.error(this, "Unknown number of ports to
forward: "+portsNotForwarded.length);
}
+ if(innerGetPriorityClass() == UserAlert.ERROR) {
+ div.addChild("#", " " + l10n("symmetricPS"));
+ }
return div;
}
