X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fbsd%2Fdevice.c;h=1d4aeee5c57baecd5860f1e429c9e8ac2f60c6ae;hp=045fc188241b03f07864453cba54f760bb758cf8;hb=e9576632dc4b780b867044269d06cc50f76d8c05;hpb=82b29e9a3b1dc6b2104ab92ed78bf431a4e55649

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 045fc188..1d4aeee5 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-2008 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,17 +42,13 @@ 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;
 #endif
 
 bool setup_device(void) {
-#ifdef TUNSIFHEAD
-	const int zero = 0;
-	const int one = 1;
-#endif
 	char *type;
 
 	cp();
@@ -82,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;
 	}
 
@@ -91,20 +87,40 @@ bool setup_device(void) {
 			device_type = DEVICE_TYPE_TUN;
 		case DEVICE_TYPE_TUN:
 #ifdef TUNSIFHEAD
+		{	
+			const int zero = 0;
 			if(ioctl(device_fd, TUNSIFHEAD, &zero, sizeof zero) == -1) {
 				logger(LOG_ERR, _("System call `%s' failed: %s"), "ioctl", strerror(errno));
 				return false;
 			}
+		}
 #endif
+#if defined(TUNSIFMODE) && defined(IFF_BROADCAST) && defined(IFF_MULTICAST)
+		{
+			const int mode = IFF_BROADCAST | IFF_MULTICAST;
+			ioctl(device_fd, TUNSIFMODE, &mode, sizeof mode);
+		}
+#endif
+
 			device_info = _("Generic BSD tun device");
 			break;
 		case DEVICE_TYPE_TUNIFHEAD:
 #ifdef TUNSIFHEAD
+		{
+			const int one = 1;
 			if(ioctl(device_fd, TUNSIFHEAD, &one, sizeof one) == -1) {
 				logger(LOG_ERR, _("System call `%s' failed: %s"), "ioctl", strerror(errno));
 				return false;
 			}
+		}
+#endif
+#if defined(TUNSIFMODE) && defined(IFF_BROADCAST) && defined(IFF_MULTICAST)
+		{
+				const int mode = IFF_BROADCAST | IFF_MULTICAST;
+				ioctl(device_fd, TUNSIFMODE, &mode, sizeof mode);
+		}
 #endif
+
 			device_info = _("Generic BSD tun device");
 			break;
 		case DEVICE_TYPE_TAP:
@@ -229,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];