X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=591f4ed50dab08378f18e61f43d51e473992a0b4;hp=d2553625dbf9425c08b5e538a3d98b825715e714;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=ec0c16b9b63f361b11a757ee1641d562e4811f93

diff --git a/src/node.c b/src/node.c
index d2553625..591f4ed5 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,7 +1,7 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.eu.org>,
+                  2001-2002 Ivo Timmermans <ivo@o2w.nl>
 
     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,20 +17,50 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: node.c,v 1.1.2.1 2001/10/10 08:49:47 guus Exp $
+    $Id: node.c,v 1.1.2.13 2002/06/21 10:11:13 guus Exp $
 */
 
+#include "config.h"
+
+#include <string.h>
+#include <syslog.h>
+
+#include <avl_tree.h>
+#include "node.h"
+#include "netutl.h"
+#include "net.h"
+#include <utils.h>
+#include <xalloc.h>
+
+#include "system.h"
+
 avl_tree_t *node_tree;		/* Known nodes, sorted by name */
+avl_tree_t *node_udp_tree;	/* Known nodes, sorted by address and port */
 
-int node_compare(connection_t *a, connection_t *b)
+node_t *myself;
+
+int node_compare(node_t *a, node_t *b)
 {
   return strcmp(a->name, b->name);
 }
 
+int node_udp_compare(node_t *a, node_t *b)
+{
+  int result;
+cp
+  result = sockaddrcmp(&a->address, &b->address);
+
+  if(result)
+    return result;
+
+  return (a->name && b->name)?strcmp(a->name, b->name):0;
+}
+
 void init_nodes(void)
 {
 cp
   node_tree = avl_alloc_tree((avl_compare_t)node_compare, NULL);
+  node_udp_tree = avl_alloc_tree((avl_compare_t)node_udp_compare, NULL);
 cp
 }
 
@@ -38,6 +68,7 @@ void exit_nodes(void)
 {
 cp
   avl_delete_tree(node_tree);
+  avl_delete_tree(node_udp_tree);
 cp
 }
 
@@ -45,7 +76,8 @@ node_t *new_node(void)
 {
   node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n));
 cp
-  n->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
+  n->subnet_tree = new_subnet_tree();
+  n->edge_tree = new_edge_tree();
   n->queue = list_alloc((list_action_t)free);
 cp
   return n;
@@ -62,12 +94,47 @@ cp
     free(n->hostname);
   if(n->key)
     free(n->key);
-  if(n->config)
-    clear_config(&n->config);
+  if(n->subnet_tree)
+    free_subnet_tree(n->subnet_tree);
+  if(n->edge_tree)
+    free_edge_tree(n->edge_tree);
   free(n);
 cp
 }
 
+void node_add(node_t *n)
+{
+cp
+  avl_insert(node_tree, n);
+  avl_insert(node_udp_tree, n);
+cp
+}
+
+void node_del(node_t *n)
+{
+  avl_node_t *node, *next;
+  edge_t *e;
+  subnet_t *s;
+cp
+  for(node = n->subnet_tree->head; node; node = next)
+    {
+      next = node->next;
+      s = (subnet_t *)node->data;
+      subnet_del(n, s);
+    }
+
+  for(node = n->edge_tree->head; node; node = next)
+    {
+      next = node->next;
+      e = (edge_t *)node->data;
+      edge_del(e);
+    }
+cp
+  avl_delete(node_tree, n);
+  avl_delete(node_udp_tree, n);
+cp
+}
+
 node_t *lookup_node(char *name)
 {
   node_t n;
@@ -76,17 +143,14 @@ cp
   return avl_search(node_tree, &n);
 }
 
-
-int read_host_config(nodet *n)
+node_t *lookup_node_udp(sockaddr_t *sa)
 {
-  char *fname;
-  int x;
-cp
-  asprintf(&fname, "%s/hosts/%s", confbase, n->name);
-  x = read_config_file(&n->config, fname);
-  free(fname);
+  node_t n;
 cp
-  return x;
+  n.address = *sa;
+  n.name = NULL;
+
+  return avl_search(node_udp_tree, &n);
 }
 
 void dump_nodes(void)
@@ -98,10 +162,10 @@ cp
 
   for(node = node_tree->head; node; node = node->next)
     {
-      n = (connection_t *)node->data;
-      syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"),
-             n->name, n->hostname, n->port, n->options,
-             n->socket, n->meta_socket, n->status);
+      n = (node_t *)node->data;
+      syslog(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"),
+             n->name, n->hostname, n->cipher?n->cipher->nid:0, n->digest?n->digest->type:0, n->maclength, n->compression, n->options,
+             n->status, n->nexthop?n->nexthop->name:"-", n->via?n->via->name:"-");
     }
     
   syslog(LOG_DEBUG, _("End of nodes."));