X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fopenbsd%2Fdevice.c;h=92c3c03010c24114a9563e3116abe436098d86e8;hp=dee8fa0ab1018fb641a8dcc8280e4b9c9e38760c;hb=e8b11b1cca11f7f50542a7b34f4251f43447db0d;hpb=f75dcef72a81a337e847adf0bae54198894f65b9 diff --git a/src/openbsd/device.c b/src/openbsd/device.c index dee8fa0a..92c3c030 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-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,135 +17,106 @@ 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.10 2002/09/09 21:25:26 guus Exp $ + $Id$ */ -#include "config.h" - -#include -#include -#include +#include "system.h" #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include + #include "conf.h" +#include "logger.h" #include "net.h" -#include "subnet.h" - -#include "system.h" +#include "utils.h" #define DEFAULT_DEVICE "/dev/tun0" -#define DEVICE_TYPE_ETHERTAP 0 -#define DEVICE_TYPE_TUNTAP 1 - 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; - -extern subnet_t mymac; +static int device_total_in = 0; +static int device_total_out = 0; -/* - open the local ethertap device -*/ -int setup_device(void) +bool setup_device(void) { + 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; - cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) { - syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); - return -1; + 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(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); + return false; } - 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, device_info); - cp return 0; + logger(LOG_INFO, _("%s is a %s"), device, device_info); + + return true; } void close_device(void) { - cp close(device_fd); -cp} + cp(); -int read_packet(vpn_packet_t * packet) + close(device_fd); +} + +bool read_packet(vpn_packet_t *packet) { 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) { - syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, + 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; + return false; } - memcpy(packet->data, mymac.net.mac.address.x, 6); - memcpy(packet->data + 6, mymac.net.mac.address.x, 6); - switch (ntohl(type)) { - case AF_INET: - packet->data[12] = 0x8; - packet->data[13] = 0x0; - break; - case AF_INET6: - packet->data[12] = 0x86; - packet->data[13] = 0xDD; - break; - default: - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_ERR, - _ - ("Unknown address family %d while reading packet from %s %s"), - ntohl(type), device_info, device); - return -1; + case AF_INET: + packet->data[12] = 0x8; + packet->data[13] = 0x0; + break; + + case AF_INET6: + packet->data[12] = 0x86; + packet->data[13] = 0xDD; + break; + + default: + ifdebug(TRAFFIC) logger(LOG_ERR, + _ ("Unknown address family %d while reading packet from %s %s"), + ntohl(type), device_info, device); + return false; } packet->len = lenin + 10; device_total_in += packet->len; - if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, + ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info); - } - return 0; -cp} + return true; +} -int write_packet(vpn_packet_t * packet) +bool write_packet(vpn_packet_t *packet) { u_int32_t type; struct iovec vector[2]; int af; - cp if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), + + 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]; @@ -158,11 +129,10 @@ int write_packet(vpn_packet_t * packet) type = htonl(AF_INET6); break; default: - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_ERR, + ifdebug(TRAFFIC) logger(LOG_ERR, _("Unknown address family %d while writing packet to %s %s"), af, device_info, device); - return -1; + return false; } vector[0].iov_base = &type; @@ -171,17 +141,21 @@ int write_packet(vpn_packet_t * packet) vector[1].iov_len = packet->len - 14; if(writev(device_fd, vector, 2) < 0) { - syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, + logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno)); - return -1; + return false; } device_total_out += packet->len; -cp} + + return true; +} 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); -cp} + 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); +}