X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fbsd%2Fdevice.c;h=ee1c988e3c6d50a25625f7dda76d84e7aed65462;hp=5e7a19881685ca4098972b4117a6ea0e6151ff9a;hb=c6830ba821e6387be961ca68b32992382a74a0e9;hpb=d8fe2ecdd8dc5caf6f8d6acf2923a0baed64735f

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 5e7a1988..ee1c988e 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction BSD tun/tap device
-    Copyright (C) 2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2001-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2001-2005 Ivo Timmermans,
+                  2001-2007 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -42,7 +42,7 @@ char *iface;
 char *device_info;
 static int device_total_in = 0;
 static int device_total_out = 0;
-#ifdef HAVE_OPENBSD
+#if defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD)
 static device_type_t device_type = DEVICE_TYPE_TUNIFHEAD;
 #else
 static device_type_t device_type = DEVICE_TYPE_TUN;
@@ -78,7 +78,7 @@ bool setup_device(void) {
 			return false;
 		}
 	} else {
-		if(strstr(device, "tap"))
+		if(strstr(device, "tap") || routing_mode != RMODE_ROUTER)
 			device_type = DEVICE_TYPE_TAP;
 	}
 
@@ -245,7 +245,7 @@ bool write_packet(vpn_packet_t *packet)
 
 		case DEVICE_TYPE_TUNIFHEAD: {
 			u_int32_t type;
-			struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
+			struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, packet->len - 14}};
 			int af;
 			
 			af = (packet->data[12] << 8) + packet->data[13];