projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
125dd0d
)
Remove remnants of Ethertap and old TUNSETIFF ioctl().
author
Guus Sliepen
<guus@tinc-vpn.org>
Tue, 25 Sep 2012 20:28:08 +0000
(22:28 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Tue, 25 Sep 2012 20:28:08 +0000
(22:28 +0200)
src/linux/device.c
patch
|
blob
|
history
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
ede6819
..
61785ad
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-55,12
+55,9
@@
static bool setup_device(void) {
device = xstrdup(DEFAULT_DEVICE);
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
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) {
@@
-104,12
+101,7
@@
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(DEBUG_ALWAYS, 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);
}