From a649aa51bf8e5b5fcc76061c9f660122a08245a8 Mon Sep 17 00:00:00 2001 From: Etienne Dechamps Date: Sun, 21 Sep 2014 11:25:49 +0100 Subject: [PATCH] Ignore the Interface option if device rename is impossible. There are platforms on which it is impossible to rename the TUN/TAP device. An example is Mac OS X (tuntapx). On these platforms, specifying the Interface option will not rename the interface, but the specified name will still be passed to tinc-up scripts and the like, resulting in potential confusion for the user. --- src/bsd/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/bsd/device.c b/src/bsd/device.c index 0e795dd0..cb65dbbf 100644 --- a/src/bsd/device.c +++ b/src/bsd/device.c @@ -73,6 +73,15 @@ static bool setup_device(void) { } if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) + iface = NULL; +#ifndef TAPGIFNAME + if (iface) { + logger(DEBUG_ALWAYS, LOG_WARNING, "Ignoring specified interface name '%s' as device rename is not supported on this platform", iface); + free(iface); + iface = NULL; + } +#endif + if (!iface) iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device); if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) { -- 2.20.1