X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=aab83ca7b020dc1e2a6bb38f2bb4d52dbe19bdcc;hb=refs%2Fheads%2F1.1-brainpool;hp=e67b9b97fd51fe8b556bdecb125be1ff518777a1;hpb=70a1a5594af5d4e6a364186b42ba4e34c676009b;p=tinc

diff --git a/src/node.c b/src/node.c
index e67b9b97..aab83ca7 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,6 +1,6 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -50,9 +50,9 @@ void exit_nodes(void) {
 }
 
 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);
+	if(replaywin) n->late = xzalloc(replaywin);
 	n->subnet_tree = new_subnet_tree();
 	n->edge_tree = new_edge_tree();
 	n->mtu = MTU;
@@ -70,16 +70,15 @@ void free_node(node_t *n) {
 
 	sockaddrfree(&n->address);
 
-	cipher_close(&n->incipher);
-	digest_close(&n->indigest);
-	cipher_close(&n->outcipher);
-	digest_close(&n->outdigest);
+	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);
 
-	if(timeout_initialized(&n->mtuevent))
-		event_del(&n->mtuevent);
+	timeout_del(&n->mtutimeout);
 
 	if(n->hostname)
 		free(n->hostname);
@@ -129,6 +128,13 @@ 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) {
+				n->sock = i;
+				break;
+			}
+		}
 		hash_insert(node_udp_cache, sa, n);
 		free(n->hostname);
 		n->hostname = sockaddr2hostname(&n->address);
@@ -139,8 +145,8 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
 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->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);