X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=1ef53010ef2f10f8327e179e35693054e65b5ffd;hp=ceda90b837ecd5e1b2651a235fa49d844acbf3c1;hb=ed397b6ac676329b237e219c806143cccf456b3c;hpb=dad90e82d3c7af95820b1c04903bed7074e2b175

diff --git a/src/net.c b/src/net.c
index ceda90b8..1ef53010 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,6 +1,7 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998,99 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
+                            2000 Guus Sliepen <guus@sliepen.warande.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,6 +16,8 @@
     You should have received a copy of the GNU General Public License
     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.29 2000/09/14 21:51:19 zarq Exp $
 */
 
 #include "config.h"
@@ -44,6 +47,8 @@
 #include "netutl.h"
 #include "protocol.h"
 
+#include "system.h"
+
 int tap_fd = -1;
 
 int total_tap_in = 0;
@@ -51,7 +56,8 @@ int total_tap_out = 0;
 int total_socket_in = 0;
 int total_socket_out = 0;
 
-time_t last_ping_time = 0;
+int upstreamindex = 0;
+static int seconds_till_retry;
 
 /* The global list of existing connections */
 conn_list_t *conn_list = NULL;
@@ -89,47 +95,34 @@ 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);
-  rp.from = myself->vpn_ip;
+  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", 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, 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;
 cp
   return 0;
 }
 
-/*
-  write as many bytes as possible to the tap
-  device, possibly in multiple turns.
-*/
-int write_n(int fd, void *buf, size_t len)
-{
-  int r, done = 0;
-cp  
-  do
-    {
-      if((r = write(fd, buf, len)) < 0)
-	return -1;
-      len -= r;
-      buf += r;
-      done += r;
-    } while(len > 0);
-
-  return done;
-cp
-}
-
 int xrecv(conn_list_t *cl, void *packet)
 {
   vpn_packet_t vp;
@@ -138,10 +131,17 @@ cp
   do_decrypt((real_packet_t*)packet, &vp, cl->key);
   add_mac_addresses(&vp);
 
-  if((lenin = write_n(tap_fd, &vp, vp.len + 2)) < 0)
-    syslog(LOG_ERR, "Can't write to tap device: %m");
+  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
     total_tap_out += lenin;
+
+  cl->want_ping = 0;
+  cl->last_ping_time = time(NULL);
 cp
   return 0;
 }
@@ -154,16 +154,13 @@ 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(queue_element_t));
+  e = xmalloc(sizeof(*e));
   e->packet = xmalloc(s);
   memcpy(e->packet, packet, s);
 
   if(!*q)
     {
-      *q = xmalloc(sizeof(packet_queue_t));
+      *q = xmalloc(sizeof(**q));
       (*q)->head = (*q)->tail = NULL;
     }
 
@@ -242,7 +239,7 @@ cp
     }
 
   if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "queue flushed");
+    syslog(LOG_DEBUG, _("Queue flushed"));
 cp
 }
 
@@ -256,17 +253,17 @@ void flush_queues(conn_list_t *cl)
 cp
   if(cl->sq)
     {
-      if(debug_lvl > 1)
-	syslog(LOG_DEBUG, "Flushing send queue for " IP_ADDR_S,
-	       IP_ADDR_V(cl->vpn_ip));
+      if(debug_lvl > 3)
+	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 > 1)
-	syslog(LOG_DEBUG, "Flushing receive queue for " IP_ADDR_S,
-	       IP_ADDR_V(cl->vpn_ip));
+      if(debug_lvl > 3)
+	syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
+	       cl->name, cl->hostname);
       flush_queue(cl, &(cl->rq), xrecv);
     }
 cp
@@ -281,40 +278,88 @@ int send_packet(ip_t to, vpn_packet_t *packet)
 cp
   if((cl = lookup_conn(to)) == NULL)
     {
-      if(debug_lvl > 2)
+      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));
         }
+
+      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);
       if(!cl)
         { /* No open outgoing connection has been found. */
-	  if(debug_lvl > 2)
-	    syslog(LOG_NOTICE, "There is no remote host I can send this packet to.");
+	  if(debug_lvl > 3)
+	    syslog(LOG_NOTICE, _("There is no remote host I can send this packet to!"));
           return -1;
         }
     }
+  else
+
+  /* If indirectdata flag is set for the destination we just looked up,
+   * then real_ip is actually the vpn_ip of the gateway tincd
+   * it is behind.
+   */
+   
+  if(cl->flags & INDIRECTDATA)
+    {
+      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 %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 %d.%d.%d.%d"), IP_ADDR_V(to));
+          return -1;        
+        }
+    }            
 
   if(my_key_expiry <= time(NULL))
     regenerate_keys();
 
   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(to);
+	send_key_request(cl->vpn_ip);			/* Keys should be sent to the host running the tincd */
       return 0;
     }
 
   if(!cl->status.active)
     {
+      if(debug_lvl > 3)
+	syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"),
+	       cl->name, cl->hostname);
       add_queue(&(cl->sq), packet, packet->len + 2);
-      if(debug_lvl > 1)
-	syslog(LOG_INFO, IP_ADDR_S " is not ready, queueing packet.", IP_ADDR_V(cl->vpn_ip));
       return 0; /* We don't want to mess up, do we? */
     }
 
@@ -323,21 +368,6 @@ cp
   return xsend(cl, packet);
 }
 
-int send_broadcast(conn_list_t *cl, vpn_packet_t *packet)
-{
-  conn_list_t *p;
-cp
-  for(p = cl; p != NULL; p = p->next)
-    if(send_packet(p->real_ip, packet) < 0)
-      {
-	syslog(LOG_ERR, "Could not send a broadcast packet to %08lx (%08lx): %m",
-	       p->vpn_ip, p->real_ip);
-	break; /* FIXME: should retry later, and send a ping over the metaconnection. */
-      }
-cp
-  return 0;
-}
-
 /*
   open the local ethertap device
 */
@@ -354,7 +384,7 @@ cp
 
   if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0)
     {
-      syslog(LOG_ERR, "Could not open %s: %m", tapfname);
+      syslog(LOG_ERR, _("Could not open %s: %m"), tapfname);
       return -1;
     }
 
@@ -372,40 +402,60 @@ 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)
     {
-      syslog(LOG_ERR, "Creating metasocket failed: %m");
+      syslog(LOG_ERR, _("Creating metasocket failed: %m"));
       return -1;
     }
 
   if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
     {
-      syslog(LOG_ERR, "setsockopt: %m");
+      syslog(LOG_ERR, _("setsockopt: %m"));
+      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)
     {
-      syslog(LOG_ERR, "fcntl: %m");
+      syslog(LOG_ERR, _("fcntl: %m"));
       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)))
     {
-      syslog(LOG_ERR, "Can't bind to port %hd/tcp: %m", port);
+      syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port);
       return -1;
     }
 
   if(listen(nfd, 3))
     {
-      syslog(LOG_ERR, "listen: %m");
+      syslog(LOG_ERR, _("listen: %m"));
       return -1;
     }
 cp
@@ -424,20 +474,20 @@ int setup_vpn_in_socket(int port)
 cp
   if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
     {
-      syslog(LOG_ERR, "Creating socket failed: %m");
+      syslog(LOG_ERR, _("Creating socket failed: %m"));
       return -1;
     }
 
   if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
     {
-      syslog(LOG_ERR, "setsockopt: %m");
+      syslog(LOG_ERR, _("setsockopt: %m"));
       return -1;
     }
 
   flags = fcntl(nfd, F_GETFL);
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
-      syslog(LOG_ERR, "fcntl: %m");
+      syslog(LOG_ERR, _("fcntl: %m"));
       return -1;
     }
 
@@ -448,7 +498,7 @@ cp
 
   if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
     {
-      syslog(LOG_ERR, "Can't bind to port %hd/udp: %m", port);
+      syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port);
       return -1;
     }
 cp
@@ -464,6 +514,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
@@ -472,7 +525,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;
     }
 
@@ -482,20 +536,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;
     }
 
-  cl->hostname = hostlookup(htonl(cl->real_ip));
-
-  syslog(LOG_INFO, "Connected to %s:%hd" , cl->hostname, cl->port);
+  if(debug_lvl > 0)
+    syslog(LOG_INFO, _("Connected to %s port %hd"),
+         cl->hostname, cl->port);
 cp
   return 0;
 }
@@ -507,16 +562,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;
     }
@@ -540,38 +604,81 @@ cp
 
   if(!(cfg = get_config_val(myvpnip)))
     {
-      syslog(LOG_ERR, "No value for my VPN IP given");
+      syslog(LOG_ERR, _("No value for my VPN IP given"));
       return -1;
     }
 
   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 == 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");
+      syslog(LOG_ERR, _("Unable to set up a listening socket"));
       return -1;
     }
 
   if((myself->socket = setup_vpn_in_socket(myself->port)) < 0)
     {
-      syslog(LOG_ERR, "Unable to set up an incoming vpn data socket");
+      syslog(LOG_ERR, _("Unable to set up an incoming vpn data socket"));
       close(myself->meta_socket);
       return -1;
     }
 
   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;
 }
 
+RETSIGTYPE
+sigalrm_handler(int a)
+{
+  config_t const *cfg;
+cp
+  cfg = get_next_config_val(upstreamip, upstreamindex++);
+
+  while(cfg)
+    {
+      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
+}
+
 /*
   setup all initial network connections
 */
@@ -580,7 +687,7 @@ int setup_network_connections(void)
   config_t const *cfg;
 cp
   if((cfg = get_config_val(pingtimeout)) == NULL)
-    timeout = 10;
+    timeout = 5;
   else
     timeout = cfg->data.val;
 
@@ -590,38 +697,24 @@ 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))
-    return -1;
-cp
-  return 0;
-}
-
-RETSIGTYPE
-sigalrm_handler(int a)
-{
-  config_t const *cfg;
-  static int seconds_till_retry;
-cp
-  cfg = get_config_val(upstreamip);
-
-  if(!setup_outgoing_connection(cfg->data.ip->ip))
-    {
-      signal(SIGALRM, SIG_IGN);
-      seconds_till_retry = 5;
-    }
-  else
+  while(cfg)
     {
-      signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry += 5;
-      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 */
+        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;
 }
 
 /*
@@ -656,7 +749,7 @@ cp
   close(tap_fd);
   destroy_conn_list();
 
-  syslog(LOG_NOTICE, "Terminating.");
+  syslog(LOG_NOTICE, _("Terminating"));
 cp
   return;
 }
@@ -669,13 +762,13 @@ int setup_vpn_connection(conn_list_t *cl)
   int nfd, flags;
   struct sockaddr_in a;
 cp
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, "Opening UDP socket to " IP_ADDR_S, IP_ADDR_V(cl->real_ip));
+  if(debug_lvl > 0)
+    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;
     }
 
@@ -685,15 +778,16 @@ cp
 
   if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
-      syslog(LOG_ERR, "Create connection to %08lx:%d failed: %m", ntohs(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;
     }
 
@@ -717,20 +811,25 @@ cp
 
   if(getpeername(sfd, &ci, &len) < 0)
     {
-      syslog(LOG_ERR, "Error: getpeername: %m");
+      syslog(LOG_ERR, _("Error: getpeername: %m"));
       return NULL;
     }
 
-  p->hostname = hostlookup(ci.sin_addr.s_addr);
   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;
-
-  syslog(LOG_NOTICE, "Connection from %s:%d", p->hostname, htons(ci.sin_port));
+  p->buflen = 0;
+  p->last_ping_time = time(NULL);
+  p->want_ping = 0;
+  
+  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
@@ -774,12 +873,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;
     }
 
@@ -787,20 +889,23 @@ 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;
+
+  rp.data.len = ntohs(rp.data.len);
+  rp.len = ntohs(rp.len);
+  rp.from = ntohl(rp.from);
+
   if(rp.len >= 0)
     {
       f = lookup_conn(rp.from);
-      if(debug_lvl > 2)
-	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;
 	}
 
@@ -826,80 +931,100 @@ cp
 */
 void terminate_connection(conn_list_t *cl)
 {
+  conn_list_t *p;
+
 cp
   if(cl->status.remove)
     return;
 
   if(debug_lvl > 0)
-    syslog(LOG_NOTICE, "Closing connection with %s.", cl->hostname);
+    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)
-    {
-      alarm(5);
-      signal(SIGALRM, sigalrm_handler);
-      syslog(LOG_NOTICE, "Try to re-establish outgoing connection in 5 seconds.");
-    }
-  
   cl->status.remove = 1;
-cp
-}
 
-/*
-  send out a ping request to all active
-  connections
-*/
-int send_broadcast_ping(void)
-{
-  conn_list_t *p;
+  /* If this cl isn't active, don't send any DEL_HOSTs. */
+  if(cl->status.active)
+    notify_others(cl,NULL,send_del_host);
+    
 cp
-  for(p = conn_list; p != NULL; p = p->next)
+  /* 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))
+          {
+            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;
+          }
+      }
+    
+  cl->status.active = 0;
+  
+  if(cl->status.outgoing)
     {
-      if(p->status.remove)
-	continue;
-      if(p->status.active && p->status.meta)
-	{
-	  if(send_ping(p))
-	    terminate_connection(p);
-	  else
-	    {
-	      p->status.pinged = 1;
-	      p->status.got_pong = 0;
-	    }
-	}
+      signal(SIGALRM, sigalrm_handler);
+      seconds_till_retry = 5;
+      alarm(seconds_till_retry);
+      syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
     }
-
-  last_ping_time = time(NULL);
 cp
-  return 0;
 }
 
 /*
-  end all connections that did not respond
-  to the ping probe in time
+  Check if the other end is active.
+  If we have sent packets, but didn't receive any,
+  then possibly the other end is dead. We send a
+  PING request over the meta connection. If the other
+  end does not reply in time, we consider them dead
+  and close the connection.
 */
 int check_dead_connections(void)
 {
   conn_list_t *p;
+  time_t now;
 cp
+  now = time(NULL);
   for(p = conn_list; p != NULL; p = p->next)
     {
       if(p->status.remove)
 	continue;
-      if(p->status.active && p->status.meta && p->status.pinged && !p->status.got_pong)
+      if(p->status.active && p->status.meta)
 	{
-	  syslog(LOG_INFO, "%s (" IP_ADDR_S ") didn't respond to ping",
-		 p->hostname, IP_ADDR_V(p->vpn_ip));
-	  p->status.timeout = 1;
-	  terminate_connection(p);
+          if(p->last_ping_time + timeout < now)
+            {
+              if(p->status.pinged && !p->status.got_pong)
+                {
+                  if(debug_lvl > 1)
+  	            syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
+		           p->name, p->hostname);
+	          p->status.timeout = 1;
+	          terminate_connection(p);
+                }
+              else if(p->want_ping)
+                {
+                  send_ping(p);
+                  p->last_ping_time = now;
+                  p->status.pinged = 1;
+                  p->status.got_pong = 0;
+                }
+            }
 	}
     }
 cp
@@ -914,19 +1039,19 @@ int handle_new_meta_connection(conn_list_t *cl)
 {
   conn_list_t *ncn;
   struct sockaddr client;
-  int nfd, len = sizeof(struct sockaddr);
+  int nfd, len = sizeof(client);
 cp
   if((nfd = accept(cl->meta_socket, &client, &len)) < 0)
     {
-      syslog(LOG_ERR, "Accepting a new connection failed: %m");
+      syslog(LOG_ERR, _("Accepting a new connection failed: %m"));
       return -1;
     }
 
-  if((ncn = create_new_connection(nfd)) == NULL)
+  if(!(ncn = create_new_connection(nfd)))
     {
       shutdown(nfd, 2);
       close(nfd);
-      syslog(LOG_NOTICE, "Closed attempted connection.");
+      syslog(LOG_NOTICE, _("Closed attempted connection"));
       return 0;
     }
 
@@ -942,37 +1067,116 @@ cp
 */
 int handle_incoming_meta_data(conn_list_t *cl)
 {
-  int x, l = sizeof(x), lenin;
-  unsigned char tmp[1600];
-  int request;
+  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);
+      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->meta_socket,
+             cl->name, cl->hostname);
       return -1;
     }
   if(x)
     {
-      syslog(LOG_ERR, "Metadata socket error: %s", sys_errlist[x]);
+      syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
+             cl->name, cl->hostname, strerror(x));
       return -1;
     }
 
-  if((lenin = recv(cl->meta_socket, &tmp, sizeof(tmp), 0)) <= 0)
+  lenin = read(cl->meta_socket, cl->buffer+cl->buflen, MAXBUFSIZE - cl->buflen);
+
+  if(lenin<=0)
     {
-      syslog(LOG_ERR, "Receive failed: %m");
+      if(errno==EINTR)
+        return 0;      
+      if(errno==0)
+        {
+          if(debug_lvl>DEBUG_CONNECTIONS)
+            syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
+                cl->name, cl->hostname);
+        }
+      else
+        syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
+               cl->name, cl->hostname);
       return -1;
     }
 
-  request = (int)(tmp[0]);
+  if(cl->status.encryptin)
+    {
+      /* FIXME: do decryption. */
+    }
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, "got request %d", request);
+  oldlen = cl->buflen;
+  cl->buflen += lenin;
 
-  if(request_handlers[request] == NULL)
-    syslog(LOG_ERR, "Unknown request %d.", request);
-  else
-    if(request_handlers[request](cl, tmp, lenin) < 0)
+  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 > DEBUG_PROTOCOL)
+            syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
+		   cl->name, cl->hostname, cl->buffer);
+          if(sscanf(cl->buffer, "%d", &request) == 1)
+            {
+              if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
+                {
+                  syslog(LOG_ERR, _("Unknown request from %s (%s)"),
+			 cl->name, cl->hostname);
+                  return -1;
+                }
+              else
+                {
+                  if(debug_lvl > DEBUG_PROTOCOL)
+                    syslog(LOG_DEBUG, _("Got %s from %s (%s)"),
+			   request_name[request], cl->name, cl->hostname);
+		}
+              if(request_handlers[request](cl))
+		/* Something went wrong. Probably scriptkiddies. Terminate. */
+                {
+                  syslog(LOG_ERR, _("Error while processing %s from %s (%s)"),
+			 request_name[request], cl->name, cl->hostname);
+                  return -1;
+                }
+            }
+          else
+            {
+              syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
+		     cl->name, cl->hostname);
+              return -1;
+            }
+
+          cl->buflen -= cl->reqlen;
+          memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
+          oldlen = 0;
+        }
+      else
+        {
+          break;
+        }
+    }
+
+  if(cl->buflen >= MAXBUFSIZE)
+    {
+      syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
+	     cl->name, cl->hostname);
       return -1;
+    }
+
+  cl->last_ping_time = time(NULL);
+  cl->want_ping = 0;
 cp  
   return 0;
 }
@@ -991,7 +1195,7 @@ cp
       if(p->status.remove)
 	continue;
 
-      if(p->status.active)
+      if(p->status.dataopen)
 	if(FD_ISSET(p->socket, f))
 	  {
 	    /*
@@ -1001,7 +1205,8 @@ 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;
 	  }  
@@ -1036,7 +1241,7 @@ cp
   memset(&vp, 0, sizeof(vp));
   if((lenin = read(tap_fd, &vp, MTU)) <= 0)
     {
-      syslog(LOG_ERR, "Error while reading from tapdevice: %m");
+      syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
       return;
     }
 
@@ -1045,29 +1250,21 @@ cp
   ether_type = ntohs(*((unsigned short*)(&vp.data[12])));
   if(ether_type != 0x0800)
     {
-      if(debug_lvl > 0)
-	syslog(LOG_INFO, "Non-IP ethernet frame %04x from " MAC_ADDR_S,
-	       ether_type, MAC_ADDR_V(vp.data[6]));
+      if(debug_lvl > 3)
+	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 > 0)
-	syslog(LOG_INFO, "Dropping short packet");
+      if(debug_lvl > 3)
+	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 > 2)
-    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);
@@ -1077,15 +1274,16 @@ cp
 }
 
 /*
-  this is where it al happens...
+  this is where it all happens...
 */
 void main_loop(void)
 {
   fd_set fset;
   struct timeval tv;
   int r;
+  time_t last_ping_check;
 cp
-  last_ping_time = time(NULL);
+  last_ping_check = time(NULL);
 
   for(;;)
     {
@@ -1097,25 +1295,45 @@ 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(r == 0 || last_ping_time + timeout < time(NULL))
-	/* Timeout... hm... something might be wrong. */
+      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))
+	/* Let's check if everybody is still alive */
 	{
 	  check_dead_connections();
-	  send_broadcast_ping();
-	  continue;
+          last_ping_check = time(NULL);
 	}
 
-      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
 }