~优化菜单结构

scripts/menu.sh

@@ -895,46 +895,7 @@ setipv6() { #ipv6设置
     esac
 }
 setfirewall() { #防火墙设置
-    set_cust_host_ipv4() {
-        [ -z "$replace_default_host_ipv4" ] && replace_default_host_ipv4="未启用"
 
-        echo "-----------------------------------------------"
-        echo -e "当前默认透明路由的网段为: \033[32m$(ip a 2>&1 | grep -w 'inet' | grep 'global' | grep 'br' | grep -v 'iot' | grep -E ' 1(92|0|72)\.' | sed 's/.*inet.//g' | sed 's/br.*$//g' | sed 's/metric.*$//g' | tr '\n' ' ' && echo) \033[0m"
-        echo -e "当前已添加的自定义网段为:\033[36m$cust_host_ipv4\033[0m"
-        echo "-----------------------------------------------"
-        echo -e " 1 移除所有自定义网段"
-        echo -e " 2 使用自定义网段覆盖默认网段	\033[36m$replace_default_host_ipv4\033[0m"
-        echo -e " 0 返回上级菜单"
-        read -p "请输入对应的序号或需要额外添加的网段 > " text
-        case "$text" in
-        2)
-            if [ "$replace_default_host_ipv4" == "未启用" ]; then
-                replace_default_host_ipv4="已启用"
-            else
-                replace_default_host_ipv4="未启用"
-            fi
-            setconfig replace_default_host_ipv4 "$replace_default_host_ipv4"
-            set_cust_host_ipv4
-            ;;
-        1)
-            unset cust_host_ipv4
-            setconfig cust_host_ipv4
-            set_cust_host_ipv4
-            ;;
-        0) ;;
-        *)
-            if [ -n "$(echo $text | grep -Eo '^([0-9]{1,3}\.){3}[0-9]{1,3}/[0-9]{1,2}'$)" -a -z "$(echo $cust_host_ipv4 | grep "$text")" ]; then
-                cust_host_ipv4="$cust_host_ipv4 $text"
-                setconfig cust_host_ipv4 "'$cust_host_ipv4'"
-            else
-                echo "-----------------------------------------------"
-                echo -e "\033[31m请输入正确的网段地址！\033[0m"
-            fi
-            sleep 1
-            set_cust_host_ipv4
-            ;;
-        esac
-    }
     [ -z "$public_support" ] && public_support=未开启
     [ -z "$public_mixport" ] && public_mixport=未开启
     [ -z "$ipv6_dns" ] && ipv6_dns=已开启
@@ -2252,7 +2213,7 @@ main_menu() {
         ;;
     2)
         checkcfg=$(cat $CFG_PATH)
-        normal_set
+        . "$CRASHDIR"/menus/normal_set.sh && normal_set
         if [ -n "$PID" ]; then
             checkcfg_new=$(cat $CFG_PATH)
             [ "$checkcfg" != "$checkcfg_new" ] && checkrestart