Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/731?usp=email
to review the following change.
Change subject: tun: removed unnecessary route installations
......................................................................
tun: removed unnecessary route installations
Removed superfluous calls to 'add_route_ipv6' for adding ipv6 routes after tun
opening in OpenBSD, NetBSD and Darwin.
Change-Id: I235891212b15277349810913c9c1763da5c48587
Signed-off-by: Marco Baffo <[email protected]>
---
M src/openvpn/route.c
M src/openvpn/tun.c
2 files changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/31/731/1
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 71b5b42..31a634a 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -2244,9 +2244,6 @@
{
argv_printf_cat(&argv, "-link -iface %s", device);
}
- /* FIX ME: in NetBSD in TUN mode, the route is already added by ifconfig
- * so add_route_ipv6 fail with 'Invalid argument' or 'File exists'
- */
argv_msg(D_ROUTE, &argv);
bool ret = openvpn_execve_check(&argv, es, 0,
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index d878161..7bdc6c4 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -1010,8 +1010,7 @@
#endif /* ifdef _WIN32 */
}
-#if defined(_WIN32) \
- || defined(TARGET_DARWIN) || defined(TARGET_NETBSD) ||
defined(TARGET_OPENBSD)
+#if defined(_WIN32)
/* some of the platforms will auto-add a "network route" pointing
* to the interface on "ifconfig tunX 2001:db8::1/64", others need
@@ -1203,11 +1202,6 @@
"FreeBSD BSD 'ifconfig inet6 -ifdisabled' failed");
#endif
-#if defined(TARGET_OPENBSD) || defined(TARGET_NETBSD) \
- || defined(TARGET_DARWIN)
- /* and, hooray, we explicitly need to add a route... */
- add_route_connected_v6_net(tt, es, is_multipoint);
-#endif
#elif defined(TARGET_AIX)
argv_printf(&argv, "%s %s inet6 %s/%d mtu %d up", IFCONFIG_PATH, ifname,
ifconfig_ipv6_local, tt->netbits_ipv6, tun_mtu);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/731?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I235891212b15277349810913c9c1763da5c48587
Gerrit-Change-Number: 731
Gerrit-PatchSet: 1
Gerrit-Owner: mrbff <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
