--- gvpe/src/vpn.C	2003/10/16 02:41:21	1.19
+++ gvpe/src/vpn.C	2003/10/16 21:57:54	1.21
@@ -42,6 +42,8 @@
 #include "util.h"
 #include "vpn.h"
 
+vpn network; // THE vpn (bad design...)
+
 /////////////////////////////////////////////////////////////////////////////
 
 const char *vpn::script_if_up ()
@@ -54,16 +56,13 @@
   mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
 
   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, "MTU=%d", mtu);
-  putenv (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);