Fix reloading Subnets when StrictSubnets is set.
[tinc] / src / net.c
index 6530316..db8eae7 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,8 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans,
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2006      Scott Lamb <slamb@slamb.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     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"
@@ -48,16 +47,13 @@ time_t now = 0;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void)
-{
+static void purge(void) {
        avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
        node_t *n;
        edge_t *e;
        subnet_t *s;
 
-       cp();
-
-       ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
+       ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes");
 
        /* Remove all edges and subnets owned by unreachable nodes. */
 
@@ -66,15 +62,15 @@ static void purge(void)
                n = nnode->data;
 
                if(!n->status.reachable) {
-                       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
+                       ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name,
                                           n->hostname);
 
                        for(snode = n->subnet_tree->head; snode; snode = snext) {
                                snext = snode->next;
                                s = snode->data;
-                               if(!tunnelserver)
-                                       send_del_subnet(broadcast, s);
-                               subnet_del(n, s);
+                               send_del_subnet(broadcast, s);
+                               if(!strictsubnets)
+                                       subnet_del(n, s);
                        }
 
                        for(enode = n->edge_tree->head; enode; enode = enext) {
@@ -102,7 +98,8 @@ static void purge(void)
                                        break;
                        }
 
-                       if(!enode)
+                       if(!enode && (!strictsubnets || !n->subnet_tree->head))
+                               /* in strictsubnets mode do not delete nodes with subnets */
                                node_del(n);
                }
        }
@@ -112,15 +109,13 @@ static void purge(void)
   put all file descriptors in an fd_set array
   While we're at it, purge stuff that needs to be removed.
 */
-static int build_fdset(fd_set * fs)
-{
+static int build_fdset(fd_set *readset, fd_set *writeset) {
        avl_node_t *node, *next;
        connection_t *c;
        int i, max = 0;
 
-       cp();
-
-       FD_ZERO(fs);
+       FD_ZERO(readset);
+       FD_ZERO(writeset);
 
        for(node = connection_tree->head; node; node = next) {
                next = node->next;
@@ -131,22 +126,25 @@ static int build_fdset(fd_set * fs)
                        if(!connection_tree->head)
                                purge();
                } else {
-                       FD_SET(c->socket, fs);
+                       FD_SET(c->socket, readset);
+                       if(c->outbuflen > 0)
+                               FD_SET(c->socket, writeset);
                        if(c->socket > max)
                                max = c->socket;
                }
        }
 
        for(i = 0; i < listen_sockets; i++) {
-               FD_SET(listen_socket[i].tcp, fs);
+               FD_SET(listen_socket[i].tcp, readset);
                if(listen_socket[i].tcp > max)
                        max = listen_socket[i].tcp;
-               FD_SET(listen_socket[i].udp, fs);
+               FD_SET(listen_socket[i].udp, readset);
                if(listen_socket[i].udp > max)
                        max = listen_socket[i].udp;
        }
 
-       FD_SET(device_fd, fs);
+       if(device_fd >= 0)
+               FD_SET(device_fd, readset);
        if(device_fd > max)
                max = device_fd;
        
@@ -160,14 +158,11 @@ static int build_fdset(fd_set * fs)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report)
-{
-       cp();
-
+void terminate_connection(connection_t *c, bool report) {
        if(c->status.remove)
                return;
 
-       ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
+       ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)",
                           c->name, c->hostname);
 
        c->status.remove = true;
@@ -208,6 +203,12 @@ void terminate_connection(connection_t *c, bool report)
                retry_outgoing(c->outgoing);
                c->outgoing = NULL;
        }
+
+       free(c->outbuf);
+       c->outbuf = NULL;
+       c->outbuflen = 0;
+       c->outbufsize = 0;
+       c->outbufstart = 0;
 }
 
 /*
@@ -218,13 +219,10 @@ void terminate_connection(connection_t *c, bool report)
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void check_dead_connections(void)
-{
+static void check_dead_connections(void) {
        avl_node_t *node, *next;
        connection_t *c;
 
-       cp();
-
        for(node = connection_tree->head; node; node = next) {
                next = node->next;
                c = node->data;
@@ -232,23 +230,39 @@ static void check_dead_connections(void)
                if(c->last_ping_time + pingtimeout < now) {
                        if(c->status.active) {
                                if(c->status.pinged) {
-                                       ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING"),
-                                                          c->name, c->hostname);
+                                       ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
+                                                          c->name, c->hostname, now - c->last_ping_time);
                                        c->status.timeout = true;
                                        terminate_connection(c, true);
-                               } else {
+                               } else if(c->last_ping_time + pinginterval < now) {
                                        send_ping(c);
                                }
                        } else {
                                if(c->status.remove) {
-                                       logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
-                                                  c->name, c->hostname, *(uint32_t *)&c->status);
+                                       logger(LOG_WARNING, "Old connection_t for %s (%s) status %04x still lingering, deleting...",
+                                                  c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status));
                                        connection_del(c);
                                        continue;
                                }
-                               ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
+                               ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication",
                                                   c->name, c->hostname);
-                               terminate_connection(c, false);
+                               if(c->status.connecting) {
+                                       c->status.connecting = false;
+                                       closesocket(c->socket);
+                                       do_outgoing_connection(c);
+                               } else {
+                                       terminate_connection(c, false);
+                               }
+                       }
+               }
+
+               if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
+                       if(c->status.active) {
+                               ifdebug(CONNECTIONS) logger(LOG_INFO,
+                                               "%s (%s) could not flush for %ld seconds (%d bytes remaining)",
+                                               c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
+                               c->status.timeout = true;
+                               terminate_connection(c, true);
                        }
                }
        }
@@ -258,28 +272,29 @@ static void check_dead_connections(void)
   check all connections to see if anything
   happened on their sockets
 */
-static void check_network_activity(fd_set * f)
-{
+static void check_network_activity(fd_set * readset, fd_set * writeset) {
        connection_t *c;
        avl_node_t *node;
        int result, i;
-       int len = sizeof(result);
+       socklen_t len = sizeof(result);
        vpn_packet_t packet;
 
-       cp();
-
-       if(FD_ISSET(device_fd, f)) {
-               if(read_packet(&packet))
+       /* check input from kernel */
+       if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
+               if(read_packet(&packet)) {
+                       packet.priority = 0;
                        route(myself, &packet);
+               }
        }
 
+       /* check meta connections */
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
 
                if(c->status.remove)
                        continue;
 
-               if(FD_ISSET(c->socket, f)) {
+               if(FD_ISSET(c->socket, readset)) {
                        if(c->status.connecting) {
                                c->status.connecting = false;
                                getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
@@ -288,8 +303,8 @@ static void check_network_activity(fd_set * f)
                                        finish_connecting(c);
                                else {
                                        ifdebug(CONNECTIONS) logger(LOG_DEBUG,
-                                                          _("Error while connecting to %s (%s): %s"),
-                                                          c->name, c->hostname, strerror(result));
+                                                          "Error while connecting to %s (%s): %s",
+                                                          c->name, c->hostname, sockstrerror(result));
                                        closesocket(c->socket);
                                        do_outgoing_connection(c);
                                        continue;
@@ -301,13 +316,20 @@ static void check_network_activity(fd_set * f)
                                continue;
                        }
                }
+
+               if(FD_ISSET(c->socket, writeset)) {
+                       if(!flush_meta(c)) {
+                               terminate_connection(c, c->status.active);
+                               continue;
+                       }
+               }
        }
 
        for(i = 0; i < listen_sockets; i++) {
-               if(FD_ISSET(listen_socket[i].udp, f))
+               if(FD_ISSET(listen_socket[i].udp, readset))
                        handle_incoming_vpn_data(listen_socket[i].udp);
 
-               if(FD_ISSET(listen_socket[i].tcp, f))
+               if(FD_ISSET(listen_socket[i].tcp, readset))
                        handle_new_meta_connection(listen_socket[i].tcp);
        }
 }
@@ -315,18 +337,17 @@ static void check_network_activity(fd_set * f)
 /*
   this is where it all happens...
 */
-int main_loop(void)
-{
-       fd_set fset;
+int main_loop(void) {
+       fd_set readset, writeset;
        struct timeval tv;
        int r, maxfd;
-       time_t last_ping_check, last_config_check;
+       time_t last_ping_check, last_config_check, last_graph_dump;
        event_t *event;
 
-       cp();
-
        last_ping_check = now;
        last_config_check = now;
+       last_graph_dump = now;
+       
        srand(now);
 
        running = true;
@@ -338,23 +359,26 @@ int main_loop(void)
                tv.tv_sec = 1;
                tv.tv_usec = 0;
 
-               maxfd = build_fdset(&fset);
+               maxfd = build_fdset(&readset, &writeset);
 
-               r = select(maxfd + 1, &fset, NULL, NULL, &tv);
+#ifdef HAVE_MINGW
+               LeaveCriticalSection(&mutex);
+#endif
+               r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
+#ifdef HAVE_MINGW
+               EnterCriticalSection(&mutex);
+#endif
 
                if(r < 0) {
-                       if(errno != EINTR && errno != EAGAIN) {
-                               logger(LOG_ERR, _("Error while waiting for input: %s"),
-                                          strerror(errno));
-                               cp_trace();
+                       if(!sockwouldblock(sockerrno)) {
+                               logger(LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno));
                                dump_connections();
                                return 1;
                        }
-
-                       continue;
                }
 
-               check_network_activity(&fset);
+               if(r > 0)
+                       check_network_activity(&readset, &writeset);
 
                if(do_purge) {
                        purge();
@@ -375,36 +399,43 @@ int main_loop(void)
                        /* Should we regenerate our key? */
 
                        if(keyexpires < now) {
-                               ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
+                               avl_node_t *node;
+                               node_t *n;
+
+                               ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
+
+                               for(node = node_tree->head; node; node = node->next) {
+                                       n = node->data;
+                                       if(n->inkey) {
+                                               free(n->inkey);
+                                               n->inkey = NULL;
+                                       }
+                               }
 
-                               RAND_pseudo_bytes(myself->key, myself->keylength);
-                               if(myself->cipher)
-                                       EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
                                send_key_changed(broadcast, myself);
                                keyexpires = now + keylifetime;
                        }
                }
 
-
-               while((event = get_expired_event())) {
-                       event->handler(event->data);
-                       free(event);
-               }
-
                if(sigalrm) {
-                       logger(LOG_INFO, _("Flushing event queue"));
-
-                       while(event_tree->head) {
-                               event = event_tree->head->data;
-                               event->handler(event->data);
-                               event_del(event);
+                       avl_node_t *node;
+                       logger(LOG_INFO, "Flushing event queue");
+                       expire_events();
+                       for(node = connection_tree->head; node; node = node->next) {
+                               connection_t *c = node->data;
+                               send_ping(c);
                        }
                        sigalrm = false;
                }
 
+               while((event = get_expired_event())) {
+                       event->handler(event->data);
+                       free_event(event);
+               }
+
                if(sighup) {
                        connection_t *c;
-                       avl_node_t *node;
+                       avl_node_t *node, *next;
                        char *fname;
                        struct stat s;
                        
@@ -416,23 +447,41 @@ int main_loop(void)
                        init_configuration(&config_tree);
 
                        if(!read_server_config()) {
-                               logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
+                               logger(LOG_ERR, "Unable to reread configuration file, exitting.");
                                return 1;
                        }
 
+                       /* Cancel non-active outgoing connections */
+
+                       for(node = connection_tree->head; node; node = next) {
+                               next = node->next;
+                               c = node->data;
+
+                               c->outgoing = NULL;
+
+                               if(c->status.connecting) {
+                                       terminate_connection(c, false);
+                                       connection_del(c);
+                               }
+                       }
+
+                       /* Wipe list of outgoing connections */
+
+                       for(list_node_t *node = outgoing_list->head; node; node = node->next) {
+                               outgoing_t *outgoing = node->data;
+
+                               if(outgoing->event)
+                                       event_del(outgoing->event);
+                       }
+
+                       list_delete_list(outgoing_list);
+
                        /* Close connections to hosts that have a changed or deleted host config file */
                        
                        for(node = connection_tree->head; node; node = node->next) {
                                c = node->data;
                                
-                               if(c->outgoing) {
-                                       free(c->outgoing->name);
-                                       freeaddrinfo(c->outgoing->ai);
-                                       free(c->outgoing);
-                                       c->outgoing = NULL;
-                               }
-                               
-                               asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+                               xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
                                if(stat(fname, &s) || s.st_mtime > last_config_check)
                                        terminate_connection(c, c->status.active);
                                free(fname);
@@ -440,10 +489,43 @@ int main_loop(void)
 
                        last_config_check = now;
 
+                       /* If StrictSubnet is set, expire deleted Subnets and read new ones in */
+
+                       if(strictsubnets) {
+                               subnet_t *subnet;
+
+                               for(node = subnet_tree->head; node; node = node->next) {
+                                       subnet = node->data;
+                                       subnet->expires = 1;
+                               }
+
+                               load_all_subnets();
+
+                               for(node = subnet_tree->head; node; node = next) {
+                                       next = node->next;
+                                       subnet = node->data;
+                                       if(subnet->expires == 1) {
+                                               send_del_subnet(broadcast, subnet);
+                                               subnet_del(subnet->owner, subnet);
+                                       } else if(subnet->expires == -1) {
+                                               subnet->expires = 0;
+                                       } else {
+                                               send_add_subnet(broadcast, subnet);
+                                       }
+                               }
+                       }
+
                        /* Try to make outgoing connections */
                        
                        try_outgoing_connections();
                }
+               
+               /* Dump graph if wanted every 60 seconds*/
+
+               if(last_graph_dump + 60 < now) {
+                       dump_graph();
+                       last_graph_dump = now;
+               }
        }
 
        return 0;