From cab110dcaffc3e8eee681d479883e87fca80b9c3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 27 Sep 2014 11:58:42 +0100 Subject: [PATCH] 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 --- tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tun.c b/tun.c index ffc195c..9ef3a9d 100644 --- 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; -- 2.30.2