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.2 2003/08/24 20:38:29 guus Exp $
+ $Id: device.c,v 1.3 2003/08/27 13:47:47 guus Exp $
*/
#include "system.h"
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.2 2003/08/24 20:38:29 guus Exp $
+ $Id: device.c,v 1.3 2003/08/27 13:47:47 guus Exp $
*/
#include "system.h"
/*
device.c -- Interaction with FreeBSD tap device
- Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2001-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
+ 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
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
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.3 2002/04/13 11:08:31 zarq Exp $
+ $Id: device.c,v 1.4 2003/08/27 13:47:48 guus Exp $
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
+#include "system.h"
-#include <utils.h>
#include "conf.h"
+#include "logger.h"
#include "net.h"
-#include "subnet.h"
-#include "logging.h"
-
-#include "system.h"
+#include "utils.h"
#define DEFAULT_DEVICE "/dev/tap0"
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;
-
-/*
- 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;
- }
-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 = _("FreeBSD tap device");
-
- syslog(LOG_INFO, _("%s is a %s"), device, 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"), &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;
+ }
+
+ device_info = _("FreeBSD tap device");
+
+ logger(LOG_INFO, _("%s is a %s"), device, device_info);
+
+ return true;
}
void close_device(void)
{
-cp
- close(device_fd);
+ cp();
+
+ close(device_fd);
}
-/*
- read, encrypt and send data that is
- available through the ethertap device
-*/
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
{
- int lenin;
-cp
- if((lenin = read(device_fd, packet->data, MTU)) <= 0)
- {
- syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
+ int lenin;
+
+ cp();
+
+ if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+ logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+ device, strerror(errno));
+ return false;
+ }
- packet->len = lenin;
+ packet->len = lenin;
- device_total_in += packet->len;
+ device_total_in += packet->len;
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"),
- packet->len, device_info);
+ 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"),
- packet->len, device_info);
-
- if(write(device_fd, packet->data, packet->len) < 0)
- {
- syslog(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
-
- device_total_out += packet->len;
-cp
+ cp();
+
+ ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+ packet->len, device_info);
+
+ if(write(device_fd, packet->data, packet->len) < 0) {
+ logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
+ device, strerror(errno));
+ 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);
-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);
}
/*
device.c -- Interaction with Linux ethertap and tun/tap device
- Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2001-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
+ 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
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
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.3 2002/04/13 11:08:31 zarq Exp $
+ $Id: device.c,v 1.4 2003/08/27 13:47:48 guus Exp $
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
+#include "system.h"
#ifdef HAVE_TUNTAP
- #ifdef LINUX_IF_TUN_H
- #include LINUX_IF_TUN_H
- #else
- #include <linux/if_tun.h>
- #endif
- #define DEFAULT_DEVICE "/dev/misc/net/tun"
+#ifdef LINUX_IF_TUN_H
+#include LINUX_IF_TUN_H
+#else
+#include <linux/if_tun.h>
+#endif
+#define DEFAULT_DEVICE "/dev/net/tun"
#else
- #define DEFAULT_DEVICE "/dev/tap0"
+#define DEFAULT_DEVICE "/dev/tap0"
#endif
-#include <utils.h>
#include "conf.h"
+#include "logger.h"
#include "net.h"
-#include "subnet.h"
-#include "logging.h"
+#include "route.h"
+#include "utils.h"
-#include "system.h"
-
-#define DEVICE_TYPE_ETHERTAP 0
-#define DEVICE_TYPE_TUNTAP 1
+typedef enum device_type_t {
+ DEVICE_TYPE_ETHERTAP,
+ DEVICE_TYPE_TUN,
+ DEVICE_TYPE_TAP,
+} device_type_t;
int device_fd = -1;
-int device_type;
+device_type_t device_type;
char *device;
-char *interface;
+char *iface;
char ifrname[IFNAMSIZ];
char *device_info;
int device_total_in = 0;
int device_total_out = 0;
-extern subnet_t mymac;
-
-/*
- open the local ethertap device
-*/
-int setup_device(void)
+bool setup_device(void)
{
- struct ifreq ifr;
+ struct ifreq ifr;
+
+ cp();
-cp
- if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- device = DEFAULT_DEVICE;
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+ device = DEFAULT_DEVICE;
- if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+ if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
#ifdef HAVE_TUNTAP
- interface = netname;
+ iface = netname;
#else
- interface = rindex(device, '/')?rindex(device, '/')+1:device;
+ iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
#endif
-cp
- if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
- {
- syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
- 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_fd = open(device, O_RDWR | O_NONBLOCK);
+
+ if(device_fd < 0) {
+ logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+ return false;
+ }
#ifdef HAVE_TUNTAP
- /* Ok now check if this is an old ethertap or a new tun/tap thingie */
-
- memset(&ifr, 0, sizeof(ifr));
-cp
- ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
- if (interface)
- strncpy(ifr.ifr_name, interface, IFNAMSIZ);
-cp
- if (!ioctl(device_fd, TUNSETIFF, (void *) &ifr))
- {
- device_info = _("Linux tun/tap device");
- device_type = DEVICE_TYPE_TUNTAP;
- strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- interface = ifrname;
- }
- else
- if (!ioctl(device_fd, (('T'<< 8) | 202), (void *) &ifr))
- {
- syslog(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
- device_type = DEVICE_TYPE_TUNTAP;
- device_info = _("Linux tun/tap device");
- strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- interface = ifrname;
- }
- else
+ /* Ok now check if this is an old ethertap or a new tun/tap thingie */
+
+ memset(&ifr, 0, sizeof(ifr));
+ if(routing_mode == RMODE_ROUTER) {
+ ifr.ifr_flags = IFF_TUN;
+ device_type = DEVICE_TYPE_TUN;
+ device_info = _("Linux tun/tap device (tun mode)");
+ } else {
+ ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+ device_type = DEVICE_TYPE_TAP;
+ device_info = _("Linux tun/tap device (tap mode)");
+ }
+
+ if(iface)
+ strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+
+ if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) {
+ strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
+ iface = ifrname;
+ } else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {
+ logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
+ strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
+ iface = ifrname;
+ } else
#endif
- {
- device_info = _("Linux ethertap device");
- device_type = DEVICE_TYPE_ETHERTAP;
- interface = rindex(device, '/')?rindex(device, '/')+1:device;
- }
-
- syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-cp
- return 0;
+ {
+ if(routing_mode == RMODE_ROUTER)
+ overwrite_mac = true;
+ device_info = _("Linux ethertap device");
+ device_type = DEVICE_TYPE_ETHERTAP;
+ iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+ }
+
+ logger(LOG_INFO, _("%s is a %s"), device, device_info);
+
+ return true;
}
void close_device(void)
{
-cp
- close(device_fd);
+ cp();
+
+ close(device_fd);
}
-/*
- read, encrypt and send data that is
- available through the ethertap device
-*/
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
{
- int lenin;
-cp
- if(device_type == DEVICE_TYPE_TUNTAP)
- {
- if((lenin = read(device_fd, packet->data, MTU)) <= 0)
- {
- syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
-
- packet->len = lenin;
- }
- else /* ethertap */
- {
- if((lenin = read(device_fd, packet->data - 2, MTU + 2)) <= 0)
- {
- syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
-
- packet->len = lenin - 2;
- }
-
- device_total_in += packet->len;
-
- if(debug_lvl >= DEBUG_TRAFFIC)
- {
- syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
- }
-
- return 0;
-cp
+ int lenin;
+
+ cp();
+
+ switch(device_type) {
+ case DEVICE_TYPE_TUN:
+ lenin = read(device_fd, packet->data + 10, MTU - 10);
+
+ if(lenin <= 0) {
+ logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+ device_info, device, strerror(errno));
+ return false;
+ }
+
+ packet->len = lenin + 10;
+ break;
+ case DEVICE_TYPE_TAP:
+ lenin = read(device_fd, packet->data, MTU);
+
+ if(lenin <= 0) {
+ logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+ device_info, device, strerror(errno));
+ return false;
+ }
+
+ packet->len = lenin;
+ break;
+ case DEVICE_TYPE_ETHERTAP:
+ lenin = read(device_fd, packet->data - 2, MTU + 2);
+
+ if(lenin <= 0) {
+ logger(LOG_ERR, _("Error while reading from %s %s: %s"),
+ device_info, device, strerror(errno));
+ return false;
+ }
+
+ packet->len = lenin - 2;
+ break;
+ }
+
+ device_total_in += packet->len;
+
+ ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+ device_info);
+
+ 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"),
- packet->len, device_info);
-
- if(device_type == DEVICE_TYPE_TUNTAP)
- {
- if(write(device_fd, packet->data, packet->len) < 0)
- {
- syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
- }
- else/* ethertap */
- {
- *(short int *)(packet->data - 2) = packet->len;
- if(write(device_fd, packet->data - 2, packet->len + 2) < 0)
- {
- syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
- }
-
- device_total_out += packet->len;
-cp
- return 0;
+ cp();
+
+ ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+ packet->len, device_info);
+
+ switch(device_type) {
+ case DEVICE_TYPE_TUN:
+ packet->data[10] = packet->data[11] = 0;
+ if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {
+ logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+ strerror(errno));
+ return false;
+ }
+ break;
+ case DEVICE_TYPE_TAP:
+ if(write(device_fd, packet->data, packet->len) < 0) {
+ logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+ strerror(errno));
+ return false;
+ }
+ break;
+ case DEVICE_TYPE_ETHERTAP:
+ *(short int *)(packet->data - 2) = packet->len;
+
+ if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
+ logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+ strerror(errno));
+ return false;
+ }
+ break;
+ }
+
+ 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);
-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);
}
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.2 2003/08/24 20:38:29 guus Exp $
+ $Id: device.c,v 1.3 2003/08/27 13:47:49 guus Exp $
*/
#include "system.h"
/*
device.c -- Interaction with NetBSD tun device
- Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2001-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
+ 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
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
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.3 2002/04/13 11:08:31 zarq Exp $
+ $Id: device.c,v 1.4 2003/08/27 13:47:49 guus Exp $
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <utils.h>
+#include "system.h"
+
#include "conf.h"
+#include "logger.h"
#include "net.h"
-#include "subnet.h"
-#include "logging.h"
-
-#include "system.h"
+#include "utils.h"
#define DEFAULT_DEVICE "/dev/tun0"
#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;
-
-/*
- open the local ethertap device
-*/
-int setup_device(void)
+bool setup_device(void)
{
- 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;
- }
-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 = _("NetBSD tun device");
-
- syslog(LOG_INFO, _("%s is a %s"), device, 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"), &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;
+ }
+
+ device_info = _("NetBSD tun device");
+
+ logger(LOG_INFO, _("%s is a %s"), device, device_info);
+
+ return true;
}
void close_device(void)
{
-cp
- close(device_fd);
-cp
+ cp();
+
+ close(device_fd);
}
-int read_packet(vpn_packet_t *packet)
+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
+ int lenin;
- if((lenin = readv(device_fd, vector, 2)) <= 0)
- {
- syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
+ cp();
- 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;
+ 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 false;
+ }
- packet->len = lenin + 10;
+ packet->data[12] = 0x08;
+ packet->data[13] = 0x00;
- device_total_in += packet->len;
+ packet->len = lenin + 14;
- if(debug_lvl >= DEBUG_TRAFFIC)
- {
- syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
- }
+ 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 true;
}
-int write_packet(vpn_packet_t *packet)
+bool write_packet(vpn_packet_t *packet)
{
- u_int32_t type = htonl(AF_INET);
- struct iovec vector[2];
-cp
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
- packet->len, device_info);
-
- 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)
- {
- syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
-
- device_total_out += packet->len;
-cp
+ 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) {
+ logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+ strerror(errno));
+ 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);
-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);
}
/*
device.c -- Interaction with OpenBSD tun device
- Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2001-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
+ 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
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
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.3 2002/04/13 11:08:31 zarq Exp $
+ $Id: device.c,v 1.4 2003/08/27 13:47:50 guus Exp $
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
+#include "system.h"
#include <sys/uio.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <utils.h>
+
#include "conf.h"
+#include "logger.h"
#include "net.h"
-#include "subnet.h"
-#include "logging.h"
-
-#include "system.h"
+#include "utils.h"
#define DEFAULT_DEVICE "/dev/tun0"
#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;
-
-/*
- open the local ethertap device
-*/
-int setup_device(void)
+bool setup_device(void)
{
- 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;
- }
-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;
+ cp();
+
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+ device = DEFAULT_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) {
+ logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+ return false;
+ }
+
+ device_info = _("OpenBSD tun device");
+
+ logger(LOG_INFO, _("%s is a %s"), device, device_info);
+
+ return true;
}
void close_device(void)
{
-cp
- close(device_fd);
-cp
+ cp();
+
+ close(device_fd);
}
-int read_packet(vpn_packet_t *packet)
+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, device, strerror(errno));
- return -1;
- }
-
- 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;
- }
-
- 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, device_info);
- }
-
- return 0;
-cp
+ 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 false;
+ }
+
+ 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:
+ 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;
+
+ ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+ device_info);
+
+ 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"),
- 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:
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(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)
- {
- syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
- return -1;
- }
-
- device_total_out += packet->len;
-cp
+ 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 false;
+ }
+
+ 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 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);
-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);
}
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.2 2003/08/24 20:38:31 guus Exp $
+ $Id: device.c,v 1.3 2003/08/27 13:47:52 guus Exp $
*/
#include "config.h"
/*
device.c -- Interaction with Solaris tun device
- Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2001-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
+ 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
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
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.3 2002/04/13 11:08:31 zarq Exp $
+ $Id: device.c,v 1.4 2003/08/27 13:47:52 guus Exp $
*/
-#include "config.h"
+#include "system.h"
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
#include <sys/stropts.h>
#include <sys/sockio.h>
#include <net/if_tun.h>
-#define DEFAULT_DEVICE "/dev/tun"
-
-#include <utils.h>
#include "conf.h"
+#include "logger.h"
#include "net.h"
-#include "subnet.h"
-#include "logging.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 *iface = NULL;
char ifrname[IFNAMSIZ];
char *device_info = NULL;
int device_total_in = 0;
int device_total_out = 0;
-subnet_t mymac;
-
-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))
- 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;
- }
-cp
- ppa = 0;
-
- ptr = device;
- while(*ptr && !isdigit((int)*ptr)) ptr++;
- 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;
- }
-
- /* 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;
- }
-
- if( (if_fd = open(device, O_RDWR, 0)) < 0){
- syslog(LOG_ERR, _("Could not open %s twice: %s"), device, strerror(errno));
- return -1;
- }
-
- if(ioctl(if_fd, I_PUSH, "ip") < 0){
- syslog(LOG_ERR, _("Can't push IP module: %s"), strerror(errno));
- return -1;
- }
-
- /* 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;
- }
-
- if(ioctl(ip_fd, I_LINK, if_fd) < 0){
- syslog(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno));
- return -1;
- }
-
- if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
- asprintf(&interface, "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;
-
- syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-cp
- return 0;
+ int ip_fd = -1, if_fd = -1;
+ int ppa;
+ char *ptr;
+
+ cp();
+
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+ device = DEFAULT_DEVICE;
+
+ if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
+ logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+ return false;
+ }
+
+ ppa = 0;
+
+ ptr = device;
+ while(*ptr && !isdigit((int) *ptr))
+ ptr++;
+ ppa = atoi(ptr);
+
+ if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) {
+ 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(LOG_ERR, _("Can't assign new interface: %s"), strerror(errno));
+ return false;
+ }
+
+ if((if_fd = open(device, O_RDWR, 0)) < 0) {
+ logger(LOG_ERR, _("Could not open %s twice: %s"), device,
+ strerror(errno));
+ return false;
+ }
+
+ if(ioctl(if_fd, I_PUSH, "ip") < 0) {
+ 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(LOG_ERR, _("Can't set PPA %d: %s"), ppa, strerror(errno));
+ return false;
+ }
+
+ if(ioctl(ip_fd, I_LINK, if_fd) < 0) {
+ logger(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno));
+ return false;
+ }
+
+ if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+ asprintf(&iface, "tun%d", ppa);
+
+ device_info = _("Solaris tun device");
+
+ logger(LOG_INFO, _("%s is a %s"), device, device_info);
+
+ 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, device, strerror(errno));
- return -1;
- }
-
- 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;
-
- 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, device_info);
- }
-
- return 0;
-cp
+ int lenin;
+
+ 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 false;
+ }
+
+ packet->data[12] = 0x08;
+ packet->data[13] = 0x00;
+
+ packet->len = lenin + 14;
+
+ device_total_in += packet->len;
+
+ ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+ device_info);
+
+ 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"),
- 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;
- }
-
- device_total_out += packet->len;
-cp
- return 0;
+ 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) {
+ logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info,
+ device, strerror(errno));
+ 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);
-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);
}
projects / tinc / commitdiff