s/sliepen.warande.net/sliepen.eu.org/g

[tinc] / src / protocol_edge.c

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 9c83199..a13a096 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -1,7 +1,7 @@
 /*
     protocol_edge.c -- handle the meta-protocol, edges
-    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_edge.c,v 1.1.4.1 2002/02/11 10:05:58 guus Exp $
+    $Id: protocol_edge.c,v 1.1.4.8 2002/06/21 10:11:19 guus Exp $
 */
 
 #include "config.h"
@@ -48,16 +48,19 @@
 int send_add_edge(connection_t *c, edge_t *e)
 {
   int x;
-  char *from_addrstr, *to_addrstr;
+  char *from_udpaddress, *from_udpport;
+  char *to_udpaddress, *to_udpport;
 cp
-  from_addrstr = address2str(e->from.address);
-  to_addrstr = address2str(e->to.address);
-  x = send_request(c, "%d %s %s %hd %s %s %hd %lx %d", ADD_EDGE,
-                      e->from.node->name, from_addrstr, e->from.port,
-                     e->to.node->name, to_addrstr, e->to.port,
+  sockaddr2str(&e->from.udpaddress, &from_udpaddress, &from_udpport);
+  sockaddr2str(&e->to.udpaddress, &to_udpaddress, &to_udpport);
+  x = send_request(c, "%d %lx %s %s %s %s %s %s %lx %d", ADD_EDGE, random(),
+                      e->from.node->name, from_udpaddress, from_udpport,
+                     e->to.node->name, to_udpaddress, to_udpport,
                      e->options, e->weight);
-  free(from_addrstr);
-  free(to_addrstr);
+  free(from_udpaddress);
+  free(from_udpport);
+  free(to_udpaddress);
+  free(to_udpport);
 cp
   return x;
 }
@@ -69,17 +72,19 @@ int add_edge_h(connection_t *c)
   node_t *from, *to;
   char from_name[MAX_STRING_SIZE];
   char to_name[MAX_STRING_SIZE];
-  char from_addrstr[MAX_STRING_SIZE];
-  char to_addrstr[MAX_STRING_SIZE];
-  ipv4_t from_address, to_address;
-  port_t from_port, to_port;
+  char from_address[MAX_STRING_SIZE];
+  char from_udpport[MAX_STRING_SIZE];
+  char to_address[MAX_STRING_SIZE];
+  char to_udpport[MAX_STRING_SIZE];
+  sockaddr_t from_udpaddress;
+  sockaddr_t to_udpaddress;
   long int options;
   int weight;
   avl_node_t *node;
 cp
-  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %hd "MAX_STRING" "MAX_STRING" %hd %lx %d",
-            from_name, from_addrstr, &from_port,
-           to_name, to_addrstr, &to_port,
+  if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %lx %d",
+            from_name, from_address, from_udpport,
+           to_name, to_address, to_udpport,
            &options, &weight) != 8)
     {
        syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_EDGE", c->name, c->hostname);
@@ -100,6 +105,9 @@ cp
       return -1;
     }
 
+  if(seen_request(c->buffer))
+    return 0;
+
   /* Lookup nodes */
 
   from = lookup_node(from_name);
@@ -122,8 +130,8 @@ cp
 
   /* Convert addresses */
   
-  from_address = str2address(from_addrstr);
-  to_address = str2address(to_addrstr);
+  from_udpaddress = str2sockaddr(from_address, from_udpport);
+  to_udpaddress = str2sockaddr(to_address, to_udpport);
 
   /* Check if edge already exists */
   
@@ -132,9 +140,9 @@ cp
   if(e)
   {
     if(e->weight != weight || e->options != options
-       || ((e->from.node == from) && (e->from.address != from_address || e->from.port != from_port || e->to.address != to_address || e->to.port != to_port))
-       || ((e->from.node == to) && (e->from.address != to_address || e->from.port != to_port || e->to.address != from_address || e->to.port != from_port))
-      )     
+       || ((e->from.node == from) && (sockaddrcmp(&e->from.udpaddress, &from_udpaddress)|| sockaddrcmp(&e->to.udpaddress, &to_udpaddress)))
+       || ((e->from.node == to) && (sockaddrcmp(&e->from.udpaddress, &to_udpaddress) || sockaddrcmp(&e->to.udpaddress, &from_udpaddress)))
+      )
     {
       if(from == myself || to == myself)
       {
@@ -165,15 +173,11 @@ cp
     return 0;
   }
 
-
-
   e = new_edge();
   e->from.node = from;
-  e->from.address = from_address;
-  e->from.port = from_port;
+  e->from.udpaddress = from_udpaddress;
   e->to.node = to;
-  e->to.address = to_address;
-  e->to.port = to_port;
+  e->to.udpaddress = to_udpaddress;
   e->options = options;
   e->weight = weight;
   edge_add(e);
@@ -184,7 +188,7 @@ cp
     {
       other = (connection_t *)node->data;
       if(other->status.active && other != c)
-        send_add_edge(other, e);
+        send_request(other, "%s", c->buffer);
     }
 
   /* Run MST before or after we tell the rest? */
@@ -197,7 +201,7 @@ cp
 int send_del_edge(connection_t *c, edge_t *e)
 {
 cp
-  return send_request(c, "%d %s %s", DEL_EDGE,
+  return send_request(c, "%d %lx %s %s", DEL_EDGE, random(),
                       e->from.node->name, e->to.node->name);
 }
 
@@ -210,7 +214,7 @@ int del_edge_h(connection_t *c)
   connection_t *other;
   avl_node_t *node;
 cp
-  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING"", from_name, to_name) != 2)
+  if(sscanf(c->buffer, "%*d %*x "MAX_STRING" "MAX_STRING"", from_name, to_name) != 2)
     {
       syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_EDGE",
              c->name, c->hostname);
@@ -231,6 +235,9 @@ cp
       return -1;
     }
 
+  if(seen_request(c->buffer))
+    return 0;
+
   /* Lookup nodes */
 
   from = lookup_node(from_name);
@@ -276,7 +283,7 @@ cp
     {
       other = (connection_t *)node->data;
       if(other->status.active && other != c)
-        send_del_edge(other, e);
+        send_request(other, "%s", c->buffer);
     }
 
   /* Delete the edge */