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

[zot...@freenetproject.org]

Author: zothar
Date: 2008-02-29 22:59:46 +0000 (Fri, 29 Feb 2008)
New Revision: 18272

Modified:
   trunk/freenet/src/freenet/node/NodeCrypto.java
Log:
Omit physical.udp, ark.number and ark.pubURI from forSetup true exported refs, 
saving more packet space; these fields will be updated via differential node 
reference after the handshake has been completed

Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java      2008-02-29 22:56:16 UTC 
(rev 18271)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java      2008-02-29 22:59:46 UTC 
(rev 18272)
@@ -283,7 +283,7 @@
         */
        SimpleFieldSet exportPublicFieldSet(boolean forSetup, boolean 
forAnonInitiator) {
                SimpleFieldSet fs = exportPublicCryptoFieldSet(forSetup, 
forAnonInitiator);
-               if(!forAnonInitiator) {
+               if((!forAnonInitiator) && (!forSetup)) {
                        // IP addresses
                        Peer[] ips = detector.detectPrimaryPeers();
                        if(ips != null) {
@@ -337,8 +337,10 @@
                if(!forAnonInitiator) {
                        // Short-lived connections don't need ARK and don't 
need negTypes either.
                        fs.put("auth.negTypes", negTypes);
-                       fs.put("ark.number", myARKNumber); // Can be changed on 
setup
-                       fs.putSingle("ark.pubURI", 
myARK.getURI().toString(false, false)); // Can be changed on setup
+                       if(!forSetup) {
+                               fs.put("ark.number", myARKNumber); // Can be 
changed on setup
+                               fs.putSingle("ark.pubURI", 
myARK.getURI().toString(false, false)); // Can be changed on setup
+                       }
                }
                return fs;
        }