Really retry outgoing connections immediately if requested.
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 2 Aug 2013 18:53:54 +0000 (20:53 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 2 Aug 2013 18:53:54 +0000 (20:53 +0200)
The retry() function would only abort connections that were in progress of
being made, it wouldn't reschedule the outgoing connections that had been
sleeping.

src/net.c

index 794bb73f0e460f400d6d2dccf8eda89f63e97103..0b43d5acfceec9480e8b0b4bab8b4bc518bc2a42 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -41,6 +41,8 @@ int contradicting_add_edge = 0;
 int contradicting_del_edge = 0;
 static int sleeptime = 10;
 time_t last_config_check = 0;
+static timeout_t pingtimer;
+static timeout_t periodictimer;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
@@ -412,24 +414,27 @@ int reload_configuration(void) {
 }
 
 void retry(void) {
+       /* Reset the reconnection timers for all outgoing connections */
+       for list_each(outgoing_t, outgoing, outgoing_list) {
+               outgoing->timeout = 0;
+               if(outgoing->ev.cb)
+                       timeout_set(&outgoing->ev, &(struct timeval){0, 0});
+       }
+
+       /* Check for outgoing connections that are in progress, and reset their ping timers */
        for list_each(connection_t, c, connection_list) {
-               if(c->outgoing && !c->node) {
-                       timeout_del(&c->outgoing->ev);
-                       if(c->status.connecting)
-                               close(c->socket);
-                       c->outgoing->timeout = 0;
-                       terminate_connection(c, c->status.active);
-               }
+               if(c->outgoing && !c->node)
+                       c->last_ping_time = 0;
        }
+
+       /* Kick the ping timeout handler */
+       timeout_set(&pingtimer, &(struct timeval){0, 0});
 }
 
 /*
   this is where it all happens...
 */
 int main_loop(void) {
-       timeout_t pingtimer = {{0}};
-       timeout_t periodictimer = {{0}};
-
        timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval){pingtimeout, rand() % 100000});
        timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval){pingtimeout, rand() % 100000});