Attention is currently required from: Arne Schwabe.
Hello Arne Schwabe,
I'd like you to do a code review.
Please visit
https://gerrit.openvpn.net/c/openvpn/+/2151?usp=email
to review the following change.
Change subject: route: merge the FreeBSD and DragonFly IPv4 route branches
......................................................................
route: merge the FreeBSD and DragonFly IPv4 route branches
add_route() and delete_route() had identical FreeBSD and DragonFly
branches, differing only in the error message. Merge them, as the IPv6
functions already do. The messages now say "FreeBSD/DragonFly", like
the OpenBSD/NetBSD ones.
Change-Id: I1d545f0a6de5ab795a0c80447002f5cb54b48b32
Signed-off-by: Razvan Cojocaru <[email protected]>
---
M src/openvpn/route.c
1 file changed, 5 insertions(+), 28 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/51/2151/1
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index d483c5f..b19e324 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -1613,7 +1613,7 @@
status = route_exec(&argv, es, "ERROR: Solaris route add command failed");
-#elif defined(TARGET_FREEBSD)
+#elif defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY)
argv_printf(&argv, "%s add", ROUTE_PATH);
@@ -1626,26 +1626,9 @@
argv_printf_cat(&argv, "-net %s %s %s", network, gateway, netmask);
- /* FIXME -- add on-link support for FreeBSD */
+ /* FIXME -- add on-link support for FreeBSD/DragonFly */
- status = route_exec(&argv, es, "ERROR: FreeBSD route add command failed");
-
-#elif defined(TARGET_DRAGONFLY)
-
- argv_printf(&argv, "%s add", ROUTE_PATH);
-
-#if 0
- if (r->flags & RT_METRIC_DEFINED)
- {
- argv_printf_cat(&argv, "-rtt %d", r->metric);
- }
-#endif
-
- argv_printf_cat(&argv, "-net %s %s %s", network, gateway, netmask);
-
- /* FIXME -- add on-link support for Dragonfly */
-
- status = route_exec(&argv, es, "ERROR: DragonFly route add command
failed");
+ status = route_exec(&argv, es, "ERROR: FreeBSD/DragonFly route add command
failed");
#elif defined(TARGET_DARWIN)
@@ -2070,17 +2053,11 @@
route_exec(&argv, es, "ERROR: Solaris route delete command failed");
-#elif defined(TARGET_FREEBSD)
+#elif defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY)
argv_printf(&argv, "%s delete -net %s %s %s", ROUTE_PATH, network,
gateway, netmask);
- route_exec(&argv, es, "ERROR: FreeBSD route delete command failed");
-
-#elif defined(TARGET_DRAGONFLY)
-
- argv_printf(&argv, "%s delete -net %s %s %s", ROUTE_PATH, network,
gateway, netmask);
-
- route_exec(&argv, es, "ERROR: DragonFly route delete command failed");
+ route_exec(&argv, es, "ERROR: FreeBSD/DragonFly route delete command
failed");
#elif defined(TARGET_DARWIN)
--
To view, visit https://gerrit.openvpn.net/c/openvpn/+/2151?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1d545f0a6de5ab795a0c80447002f5cb54b48b32
Gerrit-Change-Number: 2151
Gerrit-PatchSet: 1
Gerrit-Owner: Răzvan Cojocaru <[email protected]>
Gerrit-Reviewer: Arne Schwabe <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: Arne Schwabe <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
