--- gvpe/src/device-tincd.C	2005/03/03 16:54:34	1.12
+++ gvpe/src/device-tincd.C	2007/12/02 00:45:42	1.20
@@ -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 <cstdio>
@@ -63,11 +63,12 @@
 #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];
 };
 
@@ -80,6 +81,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,35 +96,51 @@
 
 #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
 # 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
 # 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.
@@ -141,7 +160,12 @@
 {
   device = "(null)";
 
-  if (setup_device ())
+  bool ok = setup_device ();
+
+  if (device_info)
+    device = device_info;
+
+  if (ok)
     {
       slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
       fd = device_fd;
@@ -167,7 +191,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;
     }
@@ -195,7 +219,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));
 }