--- gvpe/src/device-tincd.C	2003/10/16 02:41:21	1.4
+++ gvpe/src/device-tincd.C	2005/03/17 23:59:37	1.13
@@ -1,8 +1,10 @@
 /*
     device-tincd.C -- include one of the tincd low level implementations.
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
  
-    This program is free software; you can redistribute it and/or modify
+    This file is part of GVPE.
+
+    GVPE is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -13,7 +15,7 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    along with gvpe; if not, write to the Free Software
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -69,8 +71,6 @@
   u8 data[MAXSIZE];
 };
 
-static tap_device *self;
-
 static bool overwrite_mac;
 
 static bool
@@ -93,24 +93,47 @@
 
 #if IF_linux
 # include "tincd/linux/device.c"
+
 #elif IF_freebsd
 # include "tincd/freebsd/device.c"
+
 #elif IF_netbsd
+# define IF_istun 1
 # include "tincd/netbsd/device.c"
+
+#elif IF_openbsd
+# define IF_istun 1
+# include "tincd/openbsd/device.c"
+
 #elif IF_solaris
+# define IF_istun 1
 # include "tincd/solaris/device.c"
+
 #elif IF_cygwin
 # include "tincd/cygwin/device.c"
+
 #elif IF_mingw
 # include "tincd/mingw/device.c"
+
 #elif IF_darwin
+# define IF_istun 1
 # include "tincd/darwin/device.c"
+
 #elif IF_raw_socket
+# define IF_istun 1
 # include "tincd/raw_socket/device.c"
+
+#elif IF_uml_socket
+# include "tincd/uml_socket/device.c"
+
 #else
 # error No interface implementation for your IFTYPE/IFSUBTYPE combination.
 #endif
 
+#if IF_istun
+# include "ether_emu.C"
+#endif
+
 const char *
 tap_device::info ()
 {
@@ -119,18 +142,23 @@
 
 tap_device::tap_device ()
 {
-  self = this;
+  device = "(null)";
+
+  bool ok = setup_device ();
 
-  if (setup_device ())
+  if (device_info)
+    device = device_info;
+
+  if (ok)
     {
-      //slog (L_DEBUG, _("%s is a %s"), device, info ());
+      slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
       fd = device_fd;
       strcpy (ifrname, iface);
     }
   else
     {
-      slog (L_ERR, _("error while configuring tincd device (%s/%s)"), device, info ());
-      exit (1);
+      slog (L_ERR, _("error while configuring tincd device %s on %s"), info (), device);
+      exit (EXIT_FAILURE);
     }
 }
 
@@ -147,19 +175,35 @@
   if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
     {
       delete pkt;
-      slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE,
+      slog (L_ERR, _("can't read from to %s %s: %s"), info (), device,
             strerror (errno));
       return 0;
     }
     
+#if IF_istun
+  // assume ipv4
+  (*pkt)[12] = 0x08;
+  (*pkt)[13] = 0x00;
+
+  if (!ether_emu.tun_to_tap (pkt))
+  {
+    delete pkt;
+    return 0;
+  }
+#endif
+
   return pkt;
 }
 
 void
 tap_device::send (tap_packet *pkt)
 {
-  if (!write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
-    slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE,
+  if (
+#if IF_istun
+      ether_emu.tap_to_tun (pkt) &&
+#endif
+      !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
+    slog (L_ERR, _("can't write to %s %s: %s"), info (), device,
           strerror (errno));
 }