fix: fakeip-range6 empty vernesong#5081

Author: vernesong

luci-app-openclash/luasrc/model/cbi/openclash/settings.lua

@@ -265,17 +265,17 @@ o.placeholder = translate("5000 or 1234-2345")
 o.rmempty = true
 
 o = s2:option(ListValue, "proto", translate("Proto"))
+o:value("both", translate("Both"))
 o:value("udp", translate("UDP"))
 o:value("tcp", translate("TCP"))
-o:value("both", translate("Both"))
-o.default = "tcp"
+o.default = "both"
 o.rmempty = false
 
 o = s2:option(ListValue, "family", translate("Family"))
+o:value("both", translate("Both"))
 o:value("ipv4", translate("IPv4"))
 o:value("ipv6", translate("IPv6"))
-o:value("both", translate("Both"))
-o.default = "tcp"
+o.default = "both"
 o.rmempty = false
 
 o = s2:option(ListValue, "interface", translate("Interface"))

luci-app-openclash/root/etc/init.d/openclash

@@ -870,13 +870,21 @@ upnp_exclude()
 ipv6_suffix_to_nft_format()
 {
    local ipv6_with_prefix="$1"
-   if [[ "$ipv6_with_prefix" =~ / ]] || [ -n "$(echo ${ipv6_with_prefix} | grep '/')" ]; then
-      local suffix="${ipv6_with_prefix%%/*}"
-      local prefix="${ipv6_with_prefix##*/}"
-      echo "& $prefix == $suffix"
-   else
-      echo "$ipv6_with_prefix"
+
+   if ! echo "$ipv6_with_prefix" | grep -q '/'; then
+      echo "{ $ipv6_with_prefix }"
+      return
+   fi
+
+   local addr="${ipv6_with_prefix%%/*}"
+   local suffix="${ipv6_with_prefix##*/}"
+
+   if echo "$suffix" | grep -qE '^[0-9]+$'; then
+      echo "${addr}/${suffix}"
+      return
    fi
+
+   echo "& ${suffix} == ${addr}"
 } 2>/dev/null
 
 firewall_lan_ac_traffic()
@@ -3718,7 +3726,12 @@ get_config()
    else
       fakeip_range6=$(uci_get_config "fakeip_range6")
    fi
-   [ -z "$fakeip_range6" ] && fakeip_range6=0
+   if [ -z "$fakeip_range6" ]; then
+      fakeip_range6="fdfe:dcba:9876::1/64"
+      fake_ip_range6_enable=0
+   else
+      fake_ip_range6_enable=1
+   fi
 
    lan_interface_name=$(uci_get_config "lan_interface_name" || echo 0)
    if [ "$lan_interface_name" = "0" ]; then
@@ -3820,7 +3833,7 @@ start_service()
          "$find_process_mode" "$fakeip_range" "$ipv6_mode" "$stack_type_v6" "$enable_unified_delay"\
          "$enable_respect_rules" "$custom_fakeip_filter_mode" "$iptables_compat" "$disable_quic_go_gso" "$cors_allow"\
          "$geo_custom_url" "$geoip_custom_url" "$geosite_custom_url" "$geoasn_custom_url"\
-         "$lgbm_auto_update" "$lgbm_custom_url" "$lgbm_update_interval" "$smart_collect" "$smart_collect_size" "$fakeip_range6"
+         "$lgbm_auto_update" "$lgbm_custom_url" "$lgbm_update_interval" "$smart_collect" "$smart_collect_size" "$fakeip_range6" "$fake_ip_range6_enable"
 
          /usr/share/openclash/yml_rules_change.sh \
          "$enable_custom_clash_rules" "$TMP_CONFIG_FILE"\

luci-app-openclash/root/usr/share/openclash/yml_change.sh

@@ -378,6 +378,7 @@ begin
    smart_collect = '${44}' == '1'
    smart_collect_size = '${45}'
    fake_ip_range6 = '${46}'
+   fake_ip_range6_enable = '${47}' == '1'
    default_dashboard = '$default_dashboard'
    yacd_type = '$yacd_type'
    dashboard_type = '$dashboard_type'
@@ -480,7 +481,7 @@ begin
          else
             Value['dns']['enhanced-mode'] = 'fake-ip'
             Value['dns']['fake-ip-range'] = fake_ip_range
-            if Value['dns']['ipv6'] and fake_ip_range6 != '0'
+            if Value['dns']['ipv6'] and fake_ip_range6_enable
                Value['dns']['fake-ip-range6'] = fake_ip_range6
             end
          end