X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=9a6cfb65aae64e193b06c146006883bbd86be90e;hp=47bfa600653daab9f8ad5752e49c8267ac565b4c;hb=5bba3124c8c23568def7a4804651a53f3a6b4fd2;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8 diff --git a/src/solaris/device.c b/src/solaris/device.c index 47bfa600..9a6cfb65 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-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,62 +17,48 @@ 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 22:33:31 guus Exp $ + $Id$ */ -#include "config.h" +#include "system.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#define DEFAULT_DEVICE "/dev/tun" - -#include #include "conf.h" +#include "logger.h" #include "net.h" -#include "subnet.h" +#include "utils.h" -#include "system.h" +#define DEFAULT_DEVICE "/dev/tun" int device_fd = -1; -int device_type; char *device = NULL; -char *interface = NULL; -char ifrname[IFNAMSIZ]; +char *iface = NULL; char *device_info = NULL; -int device_total_in = 0; -int device_total_out = 0; - -subnet_t mymac; +static int device_total_in = 0; +static int device_total_out = 0; -int setup_device(void) +bool setup_device(void) { int ip_fd = -1, if_fd = -1; int ppa; char *ptr; - cp if(!get_config_string(lookup_config(config_tree, "Device"), &device)) + cp(); + + if(!get_config_string(lookup_config(config_tree, "Device"), &device)) device = DEFAULT_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((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) { + logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); + return false; } - cp ppa = 0; + + ppa = 0; ptr = device; while(*ptr && !isdigit((int) *ptr)) @@ -80,107 +66,116 @@ int setup_device(void) ppa = atoi(ptr); if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) { - syslog(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) { - syslog(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) { - syslog(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) { - syslog(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) { - syslog(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) { - syslog(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)) + asprintf(&iface, "tun%d", ppa); device_info = _("Solaris tun device"); - /* 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; + logger(LOG_INFO, _("%s is a %s"), device, device_info); - syslog(LOG_INFO, _("%s is a %s"), device, device_info); - cp return 0; + return true; } void close_device(void) { - cp close(device_fd); + cp(); + + close(device_fd); } -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) { - syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, + + cp(); + + if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 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); - 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; - 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) { - 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); if(write(device_fd, packet->data + 14, packet->len - 14) < 0) { - syslog(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; - cp return 0; + + 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); +}