X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=686db6ab6f56a5d7a80226fd5f04c63d7842ffed;hp=92b3a3caf84621b84685401e75ea620fc136c74a;hb=0b9175e998c2180e5d73ef3d644a49d620c68cad;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8 diff --git a/src/linux/device.c b/src/linux/device.c index 92b3a3ca..686db6ab 100644 --- a/src/linux/device.c +++ b/src/linux/device.c @@ -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.12 2002/09/09 22:33:24 guus Exp $ + $Id: device.c,v 1.1.2.16 2003/07/06 22:11:35 guus Exp $ */ #include "config.h" @@ -29,7 +29,6 @@ #include #include #include -#include #include #include @@ -39,7 +38,7 @@ #else #include #endif -#define DEFAULT_DEVICE "/dev/misc/net/tun" +#define DEFAULT_DEVICE "/dev/net/tun" #else #define DEFAULT_DEVICE "/dev/tap0" #endif @@ -47,12 +46,16 @@ #include #include "conf.h" #include "net.h" -#include "subnet.h" +#include "route.h" +#include "logger.h" #include "system.h" -#define DEVICE_TYPE_ETHERTAP 0 -#define DEVICE_TYPE_TUNTAP 1 +enum { + DEVICE_TYPE_ETHERTAP, + DEVICE_TYPE_TUN, + DEVICE_TYPE_TAP, +}; int device_fd = -1; int device_type; @@ -64,8 +67,6 @@ char *device_info; int device_total_in = 0; int device_total_out = 0; -extern subnet_t mymac; - /* open the local ethertap device */ @@ -87,48 +88,45 @@ int setup_device(void) device_fd = open(device, O_RDWR | O_NONBLOCK); if(device_fd < 0) { - syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); + logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); return -1; } - /* Set default MAC address for ethertap devices */ - mymac.type = SUBNET_MAC; - mymac.net.mac.address.x[0] = 0xfe; - mymac.net.mac.address.x[1] = 0xfd; - mymac.net.mac.address.x[2] = 0x00; - mymac.net.mac.address.x[3] = 0x00; - mymac.net.mac.address.x[4] = 0x00; - mymac.net.mac.address.x[5] = 0x00; - #ifdef HAVE_TUNTAP /* Ok now check if this is an old ethertap or a new tun/tap thingie */ memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_flags = IFF_TAP | IFF_NO_PI; + if(routing_mode == RMODE_ROUTER) { + ifr.ifr_flags = IFF_TUN; + device_type = DEVICE_TYPE_TUN; + device_info = _("Linux tun/tap device (tun mode)"); + } else { + ifr.ifr_flags = IFF_TAP | IFF_NO_PI; + device_type = DEVICE_TYPE_TAP; + device_info = _("Linux tun/tap device (tap mode)"); + } if(interface) strncpy(ifr.ifr_name, interface, IFNAMSIZ); if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) { - device_info = _("Linux tun/tap device"); - device_type = DEVICE_TYPE_TUNTAP; strncpy(ifrname, ifr.ifr_name, IFNAMSIZ); interface = ifrname; } else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) { - syslog(LOG_WARNING, _("Old ioctl() request was needed for %s"), device); - device_type = DEVICE_TYPE_TUNTAP; - device_info = _("Linux tun/tap device"); + logger(DEBUG_ALWAYS, LOG_WARNING, _("Old ioctl() request was needed for %s"), device); strncpy(ifrname, ifr.ifr_name, IFNAMSIZ); interface = ifrname; } else #endif { + if(routing_mode == RMODE_ROUTER) + overwrite_mac = 1; device_info = _("Linux ethertap device"); device_type = DEVICE_TYPE_ETHERTAP; interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; } - syslog(LOG_INFO, _("%s is a %s"), device, device_info); + logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info); return 0; } @@ -150,35 +148,46 @@ int read_packet(vpn_packet_t *packet) cp(); - if(device_type == DEVICE_TYPE_TUNTAP) { - lenin = read(device_fd, packet->data, MTU); - - if(lenin <= 0) { - syslog(LOG_ERR, _("Error while reading from %s %s: %s"), - device_info, device, strerror(errno)); - return -1; - } - - packet->len = lenin; - } else { /* ethertap */ - - lenin = read(device_fd, packet->data - 2, MTU + 2); - - if(lenin <= 0) { - syslog(LOG_ERR, _("Error while reading from %s %s: %s"), - device_info, device, strerror(errno)); - return -1; - } - - packet->len = lenin - 2; + switch(device_type) { + case DEVICE_TYPE_TUN: + lenin = read(device_fd, packet->data + 10, MTU - 10); + + if(lenin <= 0) { + logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"), + device_info, device, strerror(errno)); + return -1; + } + + packet->len = lenin + 10; + break; + case DEVICE_TYPE_TAP: + lenin = read(device_fd, packet->data, MTU); + + if(lenin <= 0) { + logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"), + device_info, device, strerror(errno)); + return -1; + } + + packet->len = lenin; + break; + case DEVICE_TYPE_ETHERTAP: + lenin = read(device_fd, packet->data - 2, MTU + 2); + + if(lenin <= 0) { + logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"), + device_info, device, strerror(errno)); + return -1; + } + + packet->len = lenin - 2; + break; } device_total_in += packet->len; - if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, + logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info); - } return 0; } @@ -187,24 +196,34 @@ int write_packet(vpn_packet_t *packet) { cp(); - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), + logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Writing packet of %d bytes to %s"), packet->len, device_info); - if(device_type == DEVICE_TYPE_TUNTAP) { - if(write(device_fd, packet->data, packet->len) < 0) { - syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, - strerror(errno)); - return -1; - } - } else { /* ethertap */ - *(short int *)(packet->data - 2) = packet->len; - - if(write(device_fd, packet->data - 2, packet->len + 2) < 0) { - syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, - strerror(errno)); - return -1; - } + switch(device_type) { + case DEVICE_TYPE_TUN: + packet->data[10] = packet->data[11] = 0; + if(write(device_fd, packet->data + 10, packet->len - 10) < 0) { + logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, + strerror(errno)); + return -1; + } + break; + case DEVICE_TYPE_TAP: + if(write(device_fd, packet->data, packet->len) < 0) { + logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, + strerror(errno)); + return -1; + } + break; + case DEVICE_TYPE_ETHERTAP: + *(short int *)(packet->data - 2) = packet->len; + + if(write(device_fd, packet->data - 2, packet->len + 2) < 0) { + logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, + strerror(errno)); + return -1; + } + break; } device_total_out += packet->len; @@ -216,7 +235,7 @@ void dump_device_stats(void) { cp(); - syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); - syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); - syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); + 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); }