X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=d14975b311c9e8ee50372d307b687c7f737c15e1;hp=30887d7fffbfab9ad47348b4c99ca76e04f801b1;hb=3ce5e292da8bab3a1316faf1ca18625f05074467;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad diff --git a/src/solaris/device.c b/src/solaris/device.c index 30887d7f..d14975b3 100644 --- a/src/solaris/device.c +++ b/src/solaris/device.c @@ -1,7 +1,7 @@ /* device.c -- Interaction with Solaris tun device - Copyright (C) 2001-2002 Ivo Timmermans , - 2001-2002 Guus Sliepen + Copyright (C) 2001-2005 Ivo Timmermans, + 2001-2009 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 @@ -13,63 +13,45 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - 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/07/06 22:11:37 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include "system.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#define DEFAULT_DEVICE "/dev/tun" - -#include #include "conf.h" -#include "net.h" #include "logger.h" +#include "net.h" +#include "utils.h" +#include "xalloc.h" -#include "system.h" +#define DEFAULT_DEVICE "/dev/tun" int device_fd = -1; -int device_type; +int ip_fd = -1, if_fd = -1; char *device = NULL; -char *interface = NULL; -char ifrname[IFNAMSIZ]; -char *device_info = NULL; +char *iface = NULL; +static char *device_info = NULL; -int device_total_in = 0; -int device_total_out = 0; +static uint64_t device_total_in = 0; +static uint64_t device_total_out = 0; -int setup_device(void) -{ - int ip_fd = -1, if_fd = -1; +bool setup_device(void) { int ppa; char *ptr; - cp(); - if(!get_config_string(lookup_config(config_tree, "Device"), &device)) - device = DEFAULT_DEVICE; + device = xstrdup(DEFAULT_DEVICE); if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) { - logger(DEBUG_ALWAYS, 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; } ppa = 0; @@ -80,103 +62,109 @@ int setup_device(void) ppa = atoi(ptr); if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open /dev/ip: %s"), strerror(errno)); - return -1; + logger(LOG_ERR, "Could not open /dev/ip: %s", strerror(errno)); + return false; } /* Assign a new PPA and get its unit number. */ if((ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Can't assign new interface: %s"), strerror(errno)); - return -1; + logger(LOG_ERR, "Can't assign new interface: %s", strerror(errno)); + return false; } if((if_fd = open(device, O_RDWR, 0)) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s twice: %s"), device, + logger(LOG_ERR, "Could not open %s twice: %s", device, strerror(errno)); - return -1; + return false; } if(ioctl(if_fd, I_PUSH, "ip") < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Can't push IP module: %s"), strerror(errno)); - return -1; + logger(LOG_ERR, "Can't push IP module: %s", strerror(errno)); + return false; } /* Assign ppa according to the unit number returned by tun device */ if(ioctl(if_fd, IF_UNITSEL, (char *) &ppa) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Can't set PPA %d: %s"), ppa, strerror(errno)); - return -1; + logger(LOG_ERR, "Can't set PPA %d: %s", ppa, strerror(errno)); + return false; } if(ioctl(ip_fd, I_LINK, if_fd) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno)); - return -1; + logger(LOG_ERR, "Can't link TUN device to IP: %s", strerror(errno)); + return false; } - if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) - asprintf(&interface, "tun%d", ppa); + if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) + xasprintf(&iface, "tun%d", ppa); - device_info = _("Solaris tun device"); + device_info = "Solaris tun device"; - logger(DEBUG_ALWAYS, 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) -{ - cp(); - +void close_device(void) { + close(if_fd); + close(ip_fd); close(device_fd); + + free(device); + free(iface); } -int read_packet(vpn_packet_t *packet) -{ +bool read_packet(vpn_packet_t *packet) { int lenin; - cp(); - if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) { - logger(DEBUG_ALWAYS, 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; } - packet->data[12] = 0x08; - packet->data[13] = 0x00; + switch(packet->data[14] >> 4) { + case 4: + packet->data[12] = 0x08; + packet->data[13] = 0x00; + break; + case 6: + packet->data[12] = 0x86; + packet->data[13] = 0xDD; + break; + default: + ifdebug(TRAFFIC) logger(LOG_ERR, + "Unknown IP version %d while reading packet from %s %s", + packet->data[14] >> 4, device_info, device); + return false; + } packet->len = lenin + 14; device_total_in += packet->len; - logger(DEBUG_TRAFFIC, 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) -{ - cp(); - - logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Writing packet of %d bytes to %s"), +bool write_packet(vpn_packet_t *packet) { + ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s", packet->len, device_info); if(write(device_fd, packet->data + 14, packet->len - 14) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, packet->len, - strerror(errno)); - return -1; + logger(LOG_ERR, "Can't write to %s %s: %s", device_info, + device, strerror(errno)); + return false; } device_total_out += packet->len; - return 0; + return true; } -void dump_device_stats(void) -{ - cp(); - - 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); +void dump_device_stats(void) { + logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device); + logger(LOG_DEBUG, " total bytes in: %10"PRIu64, device_total_in); + logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out); }