From 3cfc9424f255c26f2a7775b6fa059f1e3e47a76e Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 8 Aug 2000 17:07:48 +0000 Subject: [PATCH] - Moved TCP packet reception to meta handler: less kludgy and less buggy! --- src/net.c | 133 +++++++++++++++++++++++++++++++++++++------------ src/net.h | 3 +- src/protocol.c | 61 +++-------------------- 3 files changed, 111 insertions(+), 86 deletions(-) diff --git a/src/net.c b/src/net.c index c2cbfa6c..cd433d08 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.23 2000/08/08 13:47:56 guus Exp $ + $Id: net.c,v 1.35.4.24 2000/08/08 17:07:47 guus Exp $ */ #include "config.h" @@ -146,6 +146,59 @@ cp return 0; } +int tcprecv(conn_list_t *cl, real_packet_t *rp) +{ + vpn_packet_t vp; + int lenin; + conn_list_t *f; +cp + rp->data.len = ntohs(rp->data.len); + rp->len = ntohs(rp->len); + rp->from = ntohl(rp->from); + + total_socket_in += rp->len; + + if(rp->len >= 0) + { + f = lookup_conn(rp->from); + if(!f) + { + syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"), + cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp->from)); + return -1; + } + + if(f->status.validkey) + { + do_decrypt(rp, &vp, cl->key); + add_mac_addresses(&vp); + + if(debug_lvl > 3) + syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"), + rp->len, cl->vpn_hostname, cl->real_hostname); + + 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; + } + else + { + /* Can we add to queue? */ + if(!cl->status.waitingforkey) + send_key_request(rp->from); + } + + if(my_key_expiry <= time(NULL)) + regenerate_keys(); + } + + cl->want_ping = 0; + cl->last_ping_time = time(NULL); +cp + return 0; +} + /* add the given packet of size s to the queue q, be it the send or receive queue @@ -1092,53 +1145,71 @@ cp for(;;) { - cl->reqlen = 0; - - for(i = oldlen; i < cl->buflen; i++) + if(cl->tcppacket) { - if(cl->buffer[i] == '\n') + if(cl->buflen >= cl->tcppacket) + { + tcprecv(cl, (real_packet_t *)cl->buffer); + cl->buflen -= cl->tcppacket; + memmove(cl->buffer, cl->buffer + cl->tcppacket, cl->buflen); + oldlen = 0; + cl->tcppacket=0; + } + else { - cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */ - cl->reqlen = i + 1; break; } } - - if(cl->reqlen) + else { - if(debug_lvl > 2) - syslog(LOG_DEBUG, _("Got request from %s (%s): %s"), - cl->vpn_hostname, cl->real_hostname, cl->buffer); - if(sscanf(cl->buffer, "%d", &request) == 1) + cl->reqlen = 0; + + for(i = oldlen; i < cl->buflen; i++) { - if((request < 0) || (request > 255) || (request_handlers[request] == NULL)) + if(cl->buffer[i] == '\n') { - syslog(LOG_ERR, _("Unknown request from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); - return -1; + cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */ + cl->reqlen = i + 1; + break; } + } - if(request_handlers[request](cl)) /* Something went wrong. Probably scriptkiddies. Terminate. */ + if(cl->reqlen) + { + if(debug_lvl > 2) + syslog(LOG_DEBUG, _("Got request from %s (%s): %s"), + cl->vpn_hostname, cl->real_hostname, cl->buffer); + if(sscanf(cl->buffer, "%d", &request) == 1) + { + if((request < 0) || (request > 255) || (request_handlers[request] == NULL)) + { + syslog(LOG_ERR, _("Unknown request from %s (%s)"), + cl->vpn_hostname, cl->real_hostname); + return -1; + } + + if(request_handlers[request](cl)) /* Something went wrong. Probably scriptkiddies. Terminate. */ + { + syslog(LOG_ERR, _("Error while processing request from %s (%s)"), + cl->vpn_hostname, cl->real_hostname); + return -1; + } + } + else { - syslog(LOG_ERR, _("Error while processing request from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); + syslog(LOG_ERR, _("Bogus data received from %s (%s)"), + cl->vpn_hostname, cl->real_hostname); return -1; } + + cl->buflen -= cl->reqlen; + memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen); + oldlen = 0; } else { - syslog(LOG_ERR, _("Bogus data received from %s (%s)"), - cl->vpn_hostname, cl->real_hostname); - return -1; + break; } - - cl->buflen -= cl->reqlen; - memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen); - oldlen = 0; - } - else - { - break; } } diff --git a/src/net.h b/src/net.h index 41f90b09..ec88d373 100644 --- a/src/net.h +++ b/src/net.h @@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.h,v 1.9.4.8 2000/08/07 16:27:28 guus Exp $ + $Id: net.h,v 1.9.4.9 2000/08/08 17:07:48 guus Exp $ */ #ifndef __TINC_NET_H__ @@ -124,6 +124,7 @@ typedef struct conn_list_t { char buffer[MAXBUFSIZE+1]; /* metadata input buffer */ int buflen; /* bytes read into buffer */ int reqlen; /* length of first request in buffer */ + int tcppacket; /* length of incoming TCP tunnelled packet */ time_t last_ping_time; /* last time we saw some activity from the other end */ int want_ping; /* 0 if there's no need to check for activity */ struct conn_list_t *nexthop; /* nearest meta-hop in this direction */ diff --git a/src/protocol.c b/src/protocol.c index 2416599d..d5bb6759 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.23 2000/08/08 13:47:57 guus Exp $ + $Id: protocol.c,v 1.28.4.24 2000/08/08 17:07:48 guus Exp $ */ #include "config.h" @@ -132,18 +132,17 @@ cp buflen = snprintf(buffer, MAXBUFSIZE, "%d %d\n", PACKET, len); - if((write(cl->meta_socket, buffer, buflen)) != buflen) + if((write(cl->meta_socket, buffer, buflen)) < 0) { syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); return -1; } - - if((write(cl->meta_socket, data, len)) != len) + + if((write(cl->meta_socket, data, len)) < 0) { - syslog(LOG_ERR, _("Sending PACKET data failed: %s:%d: %m"), __FILE__, __LINE__); + syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__); return -1; } - cp return 0; } @@ -668,9 +667,7 @@ cp int tcppacket_h(conn_list_t *cl) { - real_packet_t rp; - int len, count = 0, result; - conn_list_t *f; + int len; cp if(!cl->status.active) { @@ -697,51 +694,7 @@ cp syslog(LOG_DEBUG, _("Got PACKET length %d from %s (%s)"), len, cl->vpn_hostname, cl->real_hostname); - /* Evil kludge comming up */ - while(len) - { - 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) - { - syslog(LOG_ERR, _("Error while receiving PACKET data from %s (%s): %m"), - cl->vpn_hostname, cl->real_hostname); - return -1; - } - count+=result; - len-=result; - } - - total_socket_in += len; - - rp.data.len = ntohs(rp.data.len); - rp.len = ntohs(rp.len); - rp.from = ntohl(rp.from); - - if(rp.len >= 0) - { - f = lookup_conn(rp.from); - if(!f) - { - syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"), - cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp.from)); - return -1; - } - - if(f->status.validkey) - xrecv(f, &rp); - else - { -/* 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); - } - - if(my_key_expiry <= time(NULL)) - regenerate_keys(); - } + cl->tcppacket=len; cp return 0; } -- 2.39.5