projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only send packets via UDP if UDP communication is possible.
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
3af8df0
..
87f72ea
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-22,14
+22,19
@@
#include "system.h"
#include "system.h"
+#ifdef HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h>
#define DEFAULT_DEVICE "/dev/net/tun"
#include <linux/if_tun.h>
#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"
#include "conf.h"
#include "logger.h"
#include "net.h"
#include "route.h"
#include "utils.h"
+#include "xalloc.h"
typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,
typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,
@@
-41,8
+46,8
@@
int device_fd = -1;
static device_type_t device_type;
char *device;
char *iface;
static device_type_t device_type;
char *device;
char *iface;
-char ifrname[IFNAMSIZ];
-char *device_info;
+
static
char ifrname[IFNAMSIZ];
+
static
char *device_info;
static int device_total_in = 0;
static int device_total_out = 0;
static int device_total_in = 0;
static int device_total_out = 0;
@@
-54,13
+59,13
@@
bool setup_device(void)
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- device =
DEFAULT_DEVICE
;
+ device =
xstrdup(DEFAULT_DEVICE)
;
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-#ifdef HAVE_
TUNTAP
- iface =
netname
;
+#ifdef HAVE_
LINUX_IF_TUN_H
+ iface =
xstrdup(netname)
;
#else
#else
- iface =
rindex(device, '/') ? rindex(device, '/') + 1 : device
;
+ iface =
xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device)
;
#endif
device_fd = open(device, O_RDWR | O_NONBLOCK);
#endif
device_fd = open(device, O_RDWR | O_NONBLOCK);
@@
-69,7
+74,7
@@
bool setup_device(void)
return false;
}
return false;
}
-#ifdef HAVE_
TUNTAP
+#ifdef HAVE_
LINUX_IF_TUN_H
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
memset(&ifr, 0, sizeof(ifr));
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
memset(&ifr, 0, sizeof(ifr));