X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=4127f51a0ec8719b03855cf2be893104f24a65fd;hp=4e63728b57755fffcece313d7ba26889615d86f8;hb=8b2b67e26c5b971761f5015764d5e188f6343bc4;hpb=9da5390666ad532825d820b3554da3f39d3bc511

diff --git a/src/protocol.c b/src/protocol.c
index 4e63728b..4127f51a 100644
--- 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.124 2002/03/21 23:11:53 guus Exp $
+    $Id: protocol.c,v 1.28.4.133 2002/09/04 16:26:44 guus Exp $
 */
 
 #include "config.h"
@@ -74,7 +74,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)"), c->name, c->hostname);
       return -1;
     }
 
@@ -89,7 +89,28 @@ cp
 
   buffer[len++] = '\n';
 cp
-  return send_meta(c, buffer, len);
+  if(c == broadcast)
+    return broadcast_meta(NULL, buffer, len);
+  else
+    return send_meta(c, buffer, len);
+}
+
+int forward_request(connection_t *from)
+{
+  int request;
+cp
+  if(debug_lvl >= DEBUG_PROTOCOL)
+    {
+      sscanf(from->buffer, "%d", &request);
+      if(debug_lvl >= DEBUG_META)
+        syslog(LOG_DEBUG, _("Broadcasting %s from %s (%s): %s"), request_name[request], from->name, from->hostname, from->buffer);
+      else
+        syslog(LOG_DEBUG, _("Broadcasting %s from %s (%s)"), request_name[request], from->name, from->hostname);
+    }
+
+  from->buffer[from->reqlen - 1] = '\n';
+cp
+  return broadcast_meta(from, from->buffer, from->reqlen);
 }
 
 int receive_request(connection_t *c)
@@ -146,20 +167,29 @@ 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
 }
 
-void exit_request(void)
+void exit_requests(void)
 {
 cp
   avl_delete_tree(past_request_tree);
@@ -173,7 +203,11 @@ cp
   p.request = request;
 
   if(avl_search(past_request_tree, &p))
-    return 1;
+    {
+      if(debug_lvl >= DEBUG_SCARY_THINGS)
+        syslog(LOG_DEBUG, _("Already seen request"));
+      return 1;
+    }
   else
     {
       new = (past_request_t *)xmalloc(sizeof(*new));
@@ -212,7 +246,6 @@ 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,
   key_changed_h, req_key_h, ans_key_h,
@@ -225,7 +258,6 @@ 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",
   "KEY_CHANGED", "REQ_KEY", "ANS_KEY",