aboutsummaryrefslogtreecommitdiff
path: root/route.c
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2010-11-13 00:55:02 +0100
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-11-13 00:55:02 +0100
commit1aa664cef51e4b4ed4b35e569925acb4fd7b9b52 (patch)
tree616d3705094f7a68ddc7c3929b8a9c0afc20509a /route.c
parentMerge branch 'bugfix2.1' into beta2.2 (diff)
parentMake "topology subnet" work on Solaris (ifconfig + route metric changes by Ka... (diff)
downloadopenvpn-1aa664cef51e4b4ed4b35e569925acb4fd7b9b52.tar.xz
Merge branch 'feat_misc' into beta2.2
Conflicts: Makefile.am openvpn.8 options.c socket.c ssl.c - feat_misc is missing a lot of bugfix2.1 changes Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'route.c')
-rw-r--r--route.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/route.c b/route.c
index 20f62d5..c63eb41 100644
--- a/route.c
+++ b/route.c
@@ -952,16 +952,14 @@ add_route (struct route *r, const struct tuntap *tt, unsigned int flags, const s
argv_printf (&argv, "%s add",
ROUTE_PATH);
-#if 0
- if (r->metric_defined)
- argv_printf_cat (&argv, "-rtt %d", r->metric);
-#endif
-
argv_printf_cat (&argv, "%s -netmask %s %s",
network,
netmask,
gateway);
+ if (r->metric_defined)
+ argv_printf_cat (&argv, "%d", r->metric);
+
argv_msg (D_ROUTE, &argv);
status = openvpn_execve_check (&argv, es, 0, "ERROR: Solaris route add command failed");