X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fdarwin%2Fdevice.c;h=691a40848fe7d6f0de4801a07e988c890c4720f3;hp=ef6c77778ca84921e1b5de0f2790d28d1a699d6b;hb=1f00810da336f3b7132df17b7fe4625748ff4b63;hpb=00ddbf5723511d80fbd2522fc503bd409dc6189a

diff --git a/src/darwin/device.c b/src/darwin/device.c
index ef6c7777..691a4084 100644
--- a/src/darwin/device.c
+++ b/src/darwin/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with MacOS/X tun device
-    Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2001-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2001-2004 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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.c,v 1.1.2.9 2003/07/18 13:41:36 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -25,20 +25,28 @@
 #include "conf.h"
 #include "logger.h"
 #include "net.h"
+#include "route.h"
 #include "utils.h"
 
 #define DEFAULT_DEVICE "/dev/tun0"
 
+typedef enum device_type {
+	DEVICE_TYPE_TUN,
+	DEVICE_TYPE_TAP,
+} device_type_t;
+
 int device_fd = -1;
-int device_type;
 char *device;
 char *iface;
 char *device_info;
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
+static device_type_t device_type = DEVICE_TYPE_TUN;
 
-int setup_device(void)
+bool setup_device(void)
 {
+	char *type;
+
 	cp();
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
@@ -49,14 +57,39 @@ int setup_device(void)
 
 	if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
 		logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-		return -1;
+		return false;
 	}
 
-	device_info = _("MacOS/X tun device");
+	if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
+		if(!strcasecmp(type, "tun"))
+			device_type = DEVICE_TYPE_TUN;
+		else if(!strcasecmp(type, "tap"))
+			device_type = DEVICE_TYPE_TAP;
+		else {
+			logger(LOG_ERR, _("Unknown device type %s!"), type);
+			return false;
+		}
+	} else {
+		if(strstr(device, "tap"))
+			device_type = DEVICE_TYPE_TAP;
+	}
+
+	switch(device_type) {
+		default:
+			device_type = DEVICE_TYPE_TUN;
+		case DEVICE_TYPE_TUN:
+			device_info = _("MacOS/X tun device");
+			break;
+		case DEVICE_TYPE_TAP:
+			if(routing_mode == RMODE_ROUTER)
+				overwrite_mac = true;
+			device_info = _("MacOS/X tap device");
+			break;
+	}
 
 	logger(LOG_INFO, _("%s is a %s"), device, device_info);
 
-	return 0;
+	return true;
 }
 
 void close_device(void)
@@ -66,45 +99,88 @@ void close_device(void)
 	close(device_fd);
 }
 
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
 {
 	int lenin;
 
 	cp();
 
-	if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
-		logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
-			   device, strerror(errno));
-		return -1;
+	switch(device_type) {
+		case DEVICE_TYPE_TUN:
+			if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+				logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+					   device, strerror(errno));
+				return false;
+			}
+
+			switch(packet->data[14] >> 4) {
+				case 4:
+					packet->data[12] = 0x08;
+					packet->data[13] = 0x00;
+					break;
+				case 6:
+					packet->data[12] = 0x86;
+					packet->data[13] = 0xDD;
+					break;
+				default:
+					ifdebug(TRAFFIC) logger(LOG_ERR,
+							   _ ("Unknown IP type %d while reading packet from %s %s"),
+							   packet->data[14] >> 4, device_info, device);
+					return false;
+			}
+
+			packet->len = lenin + 14;
+			break;
+		case DEVICE_TYPE_TAP:
+			if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+				logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+					   device, strerror(errno));
+				return false;
+			}
+
+			packet->len = lenin;
+			break;
+		default:
+			return false;
 	}
-
-	packet->data[12] = 0x08;
-	packet->data[13] = 0x00;
-
-	packet->len = lenin + 14;
-
+		
 	device_total_in += packet->len;
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"),
 			   packet->len, device_info);
 
-	return 0;
+	return true;
 }
 
-int write_packet(vpn_packet_t *packet)
+bool write_packet(vpn_packet_t *packet)
 {
 	cp();
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
 			   packet->len, device_info);
 
-	if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
-		logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
-			   device, strerror(errno));
-		return -1;
+	switch(device_type) {
+		case DEVICE_TYPE_TUN:
+			if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
+				logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
+					   device, strerror(errno));
+				return false;
+			}
+			break;
+		case DEVICE_TYPE_TAP:
+			if(write(device_fd, packet->data, packet->len) < 0) {
+				logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
+					   device, strerror(errno));
+				return false;
+			}
+			break;
+		default:
+			return false;
 	}
 
 	device_total_out += packet->len;
+
+	return true;
 }
 
 void dump_device_stats(void)