Only reset seconds_till_retry when we activate the outgoing connection.

diff --git a/src/net.c b/src/net.c
index e255cdde3dcede9f386a6f3f74184640e069c2c5..4f3999071e9c0ddf855ef91b76238053f1e9b1d0 100644 (file)
--- 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.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"
@@ -99,7 +99,7 @@ int total_socket_in = 0;
 int total_socket_out = 0;
 
 config_t *upstreamcfg;
-static int seconds_till_retry;
+int seconds_till_retry = 5;
 
 int keylifetime = 0;
 int keyexpires = 0;
@@ -1200,9 +1200,8 @@ cp
     {
       cl->status.outgoing = 0;
       signal(SIGALRM, sigalrm_handler);
-      seconds_till_retry = 5;
       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 */

diff --git a/src/net.h b/src/net.h
index c56abd85dc4be9a65ef7cfd6bd64665b646fca25..75d59df235a137bdea86be13076f89d6deb4bdc5 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -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.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__
@@ -98,6 +98,8 @@ extern int total_tap_out;
 extern int total_socket_in;
 extern int total_socket_out;
 
+extern int seconds_till_retry;
+
 extern char *request_name[256];
 extern char *status_text[10];
 

diff --git a/src/protocol.c b/src/protocol.c
index cf5cd6773c3e6aa57f58be0dcae2dfbf6db14149..de932512fede3cf3473e98f82722d1df97a709d2 100644 (file)
--- 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.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"
@@ -297,6 +297,8 @@ cp
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Connection with %s (%s) activated"), cl->name, cl->hostname);
 
+  if(cl->status.outgoing)
+    seconds_till_retry = 5;    /* Reset retry timeout */
 cp
   /* Check some options */