HUP signal now closes connections to hosts if their host config file is

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 5cd3fa5..c1030b5 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.180 2002/09/09 21:24:34 guus Exp $
+    $Id: net.c,v 1.35.4.184 2003/04/03 11:43:17 guus Exp $
 */
 
 #include "config.h"
@@ -25,16 +25,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -49,6 +39,16 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#include <netinet/in.h>
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
 
 #include <openssl/rand.h>
 
@@ -129,11 +129,11 @@ void purge(void)
   put all file descriptors in an fd_set array
   While we're at it, purge stuff that needs to be removed.
 */
-void build_fdset(fd_set * fs)
+int build_fdset(fd_set * fs)
 {
        avl_node_t *node, *next;
        connection_t *c;
-       int i;
+       int i, max = 0;
 
        cp();
 
@@ -147,16 +147,27 @@ void build_fdset(fd_set * fs)
                        connection_del(c);
                        if(!connection_tree->head)
                                purge();
-               } else
+               } else {
                        FD_SET(c->socket, fs);
+                       if(c->socket > max)
+                               max = c->socket;
+               }
        }
 
        for(i = 0; i < listen_sockets; i++) {
                FD_SET(listen_socket[i].tcp, fs);
+               if(listen_socket[i].tcp > max)
+                       max = listen_socket[i].tcp;
                FD_SET(listen_socket[i].udp, fs);
+               if(listen_socket[i].udp > max)
+                       max = listen_socket[i].udp;
        }
 
        FD_SET(device_fd, fs);
+       if(device_fd > max)
+               max = device_fd;
+       
+       return max;
 }
 
 /*
@@ -166,7 +177,7 @@ void build_fdset(fd_set * fs)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t * c, int report)
+void terminate_connection(connection_t *c, int report)
 {
        cp();
 
@@ -317,13 +328,14 @@ void main_loop(void)
 {
        fd_set fset;
        struct timeval tv;
-       int r;
-       time_t last_ping_check;
+       int r, maxfd;
+       time_t last_ping_check, last_config_check;
        event_t *event;
 
        cp();
 
        last_ping_check = now;
+       last_config_check = now;
        srand(now);
 
        for(;;) {
@@ -332,9 +344,9 @@ void main_loop(void)
                tv.tv_sec = 1 + (rand() & 7);   /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
                tv.tv_usec = 0;
 
-               build_fdset(&fset);
+               maxfd = build_fdset(&fset);
 
-               r = select(FD_SETSIZE, &fset, NULL, NULL, &tv);
+               r = select(maxfd + 1, &fset, NULL, NULL, &tv);
 
                if(r < 0) {
                        if(errno != EINTR && errno != EAGAIN) {
@@ -396,24 +408,46 @@ void main_loop(void)
                }
 
                if(sighup) {
+                       connection_t *c;
+                       avl_node_t *node;
+                       char *fname;
+                       struct stat s;
+                       
                        sighup = 0;
-                       close_network_connections();
-                       exit_configuration(&config_tree);
-
-                       syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds..."));
-                       sleep(5);
+                       
+                       /* Reread our own configuration file */
 
+                       exit_configuration(&config_tree);
                        init_configuration(&config_tree);
 
                        if(read_server_config()) {
-                               syslog(LOG_ERR,
-                                          _("Unable to reread configuration file, exitting."));
+                               syslog(LOG_ERR, _("Unable to reread configuration file, exitting."));
                                exit(1);
                        }
 
-                       if(setup_network_connections())
-                               return;
+                       /* Close connections to hosts that have a changed or deleted host config file */
+                       
+                       for(node = connection_tree->head; node; node = node->next) {
+                               c = (connection_t *) node->data;
+                               
+                               if(c->outgoing) {
+                                       free(c->outgoing->name);
+                                       free(c->outgoing);
+                                       c->outgoing = NULL;
+                               }
+                               
+                               asprintf(&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);
+                       }
+
+                       last_config_check = now;
 
+                       /* Try to make outgoing connections */
+                       
+                       try_outgoing_connections();
+                                               
                        continue;
                }
        }