- Moved TCP packet reception to meta handler: less kludgy and less buggy!

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index a3fa5f1..d5bb675 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.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: protocol.c,v 1.28.4.20 2000/08/07 14:52:15 guus Exp $
+    $Id: protocol.c,v 1.28.4.24 2000/08/08 17:07:48 guus Exp $
 */
 
 #include "config.h"
@@ -34,6 +34,8 @@
 #include <utils.h>
 #include <xalloc.h>
 
+#include <netinet/in.h>
+
 #include "conf.h"
 #include "encr.h"
 #include "net.h"
@@ -124,7 +126,7 @@ cp
 int send_tcppacket(conn_list_t *cl, void *data, int len)
 {
 cp
-  if(debug_lvl > 1)
+  if(debug_lvl > 3)
     syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"),
           cl->vpn_hostname, cl->real_hostname);
 
@@ -135,13 +137,12 @@ cp
       syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-
+    
   if((write(cl->meta_socket, data, len)) < 0)
     {
       syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
-  
 cp
   return 0;
 }
@@ -445,7 +446,7 @@ cp
          is not desirable.
        */
        
-      if(old=lookup_conn(cl->vpn_ip))
+      if((old=lookup_conn(cl->vpn_ip)))
         {
           if(debug_lvl>0)
             syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"),
@@ -531,7 +532,7 @@ cp
          old connection that has timed out but we don't know it yet.
        */
 
-      while(old = lookup_conn(cl->vpn_ip)) 
+      while((old = lookup_conn(cl->vpn_ip))) 
         {
           if(debug_lvl > 1)
             syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
@@ -666,7 +667,6 @@ cp
 
 int tcppacket_h(conn_list_t *cl)
 {
-  char packet[1600];
   int len;
 cp
   if(!cl->status.active)
@@ -683,26 +683,18 @@ cp
        return -1;
     }  
 
-  if(len>1600)
+  if(len > MTU)
     {
        syslog(LOG_ERR, _("Got too big PACKET from %s (%s)"),
               cl->vpn_hostname, cl->real_hostname);
        return -1;
     }  
 
-  if(debug_lvl > 1)
-    syslog(LOG_DEBUG, _("Got PACKET from %s (%s)"),
+  if(debug_lvl > 3)
+    syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len,
               cl->vpn_hostname, cl->real_hostname);
 
-  /* Evil kludge comming up */
-  if(read(cl->meta_socket,packet,len)!=len)
-    {
-       syslog(LOG_ERR, _("Error while receiving PACKET data from %s (%s)"),
-              cl->vpn_hostname, cl->real_hostname);
-       return -1;
-    }  
-
-  xrecv(cl,packet);    
+  cl->tcppacket=len;
 cp
   return 0;
 }
@@ -772,7 +764,7 @@ cp
        return -1;
     }  
 
-  if(old = lookup_conn(vpn_ip))
+  if((old = lookup_conn(vpn_ip)))
     {
       if((real_ip==old->real_ip) && (vpn_mask==old->vpn_mask) && (port==old->port))
         {
@@ -817,9 +809,9 @@ cp
     syslog(LOG_DEBUG, _("Got ADD_HOST for %s (%s) from %s (%s)"),
            ncn->vpn_hostname, ncn->real_hostname, cl->vpn_hostname, cl->real_hostname);
 
-skip_add_host:
-
   notify_others(ncn, cl, send_add_host);
+
+skip_add_host:
 cp
   return 0;
 }