Got rid of the nasty hacks... and replaced it by another one.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index be601b4..68ac136 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,7 +326,8 @@ 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->type = ANS_KEY;
   tmp->to = to;
   tmp->from = myself->vpn_ip;


@@ -335,7 +347,7 @@ cp
   if(debug_lvl > 2)
     syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S,
           IP_ADDR_V(fw->nexthop->vpn_ip));
   if(debug_lvl > 2)
     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)
+  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;


@@ -480,23 +492,6 @@ 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;
 }


@@ -601,18 +596,6 @@ cp
   conn_list = ncn;
   ncn->status.active = 1;
   notify_others(ncn, cl, send_add_host);
   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;
 }


@@ -635,16 +618,16 @@ cp
   fw = lookup_conn(tmp->to);
   
   if(!fw)
   fw = lookup_conn(tmp->to);
   
   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)
+  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;


@@ -659,7 +642,7 @@ void set_keys(conn_list_t *cl, key_req_t *k)
 cp
   if(!cl->public_key)
     {
 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)


@@ -672,7 +655,7 @@ cp
   ek = make_shared_key(&(k->key));
   if(!cl->key)
     {
   ek = make_shared_key(&(k->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)


@@ -725,7 +708,7 @@ cp
   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)
+  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;