From 04cb206298df033d254ca007205d13f9a670c402 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 26 Jun 2000 20:30:21 +0000 Subject: [PATCH] - Moved all connection messages to debug level 1, without -d's only the startup message will be logged. - Fixed DEL_HOST rebound. --- src/net.c | 13 ++++++++++--- src/protocol.c | 12 ++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/net.c b/src/net.c index 31acd389..6457d4c9 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.7 2000/06/26 19:39:34 guus Exp $ + $Id: net.c,v 1.35.4.8 2000/06/26 20:30:20 guus Exp $ */ #include "config.h" @@ -772,7 +772,8 @@ cp p->last_ping_time = time(NULL); p->want_ping = 0; - syslog(LOG_NOTICE, _("Connection from %s port %d"), + if(debug_lvl > 0) + syslog(LOG_NOTICE, _("Connection from %s port %d"), p->hostname, htons(ci.sin_port)); if(send_basic_info(p) < 0) @@ -902,9 +903,15 @@ cp syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds")); } - cl->status.active = 0; cl->status.remove = 1; + /* If this cl isn't active, don't send any DEL_HOSTs and don't bother + checking for other lost connections. */ + if(!cl->status.active) + return; + + cl->status.active = 0; + cp /* Find all connections that were lost because they were behind cl (the connection that was dropped). */ diff --git a/src/protocol.c b/src/protocol.c index b918d5b1..c843b56a 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.8 2000/06/26 19:39:34 guus Exp $ + $Id: protocol.c,v 1.28.4.9 2000/06/26 20:30:21 guus Exp $ */ #include "config.h" @@ -62,7 +62,8 @@ cp return -1; } - syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"), + if(debug_lvl > 0) + syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"), IP_ADDR_V(cl->vpn_ip), cl->hostname); cp return 0; @@ -527,11 +528,12 @@ cp IP_ADDR_V(cl->vpn_ip), cl->hostname); cl->status.termreq = 1; - cl->status.active = 0; if(cl->status.active) notify_others(cl, NULL, send_del_host); + cl->status.active = 0; + terminate_connection(cl); cp return 0; @@ -587,9 +589,11 @@ cp return 0; } - notify_others(cl, fw, send_del_host); + notify_others(fw, cl, send_del_host); fw->status.termreq = 1; + fw->status.active = 0; + terminate_connection(fw); cp return 0; -- 2.20.1