projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use usleep() instead of sleep(), MinGW complained.
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
35c66d5
..
c7c1b65
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-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) {
struct ifreq ifr;
bool setup_device(void) {
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);
@@
-84,6
+86,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
+113,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);
@@
-205,6
+213,6
@@
bool write_packet(vpn_packet_t *packet) {
void dump_device_stats(void) {
logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
void dump_device_stats(void) {
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);
}
}