Author: toad
Date: 2007-06-30 13:04:52 +0000 (Sat, 30 Jun 2007)
New Revision: 13843

Modified:
   trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
   trunk/freenet/src/freenet/node/Node.java
Log:
Fix ports box

Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java      
2007-06-30 12:00:46 UTC (rev 13842)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java      
2007-06-30 13:04:52 UTC (rev 13843)
@@ -459,7 +459,10 @@
                SimpleFieldSet fproxyConfig = 
node.config.get("fproxy").exportFieldSet(true);
                SimpleFieldSet fcpConfig = 
node.config.get("fcp").exportFieldSet(true);
                SimpleFieldSet tmciConfig = 
node.config.get("console").exportFieldSet(true);
-               portInfoList.addChild("li", 
L10n.getString("DarknetConnectionsToadlet.fnpPort", new String[] { "port" }, 
new String[] { Integer.toString(node.getFNPPort()) }));
+               portInfoList.addChild("li", 
L10n.getString("DarknetConnectionsToadlet.darknetFnpPort", new String[] { 
"port" }, new String[] { Integer.toString(node.getFNPPort()) }));
+               int opennetPort = node.getOpennetFNPPort();
+               if(opennetPort > 0)
+                       portInfoList.addChild("li", 
L10n.getString("DarknetConnectionsToadlet.opennetFnpPort", new String[] { 
"port" }, new String[] { Integer.toString(opennetPort) }));
                try {
                        if(fproxyConfig.getBoolean("enabled", false)) {
                                portInfoList.addChild("li", 
L10n.getString("DarknetConnectionsToadlet.fproxyPort", new String[] { "port" }, 
new String[] { Integer.toString(fproxyConfig.getInt("port")) }));

Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2007-06-30 
12:00:46 UTC (rev 13842)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2007-06-30 
13:04:52 UTC (rev 13843)
@@ -109,6 +109,7 @@
 DarknetConnectionsToadlet.confirmRemoveNodeWarningTitle=Node Removal
 DarknetConnectionsToadlet.connected=Connected: We're successfully connected to 
these nodes
 DarknetConnectionsToadlet.connectedShort=Connected
+DarknetConnectionsToadlet.darknetFnpPort=Darknet FNP: ${port}/UDP (between 
nodes; you may want to forward this port)
 DarknetConnectionsToadlet.disabled=Not connected and disabled: because the 
user has instructed the node not to connect to these peers.
 DarknetConnectionsToadlet.disabledShort=Disabled
 DarknetConnectionsToadlet.enterDescription=Enter description:
@@ -118,7 +119,6 @@
 DarknetConnectionsToadlet.fcpDisabled=FCP is disabled (for Freenet clients 
such as Frost and Thaw)
 DarknetConnectionsToadlet.fcpPort=FCP: ${port}/TCP (for Freenet clients such 
as Frost and Thaw)
 DarknetConnectionsToadlet.fileReference=Choose the file containing the 
reference here:
-DarknetConnectionsToadlet.fnpPort=FNP: ${port}/UDP (between nodes; this is 
usually the only port that you might want to port forward)
 DarknetConnectionsToadlet.forceRemove=Force Remove
 DarknetConnectionsToadlet.fproxyDisabled=FProxy is disabled (this web 
interface)
 DarknetConnectionsToadlet.fproxyPort=FProxy: ${port}/TCP (this web interface)
@@ -144,6 +144,7 @@
 DarknetConnectionsToadlet.nodePortsTitle=Ports used by the Node
 DarknetConnectionsToadlet.notConnected=Not connected: No connection so far but 
this node is continuously trying to connect.
 DarknetConnectionsToadlet.notConnectedShort=Disconnected
+DarknetConnectionsToadlet.opennetFnpPort=Opennet FNP: ${port}/UDP (between 
nodes; you may want to forward this port)
 DarknetConnectionsToadlet.pasteReference=Paste the reference here:
 DarknetConnectionsToadlet.privateNote=A private note concerning this peer
 DarknetConnectionsToadlet.privateNoteTitle=Private Note

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-06-30 12:00:46 UTC (rev 
13842)
+++ trunk/freenet/src/freenet/node/Node.java    2007-06-30 13:04:52 UTC (rev 
13843)
@@ -2601,4 +2601,9 @@
                }
                return true;
        }
+
+       public int getOpennetFNPPort() {
+               // TODO Auto-generated method stub
+               return 0;
+       }
 }


Reply via email to