X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=dbc5a7eb32152135c1357115814b50fc51e02844;hb=af2e0c9a32642065aedd2e67ca1f5791ca7a407d;hp=862bd69693ca9707e2ebd01076806e0e1bec43cf;hpb=886a6f61a1f4cc48a77b42d10f34f9126377d904;p=tinc

diff --git a/src/node.c b/src/node.c
index 862bd696..dbc5a7eb 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,6 +1,6 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2011 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -85,7 +85,8 @@ void free_node(node_t *n) {
 	cipher_close(&n->outcipher);
 	digest_close(&n->outdigest);
 
-	event_del(&n->mtuevent);
+	if(timeout_initialized(&n->mtuevent))
+		event_del(&n->mtuevent);
 	
 	if(n->hostname)
 		free(n->hostname);
@@ -125,7 +126,7 @@ void node_del(node_t *n) {
 }
 
 node_t *lookup_node(char *name) {
-	node_t n = {0};
+	node_t n = {NULL};
 
 	n.name = name;
 
@@ -133,7 +134,7 @@ node_t *lookup_node(char *name) {
 }
 
 node_t *lookup_node_udp(const sockaddr_t *sa) {
-	node_t n = {0};
+	node_t n = {NULL};
 
 	n.address = *sa;
 	n.name = NULL;
@@ -142,6 +143,11 @@ node_t *lookup_node_udp(const sockaddr_t *sa) {
 }
 
 void update_node_udp(node_t *n, const sockaddr_t *sa) {
+	if(n == myself) {
+		logger(LOG_WARNING, "Trying to update UDP address of myself!");
+		return;
+	}
+
 	splay_delete(node_udp_tree, n);
 
 	if(n->hostname)
@@ -154,7 +160,7 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
 		logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
 	} else {
 		memset(&n->address, 0, sizeof n->address);
-		n->hostname = 0;
+		n->hostname = NULL;
 		ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name);
 	}
 }
@@ -174,3 +180,16 @@ bool dump_nodes(connection_t *c) {
 
 	return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
 }
+
+bool dump_traffic(connection_t *c) {
+	splay_node_t *node;
+	node_t *n;
+
+	for(node = node_tree->head; node; node = node->next) {
+		n = node->data;
+		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);
+}