Add stricter checks for netnames.

[tinc] / src / edge.c

diff --git a/src/edge.c b/src/edge.c
index cee75a7..0e35cd1 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,6 +1,6 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *edge_weight_tree;        /* Tree with all edges, sorted on weight */
+splay_tree_t *edge_weight_tree;
 
 static int edge_compare(const edge_t *a, const edge_t *b) {
        return strcmp(a->to->name, b->to->name);
@@ -70,11 +70,12 @@ void exit_edges(void) {
 /* Creation and deletion of connection elements */
 
 edge_t *new_edge(void) {
-       return xmalloc_and_zero(sizeof(edge_t));
+       return xzalloc(sizeof(edge_t));
 }
 
 void free_edge(edge_t *e) {
        sockaddrfree(&e->address);
+       sockaddrfree(&e->local_address);
 
        free(e);
 }
@@ -99,7 +100,7 @@ void edge_del(edge_t *e) {
 
 edge_t *lookup_edge(node_t *from, node_t *to) {
        edge_t v;
-       
+
        v.from = from;
        v.to = to;
 
@@ -107,21 +108,16 @@ edge_t *lookup_edge(node_t *from, node_t *to) {
 }
 
 bool dump_edges(connection_t *c) {
-       splay_node_t *node, *node2;
-       node_t *n;
-       edge_t *e;
-       char *address;
-
-       for(node = node_tree->head; node; node = node->next) {
-               n = node->data;
-               for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
-                       e = node2->data;
-                       address = sockaddr2hostname(&e->address);
-                       send_request(c, "%d %d %s %s %s %x %d",
+       for splay_each(node_t, n, node_tree) {
+               for splay_each(edge_t, e, n->edge_tree) {
+                       char *address = sockaddr2hostname(&e->address);
+                       char* local_address = sockaddr2hostname(&e->local_address);
+                       send_request(c, "%d %d %s %s %s %s %x %d",
                                        CONTROL, REQ_DUMP_EDGES,
                                        e->from->name, e->to->name, address,
-                                       e->options, e->weight);
+                                       local_address, e->options, e->weight);
                        free(address);
+                       free(local_address);
                }
        }