--- gvpe/src/connection.C	2005/03/08 00:32:54	1.48
+++ gvpe/src/connection.C	2005/03/23 21:55:39	1.52
@@ -30,8 +30,6 @@
 #include <openssl/rsa.h>
 #include <openssl/err.h>
 
-#include "gettext.h"
-
 #include "conf.h"
 #include "slog.h"
 #include "device.h"
@@ -99,44 +97,44 @@
   void cleaner_cb (time_watcher &w); time_watcher cleaner;
   
   bool find (const rsaid &id, rsachallenge &chg)
-    {
-      for (iterator i = begin (); i != end (); ++i)
-        {
-          if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
-            {
-              memcpy (&chg, &i->chg, sizeof chg);
+  {
+    for (iterator i = begin (); i != end (); ++i)
+      {
+        if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
+          {
+            memcpy (&chg, &i->chg, sizeof chg);
 
-              erase (i);
-              return true;
-            }
-        }
+            erase (i);
+            return true;
+          }
+      }
 
-      if (cleaner.at < NOW)
-        cleaner.start (NOW + RSA_TTL);
+    if (cleaner.at < NOW)
+      cleaner.start (NOW + RSA_TTL);
 
-      return false;
-    }
+    return false;
+  }
 
   void gen (rsaid &id, rsachallenge &chg)
-    {
-      rsa_entry e;
+  {
+    rsa_entry e;
 
-      RAND_bytes ((unsigned char *)&id,  sizeof id);
-      RAND_bytes ((unsigned char *)&chg, sizeof chg);
+    RAND_bytes ((unsigned char *)&id,  sizeof id);
+    RAND_bytes ((unsigned char *)&chg, sizeof chg);
 
-      e.expire = NOW + RSA_TTL;
-      e.id = id;
-      memcpy (&e.chg, &chg, sizeof chg);
+    e.expire = NOW + RSA_TTL;
+    e.id = id;
+    memcpy (&e.chg, &chg, sizeof chg);
 
-      push_back (e);
+    push_back (e);
 
-      if (cleaner.at < NOW)
-        cleaner.start (NOW + RSA_TTL);
-    }
+    if (cleaner.at < NOW)
+      cleaner.start (NOW + RSA_TTL);
+  }
 
   rsa_cache ()
-    : cleaner (this, &rsa_cache::cleaner_cb)
-    { }
+  : cleaner (this, &rsa_cache::cleaner_cb)
+  { }
 
 } rsa_cache;
 
@@ -770,7 +768,7 @@
             }
         }
 
-      retry_int *= slow ? 3. : 0.7;
+      retry_int *= slow ? 8. : 0.7;
 
       if (retry_int < conf->max_retry)
         retry_cnt++;
@@ -790,7 +788,8 @@
             conf->nodename, (const char *)si);
 
       if (::conf.script_node_down)
-        run_script (run_script_cb (this, &connection::script_node_down), false);
+        if (!run_script (run_script_cb (this, &connection::script_node_down), false))
+          slog (L_WARN, _("node-down command execution failed, continuing."));
     }
 
   delete ictx; ictx = 0;
@@ -1021,7 +1020,8 @@
                                 p->prot_major, p->prot_minor);
 
                           if (::conf.script_node_up)
-                            run_script (run_script_cb (this, &connection::script_node_up), false);
+                            if (!run_script (run_script_cb (this, &connection::script_node_up), false))
+                              slog (L_WARN, _("node-up command execution failed, continuing."));
 
                           break;
                         }
@@ -1171,9 +1171,9 @@
   delete p;
 }
 
-void connection::script_node ()
+void connection::script_init_env ()
 {
-  vpn->script_if_up ();
+  vpn->script_init_env ();
 
   char *env;
   asprintf (&env, "DESTID=%d",   conf->id); putenv (env);
@@ -1184,20 +1184,28 @@
 
 const char *connection::script_node_up ()
 {
-  script_node ();
+  script_init_env ();
 
   putenv ("STATE=up");
 
-  return ::conf.script_node_up ? ::conf.script_node_up : "node-up";
+  char *filename;
+  asprintf (&filename,
+            "%s/%s",
+            confbase,
+            ::conf.script_node_up ? ::conf.script_node_up : "node-up");
 }
 
 const char *connection::script_node_down ()
 {
-  script_node ();
+  script_init_env ();
 
   putenv ("STATE=down");
 
-  return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
+  char *filename;
+  asprintf (&filename,
+            "%s/%s",
+            confbase,
+            ::conf.script_node_down ? ::conf.script_node_down : "node-down");
 }
 
 connection::connection (struct vpn *vpn, conf_node *conf)