--- gvpe/src/vpn.C	2005/03/05 19:13:16	1.31
+++ gvpe/src/vpn.C	2007/11/10 05:14:22	1.39
@@ -16,7 +16,7 @@
  
     You should have received a copy of the GNU General Public License
     along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "config.h"
@@ -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);
+
+  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);
+    }
+}
 
-  return ::conf.script_if_up ? ::conf.script_if_up : "if-up";
+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
@@ -86,6 +110,7 @@
         return -1;
 
       fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC);
 
 #if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
       // this I really consider a linux bug. I am neither connected
@@ -105,7 +130,7 @@
           exit (EXIT_FAILURE);
         }
 
-      ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
+      ipv4_ev_watcher.start (ipv4_fd, EV_READ);
     }
 
   udpv4_fd = -1;
@@ -118,6 +143,7 @@
         return -1;
 
       fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC);
 
       // standard daemon practise...
       {
@@ -143,7 +169,7 @@
           exit (EXIT_FAILURE);
         }
 
-      udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
+      udpv4_ev_watcher.start (udpv4_fd, EV_READ);
     }
 
   icmpv4_fd = -1;
@@ -157,6 +183,7 @@
         return -1;
 
       fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC);
 
 #ifdef ICMP_FILTER
       {
@@ -175,7 +202,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
 
@@ -187,7 +214,7 @@
           exit (EXIT_FAILURE);
         }
 
-      icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
+      icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
     }
 #endif
 
@@ -202,6 +229,7 @@
         return -1;
 
       fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC);
 
       // standard daemon practise...
       {
@@ -223,7 +251,7 @@
           exit (EXIT_FAILURE);
         }
 
-      tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
+      tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
     }
 #endif
 
@@ -237,6 +265,19 @@
       if (dnsv4_fd < 0)
         return -1;
 
+      fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK);
+      fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC);
+
+# 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 (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+      }
+# endif
+
       // standard daemon practise...
       {
         int oval = 1;
@@ -253,10 +294,16 @@
           exit (EXIT_FAILURE);
         }
 
-      dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
+      dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
     }
 #endif
 
+  /////////////////////////////////////////////////////////////////////////////
+
+  reconnect_all ();
+
+  /////////////////////////////////////////////////////////////////////////////
+
   tap = new tap_device ();
   if (!tap) //D this, of course, never catches
     {
@@ -264,11 +311,23 @@
       exit (EXIT_FAILURE);
     }
   
-  run_script (run_script_cb (this, &vpn::script_if_up), true);
+  fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
 
-  tap_ev_watcher.start (tap->fd, EVENT_READ);
+  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);
+    }
 
-  reconnect_all ();
+  if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
+    {
+      slog (L_ERR, _("if-up command execution failed, exiting."));
+      exit (EXIT_FAILURE);
+    }
+
+  tap_ev_watcher.start (tap->fd, EV_READ);
 
   return 0;
 }
@@ -429,9 +488,9 @@
 }
 
 void
-vpn::ipv4_ev (io_watcher &w, short revents)
+vpn::ipv4_ev (ev::io &w, int revents)
 {
-  if (revents & EVENT_READ)
+  if (revents & EV_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
@@ -470,9 +529,9 @@
 
 #if ENABLE_ICMP
 void
-vpn::icmpv4_ev (io_watcher &w, short revents)
+vpn::icmpv4_ev (ev::io &w, int revents)
 {
-  if (revents & EVENT_READ)
+  if (revents & EV_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
@@ -518,9 +577,9 @@
 #endif
 
 void
-vpn::udpv4_ev (io_watcher &w, short revents)
+vpn::udpv4_ev (ev::io &w, int revents)
 {
-  if (revents & EVENT_READ)
+  if (revents & EV_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
@@ -555,9 +614,9 @@
 }
 
 void
-vpn::tap_ev (io_watcher &w, short revents)
+vpn::tap_ev (ev::io &w, int revents)
 {
-  if (revents & EVENT_READ)
+  if (revents & EV_READ)
     {
       /* process data */
       tap_packet *pkt;
@@ -597,7 +656,7 @@
 }
 
 void
-vpn::event_cb (time_watcher &w)
+vpn::event_cb (ev::timer &w, int)
 {
   if (events)
     {
@@ -698,7 +757,7 @@
 void
 vpn::dump_status ()
 {
-  slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW);
+  slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev::ev_now ());
 
   for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
     (*c)->dump_status ();