Add 'prefer_slaac' and 'tunnel_activation'

Author: makeding

htdocs/luci-static/resources/view/fleth.js

@@ -280,6 +280,26 @@ return view.extend({
     o.nocreate = true;
     o.default = "wan";
 
+    o = s.taboption(
+      "general",
+      form.Flag,
+      "prefer_slaac",
+      _("Prefer SLAAC Address"),
+      _("Router outbound connections will prefer SLAAC addresses over MAP-E/ipip6h static addresses")
+    );
+    o.rmempty = false;
+    o.default = "1";
+
+    o = s.taboption(
+      "general",
+      form.Flag,
+      "tunnel_activation",
+      _("Auto Activate Tunnel"),
+      _("Automatically send ping to activate tunnel. Without traffic, some tunnels may fail to establish connection properly.")
+    );
+    o.rmempty = false;
+    o.default = "1";
+
     // LAN IPv6 Configuration section in Tools tab
     o = s.taboption("tools", form.DummyValue, "_lan_ipv6_recommendation");
     o.title = _("LAN IPv6 Configuration");

po/ja/fleth.po

@@ -212,3 +212,15 @@ msgstr "ですが、MAP-E/IPIP6 を正常に動作させるには \"00\" で終
 
 msgid "Please check your upstream router's prefix delegation settings."
 msgstr "上位ルーターのプレフィックス委譲設定を確認してください。"
+
+msgid "Prefer SLAAC Address"
+msgstr "SLAAC アドレス優先"
+
+msgid "Router outbound connections will prefer SLAAC addresses over MAP-E/ipip6h static addresses"
+msgstr "ルーターの送信接続は MAP-E/ipip6h 静的アドレスより SLAAC アドレスを優先します"
+
+msgid "Auto Activate Tunnel"
+msgstr "トンネル自動有効化"
+
+msgid "Automatically send ping to activate tunnel. Without traffic, some tunnels may fail to establish connection properly."
+msgstr "トンネルを有効化するために自動的に Ping を送信します。トラフィックがない場合、一部のトンネルは正常に接続を確立できない場合があります。"

po/zh_Hans/fleth.po

@@ -212,3 +212,15 @@ msgstr "，但必须以 \"00\" 结尾才能使 MAP-E/IPIP6 正常工作。"
 
 msgid "Please check your upstream router's prefix delegation settings."
 msgstr "请检查上游路由器的前缀委派设置。"
+
+msgid "Prefer SLAAC Address"
+msgstr "优先 SLAAC 地址"
+
+msgid "Router outbound connections will prefer SLAAC addresses over MAP-E/ipip6h static addresses"
+msgstr "路由器出站连接将优先使用 SLAAC 地址而非 MAP-E/ipip6h 静态地址"
+
+msgid "Auto Activate Tunnel"
+msgstr "自动激活隧道"
+
+msgid "Automatically send ping to activate tunnel. Without traffic, some tunnels may fail to establish connection properly."
+msgstr "自动发送 ping 以激活隧道。如果没有流量，某些隧道可能无法正常建立连接。"

po/zh_Hant/fleth.po

@@ -212,3 +212,15 @@ msgstr "，但必須以 \"00\" 結尾才能使 MAP-E/IPIP6 正常運作。"
 
 msgid "Please check your upstream router's prefix delegation settings."
 msgstr "請檢查上游路由器的前綴委派設定。"
+
+msgid "Prefer SLAAC Address"
+msgstr "優先 SLAAC 地址"
+
+msgid "Router outbound connections will prefer SLAAC addresses over MAP-E/ipip6h static addresses"
+msgstr "路由器出站連線將優先使用 SLAAC 地址而非 MAP-E/ipip6h 靜態地址"
+
+msgid "Auto Activate Tunnel"
+msgstr "自動啟動隧道"
+
+msgid "Automatically send ping to activate tunnel. Without traffic, some tunnels may fail to establish connection properly."
+msgstr "自動傳送 ping 以啟動隧道。如果沒有流量，某些隧道可能無法正常建立連線。"

root/etc/hotplug.d/iface/70-fleth

@@ -4,6 +4,8 @@
 
 h_ENABLED=$(uci get fleth.global.enabled 2>/dev/null)
 h_UPLINK_INTERFACE=$(uci get fleth.global.interface6 2>/dev/null)
+h_PREFER_SLAAC=$(uci get fleth.global.prefer_slaac 2>/dev/null)
+h_TUNNEL_ACTIVATION=$(uci get fleth.global.tunnel_activation 2>/dev/null)
 
 # Exit if fleth is not enabled or interface is not configured
 [ "$h_ENABLED" != "1" ] && exit 0
@@ -16,7 +18,7 @@ if [ "$INTERFACE" = "$h_UPLINK_INTERFACE" ] && [ "$ACTION" = "ifup" ]; then
 fi
 
 # Connectivity test for tunnel interfaces
-if [ "$ACTION" = "ifup" ]; then
+if [ "$h_TUNNEL_ACTIVATION" = "1" ] && [ "$ACTION" = "ifup" ]; then
     # Get interface protocol type
     proto=$(uci get network.${INTERFACE}.proto 2>/dev/null)
 
@@ -68,3 +70,22 @@ if [ "$ACTION" = "ifup" ]; then
             ;;
     esac
 fi
+
+# Deprecate static /128 addresses to prioritize SLAAC
+# This ensures SLAAC addresses are preferred over manually configured addresses
+if [ "$h_PREFER_SLAAC" = "1" ] && { [ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifupdate" ]; }; then
+    device=$(ifstatus ${INTERFACE} 2>/dev/null | jsonfilter -e '@.device' 2>/dev/null)
+    [ -z "$device" ] && device=$(ifstatus ${INTERFACE} 2>/dev/null | jsonfilter -e '@.l3_device' 2>/dev/null)
+    if [ -n "$device" ]; then
+        ip -6 addr show dev "$device" scope global 2>/dev/null | grep "inet6" | while read -r line; do
+            addr=$(echo "$line" | awk '{print $2}')
+            if echo "$addr" | grep -q "/128$"; then
+                if ! echo "$line" | grep -q "dynamic"; then
+                    clean_addr=$(echo "$addr" | cut -d'/' -f1)
+                    ip -6 addr change "$clean_addr"/128 dev "$device" preferred_lft 0
+                    logger -t fleth-hotplug "Deprecated static /128 address $clean_addr on $device (interface: $INTERFACE)"
+                fi
+            fi
+        done
+    fi
+fi

root/etc/uci-defaults/luci-app-fleth

@@ -10,12 +10,23 @@ config fleth 'global'
 	option interface_zone 'wan'
 	option interface6 'wan6'
 	option mtu '1460'
+	option prefer_slaac '1'
+	option tunnel_activation '1'
 EOF
-fi
-if [ -f /etc/config/fleth ]; then
+else
     sed -i '/option ip6prefix_enabled/d' /etc/config/fleth
     sed -i '/option cron_dhcpv6_renew_enabled/d' /etc/config/fleth
     sed -i '/option type/d' /etc/config/fleth
+    # Add prefer_slaac option if not exists
+    if ! grep -q "option prefer_slaac" /etc/config/fleth; then
+        uci set fleth.global.prefer_slaac='1'
+        uci commit fleth
+    fi
+    # Add tunnel_activation option if not exists
+    if ! grep -q "option tunnel_activation" /etc/config/fleth; then
+        uci set fleth.global.tunnel_activation='1'
+        uci commit fleth
+    fi
 fi
 fleth hook_none.js
 exit 0

root/lib/netifd/proto/ipip6h.sh

@@ -179,6 +179,16 @@ proto_ipip6h_setup() {
 		json_close_array
 		json_close_object
 		ubus call network add_dynamic "$(json_dump)"
+
+		# Deprecate static address if prefer_slaac is enabled
+		local prefer_slaac=$(uci get fleth.global.prefer_slaac 2>/dev/null)
+		if [ "$prefer_slaac" = "1" ]; then
+			local parent_device=$(ifstatus ${parent_iface} 2>/dev/null | jsonfilter -e '@.device' 2>/dev/null)
+			if [ -n "$parent_device" ]; then
+				ip -6 addr change "${ip6addr}"/128 dev "$parent_device" preferred_lft 0 2>/dev/null
+				logger -t ipip6h "[${cfg}] Deprecated static address ${ip6addr} to prefer SLAAC"
+			fi
+		fi
 	fi
 
 	logger -t ipip6h "[${cfg}] Setup completed"