[freenet-cvs] r18309 - in trunk/freenet/src/freenet/node: . updater

[toad at freenetproject.org]

Author: toad
Date: 2008-03-01 23:15:55 +0000 (Sat, 01 Mar 2008)
New Revision: 18309

Modified:
   trunk/freenet/src/freenet/node/LocationManager.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
Log:
Add a ByteCounter to localBroadcast().

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java	2008-03-01 23:13:55 UTC (rev 18308)
+++ trunk/freenet/src/freenet/node/LocationManager.java	2008-03-01 23:15:55 UTC (rev 18309)
@@ -574,7 +574,7 @@
      */
     private void announceLocChange() {
         Message msg = DMT.createFNPLocChangeNotification(getLocation());
-        node.peers.localBroadcast(msg, false, true);
+        node.peers.localBroadcast(msg, false, true, this);
     }
     
     private boolean locked;

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java	2008-03-01 23:13:55 UTC (rev 18308)
+++ trunk/freenet/src/freenet/node/Node.java	2008-03-01 23:15:55 UTC (rev 18309)
@@ -2707,7 +2707,7 @@
 		
 		try {
 			Message msg = DMT.createFNPDisconnect(false, false, -1, new ShortBuffer(new byte[0]));
-			peers.localBroadcast(msg, true, false);
+			peers.localBroadcast(msg, true, false, null);
 		} catch (Throwable t) {
 			try {
 				// E.g. if we haven't finished startup

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java	2008-03-01 23:13:55 UTC (rev 18308)
+++ trunk/freenet/src/freenet/node/PeerManager.java	2008-03-01 23:15:55 UTC (rev 18309)
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 
 import freenet.io.comm.AsyncMessageCallback;
+import freenet.io.comm.ByteCounter;
 import freenet.io.comm.DMT;
 import freenet.io.comm.FreenetInetAddress;
 import freenet.io.comm.Message;
@@ -639,7 +640,7 @@
     /**
      * Asynchronously send this message to every connected peer.
      */
-    public void localBroadcast(Message msg, boolean ignoreRoutability, boolean onlyRealConnections) {
+    public void localBroadcast(Message msg, boolean ignoreRoutability, boolean onlyRealConnections, ByteCounter ctr) {
         PeerNode[] peers;
         synchronized (this) {
         	// myPeers not connectedPeers as connectedPeers only contains
@@ -654,7 +655,7 @@
         	}
         	if(onlyRealConnections && !peers[i].isRealConnection()) continue;
         	try {
-                peers[i].sendAsync(msg, null, 0, null);
+                peers[i].sendAsync(msg, null, 0, ctr);
             } catch (NotConnectedException e) {
                 // Ignore
             }

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java	2008-03-01 23:13:55 UTC (rev 18308)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java	2008-03-01 23:15:55 UTC (rev 18309)
@@ -168,7 +168,7 @@
 			msg = getUOMAnnouncement();
 			broadcastUOMAnnounces = true;
 		}
-		node.peers.localBroadcast(msg, true, true);
+		node.peers.localBroadcast(msg, true, true, ctr);
 	}
 
 	private Message getUOMAnnouncement() {