projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused device stats variables.
[tinc]
/
src
/
bsd
/
device.c
diff --git
a/src/bsd/device.c
b/src/bsd/device.c
index
5fe8dc0
..
49508bc
100644
(file)
--- a/
src/bsd/device.c
+++ b/
src/bsd/device.c
@@
-1,7
+1,8
@@
/*
device.c -- Interaction BSD tun/tap device
Copyright (C) 2001-2005 Ivo Timmermans,
/*
device.c -- Interaction BSD tun/tap device
Copyright (C) 2001-2005 Ivo Timmermans,
- 2001-2009 Guus Sliepen <guus@tinc-vpn.org>
+ 2001-2013 Guus Sliepen <guus@tinc-vpn.org>
+ 2009 Grzegorz Dymarek <gregd72002@googlemail.com>
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
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
@@
-18,26
+19,33
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "system.h"
+#include "
../
system.h"
-#include "conf.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
+#include "../conf.h"
+#include "../device.h"
+#include "../logger.h"
+#include "../names.h"
+#include "../net.h"
+#include "../route.h"
+#include "../utils.h"
+#include "../xalloc.h"
-#ifdef
HAV
E_TUNEMU
+#ifdef
ENABL
E_TUNEMU
#include "bsd/tunemu.h"
#endif
#include "bsd/tunemu.h"
#endif
-#define DEFAULT_DEVICE "/dev/tun0"
+#define DEFAULT_TUN_DEVICE "/dev/tun0"
+#if defined(HAVE_FREEBSD) || defined(HAVE_NETBSD)
+#define DEFAULT_TAP_DEVICE "/dev/tap0"
+#else
+#define DEFAULT_TAP_DEVICE "/dev/tun0"
+#endif
typedef enum device_type {
DEVICE_TYPE_TUN,
DEVICE_TYPE_TUNIFHEAD,
DEVICE_TYPE_TAP,
typedef enum device_type {
DEVICE_TYPE_TUN,
DEVICE_TYPE_TUNIFHEAD,
DEVICE_TYPE_TAP,
-#ifdef
HAV
E_TUNEMU
+#ifdef
ENABL
E_TUNEMU
DEVICE_TYPE_TUNEMU,
#endif
} device_type_t;
DEVICE_TYPE_TUNEMU,
#endif
} device_type_t;
@@
-46,31
+54,31
@@
int device_fd = -1;
char *device = NULL;
char *iface = NULL;
static char *device_info = NULL;
char *device = NULL;
char *iface = NULL;
static char *device_info = NULL;
-static int device_total_in = 0;
-static int device_total_out = 0;
-#if defined(TUNEMU)
+#if defined(ENABLE_TUNEMU)
static device_type_t device_type = DEVICE_TYPE_TUNEMU;
static device_type_t device_type = DEVICE_TYPE_TUNEMU;
-#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD)
+#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD)
|| defined(HAVE_DRAGONFLY)
static device_type_t device_type = DEVICE_TYPE_TUNIFHEAD;
#else
static device_type_t device_type = DEVICE_TYPE_TUN;
#endif
static device_type_t device_type = DEVICE_TYPE_TUNIFHEAD;
#else
static device_type_t device_type = DEVICE_TYPE_TUN;
#endif
-bool setup_device(void) {
+
static
bool setup_device(void) {
char *type;
char *type;
- cp();
-
- if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- device = xstrdup(DEFAULT_DEVICE);
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
+ if(routing_mode == RMODE_ROUTER)
+ device = xstrdup(DEFAULT_TUN_DEVICE);
+ else
+ device = xstrdup(DEFAULT_TAP_DEVICE);
+ }
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
- iface = xstrdup(
rindex(device, '/') ? rindex
(device, '/') + 1 : device);
+ iface = xstrdup(
strrchr(device, '/') ? strrchr
(device, '/') + 1 : device);
if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
if(!strcasecmp(type, "tun"))
if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
if(!strcasecmp(type, "tun"))
- /* use default */;
-#ifdef
HAV
E_TUNEMU
+ /* use default */;
+#ifdef
ENABL
E_TUNEMU
else if(!strcasecmp(type, "tunemu"))
device_type = DEVICE_TYPE_TUNEMU;
#endif
else if(!strcasecmp(type, "tunemu"))
device_type = DEVICE_TYPE_TUNEMU;
#endif
@@
-81,7
+89,7
@@
bool setup_device(void) {
else if(!strcasecmp(type, "tap"))
device_type = DEVICE_TYPE_TAP;
else {
else if(!strcasecmp(type, "tap"))
device_type = DEVICE_TYPE_TAP;
else {
- logger(
LOG_ERR, _("Unknown device type %s!")
, type);
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Unknown device type %s!"
, type);
return false;
}
} else {
return false;
}
} else {
@@
-90,10
+98,10
@@
bool setup_device(void) {
}
switch(device_type) {
}
switch(device_type) {
-#ifdef
HAV
E_TUNEMU
+#ifdef
ENABL
E_TUNEMU
case DEVICE_TYPE_TUNEMU: {
char dynamic_name[256] = "";
case DEVICE_TYPE_TUNEMU: {
char dynamic_name[256] = "";
- device_fd = tunemu_open(dynamic_name);
+ device_fd = tunemu_open(dynamic_name);
}
break;
#endif
}
break;
#endif
@@
-102,19
+110,23
@@
bool setup_device(void) {
}
if(device_fd < 0) {
}
if(device_fd < 0) {
- logger(
LOG_ERR, _("Could not open %s: %s")
, device, strerror(errno));
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s"
, device, strerror(errno));
return false;
}
return false;
}
+#ifdef FD_CLOEXEC
+ fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
switch(device_type) {
default:
device_type = DEVICE_TYPE_TUN;
case DEVICE_TYPE_TUN:
#ifdef TUNSIFHEAD
switch(device_type) {
default:
device_type = DEVICE_TYPE_TUN;
case DEVICE_TYPE_TUN:
#ifdef TUNSIFHEAD
- {
+ {
const int zero = 0;
if(ioctl(device_fd, TUNSIFHEAD, &zero, sizeof zero) == -1) {
const int zero = 0;
if(ioctl(device_fd, TUNSIFHEAD, &zero, sizeof zero) == -1) {
- logger(
LOG_ERR, _("System call `%s' failed: %s")
, "ioctl", strerror(errno));
+ logger(
DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s"
, "ioctl", strerror(errno));
return false;
}
}
return false;
}
}
@@
-126,14
+138,14
@@
bool setup_device(void) {
}
#endif
}
#endif
- device_info =
_("Generic BSD tun device")
;
+ device_info =
"Generic BSD tun device"
;
break;
case DEVICE_TYPE_TUNIFHEAD:
#ifdef TUNSIFHEAD
{
const int one = 1;
if(ioctl(device_fd, TUNSIFHEAD, &one, sizeof one) == -1) {
break;
case DEVICE_TYPE_TUNIFHEAD:
#ifdef TUNSIFHEAD
{
const int one = 1;
if(ioctl(device_fd, TUNSIFHEAD, &one, sizeof one) == -1) {
- logger(
LOG_ERR, _("System call `%s' failed: %s")
, "ioctl", strerror(errno));
+ logger(
DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s"
, "ioctl", strerror(errno));
return false;
}
}
return false;
}
}
@@
-145,30
+157,39
@@
bool setup_device(void) {
}
#endif
}
#endif
- device_info =
_("Generic BSD tun device")
;
+ device_info =
"Generic BSD tun device"
;
break;
case DEVICE_TYPE_TAP:
if(routing_mode == RMODE_ROUTER)
overwrite_mac = true;
break;
case DEVICE_TYPE_TAP:
if(routing_mode == RMODE_ROUTER)
overwrite_mac = true;
- device_info = _("Generic BSD tap device");
+ device_info = "Generic BSD tap device";
+#ifdef TAPGIFNAME
+ {
+ struct ifreq ifr;
+ if(ioctl(device_fd, TAPGIFNAME, (void*)&ifr) == 0) {
+ if(iface)
+ free(iface);
+ iface = xstrdup(ifr.ifr_name);
+ }
+ }
+
+#endif
break;
break;
-#ifdef
HAV
E_TUNEMU
+#ifdef
ENABL
E_TUNEMU
case DEVICE_TYPE_TUNEMU:
case DEVICE_TYPE_TUNEMU:
- device_info =
_("BSD tunemu device")
;
+ device_info =
"BSD tunemu device"
;
break;
#endif
}
break;
#endif
}
- logger(
LOG_INFO, _("%s is a %s")
, device, device_info);
+ logger(
DEBUG_ALWAYS, LOG_INFO, "%s is a %s"
, device, device_info);
return true;
}
return true;
}
-void close_device(void) {
- cp();
-
+static void close_device(void) {
switch(device_type) {
switch(device_type) {
-#ifdef
HAV
E_TUNEMU
+#ifdef
ENABL
E_TUNEMU
case DEVICE_TYPE_TUNEMU:
tunemu_close(device_fd);
break;
case DEVICE_TYPE_TUNEMU:
tunemu_close(device_fd);
break;
@@
-176,29
+197,28
@@
void close_device(void) {
default:
close(device_fd);
}
default:
close(device_fd);
}
+ device_fd = -1;
- free(device);
- free(iface);
+ free(device); device = NULL;
+ free(iface); iface = NULL;
+ device_info = NULL;
}
}
-bool read_packet(vpn_packet_t *packet) {
- int lenin;
-
- cp();
+static bool read_packet(vpn_packet_t *packet) {
+ int inlen;
switch(device_type) {
case DEVICE_TYPE_TUN:
switch(device_type) {
case DEVICE_TYPE_TUN:
-#ifdef
HAV
E_TUNEMU
+#ifdef
ENABL
E_TUNEMU
case DEVICE_TYPE_TUNEMU:
if(device_type == DEVICE_TYPE_TUNEMU)
case DEVICE_TYPE_TUNEMU:
if(device_type == DEVICE_TYPE_TUNEMU)
-
leni
n = tunemu_read(device_fd, packet->data + 14, MTU - 14);
+
inle
n = tunemu_read(device_fd, packet->data + 14, MTU - 14);
else
else
-#else
- lenin = read(device_fd, packet->data + 14, MTU - 14);
#endif
#endif
+ inlen = read(device_fd, packet->data + 14, MTU - 14);
- if(
leni
n <= 0) {
- logger(
LOG_ERR, _("Error while reading from %s %s: %s")
, device_info,
+ if(
inle
n <= 0) {
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s"
, device_info,
device, strerror(errno));
return false;
}
device, strerror(errno));
return false;
}
@@
-213,21
+233,22
@@
bool read_packet(vpn_packet_t *packet) {
packet->data[13] = 0xDD;
break;
default:
packet->data[13] = 0xDD;
break;
default:
-
ifdebug(TRAFFIC) logger(
LOG_ERR,
-
_ ("Unknown IP version %d while reading packet from %s %s")
,
+
logger(DEBUG_TRAFFIC,
LOG_ERR,
+
"Unknown IP version %d while reading packet from %s %s"
,
packet->data[14] >> 4, device_info, device);
return false;
}
packet->data[14] >> 4, device_info, device);
return false;
}
- packet->len = lenin + 14;
+ memset(packet->data, 0, 12);
+ packet->len = inlen + 14;
break;
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
break;
case DEVICE_TYPE_TUNIFHEAD: {
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}};
- if((
leni
n = readv(device_fd, vector, 2)) <= 0) {
- logger(
LOG_ERR, _("Error while reading from %s %s: %s")
, device_info,
+ if((
inle
n = readv(device_fd, vector, 2)) <= 0) {
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s"
, device_info,
device, strerror(errno));
return false;
}
device, strerror(errno));
return false;
}
@@
-244,49
+265,45
@@
bool read_packet(vpn_packet_t *packet) {
break;
default:
break;
default:
-
ifdebug(TRAFFIC) logger(
LOG_ERR,
-
_ ("Unknown address family %x while reading packet from %s %s")
,
+
logger(DEBUG_TRAFFIC,
LOG_ERR,
+
"Unknown address family %x while reading packet from %s %s"
,
ntohl(type), device_info, device);
return false;
}
ntohl(type), device_info, device);
return false;
}
- packet->len = lenin + 10;
+ memset(packet->data, 0, 12);
+ packet->len = inlen + 10;
break;
}
case DEVICE_TYPE_TAP:
break;
}
case DEVICE_TYPE_TAP:
- if((
leni
n = read(device_fd, packet->data, MTU)) <= 0) {
- logger(
LOG_ERR, _("Error while reading from %s %s: %s")
, device_info,
+ if((
inle
n = read(device_fd, packet->data, MTU)) <= 0) {
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s"
, device_info,
device, strerror(errno));
return false;
}
device, strerror(errno));
return false;
}
- packet->len =
leni
n;
+ packet->len =
inle
n;
break;
default:
return false;
}
break;
default:
return false;
}
-
- device_total_in += packet->len;
-
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s")
,
+
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s"
,
packet->len, device_info);
packet->len, device_info);
- logger(LOG_INFO, "E:fd_read");
return true;
}
return true;
}
-bool write_packet(vpn_packet_t *packet) {
- cp();
-
- ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+static bool write_packet(vpn_packet_t *packet) {
+ logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
packet->len, device_info);
switch(device_type) {
case DEVICE_TYPE_TUN:
if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
packet->len, device_info);
switch(device_type) {
case DEVICE_TYPE_TUN:
if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
- logger(
LOG_ERR, _("Error while writing to %s %s: %s")
, device_info,
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s"
, device_info,
device, strerror(errno));
return false;
}
device, strerror(errno));
return false;
}
@@
-294,9
+311,9
@@
bool write_packet(vpn_packet_t *packet) {
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
- struct iovec vector[2] = {{&type, sizeof
(type)
}, {packet->data + 14, packet->len - 14}};
+ struct iovec vector[2] = {{&type, sizeof
type
}, {packet->data + 14, packet->len - 14}};
int af;
int af;
-
+
af = (packet->data[12] << 8) + packet->data[13];
switch (af) {
af = (packet->data[12] << 8) + packet->data[13];
switch (af) {
@@
-307,32
+324,32
@@
bool write_packet(vpn_packet_t *packet) {
type = htonl(AF_INET6);
break;
default:
type = htonl(AF_INET6);
break;
default:
-
ifdebug(TRAFFIC) logger(
LOG_ERR,
-
_("Unknown address family %x while writing packet to %s %s")
,
+
logger(DEBUG_TRAFFIC,
LOG_ERR,
+
"Unknown address family %x while writing packet to %s %s"
,
af, device_info, device);
return false;
}
if(writev(device_fd, vector, 2) < 0) {
af, device_info, device);
return false;
}
if(writev(device_fd, vector, 2) < 0) {
- logger(
LOG_ERR, _("Can't write to %s %s: %s")
, device_info, device,
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s"
, device_info, device,
strerror(errno));
return false;
}
break;
}
strerror(errno));
return false;
}
break;
}
-
+
case DEVICE_TYPE_TAP:
if(write(device_fd, packet->data, packet->len) < 0) {
case DEVICE_TYPE_TAP:
if(write(device_fd, packet->data, packet->len) < 0) {
- logger(
LOG_ERR, _("Error while writing to %s %s: %s")
, device_info,
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s"
, device_info,
device, strerror(errno));
return false;
}
break;
device, strerror(errno));
return false;
}
break;
-#ifdef
HAV
E_TUNEMU
+#ifdef
ENABL
E_TUNEMU
case DEVICE_TYPE_TUNEMU:
if(tunemu_write(device_fd, packet->data + 14, packet->len - 14) < 0) {
case DEVICE_TYPE_TUNEMU:
if(tunemu_write(device_fd, packet->data + 14, packet->len - 14) < 0) {
- logger(
LOG_ERR, _("Error while writing to %s %s: %s")
, device_info,
+ logger(
DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s"
, device_info,
device, strerror(errno));
return false;
}
device, strerror(errno));
return false;
}
@@
-343,15
+360,12
@@
bool write_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- device_total_out += packet->len;
-
return true;
}
return true;
}
-void dump_device_stats(void) {
- 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);
-}
+const devops_t os_devops = {
+ .setup = setup_device,
+ .close = close_device,
+ .read = read_packet,
+ .write = write_packet,
+};