X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=fecf7e6ecf8b00241c0d9a21fa2f39ae0e2f834f;hp=cd433d0827382e5a0e7c09986c62ed2bf1aff83d;hb=e5130495d7d4083d58ab76c26001aa27f5fc13db;hpb=3cfc9424f255c26f2a7775b6fa059f1e3e47a76e

diff --git a/src/net.c b/src/net.c
index cd433d08..fecf7e6e 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.24 2000/08/08 17:07:47 guus Exp $
+    $Id: net.c,v 1.35.4.37 2000/10/15 19:53:15 zarq Exp $
 */
 
 #include "config.h"
@@ -37,7 +37,13 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include <cipher.h>
+/* Next two includes are for tun/tap support */
+#include <net/if.h>
+
+#ifdef HAVE_LINUX_IF_TUN_H
+#include <linux/if_tun.h>
+#endif
+
 #include <utils.h>
 #include <xalloc.h>
 
@@ -46,6 +52,7 @@
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
+#include "meta.h"
 
 #include "system.h"
 
@@ -59,20 +66,15 @@ int total_socket_out = 0;
 int upstreamindex = 0;
 static int seconds_till_retry;
 
-/* The global list of existing connections */
-conn_list_t *conn_list = NULL;
-conn_list_t *myself = NULL;
+char *unknown = NULL;
 
 /*
   strip off the MAC adresses of an ethernet frame
 */
 void strip_mac_addresses(vpn_packet_t *p)
 {
-  unsigned char tmp[MAXSIZE];
 cp
-  memcpy(tmp, p->data, p->len);
-  p->len -= 12;
-  memcpy(p->data, &tmp[12], p->len);
+  memmove(p->data, p->data + 12, p->len -= 12);
 cp
 }
 
@@ -81,120 +83,68 @@ cp
 */
 void add_mac_addresses(vpn_packet_t *p)
 {
-  unsigned char tmp[MAXSIZE];
 cp
-  memcpy(&tmp[12], p->data, p->len);
+  memcpy(p->data + 12, p->data, p->len);
   p->len += 12;
-  tmp[0] = tmp[6] = 0xfe;
-  tmp[1] = tmp[7] = 0xfd;
-  *((ip_t*)(&tmp[2])) = (ip_t)(htonl(myself->vpn_ip));
-  *((ip_t*)(&tmp[8])) = *((ip_t*)(&tmp[26]));
-  memcpy(p->data, &tmp[0], p->len);
+  p->data[0] = p->data[6] = 0xfe;
+  p->data[1] = p->data[7] = 0xfd;
+  /* Really evil pointer stuff just below! */
+  *((ip_t*)(&p->data[2])) = (ip_t)(htonl(myself->address));
+  *((ip_t*)(&p->data[8])) = *((ip_t*)(&p->data[26]));
 cp
 }
 
-int xsend(conn_list_t *cl, void *packet)
+int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
 {
-  real_packet_t rp;
+  vpn_packet_t outpkt;
+  int outlen, outpad;
 cp
-  do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
-  rp.from = htonl(myself->vpn_ip);
-  rp.data.len = htons(rp.data.len);
-  rp.len = htons(rp.len);
-
+  outpkt.len = inpkt->len;
+  EVP_EncryptInit(cl->cipher_pktctx, cl->cipher_pkttype, cl->cipher_pktkey, NULL);
+  EVP_EncryptUpdate(cl->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
+  EVP_EncryptFinal(cl->cipher_pktctx, outpkt.data + outlen, &outpad);
+  outlen += outpad;
+  
   if(debug_lvl > 3)
     syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
-           ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);
+           outlen, cl->name, cl->hostname);
 
-  total_socket_out += ntohs(rp.len);
+  total_socket_out += outlen;
 
   cl->want_ping = 1;
 
-  if((cl->flags | myself->flags) & TCPONLY)
-      return send_tcppacket(cl, (void*)&rp, ntohs(rp.len));
-
-  if((send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
+  if((send(cl->socket, (char *) &(outpkt.len), outlen + 2, 0)) < 0)
     {
       syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
-             cl->vpn_hostname, cl->real_hostname);
+             cl->name, cl->hostname);
       return -1;
     }
 cp
   return 0;
 }
 
-int xrecv(conn_list_t *cl, void *packet)
+int xrecv(vpn_packet_t *inpkt)
 {
-  vpn_packet_t vp;
-  int lenin;
+  vpn_packet_t outpkt;
+  int outlen, outpad;
 cp
-  do_decrypt((real_packet_t*)packet, &vp, cl->key);
-  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->vpn_hostname, cl->real_hostname);
+    syslog(LOG_ERR, _("Receiving packet of %d bytes"),
+           inpkt->len);
+
+  outpkt.len = inpkt->len;
+  EVP_DecryptInit(myself->cipher_pktctx, myself->cipher_pkttype, myself->cipher_pktkey, NULL);
+  EVP_DecryptUpdate(myself->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
+  /* FIXME: grok DecryptFinal  
+  EVP_DecryptFinal(myself->cipher_pktctx, outpkt.data + outlen, &outpad);
+   */
+   
+  add_mac_addresses(&outpkt);
 
-  if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
+  if(write(tap_fd, outpkt.data, outpkt.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;
-}
-
-int tcprecv(conn_list_t *cl, real_packet_t *rp)
-{
-  vpn_packet_t vp;
-  int lenin;
-  conn_list_t *f;
-cp
-  rp->data.len = ntohs(rp->data.len);
-  rp->len = ntohs(rp->len);
-  rp->from = ntohl(rp->from);
-
-  total_socket_in += rp->len;
-  
-  if(rp->len >= 0)
-    {
-      f = lookup_conn(rp->from);
-      if(!f)
-	{
-	  syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
-		 cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp->from));
-	  return -1;
-	}
-
-      if(f->status.validkey)
-        {
-          do_decrypt(rp, &vp, cl->key);
-          add_mac_addresses(&vp);
-
-          if(debug_lvl > 3)
-            syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
-                   rp->len, cl->vpn_hostname, cl->real_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;
-        }
-      else
-	{
-          /* Can we add to queue? */
-	  if(!cl->status.waitingforkey)
-	    send_key_request(rp->from);
-	}
-
-      if(my_key_expiry <= time(NULL))
-	regenerate_keys();
-    }
-
-  cl->want_ping = 0;
-  cl->last_ping_time = time(NULL);
+    total_tap_out += outpkt.len;
 cp
   return 0;
 }
@@ -308,7 +258,7 @@ cp
     {
       if(debug_lvl > 3)
 	syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
-	       cl->vpn_hostname, cl->real_hostname);
+	       cl->name, cl->hostname);
       flush_queue(cl, &(cl->sq), xsend);
     }
 
@@ -316,7 +266,7 @@ cp
     {
       if(debug_lvl > 3)
 	syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
-	       cl->vpn_hostname, cl->real_hostname);
+	       cl->name, cl->hostname);
       flush_queue(cl, &(cl->rq), xrecv);
     }
 cp
@@ -329,94 +279,45 @@ int send_packet(ip_t to, vpn_packet_t *packet)
 {
   conn_list_t *cl;
 cp
-  if((cl = lookup_conn(to)) == NULL)
+  if((cl = lookup_conn_list_ipv4(to)) == NULL)
     {
       if(debug_lvl > 3)
         {
           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;
-        }
-    }
+   }
     
   /* If we ourselves have indirectdata flag set, we should send only to our uplink! */
-  
-  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 > 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->vpn_hostname, cl->real_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();
 
+  /* FIXME - check for indirection and reprogram it The Right Way(tm) this time. */
+  
   if(!cl->status.dataopen)
     if(setup_vpn_connection(cl) < 0)
       {
-        syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"), cl->vpn_hostname, cl->real_hostname);
+        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->vpn_hostname, cl->real_hostname);
+	syslog(LOG_INFO, _("No valid key known yet for %s (%s), 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 */
+	send_req_key(myself, cl);			/* 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->vpn_hostname, cl->real_hostname);
+	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? */
     }
@@ -434,19 +335,46 @@ 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(tapdevice)) == NULL)
-    tapfname = "/dev/tap0";
-  else
+  if((cfg = get_config_val(config, tapdevice)))
     tapfname = cfg->data.ptr;
-
+  else
+#ifdef HAVE_TUNTAP
+    tapfname = "/dev/misc/net/tun";
+#else
+    tapfname = "/dev/tap0";
+#endif
+cp
   if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0)
     {
       syslog(LOG_ERR, _("Could not open %s: %m"), tapfname);
       return -1;
     }
-
+cp
   tap_fd = nfd;
+
+#ifdef HAVE_TUNTAP
+  /* Ok now check if this is an old ethertap or a new tun/tap thingie */
+  memset(&ifr, 0, sizeof(ifr));
+cp
+  ifr.ifr_flags = IFF_TAP;
+  if (netname)
+    strncpy(ifr.ifr_name, netname, IFNAMSIZ);
+cp
+  if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr))
+  { 
+    syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname);
+    if((cfg = get_config_val(config, tapsubnet)) == NULL)
+      syslog(LOG_INFO, _("tun/tap device will be left unconfigured"));
+    else
+      /* Setup inetaddr/netmask etc */;
+  }
+#endif
+  
 cp
   return 0;
 }
@@ -460,6 +388,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)
     {
@@ -473,6 +402,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)
     {
@@ -480,10 +415,23 @@ cp
       return -1;
     }
 
+  if((cfg = get_config_val(config, 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(config, 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)))
     {
@@ -553,9 +501,9 @@ int setup_outgoing_meta_socket(conn_list_t *cl)
   config_t const *cfg;
 cp
   if(debug_lvl > 0)
-    syslog(LOG_INFO, _("Trying to connect to %s"), cl->real_hostname);
+    syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
 
-  if((cfg = get_config_val(upstreamport)) == NULL)
+  if((cfg = get_config_val(cl->config, port)) == NULL)
     cl->port = 655;
   else
     cl->port = cfg->data.val;
@@ -564,31 +512,31 @@ cp
   if(cl->meta_socket == -1)
     {
       syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
-             cl->real_hostname, cl->port);
+             cl->hostname, cl->port);
       return -1;
     }
 
   a.sin_family = AF_INET;
   a.sin_port = htons(cl->port);
-  a.sin_addr.s_addr = htonl(cl->real_ip);
+  a.sin_addr.s_addr = htonl(cl->address);
 
   if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
-      syslog(LOG_ERR, _("%s port %hd: %m"), cl->real_hostname, 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)
+  if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
     {
       syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
-             cl->real_hostname, cl->port);
+             cl->hostname, cl->port);
       return -1;
     }
-*/
+
   if(debug_lvl > 0)
     syslog(LOG_INFO, _("Connected to %s port %hd"),
-         cl->real_hostname, cl->port);
+         cl->hostname, cl->port);
 cp
   return 0;
 }
@@ -612,14 +560,14 @@ cp
     }
 
   ncn = new_conn_list();
-  ncn->real_ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
-  ncn->real_hostname = hostlookup(htonl(ncn->real_ip));
+  ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
+  ncn->hostname = hostlookup(htonl(ncn->address));
   
   if(setup_outgoing_meta_socket(ncn) < 0)
     {
       syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
-             ncn->real_hostname);
-      free_conn_element(ncn);
+             ncn->hostname);
+      free_conn_list(ncn);
       return -1;
     }
 
@@ -640,40 +588,52 @@ int setup_myself(void)
 cp
   myself = new_conn_list();
 
-  if(!(cfg = get_config_val(myvpnip)))
+  asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */
+  myself->flags = 0;
+  myself->protocol_version = PROT_CURRENT;
+
+  if(!(cfg = get_config_val(config, tincname))) /* Not acceptable */
     {
-      syslog(LOG_ERR, _("No value for my VPN IP given"));
+      syslog(LOG_ERR, _("Name for tinc daemon required!"));
       return -1;
     }
+  else
+    myself->name = (char*)cfg->data.val;
 
-  myself->vpn_ip = cfg->data.ip->ip;
-  myself->vpn_hostname = hostlookup(htonl(myself->vpn_ip));
-  myself->real_hostname = hostlookup(htonl(myself->vpn_ip));
-  myself->vpn_mask = cfg->data.ip->mask;
-  myself->flags = 0;
+  if(check_id(myself->name))
+    {
+      syslog(LOG_ERR, _("Invalid name for myself!"));
+      return -1;
+    }
 
-  if(!(cfg = get_config_val(listenport)))
+  if(read_host_config(myself))
+    {
+      syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
+      return -1;
+    }
+  
+  if(!(cfg = get_config_val(myself->config, port)))
     myself->port = 655;
   else
     myself->port = cfg->data.val;
 
-  if((cfg = get_config_val(indirectdata)))
+  if((cfg = get_config_val(myself->config, indirectdata)))
     if(cfg->data.val == stupid_true)
       myself->flags |= EXPORTINDIRECTDATA;
 
-  if((cfg = get_config_val(tcponly)))
+  if((cfg = get_config_val(myself->config, 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;
     }
@@ -690,8 +650,9 @@ sigalrm_handler(int a)
 {
   config_t const *cfg;
 cp
-  cfg = get_next_config_val(upstreamip, upstreamindex++);
-
+/* FIXME! Use name instead of upstreamip.
+  cfg = get_next_config_val(config, upstreamip, upstreamindex++);
+*/
   while(cfg)
     {
       if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
@@ -699,7 +660,7 @@ cp
           signal(SIGALRM, SIG_IGN);
           return;
         }
-      cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+//      cfg = get_next_config_val(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
 
   signal(SIGALRM, sigalrm_handler);
@@ -720,7 +681,7 @@ int setup_network_connections(void)
 {
   config_t const *cfg;
 cp
-  if((cfg = get_config_val(pingtimeout)) == NULL)
+  if((cfg = get_config_val(config, pingtimeout)) == NULL)
     timeout = 5;
   else
     timeout = cfg->data.val;
@@ -731,7 +692,7 @@ cp
   if(setup_myself() < 0)
     return -1;
 
-  if((cfg = get_next_config_val(upstreamip, upstreamindex++)) == NULL)
+//  if((cfg = get_next_config_val(config, upstreamip, upstreamindex++)) == NULL)
     /* No upstream IP given, we're listen only. */
     return 0;
 
@@ -739,7 +700,7 @@ cp
     {
       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 */
+//      cfg = get_next_config_val(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
     
   signal(SIGALRM, sigalrm_handler);
@@ -797,7 +758,7 @@ int setup_vpn_connection(conn_list_t *cl)
   struct sockaddr_in a;
 cp
   if(debug_lvl > 0)
-    syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->real_hostname);
+    syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
 
   nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
   if(nfd == -1)
@@ -808,12 +769,12 @@ cp
 
   a.sin_family = AF_INET;
   a.sin_port = htons(cl->port);
-  a.sin_addr.s_addr = htonl(cl->real_ip);
+  a.sin_addr.s_addr = htonl(cl->address);
 
   if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
     {
       syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
-	     cl->real_hostname, cl->port);
+	     cl->hostname, cl->port);
       return -1;
     }
 
@@ -821,7 +782,7 @@ cp
   if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
     {
       syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
-             cl->vpn_hostname, cl->real_hostname);
+             cl->name, cl->hostname);
       return -1;
     }
 
@@ -849,21 +810,23 @@ cp
       return NULL;
     }
 
-  p->real_ip = ntohl(ci.sin_addr.s_addr);
-  p->real_hostname = hostlookup(ci.sin_addr.s_addr);
+  p->name = unknown;
+  p->address = ntohl(ci.sin_addr.s_addr);
+  p->hostname = hostlookup(ci.sin_addr.s_addr);
   p->meta_socket = sfd;
   p->status.meta = 1;
+  p->buffer = xmalloc(MAXBUFSIZE);
   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->real_hostname, htons(ci.sin_port));
+         p->hostname, htons(ci.sin_port));
 
-  if(send_basic_info(p) < 0)
+  if(send_id(p) < 0)
     {
-      free_conn_element(p);
+      free_conn_list(p);
       return NULL;
     }
 cp
@@ -898,63 +861,32 @@ 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()
 {
-  real_packet_t rp;
+  vpn_packet_t pkt;
   int lenin;
   int x, l = sizeof(x);
-  conn_list_t *f;
 cp
-  if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
+  if(getsockopt(myself->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
     {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->socket,
-             cl->vpn_hostname, cl->real_hostname);
+      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"),
+	     __FILE__, __LINE__, myself->socket);
       return -1;
     }
   if(x)
     {
-      syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"),
-             cl->vpn_hostname, cl->real_hostname, sys_errlist[x]);
+      syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
       return -1;
     }
 
-  rp.len = -1;
-  lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
-  if(lenin <= 0)
+  if(recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, NULL, NULL) <= 0)
     {
-      syslog(LOG_ERR, _("Receiving packet from %s (%s) failed: %m"), cl->vpn_hostname, cl->real_hostname);
+      syslog(LOG_ERR, _("Receiving packet failed: %m"));
       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(!f)
-	{
-	  syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
-		 cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp.from));
-	  return -1;
-	}
-
-      if(f->status.validkey)
-	xrecv(f, &rp);
-      else
-	{
-	  add_queue(&(f->rq), &rp, rp.len);
-	  if(!cl->status.waitingforkey)
-	    send_key_request(rp.from);
-	}
-
-      if(my_key_expiry <= time(NULL))
-	regenerate_keys();
-    }
 cp
-  return 0;
+  return xrecv(&pkt);
 }
 
 /*
@@ -971,13 +903,7 @@ cp
 
   if(debug_lvl > 0)
     syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
-           cl->vpn_hostname, cl->real_hostname);
-
-  if(cl->status.timeout)
-    send_timeout(cl);
-/*  else if(!cl->status.termreq)
-    send_termreq(cl);
- */
+           cl->name, cl->hostname);
  
   if(cl->socket)
     close(cl->socket);
@@ -987,8 +913,11 @@ cp
   cl->status.remove = 1;
 
   /* If this cl isn't active, don't send any DEL_HOSTs. */
+
+/* FIXME: reprogram this.
   if(cl->status.active)
     notify_others(cl,NULL,send_del_host);
+*/
     
 cp
   /* Find all connections that were lost because they were behind cl
@@ -999,7 +928,9 @@ cp
         if((p->nexthop == cl) && (p != cl))
           {
             if(cl->status.active && p->status.active)
+/* FIXME: reprogram this
               notify_others(p,cl,send_del_host);
+*/;
            if(cl->socket)
              close(cl->socket);
 	    p->status.active = 0;
@@ -1045,7 +976,7 @@ cp
                 {
                   if(debug_lvl > 1)
   	            syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
-		           p->vpn_hostname, p->real_hostname);
+		           p->name, p->hostname);
 	          p->status.timeout = 1;
 	          terminate_connection(p);
                 }
@@ -1067,13 +998,13 @@ cp
   accept a new tcp connect and create a
   new connection
 */
-int handle_new_meta_connection(conn_list_t *cl)
+int handle_new_meta_connection()
 {
   conn_list_t *ncn;
   struct sockaddr client;
   int nfd, len = sizeof(client);
 cp
-  if((nfd = accept(cl->meta_socket, &client, &len)) < 0)
+  if((nfd = accept(myself->meta_socket, &client, &len)) < 0)
     {
       syslog(LOG_ERR, _("Accepting a new connection failed: %m"));
       return -1;
@@ -1094,131 +1025,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 %s (%s)"), __FILE__, __LINE__, cl->meta_socket,
-             cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
-  if(x)
-    {
-      syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
-             cl->vpn_hostname, cl->real_hostname, 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)
-    {
-      if(errno==EINTR)
-        return 0;      
-      if(errno==0)
-        {
-          if(debug_lvl>0)
-            syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
-                cl->vpn_hostname, cl->real_hostname);
-        }
-      else
-        syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
-               cl->vpn_hostname, cl->real_hostname);
-      return -1;
-    }
-
-  oldlen = cl->buflen;
-  cl->buflen += lenin;
-
-  for(;;)
-    {
-      if(cl->tcppacket)
-        {
-          if(cl->buflen >= cl->tcppacket)
-            {
-              tcprecv(cl, (real_packet_t *)cl->buffer);
-              cl->buflen -= cl->tcppacket;
-              memmove(cl->buffer, cl->buffer + cl->tcppacket, cl->buflen);
-              oldlen = 0;
-              cl->tcppacket=0;
-            }
-          else
-            {
-              break;
-            }
-        }
-      else
-        {
-          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 %s (%s): %s"),
-                             cl->vpn_hostname, cl->real_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->vpn_hostname, cl->real_hostname);
-                      return -1;
-                    }
-
-                  if(request_handlers[request](cl))  /* Something went wrong. Probably scriptkiddies. Terminate. */
-                    {
-                      syslog(LOG_ERR, _("Error while processing request from %s (%s)"),
-                             cl->vpn_hostname, cl->real_hostname);
-                      return -1;
-                    }
-                }
-              else
-                {
-                  syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
-                             cl->vpn_hostname, cl->real_hostname);
-                  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
@@ -1244,14 +1050,14 @@ cp
 	    */
 	    getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
 	    syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
-                   p->vpn_hostname, p->real_hostname, sys_errlist[x]);
+                   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;
@@ -1259,10 +1065,10 @@ cp
     }
   
   if(FD_ISSET(myself->socket, f))
-    handle_incoming_vpn_data(myself);
+    handle_incoming_vpn_data();
 
   if(FD_ISSET(myself->meta_socket, f))
-    handle_new_meta_connection(myself);
+    handle_new_meta_connection();
 cp
 }
 
@@ -1289,15 +1095,14 @@ 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;
     }
 
@@ -1344,15 +1149,19 @@ cp
       if(sighup)
         {
           sighup = 0;
+/* FIXME: reprogram this.
+	  if(debug_lvl > 1)
+	    syslog(LOG_INFO, _("Rereading configuration file"));
           close_network_connections();
           clear_config();
-          if(read_config_file(configfilename))
+          if(read_config_file(&config, configfilename))
             {
               syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
               exit(0);
             }
           sleep(5);
           setup_network_connections();
+*/
           continue;
         }