X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=3e4dec957f98f410b3912dc9dcf9904dca64fc4c;hb=a1b50920b9a52f86ca6e33fcb24d7fa34313a1ee;hp=465a48a8c0f7db6abce86880f530ebc4deffaf15;hpb=6bc5d626a8726fc23365ee705761a3c666a08ad4;p=meshlink

diff --git a/src/node.c b/src/node.c
index 465a48a8..3e4dec95 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,7 +1,6 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
-                  2001-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>,
 
     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
@@ -20,9 +19,9 @@
 
 #include "system.h"
 
-#include "control_common.h"
 #include "hash.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
@@ -30,30 +29,26 @@
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *node_tree;
 static hash_t *node_udp_cache;
 
-node_t *myself;
-
 static int node_compare(const node_t *a, const node_t *b) {
 	return strcmp(a->name, b->name);
 }
 
-void init_nodes(void) {
-	node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
+void init_nodes(meshlink_handle_t *mesh) {
+	mesh->nodes = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
 	node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
 }
 
-void exit_nodes(void) {
+void exit_nodes(meshlink_handle_t *mesh) {
 	hash_free(node_udp_cache);
-	splay_delete_tree(node_tree);
+	splay_delete_tree(mesh->nodes);
 }
 
 node_t *new_node(void) {
-	node_t *n = xmalloc_and_zero(sizeof *n);
+	node_t *n = xzalloc(sizeof *n);
 
-	if(replaywin) n->late = xmalloc_and_zero(replaywin);
-	n->subnet_tree = new_subnet_tree();
+	if(replaywin) n->late = xzalloc(replaywin);
 	n->edge_tree = new_edge_tree();
 	n->mtu = MTU;
 	n->maxmtu = MTU;
@@ -62,23 +57,16 @@ node_t *new_node(void) {
 }
 
 void free_node(node_t *n) {
-	if(n->subnet_tree)
-		free_subnet_tree(n->subnet_tree);
-
 	if(n->edge_tree)
 		free_edge_tree(n->edge_tree);
 
 	sockaddrfree(&n->address);
 
-	cipher_close(&n->incipher);
-	digest_close(&n->indigest);
-	cipher_close(&n->outcipher);
-	digest_close(&n->outdigest);
-
-	ecdsa_free(&n->ecdsa);
+	ecdsa_free(n->ecdsa);
 	sptps_stop(&n->sptps);
 
-	timeout_del(&n->mtutimeout);
+	if(n->mtutimeout.cb)
+		abort();
 
 	if(n->hostname)
 		free(n->hostname);
@@ -92,35 +80,35 @@ void free_node(node_t *n) {
 	free(n);
 }
 
-void node_add(node_t *n) {
-	splay_insert(node_tree, n);
+void node_add(meshlink_handle_t *mesh, node_t *n) {
+	n->mesh = mesh;
+	splay_insert(mesh->nodes, n);
 }
 
-void node_del(node_t *n) {
-	for splay_each(subnet_t, s, n->subnet_tree)
-		subnet_del(n, s);
+void node_del(meshlink_handle_t *mesh, node_t *n) {
+	timeout_del(&mesh->loop, &n->mtutimeout);
 
 	for splay_each(edge_t, e, n->edge_tree)
-		edge_del(e);
+		edge_del(mesh, e);
 
-	splay_delete(node_tree, n);
+	splay_delete(mesh->nodes, n);
 }
 
-node_t *lookup_node(char *name) {
+node_t *lookup_node(meshlink_handle_t *mesh, char *name) {
 	node_t n = {NULL};
 
 	n.name = name;
 
-	return splay_search(node_tree, &n);
+	return splay_search(mesh->nodes, &n);
 }
 
-node_t *lookup_node_udp(const sockaddr_t *sa) {
+node_t *lookup_node_udp(meshlink_handle_t *mesh, const sockaddr_t *sa) {
 	return hash_search(node_udp_cache, sa);
 }
 
-void update_node_udp(node_t *n, const sockaddr_t *sa) {
-	if(n == myself) {
-		logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of myself!");
+void update_node_udp(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) {
+	if(n == mesh->self) {
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of mesh->self!");
 		return;
 	}
 
@@ -129,8 +117,8 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
 	if(sa) {
 		n->address = *sa;
 		n->sock = 0;
-		for(int i = 0; i < listen_sockets; i++) {
-			if(listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) {
+		for(int i = 0; i < mesh->listen_sockets; i++) {
+			if(mesh->listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) {
 				n->sock = i;
 				break;
 			}
@@ -141,22 +129,3 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
 		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
 	}
 }
-
-bool dump_nodes(connection_t *c) {
-	for splay_each(node_t, n, node_tree)
-		send_request(c, "%d %d %s %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", CONTROL, REQ_DUMP_NODES,
-			   n->name, n->hostname ?: "unknown port unknown", cipher_get_nid(&n->outcipher),
-			   digest_get_nid(&n->outdigest), (int)digest_length(&n->outdigest), n->outcompression,
-			   n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
-			   n->via ? n->via->name ?: "-" : "-", n->distance, n->mtu, n->minmtu, n->maxmtu, (long)n->last_state_change);
-
-	return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
-}
-
-bool dump_traffic(connection_t *c) {
-	for splay_each(node_t, n, node_tree)
-		send_request(c, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_TRAFFIC,
-			   n->name, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
-
-	return send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
-}