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

Only reset seconds_till_retry when we activate the outgoing connection.

Browse source
This commit is contained in:
Guus Sliepen 2001-06-08 18:02:10 +00:00
parent c5c02a0861
commit ba918dce28
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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.113 2001/06/05 19:45:47 guus Exp $ $Id: net.c,v 1.35.4.114 2001/06/08 18:02:10 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -99,7 +99,7 @@ int total_socket_in = 0;
int total_socket_out = 0; int total_socket_out = 0;
config_t *upstreamcfg; config_t *upstreamcfg;
static int seconds_till_retry; int seconds_till_retry = 5;
int keylifetime = 0; int keylifetime = 0;
int keyexpires = 0; int keyexpires = 0;
@ -1200,9 +1200,8 @@ cp
{ {
cl->status.outgoing = 0; cl->status.outgoing = 0;
signal(SIGALRM, sigalrm_handler); signal(SIGALRM, sigalrm_handler);
seconds_till_retry = 5;
alarm(seconds_till_retry); alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds")); syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
} }
/* Deactivate */ /* Deactivate */

4
src/net.h
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.h,v 1.9.4.32 2001/06/05 16:09:55 guus Exp $ $Id: net.h,v 1.9.4.33 2001/06/08 18:02:10 guus Exp $
*/ */
#ifndef __TINC_NET_H__ #ifndef __TINC_NET_H__
@ -98,6 +98,8 @@ extern int total_tap_out;
extern int total_socket_in; extern int total_socket_in;
extern int total_socket_out; extern int total_socket_out;
extern int seconds_till_retry;
extern char *request_name[256]; extern char *request_name[256];
extern char *status_text[10]; extern char *status_text[10];

4
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.92 2001/06/05 16:09:55 guus Exp $ $Id: protocol.c,v 1.28.4.93 2001/06/08 18:02:10 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -297,6 +297,8 @@ cp
if(debug_lvl >= DEBUG_CONNECTIONS) if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname); syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname);
if(cl->status.outgoing)
seconds_till_retry = 5; /* Reset retry timeout */
cp cp
/* Check some options */ /* Check some options */