X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Flinux%2Fdevice.c;h=87f72ea28440fc442c540961258e5d9c2d314b48;hb=b069da90d67b49dce041f513a3855b8da3d82f80;hp=f9105e655f26b1a580d777171f65a56182901142;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a;p=tinc diff --git a/src/linux/device.c b/src/linux/device.c index f9105e65..87f72ea2 100644 --- a/src/linux/device.c +++ b/src/linux/device.c @@ -1,7 +1,7 @@ /* device.c -- Interaction with Linux ethertap and tun/tap device - Copyright (C) 2001-2003 Ivo Timmermans , - 2001-2003 Guus Sliepen + Copyright (C) 2001-2005 Ivo Timmermans, + 2001-2006 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,79 +17,64 @@ 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.17 2003/07/12 17:41:48 guus Exp $ + $Id$ */ -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_TUNTAP -#ifdef LINUX_IF_TUN_H -#include LINUX_IF_TUN_H -#else +#include "system.h" + +#ifdef HAVE_LINUX_IF_TUN_H #include -#endif #define DEFAULT_DEVICE "/dev/net/tun" #else #define DEFAULT_DEVICE "/dev/tap0" #endif -#include #include "conf.h" +#include "logger.h" #include "net.h" #include "route.h" -#include "logger.h" - -#include "system.h" +#include "utils.h" +#include "xalloc.h" -enum { +typedef enum device_type_t { DEVICE_TYPE_ETHERTAP, DEVICE_TYPE_TUN, DEVICE_TYPE_TAP, -}; +} device_type_t; int device_fd = -1; -int device_type; +static device_type_t device_type; char *device; -char *interface; -char ifrname[IFNAMSIZ]; -char *device_info; +char *iface; +static char ifrname[IFNAMSIZ]; +static 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; -int setup_device(void) +bool setup_device(void) { struct ifreq ifr; cp(); if(!get_config_string(lookup_config(config_tree, "Device"), &device)) - device = DEFAULT_DEVICE; + device = xstrdup(DEFAULT_DEVICE); - if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) -#ifdef HAVE_TUNTAP - interface = netname; + if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) +#ifdef HAVE_LINUX_IF_TUN_H + iface = xstrdup(netname); #else - interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; + iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device); #endif device_fd = open(device, O_RDWR | O_NONBLOCK); if(device_fd < 0) { logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); - return -1; + return false; } -#ifdef HAVE_TUNTAP +#ifdef HAVE_LINUX_IF_TUN_H /* Ok now check if this is an old ethertap or a new tun/tap thingie */ memset(&ifr, 0, sizeof(ifr)); @@ -103,29 +88,29 @@ int setup_device(void) device_info = _("Linux tun/tap device (tap mode)"); } - if(interface) - strncpy(ifr.ifr_name, interface, IFNAMSIZ); + if(iface) + strncpy(ifr.ifr_name, iface, IFNAMSIZ); - if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) { + if(!ioctl(device_fd, TUNSETIFF, &ifr)) { strncpy(ifrname, ifr.ifr_name, IFNAMSIZ); - interface = ifrname; - } else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) { + iface = ifrname; + } else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) { logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device); strncpy(ifrname, ifr.ifr_name, IFNAMSIZ); - interface = ifrname; + iface = ifrname; } else #endif { if(routing_mode == RMODE_ROUTER) - overwrite_mac = 1; + overwrite_mac = true; device_info = _("Linux ethertap device"); device_type = DEVICE_TYPE_ETHERTAP; - interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; + iface = rindex(device, '/') ? rindex(device, '/') + 1 : device; } logger(LOG_INFO, _("%s is a %s"), device, device_info); - return 0; + return true; } void close_device(void) @@ -135,7 +120,7 @@ void close_device(void) close(device_fd); } -int read_packet(vpn_packet_t *packet) +bool read_packet(vpn_packet_t *packet) { int lenin; @@ -148,7 +133,7 @@ int read_packet(vpn_packet_t *packet) if(lenin <= 0) { logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); - return -1; + return false; } packet->len = lenin + 10; @@ -159,7 +144,7 @@ int read_packet(vpn_packet_t *packet) if(lenin <= 0) { logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); - return -1; + return false; } packet->len = lenin; @@ -170,7 +155,7 @@ int read_packet(vpn_packet_t *packet) if(lenin <= 0) { logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); - return -1; + return false; } packet->len = lenin - 2; @@ -182,10 +167,10 @@ int read_packet(vpn_packet_t *packet) 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(); @@ -198,14 +183,14 @@ int write_packet(vpn_packet_t *packet) if(write(device_fd, packet->data + 10, packet->len - 10) < 0) { logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno)); - return -1; + return false; } break; case DEVICE_TYPE_TAP: if(write(device_fd, packet->data, packet->len) < 0) { logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno)); - return -1; + return false; } break; case DEVICE_TYPE_ETHERTAP: @@ -214,14 +199,14 @@ int write_packet(vpn_packet_t *packet) if(write(device_fd, packet->data - 2, packet->len + 2) < 0) { logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno)); - return -1; + return false; } break; } device_total_out += packet->len; - return 0; + return true; } void dump_device_stats(void)