Reduce KEY_CHANGED traffic.

diff --git a/src/protocol.c b/src/protocol.c
index 76c252f..91c4ef3 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: protocol.c,v 1.28.4.130 2002/09/03 20:43:25 guus Exp $
+    $Id: protocol.c,v 1.28.4.131 2002/09/04 08:02:33 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -62,8 +62,15 @@ int send_request(connection_t *c, const char *format, ...)
   va_list args;
   char buffer[MAXBUFSIZE];
   int len, request;
   va_list args;
   char buffer[MAXBUFSIZE];
   int len, request;

-
+  char *name = "everyone";
+  char *hostname = "broadcast";

 cp
 cp

+  if(c)
+    {
+      name = c->name;
+      hostname = c->hostname;
+    }
+

   /* Use vsnprintf instead of vasprintf: faster, no memory
      fragmentation, cleanup is automatic, and there is a limit on the
      input buffer anyway */
   /* Use vsnprintf instead of vasprintf: faster, no memory
      fragmentation, cleanup is automatic, and there is a limit on the
      input buffer anyway */


@@ -74,7 +81,7 @@ cp
 
   if(len < 0 || len > MAXBUFSIZE-1)
     {
 
   if(len < 0 || len > MAXBUFSIZE-1)
     {

-      syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"), c->name, c->hostname);
+      syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"), name, hostname);

       return -1;
     }
 
       return -1;
     }
 


@@ -82,14 +89,17 @@ cp
     {
       sscanf(buffer, "%d", &request);
       if(debug_lvl >= DEBUG_META)
     {
       sscanf(buffer, "%d", &request);
       if(debug_lvl >= DEBUG_META)

-        syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], c->name, c->hostname, buffer);
+        syslog(LOG_DEBUG, _("Sending %s to %s (%s): %s"), request_name[request], name, hostname, buffer);

       else
       else

-        syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], c->name, c->hostname);
+        syslog(LOG_DEBUG, _("Sending %s to %s (%s)"), request_name[request], name, hostname);

     }
 
   buffer[len++] = '\n';
 cp
     }
 
   buffer[len++] = '\n';
 cp

-  return send_meta(c, buffer, len);
+  if(c)
+    return send_meta(c, buffer, len);
+  else
+    return broadcast_meta(NULL, buffer, len);

 }
 
 int receive_request(connection_t *c)
 }
 
 int receive_request(connection_t *c)

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 90df50f..0f14cd6 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: protocol_key.c,v 1.1.4.8 2002/09/03 20:43:25 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.9 2002/09/04 08:02:33 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -47,8 +47,6 @@ int mykeyused = 0;
 
 int send_key_changed(connection_t *c, node_t *n)
 {
 
 int send_key_changed(connection_t *c, node_t *n)
 {

-  connection_t *other;
-  avl_node_t *node;

 cp
   /* Only send this message if some other daemon requested our key previously.
      This reduces unnecessary key_changed broadcasts.
 cp
   /* Only send this message if some other daemon requested our key previously.
      This reduces unnecessary key_changed broadcasts.


@@ -57,12 +55,7 @@ cp
   if(n == myself && !mykeyused)
     return 0;
 
   if(n == myself && !mykeyused)
     return 0;
 

-  for(node = connection_tree->head; node; node = node->next)
-    {
-      other = (connection_t *)node->data;
-      if(other->status.active && other != c)
-        send_request(other, "%d %lx %s", KEY_CHANGED, random(), n->name);
-    }
+  send_request(NULL, "%d %lx %s", KEY_CHANGED, random(), n->name);

 cp
   return 0;
 }
 cp
   return 0;
 }