X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fopenbsd%2Fdevice.c;h=9519bb6e0dbffed44374de56a92f06bea038f0fc;hp=b1a30d22a370c888296190df5aed1cd1a17c3e6f;hb=ef091d1ddb1f7ab5244db96841274dc769e85167;hpb=12de5a8eedd985f4732e88de6185f77a8244612c diff --git a/src/openbsd/device.c b/src/openbsd/device.c index b1a30d2..9519bb6 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-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,30 +17,16 @@ 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.13 2003/06/11 19:28:37 guus Exp $ + $Id: device.c,v 1.1.2.19 2003/08/08 11:45:37 guus Exp $ */ -#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" @@ -48,36 +34,32 @@ #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; -/* - 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; + 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) { - syslog(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 = _("OpenBSD tun device"); - syslog(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) @@ -87,7 +69,7 @@ void close_device(void) close(device_fd); } -int read_packet(vpn_packet_t *packet) +bool read_packet(vpn_packet_t *packet) { int lenin; u_int32_t type; @@ -96,9 +78,9 @@ int read_packet(vpn_packet_t *packet) cp(); if((lenin = readv(device_fd, vector, 2)) <= 0) { - syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, + logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); - return -1; + return false; } switch (ntohl(type)) { @@ -113,27 +95,23 @@ int read_packet(vpn_packet_t *packet) break; default: - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_ERR, - _ - ("Unknown address family %d while reading packet from %s %s"), + ifdebug(TRAFFIC) logger(LOG_ERR, + _ ("Unknown address family %d while reading packet from %s %s"), ntohl(type), device_info, device); - return -1; + 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; + return true; } -int write_packet(vpn_packet_t *packet) +bool write_packet(vpn_packet_t *packet) { u_int32_t type; struct iovec vector[2]; @@ -141,8 +119,7 @@ int write_packet(vpn_packet_t *packet) cp(); - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(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); af = (packet->data[12] << 8) + packet->data[13]; @@ -155,11 +132,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; @@ -168,19 +144,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; + + 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); + 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); }