j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Some device.c files weren't synchronised.

Browse source
This commit is contained in:
Guus Sliepen 2003-08-27 13:47:52 +00:00
parent 9e81a6ab5f
commit dc3b7d47f3
9 changed files with 476 additions and 612 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cygwin/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "system.h"

2
src/darwin/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "system.h"

129
src/freebsd/device.c
View file

@ -1,7 +1,7 @@
/* /*
device.c -- Interaction with FreeBSD tap device device.c -- Interaction with FreeBSD tap device
Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>, Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
2001-2002 Guus Sliepen <guus@sliepen.warande.net> 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -17,132 +17,99 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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 <utils.h>
#include "conf.h"
#include "net.h"
#include "subnet.h"
#include "logging.h"
#include "system.h" #include "system.h"
#include "conf.h"
#include "logger.h"
#include "net.h"
#include "utils.h"
#define DEFAULT_DEVICE "/dev/tap0" #define DEFAULT_DEVICE "/dev/tap0"
int device_fd = -1; int device_fd = -1;
int device_type;
char *device; char *device;
char *interface; char *iface;
char *device_info; char *device_info;
int device_total_in = 0; int device_total_in = 0;
int device_total_out = 0; int device_total_out = 0;
extern subnet_t mymac; bool setup_device(void)
/*
open the local ethertap device
*/
int setup_device(void)
{ {
cp cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
interface = rindex(device, '/')?rindex(device, '/')+1:device; iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
cp
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
{ logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); return false;
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"); device_info = _("FreeBSD tap device");
syslog(LOG_INFO, _("%s is a %s"), device, device_info); logger(LOG_INFO, _("%s is a %s"), device, device_info);
cp
return 0; return true;
} }
void close_device(void) void close_device(void)
{ {
cp cp();
close(device_fd); close(device_fd);
} }
/* bool read_packet(vpn_packet_t *packet)
read, encrypt and send data that is
available through the ethertap device
*/
int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp
if((lenin = read(device_fd, packet->data, MTU)) <= 0) cp();
{
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
return -1; 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) ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"),
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"),
packet->len, device_info); packet->len, device_info);
return 0; return true;
cp
} }
int write_packet(vpn_packet_t *packet) bool write_packet(vpn_packet_t *packet)
{ {
cp 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); packet->len, device_info);
if(write(device_fd, packet->data, packet->len) < 0) if(write(device_fd, packet->data, packet->len) < 0) {
{ logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
syslog(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, strerror(errno)); device, strerror(errno));
return -1; return false;
} }
device_total_out += packet->len; device_total_out += packet->len;
cp
return true;
} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp cp();
syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); logger(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
cp logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
} }

276
src/linux/device.c
View file

@ -1,7 +1,7 @@
/* /*
device.c -- Interaction with Linux ethertap and tun/tap device device.c -- Interaction with Linux ethertap and tun/tap device
Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>, Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
2001-2002 Guus Sliepen <guus@sliepen.warande.net> 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -17,208 +17,206 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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>
#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"
#else
#define DEFAULT_DEVICE "/dev/tap0"
#endif
#include <utils.h>
#include "conf.h"
#include "net.h"
#include "subnet.h"
#include "logging.h"
#include "system.h" #include "system.h"
#define DEVICE_TYPE_ETHERTAP 0 #ifdef HAVE_TUNTAP
#define DEVICE_TYPE_TUNTAP 1 #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"
#endif
#include "conf.h"
#include "logger.h"
#include "net.h"
#include "route.h"
#include "utils.h"
typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,
DEVICE_TYPE_TUN,
DEVICE_TYPE_TAP,
} device_type_t;
int device_fd = -1; int device_fd = -1;
int device_type; device_type_t device_type;
char *device; char *device;
char *interface; char *iface;
char ifrname[IFNAMSIZ]; char ifrname[IFNAMSIZ];
char *device_info; char *device_info;
int device_total_in = 0; int device_total_in = 0;
int device_total_out = 0; int device_total_out = 0;
extern subnet_t mymac; bool setup_device(void)
/*
open the local ethertap device
*/
int setup_device(void)
{ {
struct ifreq ifr; struct ifreq ifr;
cp cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_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 #ifdef HAVE_TUNTAP
interface = netname; iface = netname;
#else #else
interface = rindex(device, '/')?rindex(device, '/')+1:device; iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
#endif #endif
cp device_fd = open(device, O_RDWR | O_NONBLOCK);
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; if(device_fd < 0) {
mymac.net.mac.address.x[0] = 0xfe; logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
mymac.net.mac.address.x[1] = 0xfd; return false;
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;
#ifdef HAVE_TUNTAP #ifdef HAVE_TUNTAP
/* Ok now check if this is an old ethertap or a new tun/tap thingie */ /* Ok now check if this is an old ethertap or a new tun/tap thingie */
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));
cp 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; ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
if (interface) device_type = DEVICE_TYPE_TAP;
strncpy(ifr.ifr_name, interface, IFNAMSIZ); device_info = _("Linux tun/tap device (tap mode)");
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
#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); if(iface)
cp strncpy(ifr.ifr_name, iface, IFNAMSIZ);
return 0;
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
{
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) void close_device(void)
{ {
cp cp();
close(device_fd); close(device_fd);
} }
/* bool read_packet(vpn_packet_t *packet)
read, encrypt and send data that is
available through the ethertap device
*/
int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp
if(device_type == DEVICE_TYPE_TUNTAP) cp();
{
if((lenin = read(device_fd, packet->data, MTU)) <= 0) switch(device_type) {
{ case DEVICE_TYPE_TUN:
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); lenin = read(device_fd, packet->data + 10, MTU - 10);
return -1;
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; packet->len = lenin;
} break;
else /* ethertap */ case DEVICE_TYPE_ETHERTAP:
{ lenin = read(device_fd, packet->data - 2, MTU + 2);
if((lenin = read(device_fd, packet->data - 2, MTU + 2)) <= 0)
{ if(lenin <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); logger(LOG_ERR, _("Error while reading from %s %s: %s"),
return -1; device_info, device, strerror(errno));
return false;
} }
packet->len = lenin - 2; packet->len = lenin - 2;
break;
} }
device_total_in += packet->len; device_total_in += packet->len;
if(debug_lvl >= DEBUG_TRAFFIC) ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
{ device_info);
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
}
return 0; return true;
cp
} }
int write_packet(vpn_packet_t *packet) bool write_packet(vpn_packet_t *packet)
{ {
cp 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); packet->len, device_info);
if(device_type == DEVICE_TYPE_TUNTAP) switch(device_type) {
{ case DEVICE_TYPE_TUN:
if(write(device_fd, packet->data, packet->len) < 0) packet->data[10] = packet->data[11] = 0;
{ if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {
syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno)); logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
return -1; 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;
} }
else/* ethertap */ break;
{ case DEVICE_TYPE_ETHERTAP:
*(short int *)(packet->data - 2) = packet->len; *(short int *)(packet->data - 2) = packet->len;
if(write(device_fd, packet->data - 2, packet->len + 2) < 0)
{ 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)); logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
return -1; strerror(errno));
return false;
} }
break;
} }
device_total_out += packet->len; device_total_out += packet->len;
cp
return 0; return true;
} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp cp();
syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); logger(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
cp logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
} }

2
src/mingw/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "system.h"

139
src/netbsd/device.c
View file

@ -1,7 +1,7 @@
/* /*
device.c -- Interaction with NetBSD tun device device.c -- Interaction with NetBSD tun device
Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>, Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
2001-2002 Guus Sliepen <guus@sliepen.warande.net> 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -17,148 +17,105 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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 "conf.h"
#include "net.h"
#include "subnet.h"
#include "logging.h"
#include "system.h" #include "system.h"
#include "conf.h"
#include "logger.h"
#include "net.h"
#include "utils.h"
#define DEFAULT_DEVICE "/dev/tun0" #define DEFAULT_DEVICE "/dev/tun0"
#define DEVICE_TYPE_ETHERTAP 0 #define DEVICE_TYPE_ETHERTAP 0
#define DEVICE_TYPE_TUNTAP 1 #define DEVICE_TYPE_TUNTAP 1
int device_fd = -1; int device_fd = -1;
int device_type;
char *device; char *device;
char *interface; char *iface;
char *device_info; char *device_info;
int device_total_in = 0; int device_total_in = 0;
int device_total_out = 0; int device_total_out = 0;
extern subnet_t mymac; bool setup_device(void)
/*
open the local ethertap device
*/
int setup_device(void)
{ {
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
interface = rindex(device, '/')?rindex(device, '/')+1:device; iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
{ return false;
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"); device_info = _("NetBSD tun device");
syslog(LOG_INFO, _("%s is a %s"), device, device_info); logger(LOG_INFO, _("%s is a %s"), device, device_info);
cp
return 0; return true;
} }
void close_device(void) void close_device(void)
{ {
cp cp();
close(device_fd); close(device_fd);
cp
} }
int read_packet(vpn_packet_t *packet) bool read_packet(vpn_packet_t *packet)
{ {
int lenin; 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) cp();
{
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
return -1; logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
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[12] = 0x08;
packet->data[13] = 0x00; packet->data[13] = 0x00;
packet->len = lenin + 10; packet->len = lenin + 14;
device_total_in += packet->len; device_total_in += packet->len;
if(debug_lvl >= DEBUG_TRAFFIC) ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
{ device_info);
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
}
return 0; return true;
cp
} }
int write_packet(vpn_packet_t *packet) bool write_packet(vpn_packet_t *packet)
{ {
u_int32_t type = htonl(AF_INET); cp();
struct iovec vector[2];
cp ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
vector[0].iov_base = &type; if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
vector[0].iov_len = sizeof(type); logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
vector[1].iov_base = packet->data + 14; strerror(errno));
vector[1].iov_len = packet->len - 14; return false;
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; device_total_out += packet->len;
cp
return true;
} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp cp();
syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); logger(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
cp logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
} }

153
src/openbsd/device.c
View file

@ -1,7 +1,7 @@
/* /*
device.c -- Interaction with OpenBSD tun device device.c -- Interaction with OpenBSD tun device
Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>, Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
2001-2002 Guus Sliepen <guus@sliepen.warande.net> 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify 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 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 along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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 <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 "net.h"
#include "subnet.h"
#include "logging.h"
#include "system.h" #include "system.h"
#include <sys/uio.h>
#include "conf.h"
#include "logger.h"
#include "net.h"
#include "utils.h"
#define DEFAULT_DEVICE "/dev/tun0" #define DEFAULT_DEVICE "/dev/tun0"
@ -48,116 +34,97 @@
#define DEVICE_TYPE_TUNTAP 1 #define DEVICE_TYPE_TUNTAP 1
int device_fd = -1; int device_fd = -1;
int device_type;
char *device; char *device;
char *interface; char *iface;
char *device_info; char *device_info;
int device_total_in = 0; int device_total_in = 0;
int device_total_out = 0; int device_total_out = 0;
extern subnet_t mymac; bool setup_device(void)
/*
open the local ethertap device
*/
int setup_device(void)
{ {
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
interface = rindex(device, '/')?rindex(device, '/')+1:device; iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
{ return false;
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"); 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);
cp
return 0; return true;
} }
void close_device(void) void close_device(void)
{ {
cp cp();
close(device_fd); close(device_fd);
cp
} }
int read_packet(vpn_packet_t *packet) bool read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
u_int32_t type; u_int32_t type;
struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}}; struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
cp
if((lenin = readv(device_fd, vector, 2)) <= 0) cp();
{
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); if((lenin = readv(device_fd, vector, 2)) <= 0) {
return -1; logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
} }
memcpy(packet->data, mymac.net.mac.address.x, 6); switch (ntohl(type)) {
memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
switch(ntohl(type))
{
case AF_INET: case AF_INET:
packet->data[12] = 0x8; packet->data[12] = 0x8;
packet->data[13] = 0x0; packet->data[13] = 0x0;
break; break;
case AF_INET6: case AF_INET6:
packet->data[12] = 0x86; packet->data[12] = 0x86;
packet->data[13] = 0xDD; packet->data[13] = 0xDD;
break; break;
default: default:
if(debug_lvl >= DEBUG_TRAFFIC) ifdebug(TRAFFIC) logger(LOG_ERR,
syslog(LOG_ERR, _("Unknown address family %d while reading packet from %s %s"), ntohl(type), device_info, device); _ ("Unknown address family %d while reading packet from %s %s"),
return -1; ntohl(type), device_info, device);
return false;
} }
packet->len = lenin + 10; packet->len = lenin + 10;
device_total_in += packet->len; device_total_in += packet->len;
if(debug_lvl >= DEBUG_TRAFFIC) ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
{ device_info);
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
}
return 0; return true;
cp
} }
int write_packet(vpn_packet_t *packet) bool write_packet(vpn_packet_t *packet)
{ {
u_int32_t type; u_int32_t type;
struct iovec vector[2]; struct iovec vector[2];
int af; int af;
cp
if(debug_lvl >= DEBUG_TRAFFIC) cp();
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); packet->len, device_info);
af = (packet->data[12] << 8) + packet->data[13]; af = (packet->data[12] << 8) + packet->data[13];
switch(af) switch (af) {
{
case 0x800: case 0x800:
type = htonl(AF_INET); type = htonl(AF_INET);
break; break;
@ -165,9 +132,10 @@ cp
type = htonl(AF_INET6); type = htonl(AF_INET6);
break; break;
default: default:
if(debug_lvl >= DEBUG_TRAFFIC) ifdebug(TRAFFIC) logger(LOG_ERR,
syslog(LOG_ERR, _("Unknown address family %d while writing packet to %s %s"), af, device_info, device); _("Unknown address family %d while writing packet to %s %s"),
return -1; af, device_info, device);
return false;
} }
vector[0].iov_base = &type; vector[0].iov_base = &type;
@ -175,21 +143,22 @@ cp
vector[1].iov_base = packet->data + 14; vector[1].iov_base = packet->data + 14;
vector[1].iov_len = packet->len - 14; vector[1].iov_len = packet->len - 14;
if(writev(device_fd, vector, 2) < 0) if(writev(device_fd, vector, 2) < 0) {
{ logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno)); strerror(errno));
return -1; return false;
} }
device_total_out += packet->len; device_total_out += packet->len;
cp
return true;
} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp cp();
syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); logger(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
cp logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
} }

2
src/raw_socket/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "config.h"

167
src/solaris/device.c
View file

@ -1,7 +1,7 @@
/* /*
device.c -- Interaction with Solaris tun device device.c -- Interaction with Solaris tun device
Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>, Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
2001-2002 Guus Sliepen <guus@sliepen.warande.net> 2001-2003 Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -17,141 +17,117 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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/stropts.h>
#include <sys/sockio.h> #include <sys/sockio.h>
#include <net/if_tun.h> #include <net/if_tun.h>
#include "conf.h"
#include "logger.h"
#include "net.h"
#include "utils.h"
#define DEFAULT_DEVICE "/dev/tun" #define DEFAULT_DEVICE "/dev/tun"
#include <utils.h>
#include "conf.h"
#include "net.h"
#include "subnet.h"
#include "logging.h"
#include "system.h"
int device_fd = -1; int device_fd = -1;
int device_type;
char *device = NULL; char *device = NULL;
char *interface = NULL; char *iface = NULL;
char ifrname[IFNAMSIZ]; char ifrname[IFNAMSIZ];
char *device_info = NULL; char *device_info = NULL;
int device_total_in = 0; int device_total_in = 0;
int device_total_out = 0; int device_total_out = 0;
subnet_t mymac; bool setup_device(void)
int setup_device(void)
{ {
int ip_fd = -1, if_fd = -1; int ip_fd = -1, if_fd = -1;
int ppa; int ppa;
char *ptr; char *ptr;
cp cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
{ return false;
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1;
} }
cp
ppa = 0; ppa = 0;
ptr = device; ptr = device;
while(*ptr && !isdigit((int)*ptr)) ptr++; while(*ptr && !isdigit((int) *ptr))
ptr++;
ppa = atoi(ptr); ppa = atoi(ptr);
if( (ip_fd = open("/dev/ip", O_RDWR, 0)) < 0){ if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) {
syslog(LOG_ERR, _("Could not open /dev/ip: %s"), strerror(errno)); logger(LOG_ERR, _("Could not open /dev/ip: %s"), strerror(errno));
return -1; return false;
} }
/* Assign a new PPA and get its unit number. */ /* Assign a new PPA and get its unit number. */
if( (ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0){ if((ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0) {
syslog(LOG_ERR, _("Can't assign new interface: %s"), strerror(errno)); logger(LOG_ERR, _("Can't assign new interface: %s"), strerror(errno));
return -1; return false;
} }
if( (if_fd = open(device, O_RDWR, 0)) < 0){ if((if_fd = open(device, O_RDWR, 0)) < 0) {
syslog(LOG_ERR, _("Could not open %s twice: %s"), device, strerror(errno)); logger(LOG_ERR, _("Could not open %s twice: %s"), device,
return -1; strerror(errno));
return false;
} }
if(ioctl(if_fd, I_PUSH, "ip") < 0){ if(ioctl(if_fd, I_PUSH, "ip") < 0) {
syslog(LOG_ERR, _("Can't push IP module: %s"), strerror(errno)); logger(LOG_ERR, _("Can't push IP module: %s"), strerror(errno));
return -1; return false;
} }
/* Assign ppa according to the unit number returned by tun device */ /* Assign ppa according to the unit number returned by tun device */
if(ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0){ if(ioctl(if_fd, IF_UNITSEL, (char *) &ppa) < 0) {
syslog(LOG_ERR, _("Can't set PPA %d: %s"), ppa, strerror(errno)); logger(LOG_ERR, _("Can't set PPA %d: %s"), ppa, strerror(errno));
return -1; return false;
} }
if(ioctl(ip_fd, I_LINK, if_fd) < 0){ if(ioctl(ip_fd, I_LINK, if_fd) < 0) {
syslog(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno)); logger(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno));
return -1; return false;
} }
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
asprintf(&interface, "tun%d", ppa); asprintf(&iface, "tun%d", ppa);
device_info = _("Solaris tun device"); device_info = _("Solaris tun device");
/* Set default MAC address for ethertap devices */ logger(LOG_INFO, _("%s is a %s"), device, device_info);
mymac.type = SUBNET_MAC; return true;
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;
} }
void close_device(void) void close_device(void)
{ {
cp cp();
close(device_fd); close(device_fd);
} }
int read_packet(vpn_packet_t *packet) bool read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp
if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) cp();
{
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
return -1; logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
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[12] = 0x08;
packet->data[13] = 0x00; packet->data[13] = 0x00;
@ -159,38 +135,35 @@ cp
device_total_in += packet->len; device_total_in += packet->len;
if(debug_lvl >= DEBUG_TRAFFIC) ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
{ device_info);
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
}
return 0; return true;
cp
} }
int write_packet(vpn_packet_t *packet) bool write_packet(vpn_packet_t *packet)
{ {
cp 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); packet->len, device_info);
if(write(device_fd, packet->data + 14, packet->len - 14) < 0) if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
{ logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info,
syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, packet->len, strerror(errno)); device, strerror(errno));
return -1; return false;
} }
device_total_out += packet->len; device_total_out += packet->len;
cp
return 0; return true;
} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp cp();
syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in); logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); logger(LOG_DEBUG, _(" total bytes in: %10d"), device_total_in);
cp logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
} }