X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=b323dca3f3c52de8bdde53811c4adda33757e416;hp=4fbec08fabcb8e1a18e8588f089661b3832f5a01;hb=5cbddc68bade0d1f8ded1b784bb27bb44c5dc5dc;hpb=23e151aeed6b3ffe0fab10f51ffdb134deb7a852

diff --git a/src/node.c b/src/node.c
index 4fbec08f..b323dca3 100644
--- a/src/node.c
+++ b/src/node.c
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -35,38 +33,27 @@ avl_tree_t *node_udp_tree;		/* Known nodes, sorted by address and port */
 
 node_t *myself;
 
-static int node_compare(const node_t *a, const node_t *b)
-{
+static int node_compare(const node_t *a, const node_t *b) {
 	return strcmp(a->name, b->name);
 }
 
-static int node_udp_compare(const node_t *a, const node_t *b)
-{
+static int node_udp_compare(const node_t *a, const node_t *b) {
        return sockaddrcmp(&a->address, &b->address);
 }
 
-void init_nodes(void)
-{
-	cp();
-
+void init_nodes(void) {
 	node_tree = avl_alloc_tree((avl_compare_t) node_compare, (avl_action_t) free_node);
 	node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL);
 }
 
-void exit_nodes(void)
-{
-	cp();
-
+void exit_nodes(void) {
 	avl_delete_tree(node_udp_tree);
 	avl_delete_tree(node_tree);
 }
 
-node_t *new_node(void)
-{
+node_t *new_node(void) {
 	node_t *n = xmalloc_and_zero(sizeof(*n));
 
-	cp();
-
 	n->subnet_tree = new_subnet_tree();
 	n->edge_tree = new_edge_tree();
 	EVP_CIPHER_CTX_init(&n->inctx);
@@ -77,10 +64,7 @@ node_t *new_node(void)
 	return n;
 }
 
-void free_node(node_t *n)
-{
-	cp();
-
+void free_node(node_t *n) {
 	if(n->inkey)
 		free(n->inkey);
 
@@ -110,21 +94,15 @@ void free_node(node_t *n)
 	free(n);
 }
 
-void node_add(node_t *n)
-{
-	cp();
-
+void node_add(node_t *n) {
 	avl_insert(node_tree, n);
 }
 
-void node_del(node_t *n)
-{
+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 = node->data;
@@ -141,31 +119,24 @@ void node_del(node_t *n)
 	avl_delete(node_tree, n);
 }
 
-node_t *lookup_node(char *name)
-{
+node_t *lookup_node(char *name) {
 	node_t n = {0};
 
-	cp();
-	
 	n.name = name;
 
 	return avl_search(node_tree, &n);
 }
 
-node_t *lookup_node_udp(const sockaddr_t *sa)
-{
+node_t *lookup_node_udp(const sockaddr_t *sa) {
 	node_t n = {0};
 
-	cp();
-
 	n.address = *sa;
 	n.name = NULL;
 
 	return avl_search(node_udp_tree, &n);
 }
 
-void update_node_udp(node_t *n, const sockaddr_t *sa)
-{
+void update_node_udp(node_t *n, const sockaddr_t *sa) {
 	avl_delete(node_udp_tree, n);
 
 	if(n->hostname)
@@ -183,23 +154,20 @@ void update_node_udp(node_t *n, const sockaddr_t *sa)
 	}
 }
 
-void dump_nodes(void)
-{
+void dump_nodes(void) {
 	avl_node_t *node;
 	node_t *n;
 
-	cp();
-
-	logger(LOG_DEBUG, _("Nodes:"));
+	logger(LOG_DEBUG, "Nodes:");
 
 	for(node = node_tree->head; node; node = node->next) {
 		n = node->data;
-		logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)"),
+		logger(LOG_DEBUG, " %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s pmtu %d (min %d max %d)",
 			   n->name, n->hostname, n->outcipher ? n->outcipher->nid : 0,
 			   n->outdigest ? n->outdigest->type : 0, n->outmaclength, n->outcompression,
 			   n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
 			   n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
 	}
 
-	logger(LOG_DEBUG, _("End of nodes."));
+	logger(LOG_DEBUG, "End of nodes.");
 }