6rd / ds-lite: make the firewall-zones of nested-protocols configurable

[openwrt.git] / package / network / ipv6 / 6rd / files / 6rd.sh

diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh
index a3935e1..58b16c8 100644 (file)
--- a/package/network/ipv6/6rd/files/6rd.sh
+++ b/package/network/ipv6/6rd/files/6rd.sh
@@ -14,8 +14,8 @@ proto_6rd_setup() {
        local iface="$2"
        local link="6rd-$cfg"
 
-       local mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink
-       json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink
+       local mtu df ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
+       json_get_vars mtu df ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
 
        [ -z "$ip6prefix" -o -z "$peeraddr" ] && {
                proto_notify_error "$cfg" "MISSING_ADDRESS"
@@ -48,11 +48,19 @@ proto_6rd_setup() {
        proto_init_update "$link" 1
        proto_add_ipv6_address "$ip6addr" "$ip6prefixlen"
        proto_add_ipv6_prefix "$ip6lanprefix"
-       proto_add_ipv6_route "::" 0 "::$peeraddr" 4096
+
+       if [ "$sourcerouting" != "0" ]; then
+               proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "::/128"
+               proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen"
+               proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix"
+       else
+               proto_add_ipv6_route "::" 0 "::$peeraddr" 4096
+       fi
 
        proto_add_tunnel
        json_add_string mode sit
        json_add_int mtu "${mtu:-1280}"
+       json_add_boolean df "${df:-1}"
        json_add_int ttl "${ttl:-64}"
        json_add_string local "$ipaddr"
        json_add_string 6rd-prefix "$ip6prefix/$ip6prefixlen"
@@ -60,6 +68,10 @@ proto_6rd_setup() {
        [ -n "$tunlink" ] && json_add_string link "$tunlink"
        proto_close_tunnel
 
+       proto_add_data
+       [ -n "$zone" ] && json_add_string zone "$zone"
+       proto_close_data
+
        proto_send_update "$cfg"
 }
 
@@ -72,6 +84,7 @@ proto_6rd_init_config() {
        available=1
 
        proto_config_add_int "mtu"
+       proto_config_add_boolean "df"
        proto_config_add_int "ttl"
        proto_config_add_string "ipaddr"
        proto_config_add_string "peeraddr"
@@ -79,6 +92,8 @@ proto_6rd_init_config() {
        proto_config_add_string "ip6prefixlen"
        proto_config_add_string "ip4prefixlen"
        proto_config_add_string "tunlink"
+       proto_config_add_boolean "sourcerouting"
+       proto_config_add_string "zone"
 }
 
 [ -n "$INCLUDE_ONLY" ] || {