X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fdarwin%2Fdevice.c;h=691a40848fe7d6f0de4801a07e988c890c4720f3;hp=c919de727f32ea861fe9f86cb62af9638fa81df2;hb=1f00810da336f3b7132df17b7fe4625748ff4b63;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad diff --git a/src/darwin/device.c b/src/darwin/device.c index c919de72..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-2002 Ivo Timmermans , - 2001-2002 Guus Sliepen + Copyright (C) 2001-2004 Ivo Timmermans , + 2001-2004 Guus Sliepen 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,62 +17,79 @@ 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.7 2003/07/06 22:11:33 guus Exp $ + $Id$ */ -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "system.h" -#include #include "conf.h" -#include "net.h" #include "logger.h" - -#include "system.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 *interface; +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; -/* - open the local ethertap device -*/ -int setup_device(void) +bool setup_device(void) { + char *type; + cp(); if(!get_config_string(lookup_config(config_tree, "Device"), &device)) device = DEFAULT_DEVICE; - if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) - interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; + if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) + iface = rindex(device, '/') ? rindex(device, '/') + 1 : device; if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); - return -1; + logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); + 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(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info); + logger(LOG_INFO, _("%s is a %s"), device, device_info); - return 0; + return true; } void close_device(void) @@ -82,56 +99,95 @@ void close_device(void) close(device_fd); } -/* - read, encrypt and send data that is - available through the ethertap device -*/ -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(DEBUG_ALWAYS, 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; - logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Read packet of %d bytes from %s"), + 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(); - logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Writing packet of %d bytes to %s"), + 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(DEBUG_ALWAYS, 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) { cp(); - logger(DEBUG_ALWAYS, LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); - logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); - logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); + logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); + logger(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); + logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); }