X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fopenbsd%2Fdevice.c;h=e9b4bbdd784e6fff6826fb428d61c8a1ac943f7d;hp=badb459b623867c22afeefb3ef2e5dbe377a34a2;hb=5db596c6844169f1eb5f804b72abe99d067aaa5a;hpb=ad61c20f42d2bee5cc7976bec4370cf4747b42c3 diff --git a/src/openbsd/device.c b/src/openbsd/device.c index badb459b..e9b4bbdd 100644 --- a/src/openbsd/device.c +++ b/src/openbsd/device.c @@ -1,7 +1,7 @@ /* device.c -- Interaction with OpenBSD tun device - Copyright (C) 2001 Ivo Timmermans , - 2001 Guus Sliepen + Copyright (C) 2001-2003 Ivo Timmermans , + 2001-2003 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,9 +17,30 @@ 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.1 2001/10/12 15:49:11 guus Exp $ + $Id: device.c,v 1.1.2.15 2003/07/12 17:41:48 guus Exp $ */ +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include "conf.h" +#include "net.h" +#include "logger.h" + +#include "system.h" + #define DEFAULT_DEVICE "/dev/tun0" #define DEVICE_TYPE_ETHERTAP 0 @@ -27,87 +48,130 @@ int device_fd = -1; int device_type; -char *device_fname; +char *device; +char *interface; char *device_info; int device_total_in = 0; int device_total_out = 0; -/* - open the local ethertap device -*/ int setup_device(void) { - if(!get_config_string(lookup_config(config_tree, "Device"), &device_fname))) - device_fname = DEFAULT_DEVICE; - -cp - if((device_fd = open(device_fname, O_RDWR | O_NONBLOCK)) < 0) - { - syslog(LOG_ERR, _("Could not open %s: %m"), device_fname); - return -1; - } -cp - /* 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; - - device_info = _("OpenBSD tun device"); - - syslog(LOG_INFO, _("%s is a %s"), device_fname, device_info); -cp - return 0; + 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((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) { + logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); + return -1; + } + + device_info = _("OpenBSD tun device"); + + logger(LOG_INFO, _("%s is a %s"), device, device_info); + + return 0; +} + +void close_device(void) +{ + cp(); + + close(device_fd); } int read_packet(vpn_packet_t *packet) { - int lenin; - u_int32_t type; -cp - struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data, MTU}}; + int lenin; + u_int32_t type; + struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}}; + + cp(); + + if((lenin = readv(device_fd, vector, 2)) <= 0) { + logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, + device, strerror(errno)); + return -1; + } + + switch (ntohl(type)) { + case AF_INET: + packet->data[12] = 0x8; + packet->data[13] = 0x0; + break; - if((lenin = readv(device_fd, vector, 2)) <= 0) - { - syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device_fname); - return -1; - } + case AF_INET6: + packet->data[12] = 0x86; + packet->data[13] = 0xDD; + break; - packet->len = lenin - sizeof(type); + default: + ifdebug(TRAFFIC) logger(LOG_ERR, + _ ("Unknown address family %d while reading packet from %s %s"), + ntohl(type), device_info, device); + return -1; + } - device_total_in += packet->len; + packet->len = lenin + 10; - if(debug_lvl >= DEBUG_TRAFFIC) - { - syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), device_info, packet.len); - } + device_total_in += packet->len; - return 0; -cp + ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, + device_info); + } + + return 0; } int write_packet(vpn_packet_t *packet) { - u_int32_t type = htonl(AF_INET); -cp - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), - packet->len, device_info); - - - struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data, MTU}}; + u_int32_t type; + struct iovec vector[2]; + int af; + + cp(); + + ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"), + packet->len, device_info); + + af = (packet->data[12] << 8) + packet->data[13]; + + switch (af) { + case 0x800: + type = htonl(AF_INET); + break; + case 0x86DD: + type = htonl(AF_INET6); + break; + default: + ifdebug(TRAFFIC) logger(LOG_ERR, + _("Unknown address family %d while writing packet to %s %s"), + af, device_info, device); + return -1; + } + + vector[0].iov_base = &type; + vector[0].iov_len = sizeof(type); + vector[1].iov_base = packet->data + 14; + vector[1].iov_len = packet->len - 14; + + if(writev(device_fd, vector, 2) < 0) { + logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, + strerror(errno)); + return -1; + } + + device_total_out += packet->len; +} - if(writev(device_fd, vector, 2) < 0) - { - syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, packet.len); - return -1; - } +void dump_device_stats(void) +{ + cp(); - device_total_out += packet->len; -cp + 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); }