Remove support for Subnets.

[meshlink] / src / node.c

diff --git a/src/node.c b/src/node.c
index 740b9448639a9cde7e664634cfc99651ac4620b1..42eb25cb539925e419799756eeeb0dc6d39279d0 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -1,6 +1,6 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2011 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,10 +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);
-       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,24 +61,20 @@ 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);
+       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);
@@ -98,9 +93,6 @@ void node_add(node_t *n) {
 }
 
 void node_del(node_t *n) {
-       for splay_each(subnet_t, s, n->subnet_tree)
-               subnet_del(n, s);
-
        for splay_each(edge_t, e, n->edge_tree)
                edge_del(e);
 
@@ -129,6 +121,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 +138,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);