Convert DHCP->6rd and DHCPv6->DS-Lite autoconfig to dynamic interface

[lede-git/.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 59c3169b39a2aabc7666c2adb2a3b4db4e7b597b..a3935e1422cc5821c7f1535b5bfc448944b1c73e 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
-       json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen
+       local mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink
+       json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink
 
        [ -z "$ip6prefix" -o -z "$peeraddr" ] && {
                proto_notify_error "$cfg" "MISSING_ADDRESS"
@@ -42,9 +42,13 @@ proto_6rd_setup() {
        local ip6subnet=$(6rdcalc "$ip6prefix/$ip6prefixlen" "$ipaddr/$ip4prefixlen")
        local ip6addr="${ip6subnet%%::*}::1"
 
+       # Determine the IPv6 prefix
+       local ip6lanprefix="$ip6subnet/$(($ip6prefixlen + 32 - $ip4prefixlen))"
+
        proto_init_update "$link" 1
        proto_add_ipv6_address "$ip6addr" "$ip6prefixlen"
-       proto_add_ipv6_route "::" 0 "::$peeraddr"
+       proto_add_ipv6_prefix "$ip6lanprefix"
+       proto_add_ipv6_route "::" 0 "::$peeraddr" 4096
 
        proto_add_tunnel
        json_add_string mode sit
@@ -53,6 +57,7 @@ proto_6rd_setup() {
        json_add_string local "$ipaddr"
        json_add_string 6rd-prefix "$ip6prefix/$ip6prefixlen"
        json_add_string 6rd-relay-prefix "$ip4prefix/$ip4prefixlen"
+       [ -n "$tunlink" ] && json_add_string link "$tunlink"
        proto_close_tunnel
 
        proto_send_update "$cfg"
@@ -73,6 +78,7 @@ proto_6rd_init_config() {
        proto_config_add_string "ip6prefix"
        proto_config_add_string "ip6prefixlen"
        proto_config_add_string "ip4prefixlen"
+       proto_config_add_string "tunlink"
 }
 
 [ -n "$INCLUDE_ONLY" ] || {