j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Removed calling add_queue for tcponly packets.

Browse source
This commit is contained in:
Guus Sliepen 2000-08-08 13:47:57 +00:00
parent ac73c72488
commit ff87f385c3
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "config.h"
@ -129,18 +129,17 @@ int xrecv(conn_list_t *cl, void *packet)
int lenin; int lenin;
cp cp
do_decrypt((real_packet_t*)packet, &vp, cl->key); do_decrypt((real_packet_t*)packet, &vp, cl->key);
cp
add_mac_addresses(&vp); add_mac_addresses(&vp);
cp
if(debug_lvl > 3) if(debug_lvl > 3)
syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"), syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
((real_packet_t*)packet)->len, cl->vpn_hostname, cl->real_hostname); ((real_packet_t*)packet)->len, cl->vpn_hostname, cl->real_hostname);
cp
if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0) if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
syslog(LOG_ERR, _("Can't write to tap device: %m")); syslog(LOG_ERR, _("Can't write to tap device: %m"));
else else
total_tap_out += lenin; total_tap_out += lenin;
cp
cl->want_ping = 0; cl->want_ping = 0;
cl->last_ping_time = time(NULL); cl->last_ping_time = time(NULL);
cp cp

22
src/protocol.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "config.h"
@ -126,7 +126,7 @@ cp
int send_tcppacket(conn_list_t *cl, void *data, int len) int send_tcppacket(conn_list_t *cl, void *data, int len)
{ {
cp cp
if(debug_lvl > 1) if(debug_lvl > 3)
syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"), syslog(LOG_DEBUG, _("Sending PACKET to %s (%s)"),
cl->vpn_hostname, cl->real_hostname); cl->vpn_hostname, cl->real_hostname);
@ -140,7 +140,7 @@ cp
if((write(cl->meta_socket, data, len)) != len) 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; return -1;
} }
@ -686,17 +686,23 @@ cp
return -1; return -1;
} }
if(len>1600) if(len > MTU)
{ {
syslog(LOG_ERR, _("Got too big PACKET from %s (%s)"), syslog(LOG_ERR, _("Got too big PACKET from %s (%s)"),
cl->vpn_hostname, cl->real_hostname); cl->vpn_hostname, cl->real_hostname);
return -1; 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 */ /* Evil kludge comming up */
while(len) 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); result=read(cl->meta_socket,((char *)&rp)+count,len);
if(result<0) if(result<0)
{ {
@ -708,10 +714,6 @@ cp
len-=result; 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; total_socket_in += len;
rp.data.len = ntohs(rp.data.len); rp.data.len = ntohs(rp.data.len);
@ -732,7 +734,7 @@ cp
xrecv(f, &rp); xrecv(f, &rp);
else 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) if(!cl->status.waitingforkey)
send_key_request(rp.from); send_key_request(rp.from);
} }