[network-manager-libreswan] service: don't let the reset counter reinitialize



commit d642c2d2d52590a6f822f1a2353aa81c72dbb06c
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Mar 18 15:41:48 2016 +0100

    service: don't let the reset counter reinitialize
    
    Decrement it only after initialization check. Otherwise it never reaches
    zero and thus never stops retrying (until the timeout).

 src/nm-libreswan-service.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c
index f69b55d..5e07cf3 100644
--- a/src/nm-libreswan-service.c
+++ b/src/nm-libreswan-service.c
@@ -513,6 +513,7 @@ retry_cb (gpointer user_data)
 
        if (!connect_step (self, &error))
                connect_failed (self, error, NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED);
+       priv->retries--;
        g_clear_error (&error);
 
        return FALSE;
@@ -572,7 +573,6 @@ child_watch_cb (GPid pid, gint status, gpointer user_data)
                priv->retries = 0;
                success = connect_step (self, &error);
        } else if (priv->retries) {
-               priv->retries--;
                g_message ("Spawn: %d more tries...", priv->retries);
                priv->retry_id = g_timeout_add (100, retry_cb, self);
                return;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]