From: Guus Sliepen <guus@tinc-vpn.org>
Date: Tue, 8 Aug 2000 13:47:57 +0000 (+0000)
Subject: Removed calling add_queue for tcponly packets.
X-Git-Tag: release-1.0pre3~144
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=ff87f385c3a81499eff6b848aed8548cf6e5132e;p=tinc

Removed calling add_queue for tcponly packets.
---

diff --git a/src/net.c b/src/net.c
index da39686d..c2cbfa6c 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.22 2000/08/07 16:27:28 guus Exp $
+    $Id: net.c,v 1.35.4.23 2000/08/08 13:47:56 guus Exp $
 */
 
 #include "config.h"
@@ -129,18 +129,17 @@ int xrecv(conn_list_t *cl, void *packet)
   int lenin;
 cp
   do_decrypt((real_packet_t*)packet, &vp, cl->key);
-cp
   add_mac_addresses(&vp);
-cp
+
   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);
-cp
+
   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;
-cp
+
   cl->want_ping = 0;
   cl->last_ping_time = time(NULL);
 cp
diff --git a/src/protocol.c b/src/protocol.c
index 7bd64cc9..2416599d 100644
--- 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.22 2000/08/08 08:48:50 guus Exp $
+    $Id: protocol.c,v 1.28.4.23 2000/08/08 13:47:57 guus Exp $
 */
 
 #include "config.h"
@@ -126,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);
 
@@ -140,7 +140,7 @@ cp
 
   if((write(cl->meta_socket, data, len)) != len)
     {
-      syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
+      syslog(LOG_ERR, _("Sending PACKET data failed: %s:%d: %m"), __FILE__, __LINE__);
       return -1;
     }
   
@@ -686,17 +686,23 @@ 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 > 3)
+    syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len,
+              cl->vpn_hostname, cl->real_hostname);
+
   /* Evil kludge comming up */
   while(len)
     {
-       syslog(LOG_DEBUG, _("Direct read count=%d len=%d rp=%p socket=%d"), count, len, ((char *)&rp)+count, cl->meta_socket);
+       if(debug_lvl > 3)
+         syslog(LOG_DEBUG, _("Direct read count=%d len=%d rp=%p socket=%d"), count, len, ((char *)&rp)+count, cl->meta_socket);
+
        result=read(cl->meta_socket,((char *)&rp)+count,len);
        if(result<0)
          {
@@ -708,10 +714,6 @@ cp
        len-=result;
     }
 
-  if(debug_lvl > 3)
-    syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len,
-              cl->vpn_hostname, cl->real_hostname);
-
   total_socket_in += len;
 
   rp.data.len = ntohs(rp.data.len);
@@ -732,7 +734,7 @@ cp
 	xrecv(f, &rp);
       else
 	{
-	  add_queue(&(f->rq), &rp, rp.len);
+/*	  add_queue(&(f->rq), &rp, rp.len);  We can't do this since rp is on the stack */
 	  if(!cl->status.waitingforkey)
 	    send_key_request(rp.from);
 	}