--- gvpe/src/device-tincd.C	2003/10/16 13:37:10	1.5
+++ gvpe/src/device-tincd.C	2008/08/07 17:54:26	1.21
@@ -1,20 +1,32 @@
 /*
     device-tincd.C -- include one of the tincd low level implementations.
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
  
-    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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    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
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    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 3 of the License, or (at your
+    option) any later version.
+   
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
+   
+    Additional permission under GNU GPL version 3 section 7
+   
+    If you modify this Program, or any covered work, by linking or
+    combining it with the OpenSSL project's OpenSSL library (or a modified
+    version of that library), containing parts covered by the terms of the
+    OpenSSL or SSLeay licenses, the licensors of this Program grant you
+    additional permission to convey the resulting work.  Corresponding
+    Source for a non-source form of such a combination shall include the
+    source code for the parts of OpenSSL used as well as that of the
+    covered work.
 */
 
 #include <cstdio>
@@ -61,16 +73,15 @@
 #define cp()
 #define lookup_config(config_tree,key) (key)
 
-#define MTU MAXSIZE
+#define MTU MAX_MTU
 
 // BIGGEST hack of 'em all
 // will be casted to data_packet, due to structural similarity
-struct vpn_packet_t : net_packet {
+struct vpn_packet_t : net_packet
+{
   u8 data[MAXSIZE];
 };
 
-static tap_device *self;
-
 static bool overwrite_mac;
 
 static bool
@@ -80,6 +91,8 @@
     *res = conf.ifname;
   else if (!strcmp (key, "Device"))
     *res = 0;
+  else if (!strcmp (key, "DeviceType"))
+    *res = "tap";
   else
     {
       slog (L_ERR, _("tincd layer asking for unknown config '%s'"), key);
@@ -93,23 +106,52 @@
 
 #if IF_linux
 # include "tincd/linux/device.c"
+const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME hw ether $MAC mtu $MTU"; }
+
+#elif IF_bsd
+# include "tincd/bsd/device.c"
+const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
+
 #elif IF_freebsd
 # include "tincd/freebsd/device.c"
+const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
+
 #elif IF_netbsd
-#define IF_istun 1
+# define IF_istun 1
 # include "tincd/netbsd/device.c"
+const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU"; }
+
+#elif IF_openbsd
+# define IF_istun 1
+# include "tincd/openbsd/device.c"
+const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU"; }
+
 #elif IF_solaris
+# define IF_istun 1
 # include "tincd/solaris/device.c"
+const char * tap_device::if_up () { return ""; }
+
 #elif IF_cygwin
 # include "tincd/cygwin/device.c"
+const char * tap_device::if_up () { return ""; }
+
 #elif IF_mingw
 # include "tincd/mingw/device.c"
+const char * tap_device::if_up () { return ""; }
+
 #elif IF_darwin
-#define IF_istun 1
+# define IF_istun 1
 # include "tincd/darwin/device.c"
+const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
+
 #elif IF_raw_socket
-#define IF_istun 1
 # include "tincd/raw_socket/device.c"
+const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
+
+#elif IF_uml_socket
+# include "tincd/uml_socket/device.c"
+const char * tap_device::if_up () { return 0; }
+
 #else
 # error No interface implementation for your IFTYPE/IFSUBTYPE combination.
 #endif
@@ -126,18 +168,23 @@
 
 tap_device::tap_device ()
 {
-  self = this;
+  device = "(null)";
+
+  bool ok = setup_device ();
+
+  if (device_info)
+    device = device_info;
 
-  if (setup_device ())
+  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);
     }
 }
 
@@ -154,7 +201,7 @@
   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;
     }
@@ -182,7 +229,7 @@
       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 (), DEFAULT_DEVICE,
+    slog (L_ERR, _("can't write to %s %s: %s"), info (), device,
           strerror (errno));
 }