Cleanups:

[tinc] / src / protocol_subnet.c

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index fbb021d..ba617e5 100644 (file)
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -1,7 +1,7 @@
 /*
     protocol_subnet.c -- handle the meta-protocol, subnets
-    Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2002 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_subnet.c,v 1.1.4.1 2002/02/11 10:05:58 guus Exp $
+    $Id: protocol_subnet.c,v 1.1.4.7 2002/09/09 19:40:09 guus Exp $
 */
 
 #include "config.h"
@@ -40,8 +40,6 @@
 #include "meta.h"
 #include "connection.h"
 #include "node.h"
-#include "edge.h"
-#include "graph.h"
 
 #include "system.h"
 
@@ -49,11 +47,11 @@ int send_add_subnet(connection_t *c, subnet_t *subnet)
 {
   int x;
   char *netstr;
-cp
-  x = send_request(c, "%d %s %s", ADD_SUBNET,
+  cp();
+  x = send_request(c, "%d %lx %s %s", ADD_SUBNET, random(),
                       subnet->owner->name, netstr = net2str(subnet));
   free(netstr);
-cp
+  cp();
   return x;
 }
 
@@ -62,11 +60,9 @@ int add_subnet_h(connection_t *c)
   char subnetstr[MAX_STRING_SIZE];
   char name[MAX_STRING_SIZE];
   node_t *owner;
-  connection_t *other;
   subnet_t *s;
-  avl_node_t *node;
-cp
-  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
+  cp();
+  if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name, c->hostname);
       return -1;
@@ -82,12 +78,17 @@ cp
 
   /* Check if subnet string is valid */
 
-  if(!(s = str2net(subnetstr)))
+  s = str2net(subnetstr);
+
+  if(!s)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name, c->hostname, _("invalid subnet string"));
       return -1;
     }
 
+  if(seen_request(c->buffer))
+    return 0;
+ 
   /* Check if the owner of the new subnet is in the connection list */
 
   owner = lookup_node(name);
@@ -123,14 +124,9 @@ cp
   subnet_add(owner, s);
 
   /* Tell the rest */
-  
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      other = (connection_t *)node->data;
-      if(other->status.active && other != c)
-        send_add_subnet(other, s);
-    }
-cp
+
+  forward_request(c);
+  cp();
   return 0;
 }
 
@@ -138,11 +134,11 @@ int send_del_subnet(connection_t *c, subnet_t *s)
 {
   int x;
   char *netstr;
-cp
+  cp();
   netstr = net2str(s);
-  x = send_request(c, "%d %s %s", DEL_SUBNET, s->owner->name, netstr);
+  x = send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), s->owner->name, netstr);
   free(netstr);
-cp
+  cp();
   return x;
 }
 
@@ -151,11 +147,9 @@ int del_subnet_h(connection_t *c)
   char subnetstr[MAX_STRING_SIZE];
   char name[MAX_STRING_SIZE];
   node_t *owner;
-  connection_t *other;
   subnet_t *s, *find;
-  avl_node_t *node;
-cp
-  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
+  cp();
+  if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name, c->hostname);
       return -1;
@@ -171,7 +165,9 @@ cp
 
   /* Check if the owner of the new subnet is in the connection list */
 
-  if(!(owner = lookup_node(name)))
+  owner = lookup_node(name);    
+
+  if(!owner)
     {
       if(debug_lvl >= DEBUG_PROTOCOL)
         syslog(LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree"),
@@ -181,12 +177,17 @@ cp
 
   /* Check if subnet string is valid */
 
-  if(!(s = str2net(subnetstr)))
+  s = str2net(subnetstr);
+
+  if(!s)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name, c->hostname, _("invalid subnet string"));
       return -1;
     }
 
+  if(seen_request(c->buffer))
+    return 0;
+
   /* If everything is correct, delete the subnet from the list of the owner */
 
   s->owner = owner;
@@ -214,18 +215,13 @@ cp
   }
 
   /* Tell the rest */
-  
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      other = (connection_t *)node->data;
-      if(other->status.active && other != c)
-        send_del_subnet(other, find);
-    }
+
+  forward_request(c);
 
   /* Finally, delete it. */
 
   subnet_del(owner, find);
 
-cp
+  cp();
   return 0;
 }