Drop graph and edge stuff. Use new node stuff instead.

[oweals/tinc.git] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index c7c57329376a64cd1e4418e45b9e255bd1feb0f4..b2ffaff90f9d00529dbc8c42f9dde73212aafeb2 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.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.
 
-    $Id: protocol_auth.c,v 1.1.4.9 2002/06/21 10:11:13 guus Exp $
+    $Id: protocol_auth.c,v 1.1.4.10 2002/09/03 20:43:25 guus Exp $
 */
 
 #include "config.h"
@@ -48,8 +48,6 @@
 #include "meta.h"
 #include "connection.h"
 #include "node.h"
-#include "edge.h"
-#include "graph.h"
 
 #include "system.h"
 
@@ -462,7 +460,7 @@ cp
 int send_ack(connection_t *c)
 {
   /* ACK message contains rest of the information the other end needs
-     to create node_t and edge_t structures. */
+     to create node_t structures. */
 
   int x;
   char *address, *port;
@@ -473,7 +471,7 @@ cp
   gettimeofday(&now, NULL);
   c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
   sockaddr2str(&c->address, &address, &port);
-  x = send_request(c, "%d %s %s %d %lx", ACK, myport, address, c->estimated_weight, c->options);
+  x = send_request(c, "%d %s %s %lx", ACK, myport, address, c->options);
   free(address);
   free(port);
 cp
@@ -485,13 +483,16 @@ void send_everything(connection_t *c)
   avl_node_t *node, *node2;
   node_t *n;
   subnet_t *s;
-  edge_t *e;
+  connection_t *other;
 
-  /* Send all known subnets */
+  /* Send all known nodes and subnets */
   
   for(node = node_tree->head; node; node = node->next)
     {
       n = (node_t *)node->data;
+      
+      if(n != c->node && n != myself)
+        send_add_node(c, n);
 
       for(node2 = n->subnet_tree->head; node2; node2 = node2->next)
         {
@@ -500,16 +501,14 @@ void send_everything(connection_t *c)
         }
     }
 
-  /* Send all known edges */
-
-  for(node = edge_tree->head; node; node = node->next)
+  /* Inform others of this new node */
+      
+  for(node = connection_tree->head; node; node = node->next)
     {
-      e = (edge_t *)node->data;
-
-      if(e == c->edge)
-        continue;
-
-      send_add_edge(c, e);
+      other = (connection_t *)node->data;
+      
+      if(other->status.active && other != c)
+        send_add_node(other, c->node);
     }
 }
 
@@ -518,13 +517,11 @@ int ack_h(connection_t *c)
   char myaddress[MAX_STRING_SIZE];
   char hisport[MAX_STRING_SIZE];
   char *hisaddress, *dummy;
-  int weight;
   long int options;
   node_t *n;
-  connection_t *other;
   avl_node_t *node;
 cp
-  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %d %lx", hisport, myaddress, &weight, &options) != 4)
+  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" %lx", hisport, myaddress, &options) != 3)
     {
        syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name, c->hostname);
        return -1;
@@ -549,30 +546,26 @@ cp
             syslog(LOG_DEBUG, _("Established a second connection with %s (%s), closing old connection"), n->name, n->hostname);
           terminate_connection(n->connection, 0);
         }
-          
-      /* FIXME: check if information in existing node matches that of the other end of this connection */
     }
   
-  n->connection = c;
   c->node = n;
   c->options |= options;
-
-  /* Create an edge_t for this connection */
-
-  c->edge = new_edge();
-cp  
-  c->edge->from.node = myself;
-  c->edge->from.udpaddress = str2sockaddr(myaddress, myport);
-  c->edge->to.node = n;
+  c->myaddress = str2sockaddr(myaddress, myport);
+  
+  n->connection = c;
   sockaddr2str(&c->address, &hisaddress, &dummy);
-  c->edge->to.udpaddress = str2sockaddr(hisaddress, hisport);
-  free(hisaddress);
-  free(dummy);
-  c->edge->weight = (weight + c->estimated_weight) / 2;
-  c->edge->connection = c;
-  c->edge->options = c->options;
-cp
-  edge_add(c->edge);
+  node = avl_unlink(node_udp_tree, n);
+  n->address = str2sockaddr(hisaddress, hisport);
+  avl_insert_node(node_udp_tree, node);
+  if(n->hostname)
+    free(n->hostname);
+  n->hostname = sockaddr2hostname(&n->address);
+  n->options = c->options;
+  n->distance = 1;
+  n->via = n->nexthop = n;
+  n->status.reachable = 1;
+  n->status.validkey = 0;
+  n->status.waitingforkey = 0;
 
   /* Activate this connection */
 
@@ -583,23 +576,9 @@ cp
     syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), c->name, c->hostname);
 
 cp
-  /* Send him everything we know */
+  /* Send him everything we know and tell the others about him */
 
   send_everything(c);
-
-  /* Notify others of this connection */
-
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      other = (connection_t *)node->data;
-
-      if(other->status.active && other != c)
-        send_add_edge(other, c->edge);
-    }
-
-  /* Run MST and SSSP algorithms */
- 
-  graph();
 cp
   return 0;
 }