From 1e5deec973cd366b9d9cec6c1314a97e7051ce0f Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 25 Sep 2012 22:28:08 +0200 Subject: [PATCH] Remove remnants of Ethertap and old TUNSETIFF ioctl(). --- src/linux/device.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/linux/device.c b/src/linux/device.c index ede68198..61785adb 100644 --- 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)) -#ifdef HAVE_LINUX_IF_TUN_H - if (netname != NULL) + if(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) { @@ -104,12 +101,7 @@ static bool setup_device(void) { 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); } -- 2.20.1