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
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
ccb9a3f
..
cfd99ff
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-1,7
+1,7
@@
/*
device.c -- Interaction with Linux ethertap and tun/tap device
Copyright (C) 2001-2005 Ivo Timmermans,
/*
device.c -- Interaction with Linux ethertap and tun/tap device
Copyright (C) 2001-2005 Ivo Timmermans,
- 2001-201
2
Guus Sliepen <guus@tinc-vpn.org>
+ 2001-201
3
Guus Sliepen <guus@tinc-vpn.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
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,19
+18,20
@@
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 <linux/if_tun.h>
#define DEFAULT_DEVICE "/dev/net/tun"
#include <linux/if_tun.h>
#define DEFAULT_DEVICE "/dev/net/tun"
-#include "conf.h"
-#include "device.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
-#include "device.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"
+#include "../device.h"
typedef enum device_type_t {
DEVICE_TYPE_TUN,
typedef enum device_type_t {
DEVICE_TYPE_TUN,
@@
-45,26
+46,18
@@
static char *type = NULL;
static char ifrname[IFNAMSIZ];
static char *device_info;
static char ifrname[IFNAMSIZ];
static char *device_info;
-uint64_t device_in_packets = 0;
-uint64_t device_in_bytes = 0;
-uint64_t device_out_packets = 0;
-uint64_t device_out_bytes = 0;
-
static bool setup_device(void) {
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = xstrdup(DEFAULT_DEVICE);
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
static bool setup_device(void) {
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = xstrdup(DEFAULT_DEVICE);
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-#ifdef HAVE_LINUX_IF_TUN_H
- if (netname != NULL)
+ if(netname)
iface = xstrdup(netname);
iface = xstrdup(netname);
-#else
- iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
-#endif
+
device_fd = open(device, O_RDWR | O_NONBLOCK);
if(device_fd < 0) {
device_fd = open(device, O_RDWR | O_NONBLOCK);
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;
}
@@
-77,7
+70,7
@@
static bool setup_device(void) {
get_config_string(lookup_config(config_tree, "DeviceType"), &type);
if(type && strcasecmp(type, "tun") && strcasecmp(type, "tap")) {
get_config_string(lookup_config(config_tree, "DeviceType"), &type);
if(type && strcasecmp(type, "tun") && strcasecmp(type, "tap")) {
- logger(LOG_ERR, "Unknown device type %s!", type);
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Unknown device type %s!", type);
return false;
}
return false;
}
@@
-86,6
+79,8
@@
static bool setup_device(void) {
device_type = DEVICE_TYPE_TUN;
device_info = "Linux tun/tap device (tun mode)";
} else {
device_type = DEVICE_TYPE_TUN;
device_info = "Linux tun/tap device (tun mode)";
} else {
+ if (routing_mode == RMODE_ROUTER)
+ overwrite_mac = true;
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
device_type = DEVICE_TYPE_TAP;
device_info = "Linux tun/tap device (tap mode)";
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
device_type = DEVICE_TYPE_TAP;
device_info = "Linux tun/tap device (tap mode)";
@@
-104,48
+99,46
@@
static bool setup_device(void) {
if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- if(iface) free(iface);
- iface = xstrdup(ifrname);
- } else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) {
- logger(LOG_WARNING, "Old ioctl() request was needed for %s", device);
- strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- if(iface) free(iface);
+ free(iface);
iface = xstrdup(ifrname);
}
iface = xstrdup(ifrname);
}
- logger(LOG_INFO, "%s is a %s", device, device_info);
+ logger(
DEBUG_ALWAYS,
LOG_INFO, "%s is a %s", device, device_info);
return true;
}
static void close_device(void) {
close(device_fd);
return true;
}
static void close_device(void) {
close(device_fd);
+ device_fd = -1;
- free(type);
- free(device);
- free(iface);
+ free(type); type = NULL;
+ free(device); device = NULL;
+ free(iface); iface = NULL;
+ device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
int inlen;
}
static bool read_packet(vpn_packet_t *packet) {
int inlen;
-
+
switch(device_type) {
case DEVICE_TYPE_TUN:
inlen = read(device_fd, packet->data + 10, MTU - 10);
if(inlen <= 0) {
switch(device_type) {
case DEVICE_TYPE_TUN:
inlen = read(device_fd, packet->data + 10, MTU - 10);
if(inlen <= 0) {
- logger(LOG_ERR, "Error while reading from %s %s: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error while reading from %s %s: %s",
device_info, device, strerror(errno));
return false;
}
device_info, device, strerror(errno));
return false;
}
+ memset(packet->data, 0, 12);
packet->len = inlen + 10;
break;
case DEVICE_TYPE_TAP:
inlen = read(device_fd, packet->data, MTU);
if(inlen <= 0) {
packet->len = inlen + 10;
break;
case DEVICE_TYPE_TAP:
inlen = read(device_fd, packet->data, MTU);
if(inlen <= 0) {
- logger(LOG_ERR, "Error while reading from %s %s: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error while reading from %s %s: %s",
device_info, device, strerror(errno));
return false;
}
device_info, device, strerror(errno));
return false;
}
@@
-156,31
+149,28
@@
static bool read_packet(vpn_packet_t *packet) {
abort();
}
abort();
}
- device_in_packets++;
- device_in_bytes += packet->len;
-
- ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
+ logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
device_info);
return true;
}
static bool write_packet(vpn_packet_t *packet) {
device_info);
return true;
}
static bool write_packet(vpn_packet_t *packet) {
-
ifdebug(TRAFFIC) logger(
LOG_DEBUG, "Writing packet of %d bytes to %s",
+
logger(DEBUG_TRAFFIC,
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) {
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,
+ logger(
DEBUG_ALWAYS,
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) {
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,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Can't write to %s %s: %s", device_info, device,
strerror(errno));
return false;
}
strerror(errno));
return false;
}
@@
-189,22
+179,12
@@
static bool write_packet(vpn_packet_t *packet) {
abort();
}
abort();
}
- device_out_packets++;
- device_out_bytes += packet->len;
-
return true;
}
return true;
}
-static void dump_device_stats(void) {
- logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
- logger(LOG_DEBUG, " total bytes in: %10"PRIu64, device_in_bytes);
- logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_out_bytes);
-}
-
const devops_t os_devops = {
.setup = setup_device,
.close = close_device,
.read = read_packet,
.write = write_packet,
const devops_t os_devops = {
.setup = setup_device,
.close = close_device,
.read = read_packet,
.write = write_packet,
- .dump_stats = dump_device_stats,
};
};