Reduce KEY_CHANGED traffic.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 9125cf6..91c4ef3 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2001 Ivo Timmermans <ivo@o2w.nl>,
+                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     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.125 2002/03/22 11:43:48 guus Exp $
+    $Id: protocol.c,v 1.28.4.131 2002/09/04 08:02:33 guus Exp $
 */
 
 #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;
-
+  char *name = "everyone";
+  char *hostname = "broadcast";
 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 */
@@ -74,7 +81,7 @@ cp
 
   if(len < 0 || len > MAXBUFSIZE-1)
     {
-      syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"), request_name[request], c->name, c->hostname);
+      syslog(LOG_ERR, _("Output buffer overflow while sending request to %s (%s)"), name, hostname);
       return -1;
     }
 
@@ -82,14 +89,17 @@ cp
     {
       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
-        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
-  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)
@@ -146,16 +156,25 @@ cp
   return 0;
 }
 
-int request_compare(past_request_t *a, past_request_t *b)
+int past_request_compare(past_request_t *a, past_request_t *b)
 {
 cp
   return strcmp(a->request, b->request);
 }
 
+void free_past_request(past_request_t *r)
+{
+cp
+  if(r->request)
+    free(r->request);
+  free(r);
+cp
+}
+
 void init_requests(void)
 {
 cp
-  past_request_tree = avl_alloc_tree((avl_compare_t)request_compare, (avl_action_t)free);
+  past_request_tree = avl_alloc_tree((avl_compare_t)past_request_compare, (avl_action_t)free_past_request);
 cp
 }
 
@@ -216,9 +235,8 @@ int (*request_handlers[])(connection_t*) = {
   id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
   status_h, error_h, termreq_h,
   ping_h, pong_h,
-//  add_node_h, del_node_h,
   add_subnet_h, del_subnet_h,
-  add_edge_h, del_edge_h,
+  add_node_h, del_node_h,
   key_changed_h, req_key_h, ans_key_h,
   tcppacket_h,
 };
@@ -229,9 +247,8 @@ char (*request_name[]) = {
   "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
   "STATUS", "ERROR", "TERMREQ",
   "PING", "PONG",
-//  "ADD_NODE", "DEL_NODE",
   "ADD_SUBNET", "DEL_SUBNET",
-  "ADD_EDGE", "DEL_EDGE",
+  "ADD_NODE", "DEL_NODE",
   "KEY_CHANGED", "REQ_KEY", "ANS_KEY",
   "PACKET",
 };