Removed debug messages.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index be601b4..fc23c8e 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <syslog.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <syslog.h>
 #include <sys/socket.h>

+#include <unistd.h>

 
 #include <utils.h>
 #include <xalloc.h>
 
 #include <utils.h>
 #include <xalloc.h>


@@ -41,7 +42,7 @@ cp
     syslog(LOG_DEBUG, "Send ACK to %s", cl->hostname);
 
   syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);
     syslog(LOG_DEBUG, "Send ACK to %s", cl->hostname);
 
   syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);

-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %d:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %d:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -54,6 +55,7 @@ int send_termreq(conn_list_t *cl)
 {
   termreq_t tmp;
 cp
 {
   termreq_t tmp;
 cp

+  memset(&tmp, 0, sizeof(tmp));

   tmp.type = TERMREQ;
   tmp.vpn_ip = myself->vpn_ip;
 
   tmp.type = TERMREQ;
   tmp.vpn_ip = myself->vpn_ip;
 


@@ -61,7 +63,7 @@ cp
     syslog(LOG_DEBUG, "Send TERMREQ(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip),
           IP_ADDR_V(cl->vpn_ip));
 
     syslog(LOG_DEBUG, "Send TERMREQ(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip),
           IP_ADDR_V(cl->vpn_ip));
 

-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -74,6 +76,7 @@ int send_timeout(conn_list_t *cl)
 {
   termreq_t tmp;
 cp
 {
   termreq_t tmp;
 cp

+  memset(&tmp, 0, sizeof(tmp));

   tmp.type = PINGTIMEOUT;
   tmp.vpn_ip = myself->vpn_ip;
 
   tmp.type = PINGTIMEOUT;
   tmp.vpn_ip = myself->vpn_ip;
 


@@ -81,7 +84,7 @@ cp
     syslog(LOG_DEBUG, "Send TIMEOUT(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip),
           IP_ADDR_V(cl->vpn_ip));
 
     syslog(LOG_DEBUG, "Send TIMEOUT(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip),
           IP_ADDR_V(cl->vpn_ip));
 

-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -94,6 +97,7 @@ int send_del_host(conn_list_t *cl, conn_list_t *new_host)
 {
   del_host_t tmp;
 cp
 {
   del_host_t tmp;
 cp

+  memset(&tmp, 0, sizeof(tmp));

   tmp.type = DEL_HOST;
   tmp.vpn_ip = new_host->vpn_ip;
 
   tmp.type = DEL_HOST;
   tmp.vpn_ip = new_host->vpn_ip;
 


@@ -101,7 +105,7 @@ cp
     syslog(LOG_DEBUG, "Sending delete host %lx to " IP_ADDR_S,
           tmp.vpn_ip, IP_ADDR_V(cl->vpn_ip));
 
     syslog(LOG_DEBUG, "Sending delete host %lx to " IP_ADDR_S,
           tmp.vpn_ip, IP_ADDR_V(cl->vpn_ip));
 

-  if((send(cl->meta_socket, (unsigned char*)&tmp, sizeof(del_host_t), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -117,7 +121,7 @@ cp
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "pinging " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
 
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "pinging " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
 

-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -130,7 +134,7 @@ int send_pong(conn_list_t *cl)
 {
   unsigned char tmp = PONG;
 cp
 {
   unsigned char tmp = PONG;
 cp

-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -143,6 +147,7 @@ int send_add_host(conn_list_t *cl, conn_list_t *new_host)
 {
   add_host_t tmp;
 cp
 {
   add_host_t tmp;
 cp

+  memset(&tmp, 0, sizeof(tmp));

   tmp.type = ADD_HOST;
   tmp.real_ip = new_host->real_ip;
   tmp.vpn_ip = new_host->vpn_ip;
   tmp.type = ADD_HOST;
   tmp.real_ip = new_host->real_ip;
   tmp.vpn_ip = new_host->vpn_ip;


@@ -154,7 +159,7 @@ cp
           tmp.vpn_ip, tmp.vpn_mask, tmp.real_ip, tmp.portnr,
           IP_ADDR_V(cl->vpn_ip));
 
           tmp.vpn_ip, tmp.vpn_mask, tmp.real_ip, tmp.portnr,
           IP_ADDR_V(cl->vpn_ip));
 

-  if((send(cl->meta_socket, (unsigned char*)&tmp, sizeof(add_host_t), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -167,6 +172,7 @@ int send_key_changed(conn_list_t *cl, conn_list_t *src)
 {
   key_changed_t tmp;
 cp
 {
   key_changed_t tmp;
 cp

+  memset(&tmp, 0, sizeof(tmp));

   tmp.type = KEY_CHANGED;
   tmp.from = src->vpn_ip;
 
   tmp.type = KEY_CHANGED;
   tmp.from = src->vpn_ip;
 


@@ -174,7 +180,7 @@ cp
     syslog(LOG_DEBUG, "Sending KEY_CHANGED (%lx) to " IP_ADDR_S,
           tmp.from, IP_ADDR_V(cl->vpn_ip));
 
     syslog(LOG_DEBUG, "Sending KEY_CHANGED (%lx) to " IP_ADDR_S,
           tmp.from, IP_ADDR_V(cl->vpn_ip));
 

-  if((send(cl->meta_socket, (unsigned char*)&tmp, sizeof(key_changed_t), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -197,6 +203,7 @@ int send_basic_info(conn_list_t *cl)
 {
   basic_info_t tmp;
 cp
 {
   basic_info_t tmp;
 cp

+  memset(&tmp, 0, sizeof(tmp));

   tmp.type = BASIC_INFO;
   tmp.protocol = PROT_CURRENT;
 
   tmp.type = BASIC_INFO;
   tmp.protocol = PROT_CURRENT;
 


@@ -209,7 +216,7 @@ cp
           tmp.protocol, tmp.portnr, IP_ADDR_V(tmp.vpn_ip), IP_ADDR_V(tmp.vpn_mask),
           IP_ADDR_V(cl->real_ip));
 
           tmp.protocol, tmp.portnr, IP_ADDR_V(tmp.vpn_ip), IP_ADDR_V(tmp.vpn_mask),
           IP_ADDR_V(cl->real_ip));
 

-  if((send(cl->meta_socket, &tmp, sizeof(tmp), 0)) < 0)
+  if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -222,6 +229,7 @@ int send_passphrase(conn_list_t *cl)
 {
   passphrase_t tmp;
 cp
 {
   passphrase_t tmp;
 cp

+  memset(&tmp, 0, sizeof(tmp));

   tmp.type = PASSPHRASE;
   encrypt_passphrase(&tmp);
 
   tmp.type = PASSPHRASE;
   encrypt_passphrase(&tmp);
 


@@ -229,7 +237,7 @@ cp
     syslog(LOG_DEBUG, "Send PASSPHRASE(%hd,...) to " IP_ADDR_S, tmp.len,
           IP_ADDR_V(cl->vpn_ip));
 
     syslog(LOG_DEBUG, "Send PASSPHRASE(%hd,...) to " IP_ADDR_S, tmp.len,
           IP_ADDR_V(cl->vpn_ip));
 

-  if((send(cl->meta_socket, &tmp, tmp.len+3, 0)) < 0)
+  if((write(cl->meta_socket, &tmp, tmp.len+3)) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -242,7 +250,8 @@ int send_public_key(conn_list_t *cl)
 {
   public_key_t *tmp;
 cp
 {
   public_key_t *tmp;
 cp

-  tmp = (public_key_t*)xmalloc(strlen(my_public_key_base36)+sizeof(public_key_t));
+  tmp = (public_key_t*)xmalloc(strlen(my_public_key_base36)+sizeof(*tmp));
+  memset(tmp, 0, sizeof(*tmp));

   tmp->type = PUBLIC_KEY;
   tmp->len = strlen(my_public_key_base36);
   strcpy(&tmp->key, my_public_key_base36);
   tmp->type = PUBLIC_KEY;
   tmp->len = strlen(my_public_key_base36);
   strcpy(&tmp->key, my_public_key_base36);


@@ -251,7 +260,7 @@ cp
     syslog(LOG_DEBUG, "Send PUBLIC_KEY(%hd,%s) to " IP_ADDR_S, tmp->len, &tmp->key,
           IP_ADDR_V(cl->vpn_ip));
 
     syslog(LOG_DEBUG, "Send PUBLIC_KEY(%hd,%s) to " IP_ADDR_S, tmp->len, &tmp->key,
           IP_ADDR_V(cl->vpn_ip));
 

-  if((send(cl->meta_socket, tmp, tmp->len+sizeof(public_key_t), 0)) < 0)
+  if((write(cl->meta_socket, tmp, tmp->len+sizeof(*tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -264,12 +273,13 @@ int send_calculate(conn_list_t *cl, char *k)
 {
   calculate_t *tmp;
 cp
 {
   calculate_t *tmp;
 cp

-  tmp = xmalloc(strlen(k)+sizeof(calculate_t));
+  tmp = xmalloc(strlen(k)+sizeof(*tmp));
+  memset(tmp, 0, sizeof(*tmp));

   tmp->type = CALCULATE;
   tmp->len = strlen(k);
   strcpy(&tmp->key, k);
 
   tmp->type = CALCULATE;
   tmp->len = strlen(k);
   strcpy(&tmp->key, k);
 

-  if(send(cl->meta_socket, tmp, tmp->len+4, 0) < 0)
+  if((write(cl->meta_socket, tmp, tmp->len+sizeof(*tmp))) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -283,7 +293,8 @@ int send_key_request(ip_t to)
   key_req_t *tmp;
   conn_list_t *fw;
 cp
   key_req_t *tmp;
   conn_list_t *fw;
 cp

-  tmp = xmalloc(sizeof(key_req_t));
+  tmp = xmalloc(sizeof(*tmp));
+  memset(tmp, 0, sizeof(*tmp));

   tmp->type = REQ_KEY;
   tmp->to = to;
   tmp->from = myself->vpn_ip;
   tmp->type = REQ_KEY;
   tmp->to = to;
   tmp->from = myself->vpn_ip;


@@ -300,7 +311,7 @@ cp
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Sending out request for public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Sending out request for public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));

-  if(send(fw->nexthop->meta_socket, tmp, sizeof(key_req_t), 0) < 0)
+  if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -315,27 +326,30 @@ int send_key_answer(conn_list_t *cl, ip_t to)
   key_req_t *tmp;
   conn_list_t *fw;
 cp
   key_req_t *tmp;
   conn_list_t *fw;
 cp

-  tmp = xmalloc(sizeof(key_req_t)+strlen(my_public_key_base36));
+  tmp = xmalloc(sizeof(*tmp)+strlen(my_public_key_base36));
+  memset(tmp, 0, sizeof(*tmp));

   tmp->type = ANS_KEY;
   tmp->to = to;
   tmp->from = myself->vpn_ip;
   tmp->expiry = my_key_expiry;
   tmp->len = strlen(my_public_key_base36);
   tmp->type = ANS_KEY;
   tmp->to = to;
   tmp->from = myself->vpn_ip;
   tmp->expiry = my_key_expiry;
   tmp->len = strlen(my_public_key_base36);

-  strcpy(&tmp->key, my_public_key_base36);
+  strcpy(&(tmp->key), my_public_key_base36);

 
   fw = lookup_conn(to);
   
   if(!fw)
 
   fw = lookup_conn(to);
   
   if(!fw)

-  {
-    syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
-          IP_ADDR_V(to));
-    return -1;
-  }
-  
-  if(debug_lvl > 2)
+    {
+      syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
+            IP_ADDR_V(to));
+      return -1;
+    }
+
+cp
+ if(debug_lvl > 2)

     syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));
     syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));

-  if(send(fw->nexthop->meta_socket, tmp, sizeof(key_req_t)+tmp->len, 0) < 0)
+cp
+  if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)+tmp->len) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -380,14 +394,20 @@ cp
   The incoming request handlers
 */
 
   The incoming request handlers
 */
 

-int basic_info_h(conn_list_t *cl, unsigned char *d, int len)
+int basic_info_h(conn_list_t *cl)

 {
 {

-  basic_info_t *tmp = (basic_info_t*)d;
+  basic_info_t tmp;

 cp
 cp

-  cl->protocol_version = tmp->protocol;
-  cl->port = tmp->portnr;
-  cl->vpn_ip = tmp->vpn_ip;
-  cl->vpn_mask = tmp->vpn_mask;
+  if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+
+  cl->protocol_version = tmp.protocol;
+  cl->port = tmp.portnr;
+  cl->vpn_ip = tmp.vpn_ip;
+  cl->vpn_mask = tmp.vpn_mask;

 
   if(cl->protocol_version < PROT_CURRENT)
     {
 
   if(cl->protocol_version < PROT_CURRENT)
     {


@@ -421,15 +441,34 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int passphrase_h(conn_list_t *cl, unsigned char *d, int len)
+int passphrase_h(conn_list_t *cl)

 {
 {

-  passphrase_t *tmp = (passphrase_t*)d;
+  char unused;
+  unsigned short int len;

 cp
 cp

-  cl->pp = xmalloc(tmp->len+3);
-  memcpy(cl->pp, tmp, tmp->len+3);
+  if(read(cl->meta_socket, &unused, sizeof(unused)) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+
+  if(read(cl->meta_socket, &len, sizeof(len)) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+  
+  cl->pp = xmalloc(len+4);

 
 

+  cl->pp->len = len;
+  if(read(cl->meta_socket, &(cl->pp->phrase), len) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+  

   if(debug_lvl > 2)
   if(debug_lvl > 2)

-    syslog(LOG_DEBUG, "got PASSPHRASE(%hd,...)", cl->pp->len);
+    syslog(LOG_DEBUG, "got PASSPHRASE(%hd,...)", len);

 
   if(cl->status.outgoing)
     send_passphrase(cl);
 
   if(cl->status.outgoing)
     send_passphrase(cl);


@@ -439,16 +478,33 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int public_key_h(conn_list_t *cl, unsigned char *d, int len)
+int public_key_h(conn_list_t *cl)

 {
   char *g_n;
 {
   char *g_n;

-  public_key_t *tmp = (public_key_t*)d;
+  unsigned short int len;
+  char unused;

 cp
 cp

-  if(debug_lvl > 2)
-    syslog(LOG_DEBUG, "got PUBLIC_KEY(%hd,%s)", tmp->len, &tmp->key);
+  if(read(cl->meta_socket, &unused, sizeof(unused)) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+  if(read(cl->meta_socket, &len, sizeof(len)) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }

 
 

-  g_n = xmalloc(tmp->len+1);
-  strcpy(g_n, &tmp->key);
+  g_n = xmalloc(len+2);
+
+  if(read(cl->meta_socket, g_n, len+2) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+
+  if(debug_lvl > 2)
+    syslog(LOG_DEBUG, "got PUBLIC_KEY(%hd,%s)", len, g_n);

 
   if(verify_passphrase(cl, g_n))
     {
 
   if(verify_passphrase(cl, g_n))
     {


@@ -472,7 +528,7 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int ack_h(conn_list_t *cl, unsigned char *d, int len)
+int ack_h(conn_list_t *cl)

 {
 cp
   if(debug_lvl > 2)
 {
 cp
   if(debug_lvl > 2)


@@ -480,28 +536,11 @@ cp
   
   cl->status.active = 1;
   syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);
   
   cl->status.active = 1;
   syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);

-
-  /*
-                        === FIXME ===
-    Now I'm going to cheat. The meta protocol is actually
-    a stream of requests, that may come in in the same TCP
-    packet. This is the only place that it will happen,
-    though.
-    I may change it in the future, if it appears that this
-    is not retainable.
-  */
-  if(len > 1) /* An ADD_HOST follows */
-    {
-      if(request_handlers[d[1]] == NULL)
-       syslog(LOG_ERR, "Unknown request %d.", d[1]);
-      if(request_handlers[d[1]](cl, d + 1, len - 1) < 0)
-       return -1;
-    }

 cp
   return 0;
 }
 
 cp
   return 0;
 }
 

-int termreq_h(conn_list_t *cl, unsigned char *d, int len)
+int termreq_h(conn_list_t *cl)

 {
 cp
   syslog(LOG_NOTICE, IP_ADDR_S " wants to quit", IP_ADDR_V(cl->vpn_ip));
 {
 cp
   syslog(LOG_NOTICE, IP_ADDR_S " wants to quit", IP_ADDR_V(cl->vpn_ip));


@@ -513,7 +552,7 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int timeout_h(conn_list_t *cl, unsigned char *d, int len)
+int timeout_h(conn_list_t *cl)

 {
 cp
   syslog(LOG_NOTICE, IP_ADDR_S " says it's gotten a timeout from us", IP_ADDR_V(cl->vpn_ip));
 {
 cp
   syslog(LOG_NOTICE, IP_ADDR_S " says it's gotten a timeout from us", IP_ADDR_V(cl->vpn_ip));


@@ -523,19 +562,25 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int del_host_h(conn_list_t *cl, unsigned char *d, int len)
+int del_host_h(conn_list_t *cl)

 {
 {

-  del_host_t *tmp = (del_host_t*)d;
+  del_host_t tmp;

   conn_list_t *fw;
 cp
   conn_list_t *fw;
 cp

+  if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+

   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "got DEL_HOST for " IP_ADDR_S,
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "got DEL_HOST for " IP_ADDR_S,

-          IP_ADDR_V(tmp->vpn_ip));
+          IP_ADDR_V(tmp.vpn_ip));

 
 

-  if(!(fw = lookup_conn(tmp->vpn_ip)))
+  if(!(fw = lookup_conn(tmp.vpn_ip)))

     {
       syslog(LOG_ERR, "Somebody wanted to delete " IP_ADDR_S " which does not exist?",
     {
       syslog(LOG_ERR, "Somebody wanted to delete " IP_ADDR_S " which does not exist?",

-            IP_ADDR_V(tmp->vpn_ip));
+            IP_ADDR_V(tmp.vpn_ip));

       return 0;
     }
 
       return 0;
     }
 


@@ -547,7 +592,7 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int ping_h(conn_list_t *cl, unsigned char *d, int len)
+int ping_h(conn_list_t *cl)

 {
 cp
   if(debug_lvl > 3)
 {
 cp
   if(debug_lvl > 3)


@@ -560,7 +605,7 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int pong_h(conn_list_t *cl, unsigned char *d, int len)
+int pong_h(conn_list_t *cl)

 {
 cp
   if(debug_lvl > 3)
 {
 cp
   if(debug_lvl > 3)


@@ -570,81 +615,84 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int add_host_h(conn_list_t *cl, unsigned char *d, int len)
+int add_host_h(conn_list_t *cl)

 {
 {

-  add_host_t *tmp = (add_host_t*)d;
+  add_host_t tmp;

   conn_list_t *ncn, *fw;
 cp
   conn_list_t *ncn, *fw;
 cp

+  if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+

   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Add host request from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "got ADD_HOST(" IP_ADDR_S "," IP_ADDR_S ",%hd)",
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Add host request from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "got ADD_HOST(" IP_ADDR_S "," IP_ADDR_S ",%hd)",

-          IP_ADDR_V(tmp->vpn_ip), IP_ADDR_V(tmp->vpn_mask), tmp->portnr);
+          IP_ADDR_V(tmp.vpn_ip), IP_ADDR_V(tmp.vpn_mask), tmp.portnr);

 
   /*
     Suggestion of Hans Bayle
   */
 
   /*
     Suggestion of Hans Bayle
   */

-  if((fw = lookup_conn(tmp->vpn_ip)))
+  if((fw = lookup_conn(tmp.vpn_ip)))

     {
       notify_others(fw, cl, send_add_host);
       return 0;
     }
 
   ncn = new_conn_list();
     {
       notify_others(fw, cl, send_add_host);
       return 0;
     }
 
   ncn = new_conn_list();

-  ncn->real_ip = tmp->real_ip;
-  ncn->vpn_ip = tmp->vpn_ip;
-  ncn->vpn_mask = tmp->vpn_mask;
-  ncn->port = tmp->portnr;
-  ncn->hostname = hostlookup(tmp->real_ip);
+  ncn->real_ip = tmp.real_ip;
+  ncn->vpn_ip = tmp.vpn_ip;
+  ncn->vpn_mask = tmp.vpn_mask;
+  ncn->port = tmp.portnr;
+  ncn->hostname = hostlookup(tmp.real_ip);

   ncn->nexthop = cl;
   ncn->next = conn_list;
   conn_list = ncn;
   ncn->status.active = 1;
   notify_others(ncn, cl, send_add_host);
   ncn->nexthop = cl;
   ncn->next = conn_list;
   conn_list = ncn;
   ncn->status.active = 1;
   notify_others(ncn, cl, send_add_host);

-
-  /*
-    again, i'm cheating here. see the comment in ack_h.
-    Naughty zarq! Now you see what cheating will get you... [GS]
-  */
-  if(len > sizeof(add_host_t)) /* Another ADD_HOST follows */
-    {
-      if(request_handlers[d[sizeof(add_host_t)]] == NULL)
-       syslog(LOG_ERR, "Unknown request %d.", d[sizeof(add_host_t)]);
-      if(request_handlers[d[sizeof(add_host_t)]](cl, d + sizeof(add_host_t), len - sizeof(add_host_t)) < 0)
-       return -1;
-    }

 cp
   return 0;
 }
 
 cp
   return 0;
 }
 

-int req_key_h(conn_list_t *cl, unsigned char *d, int len)
+int req_key_h(conn_list_t *cl)

 {
 {

-  key_req_t *tmp = (key_req_t*)d;
+  key_req_t tmp;

   conn_list_t *fw;
 cp
   conn_list_t *fw;
 cp

+  if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+

   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "got REQ_KEY from " IP_ADDR_S " for " IP_ADDR_S,
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "got REQ_KEY from " IP_ADDR_S " for " IP_ADDR_S,

-          IP_ADDR_V(tmp->from), IP_ADDR_V(tmp->to));
+          IP_ADDR_V(tmp.from), IP_ADDR_V(tmp.to));

 
 

-  if((tmp->to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
+  if((tmp.to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))

     {  /* hey! they want something from ME! :) */
     {  /* hey! they want something from ME! :) */

-      send_key_answer(cl, tmp->from);
+      send_key_answer(cl, tmp.from);

       return 0;
     }
 
       return 0;
     }
 

-  fw = lookup_conn(tmp->to);
+  fw = lookup_conn(tmp.to);

   
   if(!fw)
   
   if(!fw)

-  {
-    syslog(LOG_ERR, "Attempting to forward key request to " IP_ADDR_S ", which does not exist?",
-          IP_ADDR_V(tmp->to));
-    return -1;
-  }
+    {
+      syslog(LOG_ERR, "Attempting to forward key request to " IP_ADDR_S ", which does not exist?",
+            IP_ADDR_V(tmp.to));
+      return -1;
+    }

 
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));
 
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));

-  if(send(fw->nexthop->meta_socket, tmp, sizeof(key_req_t), 0) < 0)
+  
+  tmp.type = REQ_KEY;
+  tmp.key = 0;
+  if(write(fw->nexthop->meta_socket, &tmp, sizeof(tmp)) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -653,13 +701,13 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-void set_keys(conn_list_t *cl, key_req_t *k)
+void set_keys(conn_list_t *cl, key_req_t *k, char *key)

 {
   char *ek;
 cp
   if(!cl->public_key)
     {
 {
   char *ek;
 cp
   if(!cl->public_key)
     {

-      cl->public_key = xmalloc(sizeof(enc_key_t));
+      cl->public_key = xmalloc(sizeof(*cl->key));

       cl->public_key->key = NULL;
     }
   if(cl->public_key->key)
       cl->public_key->key = NULL;
     }
   if(cl->public_key->key)


@@ -667,12 +715,12 @@ cp
   cl->public_key->length = k->len;
   cl->public_key->expiry = k->expiry;
   cl->public_key->key = xmalloc(k->len + 1);
   cl->public_key->length = k->len;
   cl->public_key->expiry = k->expiry;
   cl->public_key->key = xmalloc(k->len + 1);

-  strcpy(cl->public_key->key, &(k->key));
+  strcpy(cl->public_key->key, key);

 
 

-  ek = make_shared_key(&(k->key));
+  ek = make_shared_key(key);

   if(!cl->key)
     {
   if(!cl->key)
     {

-      cl->key = xmalloc(sizeof(enc_key_t));
+      cl->key = xmalloc(sizeof(*cl->key));

       cl->key->key = NULL;
     }
   if(cl->key->key)
       cl->key->key = NULL;
     }
   if(cl->key->key)


@@ -684,48 +732,69 @@ cp
 cp
 }
 
 cp
 }
 

-int ans_key_h(conn_list_t *cl, unsigned char *d, int len)
+int ans_key_h(conn_list_t *cl)

 {
 {

-  key_req_t *tmp = (key_req_t*)d;
+  key_req_t tmp;

   conn_list_t *fw, *gk;
   conn_list_t *fw, *gk;

+  char *key;

 cp
 cp

+  if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-2) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+
+  key = xmalloc(tmp.len);
+
+  if(read(cl->meta_socket, key, tmp.len + 1) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+

   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S,
   if(debug_lvl > 3)
     syslog(LOG_DEBUG, "got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S,

-          IP_ADDR_V(tmp->from), IP_ADDR_V(tmp->to));
+          IP_ADDR_V(tmp.from), IP_ADDR_V(tmp.to));

 
 

-  if(tmp->to == myself->vpn_ip)
+  if(tmp.to == myself->vpn_ip)

     {  /* hey! that key's for ME! :) */
       if(debug_lvl > 2)
        syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it.");
     {  /* hey! that key's for ME! :) */
       if(debug_lvl > 2)
        syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it.");

-      gk = lookup_conn(tmp->from);
+      gk = lookup_conn(tmp.from);

 
       if(!gk)
         {
           syslog(LOG_ERR, "Receiving key from " IP_ADDR_S ", which does not exist?",
 
       if(!gk)
         {
           syslog(LOG_ERR, "Receiving key from " IP_ADDR_S ", which does not exist?",

-                IP_ADDR_V(tmp->from));
+                IP_ADDR_V(tmp.from));

           return -1;
         }
 
           return -1;
         }
 

-      set_keys(gk, tmp);
+      set_keys(gk, &tmp, key);

       gk->status.validkey = 1;
       gk->status.waitingforkey = 0;
       flush_queues(gk);
       return 0;
     }
 
       gk->status.validkey = 1;
       gk->status.waitingforkey = 0;
       flush_queues(gk);
       return 0;
     }
 

-  fw = lookup_conn(tmp->to);
+  fw = lookup_conn(tmp.to);

   
   if(!fw)
   
   if(!fw)

-  {
-    syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?",
-          IP_ADDR_V(tmp->to));
-    return -1;
-  }
+    {
+      syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?",
+            IP_ADDR_V(tmp.to));
+      return -1;
+    }

 
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));
 
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));

-  if(send(fw->nexthop->meta_socket, tmp, sizeof(key_req_t)+tmp->len, 0) < 0)
+  tmp.type = ANS_KEY;
+  if(write(fw->nexthop->meta_socket, &tmp, sizeof(tmp) -1) < 0)
+    {
+      syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+      return -1;
+    }
+  if(write(fw->nexthop->meta_socket, key, tmp.len + 1) < 0)

     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;
     {
       syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
       return -1;


@@ -734,21 +803,27 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int key_changed_h(conn_list_t *cl, unsigned char *d, int len)
+int key_changed_h(conn_list_t *cl)

 {
 {

-  key_changed_t *tmp = (key_changed_t*)d;
+  key_changed_t tmp;

   conn_list_t *ik;
 cp
   conn_list_t *ik;
 cp

+  if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)-1) <= 0)
+    {
+      syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
+      return -1;
+    }
+

   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "got KEY_CHANGED from " IP_ADDR_S,
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "got KEY_CHANGED from " IP_ADDR_S,

-          IP_ADDR_V(tmp->from));
+          IP_ADDR_V(tmp.from));

 
 

-  ik = lookup_conn(tmp->from);
+  ik = lookup_conn(tmp.from);

 
   if(!ik)
     {
       syslog(LOG_ERR, "Got changed key from " IP_ADDR_S ", which does not exist?",
 
   if(!ik)
     {
       syslog(LOG_ERR, "Got changed key from " IP_ADDR_S ", which does not exist?",

-            IP_ADDR_V(tmp->from));
+            IP_ADDR_V(tmp.from));

       return -1;
     }
 
       return -1;
     }
 


@@ -763,7 +838,7 @@ cp
   return 0;
 }
 
   return 0;
 }
 

-int (*request_handlers[256])(conn_list_t*, unsigned char*, int) = {
+int (*request_handlers[256])(conn_list_t*) = {

   0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,