fds: Simplify fd close condition in tun_set_route

Recreating the condition under which the fd was opened is confusing
and fragile.  Instead, simply close it if we opened it, which we can
tell from the value of the variable (because we initialise it to -1 at
the top).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tun.c b/tun.c
index ffc195ca5a4f3c777db13b5ebe77de94f2f5d5a9..9ef3a9d627c161b96c50290b2985dcf7d307d176 100644 (file)
--- a/tun.c
+++ b/tun.c
@@ -241,7 +241,7 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
            break;
        }
     }
-    if (st->route_type==TUN_CONFIG_IOCTL) {
+    if (fd >= 0) {
        close(fd);
     }
     routes->kup=up;