--- gvpe/src/vpn.C	2005/03/07 01:31:26	1.32
+++ gvpe/src/vpn.C	2005/04/08 16:48:16	1.36
@@ -48,7 +48,8 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-const char *vpn::script_if_up ()
+void
+vpn::script_init_env ()
 {
   // the tunnel device mtu should be the physical mtu - overhead
   // the tricky part is rounding to the cipher key blocksize
@@ -59,18 +60,41 @@
 
   char *env;
   asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
-  asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
-  asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
   asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
   asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
   asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
   asprintf (&env, "MTU=%d", mtu); putenv (env);
-  asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
-            0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
-            THISNODE->id & 0xff);
-  putenv (env);
+  asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
+  asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
 
-  return ::conf.script_if_up ? ::conf.script_if_up : "if-up";
+  conns [THISNODE->id - 1]->script_init_env ("");
+
+  for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
+    {
+      char ext[16];
+      snprintf (ext, 16, "_%d", (*c)->conf->id);
+      (*c)->script_init_env (ext);
+    }
+}
+
+const char *vpn::script_if_init ()
+{
+  script_init_env ();
+
+  return tap->if_up ();
+}
+
+const char *vpn::script_if_up ()
+{
+  script_init_env ();
+
+  char *filename;
+  asprintf (&filename,
+            "%s/%s",
+            confbase,
+            ::conf.script_if_up ? ::conf.script_if_up : "if-up");
+
+  return filename;
 }
 
 int
@@ -175,7 +199,7 @@
       // fragment for me sometimes.
       {
         int oval = IP_PMTUDISC_DONT;
-        setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+        setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
       }
 #endif
 
@@ -237,15 +261,15 @@
       if (dnsv4_fd < 0)
         return -1;
 
-#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
+# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
       // nor do I fragment myself. Linux still sets DF and doesn't
       // fragment for me sometimes.
       {
         int oval = IP_PMTUDISC_DONT;
-        setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+        setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
       }
-#endif
+# endif
 
       // standard daemon practise...
       {
@@ -267,6 +291,12 @@
     }
 #endif
 
+  /////////////////////////////////////////////////////////////////////////////
+
+  reconnect_all ();
+
+  /////////////////////////////////////////////////////////////////////////////
+
   tap = new tap_device ();
   if (!tap) //D this, of course, never catches
     {
@@ -274,11 +304,21 @@
       exit (EXIT_FAILURE);
     }
   
-  run_script (run_script_cb (this, &vpn::script_if_up), true);
+  if (tap->if_up () &&
+      !run_script (run_script_cb (this, &vpn::script_if_init), true))
+    {
+      slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
+            tap->if_up ());
+      exit (EXIT_FAILURE);
+    }
 
-  tap_ev_watcher.start (tap->fd, EVENT_READ);
+  if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
+    {
+      slog (L_ERR, _("if-up command execution failed, exiting."));
+      exit (EXIT_FAILURE);
+    }
 
-  reconnect_all ();
+  tap_ev_watcher.start (tap->fd, EVENT_READ);
 
   return 0;
 }