projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More updates to protocol handlers and reimplemented terminate_connection().
[tinc]
/
src
/
node.c
diff --git
a/src/node.c
b/src/node.c
index
d255362
..
95a1d4f
100644
(file)
--- a/
src/node.c
+++ b/
src/node.c
@@
-17,20
+17,47
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.
5 2001/10/30 12:59:12
guus Exp $
*/
*/
+#include "config.h"
+
+#include <string.h>
+#include <syslog.h>
+
+#include <avl_tree.h>
+#include "node.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_tree; /* Known nodes, sorted by name */
+avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */
+
+node_t *myself;
-int node_compare(
connection_t *a, connection
_t *b)
+int node_compare(
node_t *a, node
_t *b)
{
return strcmp(a->name, b->name);
}
{
return strcmp(a->name, b->name);
}
+int node_udp_compare(node_t *a, node_t *b)
+{
+ if(a->address < b->address)
+ return -1;
+ else if (a->address > b->address)
+ return 1;
+ else
+ return a->port - b->port;
+}
+
void init_nodes(void)
{
cp
node_tree = avl_alloc_tree((avl_compare_t)node_compare, NULL);
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
}
cp
}
@@
-38,6
+65,7
@@
void exit_nodes(void)
{
cp
avl_delete_tree(node_tree);
{
cp
avl_delete_tree(node_tree);
+ avl_delete_tree(node_udp_tree);
cp
}
cp
}
@@
-45,7
+73,8
@@
node_t *new_node(void)
{
node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n));
cp
{
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;
n->queue = list_alloc((list_action_t)free);
cp
return n;
@@
-62,12
+91,30
@@
cp
free(n->hostname);
if(n->key)
free(n->key);
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
}
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)
+{
+cp
+ avl_delete(node_tree, n);
+ avl_delete(node_udp_tree, n);
+cp
+}
+
node_t *lookup_node(char *name)
{
node_t n;
node_t *lookup_node(char *name)
{
node_t n;
@@
-76,17
+123,13
@@
cp
return avl_search(node_tree, &n);
}
return avl_search(node_tree, &n);
}
-
-int read_host_config(nodet *n)
+node_t *lookup_node_udp(ipv4_t address, port_t port)
{
{
- 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
cp
- return x;
+ n.address = address;
+ n.port = port;
+ return avl_search(node_udp_tree, &n);
}
void dump_nodes(void)
}
void dump_nodes(void)
@@
-98,10
+141,10
@@
cp
for(node = node_tree->head; node; node = node->next)
{
for(node = node_tree->head; node; node = node->next)
{
- n = (
connection
_t *)node->data;
- syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld s
ockets %d, %d status %04x
"),
+ n = (
node
_t *)node->data;
+ syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld s
tatus %04x nexthop %s via %s
"),
n->name, n->hostname, n->port, n->options,
n->name, n->hostname, n->port, n->options,
- n->s
ocket, n->meta_socket, n->status
);
+ n->s
tatus, n->nexthop->name, n->via->name
);
}
syslog(LOG_DEBUG, _("End of nodes."));
}
syslog(LOG_DEBUG, _("End of nodes."));