From 1bba3f853bf5b2974b32303c55dfbc0e78d01965 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 21 Mar 2015 19:20:24 +0100 Subject: Fix regression with IPv6 source-dest-routes --- scripts/netifd-proto.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/netifd-proto.sh b/scripts/netifd-proto.sh index 2a62bda..999bd68 100644 --- a/scripts/netifd-proto.sh +++ b/scripts/netifd-proto.sh @@ -122,7 +122,7 @@ proto_add_ipv4_route() { local gw="$3" local source="$4" - append PROTO_ROUTE "$target/$mask/$gw///$source/" + append PROTO_ROUTE "$target/$mask/$gw////$source" } proto_add_ipv6_route() { @@ -134,7 +134,7 @@ proto_add_ipv6_route() { local source="$6" local table="$7" - append PROTO_ROUTE6 "$target/$mask/$gw/$metric/$valid/$source/$table" + append PROTO_ROUTE6 "$target/$mask/$gw/$metric/$valid/$table/$source" } proto_add_ipv6_prefix() { @@ -212,9 +212,9 @@ _proto_push_route() { str="${str#*/}" local valid="${str%%/*}" str="${str#*/}" - local source="${str%%/*}" + local table="${str%%/*}" str="${str#*/}" - local table="${str}" + local source="${str}" json_add_object "" json_add_string target "$target" -- cgit v1.2.1