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

- Moved all connection messages to debug level 1, without -d's only the

Browse source 
startup message will be logged.
- Fixed DEL_HOST rebound.
This commit is contained in:
Guus Sliepen 2000-06-26 20:30:21 +00:00
parent 783c829861
commit 04cb206298
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
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.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" #include "config.h"
@ -772,7 +772,8 @@ cp
p->last_ping_time = time(NULL); p->last_ping_time = time(NULL);
p->want_ping = 0; 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)); p->hostname, htons(ci.sin_port));
if(send_basic_info(p) < 0) if(send_basic_info(p) < 0)
@ -902,9 +903,15 @@ cp
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds")); syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
} }
cl->status.active = 0;
cl->status.remove = 1; 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 cp
/* Find all connections that were lost because they were behind cl /* Find all connections that were lost because they were behind cl
(the connection that was dropped). */ (the connection that was dropped). */

12
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.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" #include "config.h"
@ -62,7 +62,8 @@ cp
return -1; 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); IP_ADDR_V(cl->vpn_ip), cl->hostname);
cp cp
return 0; return 0;
@ -527,11 +528,12 @@ cp
IP_ADDR_V(cl->vpn_ip), cl->hostname); IP_ADDR_V(cl->vpn_ip), cl->hostname);
cl->status.termreq = 1; cl->status.termreq = 1;
cl->status.active = 0;
if(cl->status.active) if(cl->status.active)
notify_others(cl, NULL, send_del_host); notify_others(cl, NULL, send_del_host);
cl->status.active = 0;
terminate_connection(cl); terminate_connection(cl);
cp cp
return 0; return 0;
@ -587,9 +589,11 @@ cp
return 0; return 0;
} }
notify_others(cl, fw, send_del_host); notify_others(fw, cl, send_del_host);
fw->status.termreq = 1; fw->status.termreq = 1;
fw->status.active = 0;
terminate_connection(fw); terminate_connection(fw);
cp cp
return 0; return 0;