projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set FD_CLOEXEC flag on all sockets.
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
35c66d5
..
f50ff11
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-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2001-20
12
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
@@
-28,6
+28,7
@@
#endif
#include "conf.h"
#endif
#include "conf.h"
+#include "device.h"
#include "logger.h"
#include "net.h"
#include "route.h"
#include "logger.h"
#include "net.h"
#include "route.h"
@@
-47,11
+48,12
@@
char *iface = NULL;
static char ifrname[IFNAMSIZ];
static char *device_info;
static char ifrname[IFNAMSIZ];
static char *device_info;
-static
in
t device_total_in = 0;
-static
in
t device_total_out = 0;
+static
uint64_
t device_total_in = 0;
+static
uint64_
t device_total_out = 0;
-bool setup_device(void) {
+
static
bool setup_device(void) {
struct ifreq ifr;
struct ifreq ifr;
+ bool t1q = false;
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = xstrdup(DEFAULT_DEVICE);
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = xstrdup(DEFAULT_DEVICE);
@@
-61,7
+63,7
@@
bool setup_device(void) {
if (netname != NULL)
iface = xstrdup(netname);
#else
if (netname != NULL)
iface = xstrdup(netname);
#else
- iface = xstrdup(
rindex(device, '/') ? rindex
(device, '/') + 1 : device);
+ iface = xstrdup(
strrchr(device, '/') ? strrchr
(device, '/') + 1 : device);
#endif
device_fd = open(device, O_RDWR | O_NONBLOCK);
#endif
device_fd = open(device, O_RDWR | O_NONBLOCK);
@@
-70,6
+72,10
@@
bool setup_device(void) {
return false;
}
return false;
}
+#ifdef FD_CLOEXEC
+ fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
#ifdef HAVE_LINUX_IF_TUN_H
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
#ifdef HAVE_LINUX_IF_TUN_H
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
@@
-84,6
+90,12
@@
bool setup_device(void) {
device_info = "Linux tun/tap device (tap mode)";
}
device_info = "Linux tun/tap device (tap mode)";
}
+#ifdef IFF_ONE_QUEUE
+ /* Set IFF_ONE_QUEUE flag... */
+ if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q)
+ ifr.ifr_flags |= IFF_ONE_QUEUE;
+#endif
+
if(iface)
strncpy(ifr.ifr_name, iface, IFNAMSIZ);
if(iface)
strncpy(ifr.ifr_name, iface, IFNAMSIZ);
@@
-105,7
+117,7
@@
bool setup_device(void) {
device_type = DEVICE_TYPE_ETHERTAP;
if(iface)
free(iface);
device_type = DEVICE_TYPE_ETHERTAP;
if(iface)
free(iface);
- iface = xstrdup(
rindex(device, '/') ? rindex
(device, '/') + 1 : device);
+ iface = xstrdup(
strrchr(device, '/') ? strrchr
(device, '/') + 1 : device);
}
logger(LOG_INFO, "%s is a %s", device, device_info);
}
logger(LOG_INFO, "%s is a %s", device, device_info);
@@
-113,14
+125,14
@@
bool setup_device(void) {
return true;
}
return true;
}
-void close_device(void) {
+
static
void close_device(void) {
close(device_fd);
free(device);
free(iface);
}
close(device_fd);
free(device);
free(iface);
}
-bool read_packet(vpn_packet_t *packet) {
+
static
bool read_packet(vpn_packet_t *packet) {
int lenin;
switch(device_type) {
int lenin;
switch(device_type) {
@@
-167,7
+179,7
@@
bool read_packet(vpn_packet_t *packet) {
return true;
}
return true;
}
-bool write_packet(vpn_packet_t *packet) {
+
static
bool write_packet(vpn_packet_t *packet) {
ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
packet->len, device_info);
ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
packet->len, device_info);
@@
-203,8
+215,16
@@
bool write_packet(vpn_packet_t *packet) {
return true;
}
return true;
}
-void dump_device_stats(void) {
+
static
void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
- logger(LOG_DEBUG, " total bytes in: %10
d"
, device_total_in);
- logger(LOG_DEBUG, " total bytes out: %10
d"
, device_total_out);
+ logger(LOG_DEBUG, " total bytes in: %10
"PRIu64
, device_total_in);
+ logger(LOG_DEBUG, " total bytes out: %10
"PRIu64
, device_total_out);
}
}
+
+const devops_t os_devops = {
+ .setup = setup_device,
+ .close = close_device,
+ .read = read_packet,
+ .write = write_packet,
+ .dump_stats = dump_device_stats,
+};