From 4dee76522e177dcb4af5d6d844a5f3b74070e4b7 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 25 May 2001 08:36:11 +0000 Subject: [PATCH] Small fixes: - Fix compiler warnings (one was a real (but harmless) bug) - Don't send PING packets if there is UDP traffic - Correctly terminate strings containing salt for PING/PONG packets --- src/meta.c | 3 +-- src/net.c | 14 +++++++++----- src/protocol.c | 4 +++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/meta.c b/src/meta.c index ecf875c7..87cb415d 100644 --- a/src/meta.c +++ b/src/meta.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: meta.c,v 1.1.2.16 2001/03/12 23:58:19 guus Exp $ + $Id: meta.c,v 1.1.2.17 2001/05/25 08:36:11 guus Exp $ */ #include "config.h" @@ -93,7 +93,6 @@ int receive_meta(connection_t *cl) int oldlen, i; int lenin = 0; char inbuf[MAXBUFSIZE]; - char *bufp; int decrypted = 0; cp if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) diff --git a/src/net.c b/src/net.c index c3f89ca5..68080fde 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.105 2001/05/07 19:08:43 guus Exp $ + $Id: net.c,v 1.35.4.106 2001/05/25 08:36:11 guus Exp $ */ #include "config.h" @@ -848,11 +848,13 @@ cp cfg = get_config_val(upstreamcfg, config_connectto); if(!cfg) - if(upstreamcfg == config) { - /* No upstream IP given, we're listen only. */ - signal(SIGALRM, SIG_IGN); - return; + if(upstreamcfg == config) + { + /* No upstream IP given, we're listen only. */ + signal(SIGALRM, SIG_IGN); + return; + } } else { @@ -1075,6 +1077,8 @@ cp return; } + cl->last_ping_time = time(NULL); + receive_udppacket(cl, &pkt); cp } diff --git a/src/protocol.c b/src/protocol.c index be3b5d1c..52300632 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.89 2001/05/24 21:52:26 guus Exp $ + $Id: protocol.c,v 1.28.4.90 2001/05/25 08:36:11 guus Exp $ */ #include "config.h" @@ -1068,6 +1068,7 @@ cp cl->last_ping_time = time(NULL); RAND_bytes(salt, SALTLEN); bin2hex(salt, salt, SALTLEN); + salt[SALTLEN*2] = '\0'; cp return send_request(cl, "%d %s", PING, salt); } @@ -1084,6 +1085,7 @@ int send_pong(connection_t *cl) cp RAND_bytes(salt, SALTLEN); bin2hex(salt, salt, SALTLEN); + salt[SALTLEN*2] = '\0'; cp return send_request(cl, "%d %s", PONG, salt); } -- 2.39.5