--- gvpe/src/vpn.C	2003/10/16 14:12:00	1.20
+++ gvpe/src/vpn.C	2004/01/17 01:18:36	1.22
@@ -1,6 +1,6 @@
 /*
     vpn.C -- handle the protocol, encryption, handshaking etc.
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -56,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);
@@ -106,7 +103,7 @@
           exit (1);
         }
 
-      ipv4_ev_watcher.start (ipv4_fd, POLLIN);
+      ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
     }
 
   udpv4_fd = -1;
@@ -144,7 +141,7 @@
           exit (1);
         }
 
-      udpv4_ev_watcher.start (udpv4_fd, POLLIN);
+      udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
     }
 
   icmpv4_fd = -1;
@@ -188,7 +185,7 @@
           exit (1);
         }
 
-      icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
+      icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
     }
 #endif
 
@@ -224,7 +221,7 @@
           exit (1);
         }
 
-      tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
+      tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
     }
 #endif
 
@@ -237,7 +234,7 @@
   
   run_script (run_script_cb (this, &vpn::script_if_up), true);
 
-  tap_ev_watcher.start (tap->fd, POLLIN);
+  tap_ev_watcher.start (tap->fd, EVENT_READ);
 
   reconnect_all ();
 
@@ -401,7 +398,7 @@
 void
 vpn::ipv4_ev (io_watcher &w, short revents)
 {
-  if (revents & (POLLIN | POLLERR))
+  if (revents & EVENT_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
@@ -430,12 +427,6 @@
 
       delete pkt;
     }
-  else if (revents & POLLHUP)
-    {
-      // this cannot ;) happen on udp sockets
-      slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
-      exit (1);
-    }
   else
     {
       slog (L_ERR,
@@ -449,7 +440,7 @@
 void
 vpn::icmpv4_ev (io_watcher &w, short revents)
 {
-  if (revents & (POLLIN | POLLERR))
+  if (revents & EVENT_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
@@ -484,12 +475,6 @@
 
       delete pkt;
     }
-  else if (revents & POLLHUP)
-    {
-      // this cannot ;) happen on udp sockets
-      slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
-      exit (1);
-    }
   else
     {
       slog (L_ERR,
@@ -503,7 +488,7 @@
 void
 vpn::udpv4_ev (io_watcher &w, short revents)
 {
-  if (revents & (POLLIN | POLLERR))
+  if (revents & EVENT_READ)
     {
       vpn_packet *pkt = new vpn_packet;
       struct sockaddr_in sa;
@@ -528,12 +513,6 @@
 
       delete pkt;
     }
-  else if (revents & POLLHUP)
-    {
-      // this cannot ;) happen on udp sockets
-      slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
-      exit (1);
-    }
   else
     {
       slog (L_ERR,
@@ -546,7 +525,7 @@
 void
 vpn::tap_ev (io_watcher &w, short revents)
 {
-  if (revents & POLLIN)
+  if (revents & EVENT_READ)
     {
       /* process data */
       tap_packet *pkt;
@@ -581,11 +560,6 @@
 
       delete pkt;
     }
-  else if (revents & (POLLHUP | POLLERR))
-    {
-      slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
-      exit (1);
-    }
   else
     abort ();
 }
@@ -600,11 +574,8 @@
           slog (L_INFO, _("preparing shutdown..."));
 
           shutdown_all ();
-
           remove_pid (pidfilename);
-
           slog (L_INFO, _("terminating"));
-
           exit (0);
         }
 
@@ -617,8 +588,6 @@
 
       events = 0;
     }
-
-  w.at = TSTAMP_CANCEL;
 }
 
 void