X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=a1b170524e9c059695ed95334aee295dbd31fabd;hp=fb70dee4de17d21eaaf9c73a2f16fced23c1b359;hb=14979f835df4214a7c2510852f7ffedc9e08c2c0;hpb=50403909b6bf6536924d4693bb1f32c248f17fda

diff --git a/src/net.c b/src/net.c
index fb70dee4..a1b17052 100644
--- 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.158 2002/02/26 23:26:41 guus Exp $
+    $Id: net.c,v 1.35.4.160 2002/03/01 14:09:31 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
 */
@@ -90,11 +92,11 @@ cp
       FD_SET(c->socket, fs);
     }
 
-  for(i = 0; i < tcp_sockets; i++)
-    FD_SET(tcp_socket[i], fs);
-
-  for(i = 0; i < udp_sockets; i++)
-    FD_SET(udp_socket[i], 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
@@ -229,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;
@@ -286,9 +285,13 @@ cp
         route_outgoing(&packet);
     }
 
-  for(i = 0; i < udp_sockets; i++)
-    if(FD_ISSET(udp_socket[i], f))
-      handle_incoming_vpn_data(udp_socket[i]);
+  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)
     {
@@ -321,10 +324,6 @@ cp
             }
         }
     }
-
-  for(i = 0; i < tcp_sockets; i++)
-    if(FD_ISSET(tcp_socket[i], f))
-      handle_new_meta_connection(tcp_socket[i]);
 cp
 }
 
@@ -359,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;
 
@@ -394,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_ROUTER)
+	    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;
             }
         }