Author: zothar
Date: 2008-01-24 00:26:36 +0000 (Thu, 24 Jan 2008)
New Revision: 17219

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/OpennetPeerNode.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Send a differential node reference on connect to any type of peer, rather than 
just pure darknet and opennet.  Fix the build from a missing return value not 
caught by my earlier partial build before commit

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-24 00:12:10 UTC 
(rev 17218)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-24 00:26:36 UTC 
(rev 17219)
@@ -1526,11 +1526,6 @@
                        return super.equals(o);
                } else return false;
        }
-       
-       protected void sendInitialMessages() {
-               super.sendInitialMessages();
-               sendConnectedDiffNoderef();
-       }

        /**
         * Return the relevant local node reference related to this peer's type

Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-01-24 00:12:10 UTC 
(rev 17218)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-01-24 00:26:36 UTC 
(rev 17219)
@@ -96,11 +96,6 @@
                        return super.equals(o);
                } else return false;
        }
-       
-       protected void sendInitialMessages() {
-               super.sendInitialMessages();
-               sendConnectedDiffNoderef();
-       }

        /**
         * Return the relevant local node reference related to this peer's type

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-01-24 00:12:10 UTC 
(rev 17218)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-01-24 00:26:36 UTC 
(rev 17219)
@@ -1896,6 +1896,7 @@

                if(node.nodeUpdater != null)
                        node.nodeUpdater.maybeSendUOMAnnounce(this);
+               sendConnectedDiffNoderef();
        }

        private Message createSentPacketsMessage() {
@@ -3494,6 +3495,7 @@
         */
        protected SimpleFieldSet getLocalNoderef() {
                // Do nothing in the default impl
+               return null;
        }

        /**


Reply via email to