Create/bind TCP and UDP listening sockets in pairs.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index bf58cf0..5632727 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.
 
     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.159 2002/03/01 13:18:54 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -80,6 +80,7 @@ void build_fdset(fd_set *fs)
 {
   avl_node_t *node;
   connection_t *c;
 {
   avl_node_t *node;
   connection_t *c;

+  int i;

 cp
   FD_ZERO(fs);
 
 cp
   FD_ZERO(fs);
 


@@ -89,8 +90,12 @@ cp
       FD_SET(c->socket, fs);
     }
 
       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
 }
   FD_SET(device_fd, fs);
 cp
 }


@@ -271,7 +276,7 @@ void check_network_activity(fd_set *f)
 {
   connection_t *c;
   avl_node_t *node;
 {
   connection_t *c;
   avl_node_t *node;

-  int result;
+  int result, i;

   int len = sizeof(result);
   vpn_packet_t packet;
 cp
   int len = sizeof(result);
   vpn_packet_t packet;
 cp


@@ -281,8 +286,13 @@ cp
         route_outgoing(&packet);
     }
 
         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)
     {
 
   for(node = connection_tree->head; node; node = node->next)
     {


@@ -315,9 +325,6 @@ cp
             }
         }
     }
             }
         }
     }

-
-  if(FD_ISSET(tcp_socket, f))
-    handle_new_meta_connection();

 cp
 }
 
 cp
 }
 


@@ -431,19 +438,21 @@ cp
 
       if(sighup)
         {
 
       if(sighup)
         {

-          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));

           sighup = 0;
           close_network_connections();
           exit_configuration(&config_tree);
 
           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"));
               exit(1);
             }
 
           if(read_server_config())
             {
               syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
               exit(1);
             }
 

-          sleep(5);
-

           if(setup_network_connections())
             return;
 
           if(setup_network_connections())
             return;