From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Sep 2014 10:58:42 +0000 (+0100)
Subject: fds: Simplify fd close condition in tun_set_route
X-Git-Tag: base.ipv6-3.v2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=cab110dcaffc3e8eee681d479883e87fca80b9c3

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 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;