X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=94c0e4456f60e087a576eaab8f5d414daf294e32;hp=1fee46b80cdc3b3fee6cdfa1165bb17a3b883ad3;hb=c78a204f06182f50b0812c8e4fef6163e82097bf;hpb=7f7e158aae8df5c65211bcfa82516e7c243cdd2e

diff --git a/src/net.c b/src/net.c
index 1fee46b8..94c0e445 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.3 2000/06/25 15:16:11 guus Exp $
+    $Id: net.c,v 1.35.4.32 2000/09/26 14:06:04 guus Exp $
 */
 
 #include "config.h"
@@ -46,6 +46,7 @@
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
+#include "meta.h"
 
 #include "system.h"
 
@@ -56,6 +57,7 @@ int total_tap_out = 0;
 int total_socket_in = 0;
 int total_socket_out = 0;
 
+int upstreamindex = 0;
 static int seconds_till_retry;
 
 /* The global list of existing connections */
@@ -94,26 +96,30 @@ cp
 
 int xsend(conn_list_t *cl, void *packet)
 {
-  int r;
   real_packet_t rp;
 cp
-  do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
+  do_encrypt((vpn_packet_t*)packet, &rp, cl->datakey);
   rp.from = htonl(myself->vpn_ip);
   rp.data.len = htons(rp.data.len);
   rp.len = htons(rp.len);
 
   if(debug_lvl > 3)
-    syslog(LOG_ERR, _("Sent %d bytes to %lx"), ntohs(rp.len), cl->vpn_ip);
+    syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+           ntohs(rp.len), cl->name, cl->hostname);
+
+  total_socket_out += ntohs(rp.len);
+
+  cl->want_ping = 1;
+
+  if((cl->flags | myself->flags) & TCPONLY)
+      return send_tcppacket(cl, (void*)&rp, ntohs(rp.len));
 
-  if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
+  if((send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
     {
-      syslog(LOG_ERR, _("Error sending data: %m"));
+      syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
+             cl->name, cl->hostname);
       return -1;
     }
-
-  total_socket_out += r;
-
-  cl->want_ping = 1;
 cp
   return 0;
 }
@@ -123,9 +129,13 @@ int xrecv(conn_list_t *cl, void *packet)
   vpn_packet_t vp;
   int lenin;
 cp
-  do_decrypt((real_packet_t*)packet, &vp, cl->key);
+  do_decrypt((real_packet_t*)packet, &vp, cl->datakey);
   add_mac_addresses(&vp);
 
+  if(debug_lvl > 3)
+    syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
+           ((real_packet_t*)packet)->len, cl->name, cl->hostname);
+
   if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
     syslog(LOG_ERR, _("Can't write to tap device: %m"));
   else
@@ -145,9 +155,6 @@ void add_queue(packet_queue_t **q, void *packet, size_t s)
 {
   queue_element_t *e;
 cp
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("packet to queue: %d"), s);
-
   e = xmalloc(sizeof(*e));
   e->packet = xmalloc(s);
   memcpy(e->packet, packet, s);
@@ -233,7 +240,7 @@ cp
     }
 
   if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("queue flushed"));
+    syslog(LOG_DEBUG, _("Queue flushed"));
 cp
 }
 
@@ -248,16 +255,16 @@ cp
   if(cl->sq)
     {
       if(debug_lvl > 3)
-	syslog(LOG_DEBUG, _("Flushing send queue for " IP_ADDR_S),
-	       IP_ADDR_V(cl->vpn_ip));
+	syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
+	       cl->name, cl->hostname);
       flush_queue(cl, &(cl->sq), xsend);
     }
 
   if(cl->rq)
     {
       if(debug_lvl > 3)
-	syslog(LOG_DEBUG, _("Flushing receive queue for " IP_ADDR_S),
-	       IP_ADDR_V(cl->vpn_ip));
+	syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
+	       cl->name, cl->hostname);
       flush_queue(cl, &(cl->rq), xrecv);
     }
 cp
@@ -274,25 +281,19 @@ cp
     {
       if(debug_lvl > 3)
         {
-          syslog(LOG_NOTICE, _("Trying to look up " IP_ADDR_S " in connection list failed!"),
+          syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),
 	         IP_ADDR_V(to));
         }
-        
-      /* Is this really necessary? If we can't find "to", then neither should any uplink. (GS) */
-      
-      return -1;
-        
-      for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next);
-      if(!cl)
-        { /* No open outgoing connection has been found. */
-	  if(debug_lvl > 3)
-	    syslog(LOG_NOTICE, _("There is no remote host I can send this packet to!"));
-          return -1;
-        }
-    }
 
+      return -1;
+   }
+    
   /* If we ourselves have indirectdata flag set, we should send only to our uplink! */
   
+  /* The next few lines will be obsoleted, if we are going indirect, matching subnet_t
+     should point to only our uplink as the recepient
+  */
+
   if(myself->flags & EXPORTINDIRECTDATA)
     {
       for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next);
@@ -312,25 +313,24 @@ cp
    
   if(cl->flags & INDIRECTDATA)
     {
-      if((cl = lookup_conn(cl->vpn_ip)) == NULL)
+      if(debug_lvl > 3)
+        syslog(LOG_NOTICE, _("Indirect packet to %s via %s"),
+               cl->name, cl->hostname);
+      if((cl = lookup_conn(cl->real_ip)) == NULL)
         {
           if(debug_lvl > 3)
-            {
-              syslog(LOG_NOTICE, _("Indirect look up " IP_ADDR_S " in connection list failed!"),
-	             IP_ADDR_V(to));
-            }
+              syslog(LOG_NOTICE, _("Indirect look up %d.%d.%d.%d in connection list failed!"), IP_ADDR_V(to));
             
           /* Gateway tincd dead? Should we kill it? (GS) */
 
           return -1;
         }
       if(cl->flags & INDIRECTDATA)  /* This should not happen */
-        if(debug_lvl > 3)
-          {
-            syslog(LOG_NOTICE, _("double indirection for " IP_ADDR_S),
-	           IP_ADDR_V(to));
-          }
-        return -1;        
+        {
+          if(debug_lvl > 3)
+              syslog(LOG_NOTICE, _("Double indirection for %d.%d.%d.%d"), IP_ADDR_V(to));
+          return -1;        
+        }
     }            
 
   if(my_key_expiry <= time(NULL))
@@ -338,10 +338,17 @@ cp
 
   if(!cl->status.dataopen)
     if(setup_vpn_connection(cl) < 0)
-      return -1;
-
+      {
+        syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"),
+	       cl->name, cl->hostname);
+        return -1;
+      }
+      
   if(!cl->status.validkey)
     {
+      if(debug_lvl > 3)
+	syslog(LOG_INFO, _("%s (%s) has no valid key, queueing packet"),
+	       cl->name, cl->hostname);
       add_queue(&(cl->sq), packet, packet->len + 2);
       if(!cl->status.waitingforkey)
 	send_key_request(cl->vpn_ip);			/* Keys should be sent to the host running the tincd */
@@ -350,9 +357,10 @@ cp
 
   if(!cl->status.active)
     {
-      add_queue(&(cl->sq), packet, packet->len + 2);
       if(debug_lvl > 3)
-	syslog(LOG_INFO, _(IP_ADDR_S " is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip));
+	syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"),
+	       cl->name, cl->hostname);
+      add_queue(&(cl->sq), packet, packet->len + 2);
       return 0; /* We don't want to mess up, do we? */
     }
 
@@ -395,6 +403,7 @@ int setup_listen_meta_socket(int port)
   int nfd, flags;
   struct sockaddr_in a;
   const int one = 1;
+  config_t const *cfg;
 cp
   if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
     {
@@ -408,6 +417,12 @@ cp
       return -1;
     }
 
+  if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
+    {
+      syslog(LOG_ERR, _("setsockopt: %m"));
+      return -1;
+    }
+
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
@@ -415,10 +430,23 @@ cp
       return -1;
     }
 
+  if((cfg = get_config_val(interface)))
+    {
+      if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
+        {
+          syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr);
+          return -1;
+        }
+    }
+
   memset(&a, 0, sizeof(a));
   a.sin_family = AF_INET;
   a.sin_port = htons(port);
-  a.sin_addr.s_addr = htonl(INADDR_ANY);
+  
+  if((cfg = get_config_val(interfaceip)))
+    a.sin_addr.s_addr = htonl(cfg->data.ip->ip);
+  else
+    a.sin_addr.s_addr = htonl(INADDR_ANY);
 
   if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
     {
@@ -487,6 +515,9 @@ int setup_outgoing_meta_socket(conn_list_t *cl)
   struct sockaddr_in a;
   config_t const *cfg;
 cp
+  if(debug_lvl > 0)
+    syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
+
   if((cfg = get_config_val(upstreamport)) == NULL)
     cl->port = 655;
   else
@@ -495,7 +526,8 @@ cp
   cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
   if(cl->meta_socket == -1)
     {
-      syslog(LOG_ERR, _("Creating socket failed: %m"));
+      syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
+             cl->hostname, cl->port);
       return -1;
     }
 
@@ -505,19 +537,21 @@ cp
 
   if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
-      syslog(LOG_ERR, _(IP_ADDR_S ":%d: %m"), IP_ADDR_V(cl->real_ip), cl->port);
+      syslog(LOG_ERR, _("%s port %hd: %m"), cl->hostname, cl->port);
       return -1;
     }
 
   flags = fcntl(cl->meta_socket, F_GETFL);
   if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
     {
-      syslog(LOG_ERR, _("fcntl: %m"));
+      syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
+             cl->hostname, cl->port);
       return -1;
     }
 
-  syslog(LOG_INFO, _("Connected to " IP_ADDR_S ":%hd"),
-         IP_ADDR_V(cl->real_ip), cl->port);
+  if(debug_lvl > 0)
+    syslog(LOG_INFO, _("Connected to %s port %hd"),
+         cl->hostname, cl->port);
 cp
   return 0;
 }
@@ -529,16 +563,25 @@ cp
   an authentication sequence during which
   we will do just that.
 */
-int setup_outgoing_connection(ip_t ip)
+int setup_outgoing_connection(char *hostname)
 {
   conn_list_t *ncn;
+  struct hostent *h;
 cp
-  ncn = new_conn_list();
-  ncn->real_ip = ip;
+  if(!(h = gethostbyname(hostname)))
+    {
+      syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+      return -1;
+    }
 
+  ncn = new_conn_list();
+  ncn->real_ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
+  ncn->hostname = hostlookup(htonl(ncn->real_ip));
+  
   if(setup_outgoing_meta_socket(ncn) < 0)
     {
-      syslog(LOG_ERR, _("Could not set up a meta connection!"));
+      syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
+             ncn->hostname);
       free_conn_element(ncn);
       return -1;
     }
@@ -567,18 +610,28 @@ cp
     }
 
   myself->vpn_ip = cfg->data.ip->ip;
+  myself->hostname = hostlookup(htonl(myself->vpn_ip));
   myself->vpn_mask = cfg->data.ip->mask;
   myself->flags = 0;
 
+  if(!(cfg = get_config_val(tincname)))
+    asprintf(&(myself->name), IP_ADDR_S, IP_ADDR_V(myself->vpn_ip));
+  else
+    myself->name = (char*)cfg->data.val;
+  
   if(!(cfg = get_config_val(listenport)))
     myself->port = 655;
   else
     myself->port = cfg->data.val;
 
-  if(cfg = get_config_val(indirectdata))
-    if(cfg->data.val)
+  if((cfg = get_config_val(indirectdata)))
+    if(cfg->data.val == stupid_true)
       myself->flags |= EXPORTINDIRECTDATA;
 
+  if((cfg = get_config_val(tcponly)))
+    if(cfg->data.val == stupid_true)
+      myself->flags |= TCPONLY;
+
   if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening socket"));
@@ -594,7 +647,7 @@ cp
 
   myself->status.active = 1;
 
-  syslog(LOG_NOTICE, _("Ready: listening on port %d"), myself->port);
+  syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
 cp
   return 0;
 }
@@ -604,22 +657,26 @@ sigalrm_handler(int a)
 {
   config_t const *cfg;
 cp
-  cfg = get_config_val(upstreamip);
+  cfg = get_next_config_val(upstreamip, upstreamindex++);
 
-  if(!setup_outgoing_connection(cfg->data.ip->ip))
-    {
-      signal(SIGALRM, SIG_IGN);
-    }
-  else
+  while(cfg)
     {
-      signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry += 5;
-      if(seconds_till_retry>300)    /* Don't wait more than 5 minutes. */
-        seconds_till_retry = 300;
-      alarm(seconds_till_retry);
-      syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
-	     seconds_till_retry);
+      if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
+        {
+          signal(SIGALRM, SIG_IGN);
+          return;
+        }
+      cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
+
+  signal(SIGALRM, sigalrm_handler);
+  upstreamindex = 0;
+  seconds_till_retry += 5;
+  if(seconds_till_retry > MAXTIMEOUT)    /* Don't wait more than MAXTIMEOUT seconds. */
+    seconds_till_retry = MAXTIMEOUT;
+  syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
+	 seconds_till_retry);
+  alarm(seconds_till_retry);
 cp
 }
 
@@ -641,17 +698,22 @@ cp
   if(setup_myself() < 0)
     return -1;
 
-  if((cfg = get_config_val(upstreamip)) == NULL)
+  if((cfg = get_next_config_val(upstreamip, upstreamindex++)) == NULL)
     /* No upstream IP given, we're listen only. */
     return 0;
 
-  if(setup_outgoing_connection(cfg->data.ip->ip))
+  while(cfg)
     {
-      signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry = 300;
-      alarm(seconds_till_retry);
-      syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
+      if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
+        return 0;
+      cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
+    
+  signal(SIGALRM, sigalrm_handler);
+  upstreamindex = 0;
+  seconds_till_retry = MAXTIMEOUT;
+  syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
+  alarm(seconds_till_retry);
 cp
   return 0;
 }
@@ -702,12 +764,12 @@ int setup_vpn_connection(conn_list_t *cl)
   struct sockaddr_in a;
 cp
   if(debug_lvl > 0)
-    syslog(LOG_DEBUG, _("Opening UDP socket to " IP_ADDR_S), IP_ADDR_V(cl->real_ip));
+    syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
 
   nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
   if(nfd == -1)
     {
-      syslog(LOG_ERR, _("Creating data socket failed: %m"));
+      syslog(LOG_ERR, _("Creating UDP socket failed: %m"));
       return -1;
     }
 
@@ -717,15 +779,16 @@ cp
 
   if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
-      syslog(LOG_ERR, _("Connecting to " IP_ADDR_S ":%d failed: %m"),
-	     IP_ADDR_V(cl->real_ip), cl->port);
+      syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
+	     cl->hostname, cl->port);
       return -1;
     }
 
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, nfd);
+      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
+             cl->name, cl->hostname);
       return -1;
     }
 
@@ -754,18 +817,20 @@ cp
     }
 
   p->real_ip = ntohl(ci.sin_addr.s_addr);
+  p->hostname = hostlookup(ci.sin_addr.s_addr);
   p->meta_socket = sfd;
   p->status.meta = 1;
   p->buflen = 0;
   p->last_ping_time = time(NULL);
   p->want_ping = 0;
   
-  syslog(LOG_NOTICE, _("Connection from " IP_ADDR_S ":%d"),
-         IP_ADDR_V(p->real_ip), htons(ci.sin_port));
+  if(debug_lvl > 0)
+    syslog(LOG_NOTICE, _("Connection from %s port %d"),
+         p->hostname, htons(ci.sin_port));
 
   if(send_basic_info(p) < 0)
     {
-      free(p);
+      free_conn_element(p);
       return NULL;
     }
 cp
@@ -809,12 +874,15 @@ int handle_incoming_vpn_data(conn_list_t *cl)
 cp
   if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
     {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, cl->socket);
+      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"),
+	     __FILE__, __LINE__, cl->socket,
+             cl->name, cl->hostname);
       return -1;
     }
   if(x)
     {
-      syslog(LOG_ERR, _("Incoming data socket error: %s"), sys_errlist[x]);
+      syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"),
+             cl->name, cl->hostname, strerror(x));
       return -1;
     }
 
@@ -822,7 +890,8 @@ cp
   lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
   if(lenin <= 0)
     {
-      syslog(LOG_ERR, _("Receiving data failed: %m"));
+      syslog(LOG_ERR, _("Receiving packet from %s (%s) failed: %m"),
+	     cl->name, cl->hostname);
       return -1;
     }
   total_socket_in += lenin;
@@ -834,13 +903,10 @@ cp
   if(rp.len >= 0)
     {
       f = lookup_conn(rp.from);
-      if(debug_lvl > 3)
-	syslog(LOG_DEBUG, _("packet from " IP_ADDR_S " (len %d)"),
-	       IP_ADDR_V(rp.from), rp.len);
       if(!f)
 	{
-	  syslog(LOG_ERR, _("Got packet from unknown source " IP_ADDR_S),
-		 IP_ADDR_V(rp.from));
+	  syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
+		 cl->name, cl->hostname, IP_ADDR_V(rp.from));
 	  return -1;
 	}
 
@@ -866,55 +932,59 @@ cp
 */
 void terminate_connection(conn_list_t *cl)
 {
-  conn_list_t *p, *q;
+  conn_list_t *p;
 
 cp
   if(cl->status.remove)
     return;
 
   if(debug_lvl > 0)
-    syslog(LOG_NOTICE, _("Closing connection with " IP_ADDR_S " (" IP_ADDR_S ")"),
-           IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+    syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+           cl->name, cl->hostname);
 
   if(cl->status.timeout)
     send_timeout(cl);
-  else if(!cl->status.termreq)
+/*  else if(!cl->status.termreq)
     send_termreq(cl);
-
-  close(cl->socket);
+ */
+ 
+  if(cl->socket)
+    close(cl->socket);
   if(cl->status.meta)
     close(cl->meta_socket);
 
-  if(cl->status.outgoing)
-    {
-      signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry = 5;
-      alarm(seconds_till_retry);
-      syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
-    }
-  
-  cl->status.active = 0;
   cl->status.remove = 1;
 
+  /* If this cl isn't active, don't send any DEL_HOSTs. */
+  if(cl->status.active)
+    notify_others(cl,NULL,send_del_host);
+    
 cp
   /* Find all connections that were lost because they were behind cl
      (the connection that was dropped). */
-  for(p = conn_list; p != NULL; p = p->next)
-    if(p->nexthop == cl)
+  if(cl->status.meta)
+    for(p = conn_list; p != NULL; p = p->next)
       {
-	p->status.active = 0;
-	p->status.remove = 1;
+        if((p->nexthop == cl) && (p != cl))
+          {
+            if(cl->status.active && p->status.active)
+              notify_others(p,cl,send_del_host);
+           if(cl->socket)
+             close(cl->socket);
+	    p->status.active = 0;
+	    p->status.remove = 1;
+          }
       }
-
-cp 
-  /* Then send a notification about all these connections to all hosts
-     that are still connected to us. */
-  for(p = conn_list; p != NULL; p = p->next)
-    if(!p->status.remove && p->status.meta)
-      for(q = conn_list; q != NULL; q = q->next)
-	if(q->status.remove)
-	  send_del_host(p, q);
-
+    
+  cl->status.active = 0;
+  
+  if(cl->status.outgoing)
+    {
+      signal(SIGALRM, sigalrm_handler);
+      seconds_till_retry = 5;
+      alarm(seconds_till_retry);
+      syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
+    }
 cp
 }
 
@@ -943,8 +1013,8 @@ cp
               if(p->status.pinged && !p->status.got_pong)
                 {
                   if(debug_lvl > 1)
-  	            syslog(LOG_INFO, _(IP_ADDR_S " (" IP_ADDR_S ") didn't respond to ping"),
-		           IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->real_ip));
+  	            syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
+		           p->name, p->hostname);
 	          p->status.timeout = 1;
 	          terminate_connection(p);
                 }
@@ -978,7 +1048,7 @@ cp
       return -1;
     }
 
-  if((ncn = create_new_connection(nfd)) == NULL)
+  if(!(ncn = create_new_connection(nfd)))
     {
       shutdown(nfd, 2);
       close(nfd);
@@ -993,101 +1063,6 @@ cp
   return 0;
 }
 
-/*
-  dispatch any incoming meta requests
-*/
-int handle_incoming_meta_data(conn_list_t *cl)
-{
-  int x, l = sizeof(x);
-  int request, oldlen, i;
-  int lenin = 0;
-cp
-  if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
-    {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, cl->meta_socket);
-      return -1;
-    }
-  if(x)
-    {
-      syslog(LOG_ERR, _("Metadata socket error: %s"), sys_errlist[x]);
-      return -1;
-    }
-
-  if(cl->buflen >= MAXBUFSIZE)
-    {
-      syslog(LOG_ERR, _("Metadata read buffer overflow!"));
-      return -1;
-    }
-
-  lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE-cl->buflen);
-
-  if(lenin<=0)
-    {
-      syslog(LOG_ERR, _("Metadata socket read error: %m"));
-      return -1;
-    }
-
-  oldlen = cl->buflen;
-  cl->buflen += lenin;
-
-  for(;;)
-    {
-      cl->reqlen = 0;
-
-      for(i = oldlen; i < cl->buflen; i++)
-        {
-          if(cl->buffer[i] == '\n')
-            {
-              cl->buffer[i] = 0;  /* replace end-of-line by end-of-string so we can use sscanf */
-              cl->reqlen = i + 1;
-              break;
-            }
-        }
-
-      if(cl->reqlen)
-        {
-          if(debug_lvl > 2)
-            syslog(LOG_DEBUG, _("Got request from " IP_ADDR_S " (" IP_ADDR_S "): %s"),
-                         IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip), cl->buffer);
-          if(sscanf(cl->buffer, "%d", &request) == 1)
-            {
-              if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
-                {
-                  syslog(LOG_ERR, _("Unknown request from " IP_ADDR_S " (" IP_ADDR_S ")"),
-                         IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
-                  return -1;
-                }
-
-              if(request_handlers[request](cl))  /* Something went wrong. Probably scriptkiddies. Terminate. */
-                {
-                  syslog(LOG_ERR, _("Error while processing request from " IP_ADDR_S " (" IP_ADDR_S ")"),
-                         IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
-                  return -1;
-                }
-            }
-          else
-            {
-              syslog(LOG_ERR, _("Bogus data received from " IP_ADDR_S " (" IP_ADDR_S ")"),
-                         IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
-              return -1;
-            }
-
-          cl->buflen -= cl->reqlen;
-          memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
-          oldlen = 0;
-        }
-      else
-        {
-          break;
-        }
-    }
-
-  cl->last_ping_time = time(NULL);
-  cl->want_ping = 0;
-cp  
-  return 0;
-}
-
 /*
   check all connections to see if anything
   happened on their sockets
@@ -1112,14 +1087,15 @@ cp
 	      I've once got here when it said `No route to host'.
 	    */
 	    getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
-	    syslog(LOG_ERR, _("Outgoing data socket error: %s"), sys_errlist[x]);
+	    syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
+                   p->name, p->hostname, strerror(x));
 	    terminate_connection(p);
 	    return;
 	  }  
 
       if(p->status.meta)
 	if(FD_ISSET(p->meta_socket, f))
-	  if(handle_incoming_meta_data(p) < 0)
+	  if(receive_meta(p) < 0)
 	    {
 	      terminate_connection(p);
 	      return;
@@ -1157,28 +1133,20 @@ cp
   if(ether_type != 0x0800)
     {
       if(debug_lvl > 3)
-	syslog(LOG_INFO, _("Non-IP ethernet frame %04x from " MAC_ADDR_S),
-	       ether_type, MAC_ADDR_V(vp.data[6]));
+	syslog(LOG_INFO, _("Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"), ether_type, MAC_ADDR_V(vp.data[6]));
       return;
     }
   
   if(lenin < 32)
     {
       if(debug_lvl > 3)
-	syslog(LOG_INFO, _("Dropping short packet"));
+	syslog(LOG_INFO, _("Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"), MAC_ADDR_V(vp.data[6]));
       return;
     }
 
   from = ntohl(*((unsigned long*)(&vp.data[26])));
   to = ntohl(*((unsigned long*)(&vp.data[30])));
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("An IP packet (%04x) for " IP_ADDR_S " from " IP_ADDR_S),
-	   ether_type, IP_ADDR_V(to), IP_ADDR_V(from));
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _(MAC_ADDR_S " to " MAC_ADDR_S),
-	   MAC_ADDR_V(vp.data[0]), MAC_ADDR_V(vp.data[6]));
-  
   vp.len = (length_t)lenin - 2;
 
   strip_mac_addresses(&vp);
@@ -1209,10 +1177,28 @@ cp
 
       if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
         {
-	  if(errno == EINTR) /* because of alarm */
-	    continue;
-          syslog(LOG_ERR, _("Error while waiting for input: %m"));
-          return;
+	  if(errno != EINTR) /* because of alarm */
+            {
+              syslog(LOG_ERR, _("Error while waiting for input: %m"));
+              return;
+            }
+        }
+
+      if(sighup)
+        {
+          sighup = 0;
+	  if(debug_lvl > 1)
+	    syslog(LOG_INFO, _("Rereading configuration file"));
+          close_network_connections();
+          clear_config();
+          if(read_config_file(configfilename))
+            {
+              syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+              exit(0);
+            }
+          sleep(5);
+          setup_network_connections();
+          continue;
         }
 
       if(last_ping_check + timeout < time(NULL))
@@ -1220,14 +1206,16 @@ cp
 	{
 	  check_dead_connections();
           last_ping_check = time(NULL);
-	  continue;
 	}
 
-      check_network_activity(&fset);
+      if(r > 0)
+        {
+          check_network_activity(&fset);
 
-      /* local tap data */
-      if(FD_ISSET(tap_fd, &fset))
-	handle_tap_input();
+          /* local tap data */
+          if(FD_ISSET(tap_fd, &fset))
+	    handle_tap_input();
+        }
     }
 cp
 }