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

[zot...@freenetproject.org]

Author: zothar
Date: 2008-01-23 01:35:49 +0000 (Wed, 23 Jan 2008)
New Revision: 17204

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Factor getLocalNoderef() out of sendConnectedDiffNoderef as suggested by toad

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-01-23 01:21:25 UTC 
(rev 17203)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-01-23 01:35:49 UTC 
(rev 17204)
@@ -3486,6 +3486,19 @@
        }

        /**
+        * Return the relevant local node reference related to this peer's type
+        */
+       protected SimpleFieldSet getLocalNoderef() {
+               if(isDarknet()) {
+                       return node.exportDarknetPublicFieldSet();
+               } else if(isOpennet()) {
+                       return node.exportOpennetPublicFieldSet();
+               }
+               // What else is there that a differential node reference would 
care about?  Add it here if needed
+               return null;
+       }
+
+       /**
         * A method to be called after completing a handshake to send the
         * newly connected peer, as a differential node reference, the
         * parts of our node reference not needed for handshake.
@@ -3494,15 +3507,8 @@
         */
        protected void sendConnectedDiffNoderef() {
                SimpleFieldSet fs = new SimpleFieldSet(true);
-               SimpleFieldSet nfs = null;
-               if(isDarknet()) {
-                       nfs = node.exportDarknetPublicFieldSet();
-               } else if(isOpennet()) {
-                       nfs = node.exportOpennetPublicFieldSet();
-               } else {
-                       // What else is there that a differential node 
reference would care about?  Add it here if needed
-                       return;
-               }
+               SimpleFieldSet nfs = getLocalNoderef();
+               if(null == nfs) return;
                if(null != nfs.get("ark.pubURI")) {
                        fs.putOverwrite("ark.pubURI", nfs.get("ark.pubURI"));
                }