wo#4822 . attempt to simplify _updown.netkey, and do not include dev …

…argument if unknown
xelerance · Jun 12, 2017 · 8800a81 · 8800a81
1 parent e62cdd4
commit 8800a81
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/programs/_updown.netkey/_updown.netkey.in b/programs/_updown.netkey/_updown.netkey.in
@@ -393,21 +393,20 @@ doroute() {
     fi
     parms="$PLUTO_PEER_CLIENT"
     parms2=$IPRARGS
-    # use nexthop if (right/left)nexthop is set and nexthop is not %direct
-    if [ ! "$PLUTO_NEXT_HOP" = "$PLUTO_PEER" ]; then
-	parms2="via $PLUTO_NEXT_HOP"
-    fi
 
-    # route via proper interface according to routing table
-    if [ "$1" = "del" ]; then
-	PLUTO_PEER_INTERFACE=`ip -o route get $PLUTO_PEER_CLIENT | sed "s/^.*dev \([^ ]*\) .*/\1/"`
+    if [ -n "$PLUTO_NEXT_HOP" ]; then
+	parms2="$parms2 via $PLUTO_NEXT_HOP"
     else
-	PLUTO_PEER_INTERFACE=`ip -o route get $PLUTO_NEXT_HOP | sed "s/^.*dev \([^ ]*\) .*/\1/"`
+        parms2="$params dev $PLUTO_INTERFACE"
+    fi
+
+    if [ -n "$PLUTO_MTU" ]; then
+        parms2="$parms2 mtu ${PLUTO_MTU}"
     fi
-    if [ -z "$PLUTO_PEER_INTERFACE" ]; then
-	PLUTO_PEER_INTERFACE=$PLUTO_INTERFACE
+    if [ -n "$PLUTO_METRIC" ]; then
+        parms2="$parms2 metric ${PLUTO_METRIC}"
     fi
-    parms2="$parms2 dev ${PLUTO_PEER_INTERFACE%:*}${PLUTO_MTU:+ mtu ${PLUTO_MTU}}${PLUTO_METRIC:+ metric ${PLUTO_METRIC}} $IPROUTEARGS"
+    parms2="$parms2 $IPROUTEARGS"
 
     # make sure whe have sourceip locally in this machine
     if [ "$1" = "replace" -a -n "$PLUTO_MY_SOURCEIP" ]; then