X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=5e8cfaffaa8a103c819516a664fc4dda80469940;hp=2e06a39e30b11afd75e9073087da30fac980c20e;hb=cf49b2c0647554613874cce495e4a7937a9f7863;hpb=7f87c3d9134612041d56180ea7fc3e6c37991f6b

diff --git a/src/net.c b/src/net.c
index 2e06a39e..5e8cfaff 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.74 2000/11/15 22:07:36 zarq Exp $
+    $Id: net.c,v 1.35.4.81 2000/11/24 23:13:02 guus Exp $
 */
 
 #include "config.h"
@@ -67,11 +67,12 @@
 #include <xalloc.h>
 
 #include "conf.h"
-#include "connlist.h"
+#include "connection.h"
 #include "list.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
+#include "process.h"
 #include "protocol.h"
 #include "subnet.h"
 
@@ -94,135 +95,7 @@ char *unknown = NULL;
 
 subnet_t mymac;
 
-list_t *child_pids;
-
-void _execute_script(const char *name)
-{
-  int error = 0;
-  char *scriptname;
-  char *s;
-  int fd;
-
-  if(netname)
-    {
-      asprintf(&s, "NETNAME=%s", netname);
-      putenv(s);	/* Don't free s! see man 3 putenv */
-    }
-#ifdef HAVE_UNSETENV
-  else
-    {
-      unsetenv("NETNAME");
-    }
-#endif
-
-  if(chdir(confbase) < 0)
-    /* This cannot fail since we already read config files from this
-       directory. - Guus */
-    /* Yes this can fail, somebody could have removed this directory
-       when we didn't pay attention. - Ivo */
-    {
-      if(chdir("/") < 0)
-	/* Now if THIS fails, something wicked is going on. - Ivo */
-	syslog(LOG_ERR, _("Couldn't chdir to `/': %m"));
-
-      /* Continue anyway. */
-    }
-  
-  asprintf(&scriptname, "%s/%s", confbase, name);
-
-  /* Close all file descriptors */
-  closelog();
-  fcloseall();
-
-  /* Open standard input */
-  if(open("/dev/null", O_RDONLY) < 0)
-    {
-      syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
-      error = 1;
-    }
-
-  if(!error)
-    {
-      /* Standard output directly goes to syslog */
-      openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
-      /* Standard error as well */
-      if(dup2(1, 2) < 0)
-	{
-	  syslog(LOG_ERR, _("System call `%s' failed: %m"),
-		 "dup2");
-	  error = 1;
-	}
-    }
-  
-  if(error && debug_lvl > 1)
-    syslog(LOG_INFO, _("This means that any output the script generates will not be shown in syslog."));
-  
-  execl(scriptname, NULL);
-  /* No return on success */
-  
-  if(errno != ENOENT)  /* Ignore if the file does not exist */
-    syslog(LOG_WARNING, _("Error executing `%s': %m"), scriptname);
-
-  /* No need to free things */
-  exit(0);
-}
-
-/*
-  Execute the given script.
-  This function doesn't really belong here.
-*/
-int execute_script(const char *name)
-{
-  pid_t pid;
-
-  if((pid = fork()) < 0)
-    {
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-	     "fork");
-      return -1;
-    }
-
-  if(pid)
-    {
-      list_append(child_pids, pid);
-      return 0;
-    }
-
-  /* Child here */
-
-  _execute_script(name);
-}
-
-int check_child(void *data)
-{
-  pid_t pid;
-  int status;
-
-  pid = (pid_t) data;
-  pid = waitpid(pid, &status, WNOHANG);
-  if(WIFEXITED(status))
-    {
-      if(WIFSIGNALED(status)) /* Child was killed by a signal */
-	{
-	  syslog(LOG_ERR, _("Child with PID %d was killed by signal %d (%s)"),
-		 pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
-	  return -1;
-	}
-      if(WEXITSTATUS(status) != 0)
-	{
-	  syslog(LOG_INFO, _("Child with PID %d exited with code %d"),
-		 WEXITSTATUS(status));
-	}
-      return -1;
-    }
-}
-
-void check_children(void)
-{
-  list_forall_nodes(child_pids, check_child);
-}
-
-int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
+int xsend(connection_t *cl, vpn_packet_t *inpkt)
 {
   vpn_packet_t outpkt;
   int outlen, outpad;
@@ -258,7 +131,7 @@ cp
   return 0;
 }
 
-int xrecv(conn_list_t *cl, vpn_packet_t *inpkt)
+int xrecv(connection_t *cl, vpn_packet_t *inpkt)
 {
   vpn_packet_t outpkt;
   int outlen, outpad;
@@ -381,8 +254,8 @@ cp
   each packet, and removing it when that
   returned a zero exit code
 */
-void flush_queue(conn_list_t *cl, packet_queue_t **pq,
-		 int (*function)(conn_list_t*,vpn_packet_t*))
+void flush_queue(connection_t *cl, packet_queue_t **pq,
+		 int (*function)(connection_t*,vpn_packet_t*))
 {
   queue_element_t *p, *next = NULL;
 cp
@@ -406,7 +279,7 @@ cp
   void because nothing goes wrong here, packets
   remain in the queue if something goes wrong
 */
-void flush_queues(conn_list_t *cl)
+void flush_queues(connection_t *cl)
 {
 cp
   if(cl->sq)
@@ -432,7 +305,7 @@ cp
 */
 int send_packet(ip_t to, vpn_packet_t *packet)
 {
-  conn_list_t *cl;
+  connection_t *cl;
   subnet_t *subnet;
 cp
   if((subnet = lookup_subnet_ipv4(to)) == NULL)
@@ -511,7 +384,9 @@ int setup_tap_fd(void)
   int nfd;
   const char *tapfname;
   config_t const *cfg;
+#ifdef HAVE_TUNTAP
   struct ifreq ifr;
+#endif
 
 cp  
   if((cfg = get_config_val(config, config_tapdevice)))
@@ -691,7 +566,7 @@ cp
 /*
   setup an outgoing meta (tcp) socket
 */
-int setup_outgoing_meta_socket(conn_list_t *cl)
+int setup_outgoing_meta_socket(connection_t *cl)
 {
   int flags;
   struct sockaddr_in a;
@@ -751,7 +626,7 @@ cp
 */
 int setup_outgoing_connection(char *name)
 {
-  conn_list_t *ncn;
+  connection_t *ncn;
   struct hostent *h;
   config_t const *cfg;
 cp
@@ -761,27 +636,27 @@ cp
       return -1;
     }
 
-  ncn = new_conn_list();
+  ncn = new_connection();
   asprintf(&ncn->name, "%s", name);
     
   if(read_host_config(ncn))
     {
       syslog(LOG_ERR, _("Error reading host configuration file for %s"));
-      free_conn_list(ncn);
+      free_connection(ncn);
       return -1;
     }
     
   if(!(cfg = get_config_val(ncn->config, config_address)))
     {
       syslog(LOG_ERR, _("No address specified for %s"));
-      free_conn_list(ncn);
+      free_connection(ncn);
       return -1;
     }
     
   if(!(h = gethostbyname(cfg->data.ptr)))
     {
       syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
-      free_conn_list(ncn);
+      free_connection(ncn);
       return -1;
     }
 
@@ -792,7 +667,7 @@ cp
     {
       syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
              ncn->hostname);
-      free_conn_list(ncn);
+      free_connection(ncn);
       return -1;
     }
 
@@ -801,7 +676,7 @@ cp
   ncn->buflen = 0;
   ncn->last_ping_time = time(NULL);
 
-  conn_list_add(ncn);
+  connection_add(ncn);
 
   send_id(ncn);
 cp
@@ -809,7 +684,7 @@ cp
 }
 
 /*
-  Configure conn_list_t myself and set up the local sockets (listen only)
+  Configure connection_t myself and set up the local sockets (listen only)
 */
 int setup_myself(void)
 {
@@ -817,7 +692,7 @@ int setup_myself(void)
   config_t *next;
   subnet_t *net;
 cp
-  myself = new_conn_list();
+  myself = new_connection();
 
   asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */
   myself->flags = 0;
@@ -931,8 +806,6 @@ cp
   myself->status.active = 1;
 
   syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
-
-  child_pids = list_new();
 cp
   return 0;
 }
@@ -977,6 +850,9 @@ int setup_network_connections(void)
 {
   config_t const *cfg;
 cp
+  init_connections();
+  init_subnets();
+
   if((cfg = get_config_val(config, config_pingtimeout)) == NULL)
     timeout = 60;
   else
@@ -991,12 +867,12 @@ cp
   if(setup_tap_fd() < 0)
     return -1;
 
-  if(setup_myself() < 0)
-    return -1;
-
   /* Run tinc-up script to further initialize the tap interface */
   execute_script("tinc-up");
   
+  if(setup_myself() < 0)
+    return -1;
+
   if(!(cfg = get_config_val(config, config_connectto)))
     /* No upstream IP given, we're listen only. */
     return 0;
@@ -1023,10 +899,12 @@ cp
 */
 void close_network_connections(void)
 {
-  conn_list_t *p;
+  rbl_t *rbl;
+  connection_t *p;
 cp
-  for(p = conn_list; p != NULL; p = p->next)
+  RBL_FOREACH(connection_tree, rbl)
     {
+      p = (connection_t *)rbl->data;
       p->status.active = 0;
       terminate_connection(p);
     }
@@ -1035,7 +913,7 @@ cp
     if(myself->status.active)
       {
 	close(myself->meta_socket);
-        free_conn_list(myself);
+        free_connection(myself);
         myself = NULL;
       }
 
@@ -1044,9 +922,7 @@ cp
   /* Execute tinc-down script right after shutting down the interface */
   execute_script("tinc-down");
 
-  destroy_conn_list();
-
-  syslog(LOG_NOTICE, _("Terminating"));
+  destroy_connection_tree();
 cp
   return;
 }
@@ -1054,7 +930,7 @@ cp
 /*
   create a data (udp) socket
 */
-int setup_vpn_connection(conn_list_t *cl)
+int setup_vpn_connection(connection_t *cl)
 {
   int nfd, flags;
   struct sockaddr_in a;
@@ -1130,13 +1006,13 @@ cp
   handle an incoming tcp connect call and open
   a connection to it.
 */
-conn_list_t *create_new_connection(int sfd)
+connection_t *create_new_connection(int sfd)
 {
-  conn_list_t *p;
+  connection_t *p;
   struct sockaddr_in ci;
   int len = sizeof(ci);
 cp
-  p = new_conn_list();
+  p = new_connection();
 
   if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
     {
@@ -1168,16 +1044,18 @@ cp
 */
 void build_fdset(fd_set *fs)
 {
-  conn_list_t *p;
+  rbl_t *rbl;
+  connection_t *p;
 cp
   FD_ZERO(fs);
 
-  for(p = conn_list; p != NULL; p = p->next)
+  RBL_FOREACH(connection_tree, rbl)
     {
+      p = (connection_t *)rbl->data;
       if(p->status.meta)
-	FD_SET(p->meta_socket, fs);
+        FD_SET(p->meta_socket, fs);
       if(p->status.dataopen)
-	FD_SET(p->socket, fs);
+        FD_SET(p->socket, fs);
     }
 
   FD_SET(myself->meta_socket, fs);
@@ -1190,7 +1068,7 @@ cp
   udp socket and write it to the ethertap
   device after being decrypted
 */
-int handle_incoming_vpn_data(conn_list_t *cl)
+int handle_incoming_vpn_data(connection_t *cl)
 {
   vpn_packet_t pkt;
   int x, l = sizeof(x);
@@ -1228,10 +1106,11 @@ cp
   terminate a connection and notify the other
   end before closing the sockets
 */
-void terminate_connection(conn_list_t *cl)
+void terminate_connection(connection_t *cl)
 {
-  conn_list_t *p;
-  subnet_t *s;
+  connection_t *p;
+  subnet_t *subnet;
+  rbl_t *rbl;
 cp
   if(cl->status.remove)
     return;
@@ -1247,26 +1126,34 @@ cp
   if(cl->status.meta)
     close(cl->meta_socket);
 
-cp
   /* Find all connections that were lost because they were behind cl
      (the connection that was dropped). */
 
   if(cl->status.meta)
-    for(p = conn_list; p != NULL; p = p->next)
-      if((p->nexthop == cl) && (p != cl))
-        terminate_connection(p);	/* Sounds like recursion, but p does not have a meta connection :) */
+    RBL_FOREACH(connection_tree, rbl)
+      {
+        p = (connection_t *)rbl->data;
+        if(p->nexthop == cl && p != cl)
+          terminate_connection(p);
+      }
 
   /* Inform others of termination if it was still active */
 
   if(cl->status.active)
-    for(p = conn_list; p != NULL; p = p->next)
-      if(p->status.meta && p->status.active && p!=cl)
-        send_del_host(p, cl);
+    RBL_FOREACH(connection_tree, rbl)
+      {
+        p = (connection_t *)rbl->data;
+        if(p->status.meta && p->status.active && p!=cl)
+          send_del_host(p, cl);	/* Sounds like recursion, but p does not have a meta connection :) */
+      }
 
   /* Remove the associated subnets */
 
-  for(s = cl->subnets; s; s = s->next)
-    subnet_del(s);
+  RBL_FOREACH(cl->subnet_tree, rbl)
+    {
+      subnet = (subnet_t *)rbl->data;
+      subnet_del(subnet);
+    }
 
   /* Check if this was our outgoing connection */
     
@@ -1292,35 +1179,37 @@ cp
   end does not reply in time, we consider them dead
   and close the connection.
 */
-int check_dead_connections(void)
+void check_dead_connections(void)
 {
-  conn_list_t *p;
   time_t now;
+  rbl_t *rbl;
+  connection_t *cl;
 cp
   now = time(NULL);
-  for(p = conn_list; p != NULL; p = p->next)
+
+  RBL_FOREACH(connection_tree, rbl)
     {
-      if(p->status.active && p->status.meta)
-	{
-          if(p->last_ping_time + timeout < now)
+      cl = (connection_t *)rbl->data;
+      if(cl->status.active && cl->status.meta)
+        {
+          if(cl->last_ping_time + timeout < now)
             {
-              if(p->status.pinged)
+              if(cl->status.pinged)
                 {
                   if(debug_lvl >= DEBUG_PROTOCOL)
   	            syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
-		           p->name, p->hostname);
-	          p->status.timeout = 1;
-	          terminate_connection(p);
+		           cl->name, cl->hostname);
+	          cl->status.timeout = 1;
+	          terminate_connection(cl);
                 }
               else
                 {
-                  send_ping(p);
+                  send_ping(cl);
                 }
             }
-	}
+        }
     }
 cp
-  return 0;
 }
 
 /*
@@ -1329,7 +1218,7 @@ cp
 */
 int handle_new_meta_connection()
 {
-  conn_list_t *ncn;
+  connection_t *ncn;
   struct sockaddr client;
   int nfd, len = sizeof(client);
 cp
@@ -1347,7 +1236,7 @@ cp
       return 0;
     }
 
-  conn_list_add(ncn);
+  connection_add(ncn);
 cp
   return 0;
 }
@@ -1358,12 +1247,15 @@ cp
 */
 void check_network_activity(fd_set *f)
 {
-  conn_list_t *p;
+  connection_t *p;
+  rbl_t *rbl;
 cp
-  for(p = conn_list; p != NULL; p = p->next)
+  RBL_FOREACH(connection_tree, rbl)
     {
+      p = (connection_t *)rbl->data;
+
       if(p->status.remove)
-	continue;
+	return;
 
       if(p->status.dataopen)
 	if(FD_ISSET(p->socket, f))
@@ -1388,7 +1280,7 @@ cp
 	      return;
 	    } 
     }
-  
+    
   if(FD_ISSET(myself->meta_socket, f))
     handle_new_meta_connection();
 cp
@@ -1458,7 +1350,7 @@ cp
       tv.tv_sec = timeout;
       tv.tv_usec = 0;
 
-      prune_conn_list();
+      prune_connection_tree();
       build_fdset(&fset);
 
       if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
@@ -1521,8 +1413,6 @@ cp
           if(FD_ISSET(tap_fd, &fset))
 	    handle_tap_input();
         }
-
-      check_children();
     }
 cp
 }