Cleanups, spelling fixes, allow symbol names for signals (-k option),

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index bf58cf0..4061d7a 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.156 2002/02/18 16:25:16 guus Exp $
+    $Id: net.c,v 1.35.4.162 2002/03/11 11:23:04 guus Exp $
 */
 
 #include "config.h"
@@ -73,6 +73,8 @@ int do_purge = 0;
 int sighup = 0;
 int sigalrm = 0;
 
+time_t now = 0;
+
 /*
   put all file descriptors in an fd_set array
 */
@@ -80,6 +82,7 @@ void build_fdset(fd_set *fs)
 {
   avl_node_t *node;
   connection_t *c;
+  int i;
 cp
   FD_ZERO(fs);
 
@@ -89,8 +92,12 @@ cp
       FD_SET(c->socket, fs);
     }
 
-  FD_SET(tcp_socket, fs);
-  FD_SET(udp_socket, fs);
+  for(i = 0; i < listen_sockets; i++)
+    {
+      FD_SET(tcp_socket[i], fs);
+      FD_SET(udp_socket[i], fs);
+    }
+
   FD_SET(device_fd, fs);
 cp
 }
@@ -224,12 +231,9 @@ cp
 */
 void check_dead_connections(void)
 {
-  time_t now;
   avl_node_t *node, *next;
   connection_t *c;
 cp
-  now = time(NULL);
-
   for(node = connection_tree->head; node; node = next)
     {
       next = node->next;
@@ -271,7 +275,7 @@ void check_network_activity(fd_set *f)
 {
   connection_t *c;
   avl_node_t *node;
-  int result;
+  int result, i;
   int len = sizeof(result);
   vpn_packet_t packet;
 cp
@@ -281,8 +285,13 @@ cp
         route_outgoing(&packet);
     }
 
-  if(FD_ISSET(udp_socket, f))
-    handle_incoming_vpn_data();
+  for(i = 0; i < listen_sockets; i++)
+    {
+      if(FD_ISSET(udp_socket[i], f))
+       handle_incoming_vpn_data(udp_socket[i]);
+      if(FD_ISSET(tcp_socket[i], f))
+       handle_new_meta_connection(tcp_socket[i]);
+    }
 
   for(node = connection_tree->head; node; node = node->next)
     {
@@ -315,9 +324,6 @@ cp
             }
         }
     }
-
-  if(FD_ISSET(tcp_socket, f))
-    handle_new_meta_connection();
 cp
 }
 
@@ -352,12 +358,14 @@ void main_loop(void)
   int t;
   event_t *event;
 cp
-  last_ping_check = time(NULL);
+  last_ping_check = now;
 
-  srand(time(NULL));
+  srand(now);
 
   for(;;)
     {
+      now = time(NULL);
+
       tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
       tv.tv_usec = 0;
 
@@ -387,25 +395,26 @@ cp
           do_purge = 0;
         }
 
-      t = time(NULL);
-
       /* Let's check if everybody is still alive */
 
-      if(last_ping_check + pingtimeout < t)
+      if(last_ping_check + pingtimeout < now)
         {
           check_dead_connections();
-          last_ping_check = time(NULL);
+          last_ping_check = now;
+
+          if(routing_mode== RMODE_SWITCH)
+           age_mac();
 
           /* Should we regenerate our key? */
 
-          if(keyexpires < t)
+          if(keyexpires < now)
             {
               if(debug_lvl >= DEBUG_STATUS)
                 syslog(LOG_INFO, _("Regenerating symmetric key"));
 
               RAND_pseudo_bytes(myself->key, myself->keylength);
               send_key_changed(myself->connection, myself);
-              keyexpires = time(NULL) + keylifetime;
+              keyexpires = now + keylifetime;
             }
         }
 
@@ -431,19 +440,21 @@ cp
 
       if(sighup)
         {
-          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
           sighup = 0;
           close_network_connections();
           exit_configuration(&config_tree);
 
+          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds..."));
+          sleep(5);
+
+          init_configuration(&config_tree);
+
           if(read_server_config())
             {
-              syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+              syslog(LOG_ERR, _("Unable to reread configuration file, exitting."));
               exit(1);
             }
 
-          sleep(5);
-
           if(setup_network_connections())
             return;