[freenet-cvs] r19209 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-04-11 21:23:07 +0000 (Fri, 11 Apr 2008)
New Revision: 19209

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/NodeCrypto.java
   trunk/freenet/src/freenet/node/NodeIPPortDetector.java
Log:
Use the FreenetInetAddress on NodeCryptoConfig, don't copy it into NodeCrypto.
Saves memory, updated more quickly.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-04-11 21:00:07 UTC (rev 
19208)
+++ trunk/freenet/src/freenet/node/Node.java    2008-04-11 21:23:07 UTC (rev 
19209)
@@ -1648,8 +1648,8 @@
                }
                Logger.normal(this, "Freenet 0.7 Build 
#"+Version.buildNumber()+" r"+Version.cvsRevision);
                System.out.println("Freenet 0.7 Build 
#"+Version.buildNumber()+" r"+Version.cvsRevision);
-               Logger.normal(this, "FNP port is on "+darknetCrypto.bindto+ ':' 
+getDarknetPortNumber());
-               System.out.println("FNP port is on "+darknetCrypto.bindto+ ':' 
+getDarknetPortNumber());
+               Logger.normal(this, "FNP port is on 
"+darknetCrypto.getBindTo()+ ':' +getDarknetPortNumber());
+               System.out.println("FNP port is on "+darknetCrypto.getBindTo()+ 
':' +getDarknetPortNumber());
                // Start services

 //             SubConfig pluginManagerConfig = new SubConfig("pluginmanager3", 
config);
@@ -3116,9 +3116,9 @@
         */
        public synchronized boolean dontDetect() {
                // Only return true if bindTo is set on all ports which are in 
use
-               if(!darknetCrypto.bindto.isRealInternetAddress(false, true, 
false)) return false;
+               if(!darknetCrypto.getBindTo().isRealInternetAddress(false, 
true, false)) return false;
                if(opennet != null) {
-                       if(opennet.crypto.bindto.isRealInternetAddress(false, 
true, false)) return false;
+                       
if(opennet.crypto.getBindTo().isRealInternetAddress(false, true, false)) return 
false;
                }
                return true;
        }

Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java      2008-04-11 21:00:07 UTC 
(rev 19208)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java      2008-04-11 21:23:07 UTC 
(rev 19209)
@@ -51,7 +51,6 @@
        /** The object which handles our specific UDP port, pulls messages from 
it, feeds them to the packet mangler for decryption etc */
        UdpSocketHandler socket;
        public FNPPacketMangler packetMangler;
-       final FreenetInetAddress bindto;
        // FIXME: abstract out address stuff? Possibly to something like 
NodeReference?
        final int portNumber;
        byte[] myIdentity; // FIXME: simple identity block; should be unique
@@ -100,7 +99,7 @@

                int port = config.getPort();

-               bindto = config.getBindTo();
+               FreenetInetAddress bindto = config.getBindTo();

                UdpSocketHandler u = null;

@@ -505,4 +504,8 @@
        public boolean definitelyPortForwarded() {
                return socket.getDetectedConnectivityStatus() == 
AddressTracker.DEFINITELY_PORT_FORWARDED;
        }
+
+       public FreenetInetAddress getBindTo() {
+               return config.getBindTo();
+       }
 }

Modified: trunk/freenet/src/freenet/node/NodeIPPortDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPPortDetector.java      2008-04-11 
21:00:07 UTC (rev 19208)
+++ trunk/freenet/src/freenet/node/NodeIPPortDetector.java      2008-04-11 
21:23:07 UTC (rev 19209)
@@ -44,7 +44,7 @@
         */
        FreenetInetAddress[] detectPrimaryIPAddress() {
                FreenetInetAddress[] addresses = 
ipDetector.detectPrimaryIPAddress();
-               FreenetInetAddress addr = crypto.bindto;
+               FreenetInetAddress addr = crypto.getBindTo();
                if(addr.isRealInternetAddress(false, true, false)) {
                        for(int i=0;i<addresses.length;i++) {
                                if(addresses[i] == addr) return addresses;