From 1bb016c063b937d86643f1d12d8e4d764cbe0f1f Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Sun, 9 Aug 2020 13:51:37 +0800
Subject: [PATCH] =?UTF-8?q?v0.8.5=20~=E6=96=B0=E5=A2=9E=E4=BA=86Tun/Redir?=
 =?UTF-8?q?=E6=B7=B7=E5=90=88=E6=A8=A1=E5=BC=8F=20~=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=94=AF=E6=8C=81ipv6=E7=9A=84=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=20~=E6=96=B0=E5=A2=9E=E4=BA=86=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=A0=B8=E5=BF=83=E6=97=B6=E7=9A=84=E7=89=88=E6=9C=AC=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=20~=E6=96=B0=E5=A2=9E=E4=BA=86=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E9=87=8D=E5=A4=8D=E5=AE=89=E8=A3=85=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=20~=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=20~=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E9=83=A8=E5=88=86=E8=AE=BE=E5=AE=9A=E6=9C=AA=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/clashfm.tar.gz   | Bin 9580 -> 9580 bytes
 scripts/clash.sh     | 846 +++++++++++++++++++++++--------------------
 scripts/clashservice |  44 ++-
 scripts/getdate.sh   | 327 +++++++++--------
 4 files changed, 658 insertions(+), 559 deletions(-)

diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz
index 187b75dc4f233cc533e7e06f5dd4c7e84554cf58..060c70019742c9b66f84769bcf17c92e73fa0578 100644
GIT binary patch
delta 16
XcmaFk^~Q@`zMF$Xs!x9-d#Wk`G%N*2

delta 16
XcmaFk^~Q@`zMF%?+(LIFd#Wk`GU){j

diff --git a/scripts/clash.sh b/scripts/clash.sh
index 26b40a7..b634b37 100644
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -9,7 +9,7 @@ echo "***********************************************"
 
 getconfig(){
 #版本号
-versionsh_l=0.8.4
+versionsh_l=0.8.5
 #更新服务器地址
 update_url="https://juewuy.xyz/clash"
 #文件路径
@@ -17,65 +17,64 @@ ccfg=$clashdir/mark
 yaml=$clashdir/config.yaml
 #检查标识文件
 if [ ! -f "$ccfg" ]; then
-echo mark文件不存在，正在创建！
-cat >$ccfg<<EOF
+	echo mark文件不存在，正在创建！
+	cat >$ccfg<<EOF
 #标识clash运行状态的文件，不明勿动！
 EOF
 fi
 source $ccfg
 #获取自启状态
-#if [ $auto_start = true ] > /dev/null 2>&1; then 
 if [ -f /etc/rc.d/*clash ]; then 
-auto="\033[32m已设置开机启动！\033[0m"
-auto1="\033[36m禁用\033[0mclash开机启动"
+	auto="\033[32m已设置开机启动！\033[0m"
+	auto1="\033[36m禁用\033[0mclash开机启动"
 else
-auto="\033[31m未设置开机启动！\033[0m"
-auto1="\033[36m允许\033[0mclash开机启动"
+	auto="\033[31m未设置开机启动！\033[0m"
+	auto1="\033[36m允许\033[0mclash开机启动"
 fi
 #获取运行模式
 if [ ! -n "$redir_mod" ]; then
-sed -i "2i\redir_mod=Redir模式" $ccfg
-redir_mod=Redir模式
+	sed -i "2i\redir_mod=Redir模式" $ccfg
+	redir_mod=Redir模式
 fi
 #获取运行状态
 status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
 if [[ $status -gt 0 ]];then
-run="\033[32m正在运行（$redir_mod）\033[0m"
-uid=`ps |grep -w 'clash -d'|grep -v grep|awk '{print $1}'`
-VmRSS=`cat /proc/$uid/status|grep -w VmRSS|awk '{print $2,$3}'`
-  #获取运行时长
-  if [ "$start_time" > 0 ] > /dev/null 2>&1; then 
-  time=$((`date +%s`-$start_time))
-  day=$(($time/86400))
-    if [[ $day != 0 ]]; then 
-    day=$day天
-    else
-    day=""
-    fi
-  time=`date -u -d @${time} +"%-H小时%-M分%-S秒"`
-  fi
+	run="\033[32m正在运行（$redir_mod）\033[0m"
+	uid=`ps |grep -w 'clash -d'|grep -v grep|awk '{print $1}'`
+	VmRSS=`cat /proc/$uid/status|grep -w VmRSS|awk '{print $2,$3}'`
+	#获取运行时长
+	if [ -n "$start_time" ]; then 
+		time=$((`date +%s`-$start_time))
+		day=$(($time/86400))
+		if [[ $day != 0 ]]; then 
+			day=$day天
+		else
+			day=""
+		fi
+		time=`date -u -d @${time} +"%-H小时%-M分%-S秒"`
+	fi
 else
-run="\033[31m没有运行（$redir_mod）\033[0m"
+	run="\033[31m没有运行（$redir_mod）\033[0m"
 fi
 #输出状态
 echo -----------------------------------------------
 echo -e "Clash服务"$run"，"$auto""
 if [ $status -gt 0 ];then
-echo -e "当前内存占用：\033[44m"$VmRSS"\033[0m，已运行：\033[46;30m"$day"\033[44;37m"$time"\033[0m"
+	echo -e "当前内存占用：\033[44m"$VmRSS"\033[0m，已运行：\033[46;30m"$day"\033[44;37m"$time"\033[0m"
 fi
 #安装clash核心
 if [ ! -f $clashdir/clash ];then
-echo -----------------------------------------------
-echo -e "\033[31m没有找到核心文件，请先下载clash核心！\033[0m"
-source $clashdir/getdate.sh
-getcore
+	echo -----------------------------------------------
+	echo -e "\033[31m没有找到核心文件，请先下载clash核心！\033[0m"
+	source $clashdir/getdate.sh
+	getcore
 fi
 #安装GeoIP数据库
 if [ ! -f $clashdir/Country.mmdb ];then
-echo -----------------------------------------------
-echo -e "\033[31m没有找到GeoIP数据库文件，请先下载数据库！\033[0m"
-source $clashdir/getdate.sh
-getgeo
+	echo -----------------------------------------------
+	echo -e "\033[31m没有找到GeoIP数据库文件，请先下载数据库！\033[0m"
+	source $clashdir/getdate.sh
+	getgeo
 fi
 }
 clashstart(){
@@ -98,15 +97,15 @@ status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
 clashlink(){
 #获取订阅规则
 if [ ! -n "$rule_link" ]; then
-sed -i '/rule_link=*/'d $ccfg
-sed -i "4i\rule_link=1" $ccfg
-rule_link=1
+	sed -i '/rule_link=*/'d $ccfg
+	sed -i "4i\rule_link=1" $ccfg
+	rule_link=1
 fi
 #获取后端服务器地址
 if [ ! -n "$server_link" ]; then
-sed -i '/server_link=*/'d $ccfg
-sed -i "5i\server_link=1" $ccfg
-server_link=1
+	sed -i '/server_link=*/'d $ccfg
+	sed -i "5i\server_link=1" $ccfg
+	server_link=1
 fi
 echo -----------------------------------------------
 echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
@@ -121,285 +120,336 @@ echo -e " 7 设置自动更新（未完成）"
 echo -e " 0 返回上级菜单"
 read -p "请输入对应数字 > " num
 if [ -z $num ];then
-  echo -----------------------------------------------
-  echo -e "\033[31m请输入正确的数字！\033[0m"
-  clashsh
+	echo -----------------------------------------------
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+	clashsh
 elif [[ $num == 1 ]];then
-  if [ -n "$Url" ];then
-    echo -----------------------------------------------
-    echo -e "\033[33m检测到已记录的订阅链接：\033[0m"
-    echo -e "\033[4;32m$Url\033[0m"
-    echo -----------------------------------------------
-	read -p "清空链接/追加导入？[1/0] > " res
-	  if [ "$res" = '1' ]; then
-      Url=""
-	  echo -----------------------------------------------
-	  echo -e "\033[31m链接已清空！\033[0m"
-	  fi
-  fi
-  source $clashdir/getdate.sh
-  getlink
+	if [ -n "$Url" ];then
+		echo -----------------------------------------------
+		echo -e "\033[33m检测到已记录的订阅链接：\033[0m"
+		echo -e "\033[4;32m$Url\033[0m"
+		echo -----------------------------------------------
+		read -p "清空链接/追加导入？[1/0] > " res
+		if [ "$res" = '1' ]; then
+			Url=""
+			echo -----------------------------------------------
+			echo -e "\033[31m链接已清空！\033[0m"
+		fi
+	fi
+	source $clashdir/getdate.sh
+	getlink
   
 elif [[ $num == 2 ]];then
-  if [ -n "$Url" ];then
-    echo -----------------------------------------------
-    echo -e "\033[33m检测到已记录的订阅链接：\033[0m"
-    echo -e "\033[4;32m$Url\033[0m"
-    echo -----------------------------------------------
-	read -p "清空链接/追加导入？[1/0] > " res
-	  if [ "$res" = '1' ]; then
-      Url=""
-	  echo -----------------------------------------------
-	  echo -e "\033[31m链接已清空！\033[0m"
-	  fi
-  fi
-  source $clashdir/getdate.sh
-  getlink2
-elif [[ $num == 3 ]];then
-  echo -----------------------------------------------
-  echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
-  echo 当前使用规则为：$rule_link
-  echo 1 ACL4SSR默认通用版（推荐）
-  echo 2 ACL4SSR精简全能版（推荐）
-  echo 3 ACL4SSR通用版去广告加强
-  echo 4 ACL4SSR精简版去广告加强
-  echo 5 ACL4SSR通用版无去广告
-  echo 0 返回上级菜单
-  read -p "请输入对应数字 > " num
-    if [ -z $num ];then
-	  echo -----------------------------------------------
-	  echo -e "\033[31m请输入正确的数字！\033[0m"
-	  clashlink
-	else
-	  #将对应标记值写入mark
-	  sed -i '/rule_link*/'d $ccfg
-      sed -i "4i\rule_link="$num"" $ccfg	
-	  echo -----------------------------------------------	  
-	  echo -e "\033[32m设置成功！返回上级菜单！\033[0m"
-	  clashlink
+	if [ -n "$Url" ];then
+		echo -----------------------------------------------
+		echo -e "\033[33m检测到已记录的订阅链接：\033[0m"
+		echo -e "\033[4;32m$Url\033[0m"
+		echo -----------------------------------------------
+		read -p "清空链接/追加导入？[1/0] > " res
+		if [ "$res" = '1' ]; then
+			Url=""
+			echo -----------------------------------------------
+			echo -e "\033[31m链接已清空！\033[0m"
+		fi
 	fi
+	source $clashdir/getdate.sh
+	getlink2
+elif [[ $num == 3 ]];then
+	echo -----------------------------------------------
+	echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+	echo 当前使用规则为：$rule_link
+	echo 1 ACL4SSR默认通用版（推荐）
+	echo 2 ACL4SSR精简全能版（推荐）
+	echo 3 ACL4SSR通用版去广告加强
+	echo 4 ACL4SSR精简版去广告加强
+	echo 5 ACL4SSR通用版无去广告
+	echo 0 返回上级菜单
+	read -p "请输入对应数字 > " num
+		if [ -z $num ];then
+		echo -----------------------------------------------
+		echo -e "\033[31m请输入正确的数字！\033[0m"
+		clashlink
+		else
+			#将对应标记值写入mark
+			sed -i '/rule_link*/'d $ccfg
+			sed -i "4i\rule_link="$num"" $ccfg	
+			rule_link=$num
+			echo -----------------------------------------------	  
+			echo -e "\033[32m设置成功！返回上级菜单！\033[0m"
+			clashlink
+		fi
 elif [[ $num == 4 ]];then
-  echo -----------------------------------------------
-  echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
-  echo 当前使用后端为：$server_link
-  echo 1 subconverter-web.now.sh
-  echo 2 subconverter.herokuapp.com
-  echo 3 subcon.py6.pw
-  echo 4 api.dler.io
-  echo 5 api.wcc.best
-  echo 6 skapi.cool
-  echo 7 subconvert.dreamcloud.pw
-  echo 0 返回上级菜单
-  read -p "请输入对应数字 > " num
+	echo -----------------------------------------------
+	echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+	echo 当前使用后端为：$server_link
+	echo 1 subconverter-web.now.sh
+	echo 2 subconverter.herokuapp.com
+	echo 3 subcon.py6.pw
+	echo 4 api.dler.io
+	echo 5 api.wcc.best
+	echo 6 skapi.cool
+	echo 7 subconvert.dreamcloud.pw
+	echo 0 返回上级菜单
+	read -p "请输入对应数字 > " num
     if [ -z $num ];then
-	  echo -----------------------------------------------
-	  echo -e "\033[31m请输入正确的数字！\033[0m"
-	  clashlink
+		echo -----------------------------------------------
+		echo -e "\033[31m请输入正确的数字！\033[0m"
+		clashlink
 	else
-	  if [[ $num == 0 ]];then
-	  clashlink
-	  fi
-	  #将对应标记值写入mark
-	  sed -i '/server_link*/'d $ccfg
-      sed -i "4i\server_link="$num"" $ccfg		
-      echo -----------------------------------------------	  
-	  echo -e "\033[32m设置成功！返回上级菜单！\033[0m"
-	  clashlink
+		if [[ $num == 0 ]];then
+		clashlink
+		fi
+		#将对应标记值写入mark
+		sed -i '/server_link*/'d $ccfg
+		sed -i "4i\server_link="$num"" $ccfg	
+		server_link=$num
+		echo -----------------------------------------------	  
+		echo -e "\033[32m设置成功！返回上级菜单！\033[0m"
+		clashlink
 	fi
 elif [[ $num == 5 ]];then
-  yamlbak=$yaml.bak
-  if [ ! -f "$yaml".bak ];then
-  echo -----------------------------------------------
-  echo -e "\033[31m没有找到配置文件的备份！\033[0m"
-  else
-  echo -----------------------------------------------
-  echo -e 备份文件共有"\033[32m`wc -l < $yamlbak`\033[0m"行内容，当前文件共有"\033[32m`wc -l < $yaml`\033[0m"行内容
-  read -p "确认还原配置文件？此操作不可逆！[1/0] > " res
-	if [ "$res" = '1' ]; then
-	mv $yamlbak $yaml
-    echo -----------------------------------------------
-	echo -e "\033[32m配置文件已还原！请手动重启clash服务！\033[0m"
-	else 
-    echo -----------------------------------------------
-	echo -e "\033[31m操作已取消！返回上级菜单！\033[0m"
+	yamlbak=$yaml.bak
+	if [ ! -f "$yaml".bak ];then
+		echo -----------------------------------------------
+		echo -e "\033[31m没有找到配置文件的备份！\033[0m"
+	else
+		echo -----------------------------------------------
+		echo -e 备份文件共有"\033[32m`wc -l < $yamlbak`\033[0m"行内容，当前文件共有"\033[32m`wc -l < $yaml`\033[0m"行内容
+		read -p "确认还原配置文件？此操作不可逆！[1/0] > " res
+		if [ "$res" = '1' ]; then
+			mv $yamlbak $yaml
+			echo -----------------------------------------------
+			echo -e "\033[32m配置文件已还原！请手动重启clash服务！\033[0m"
+		else 
+			echo -----------------------------------------------
+			echo -e "\033[31m操作已取消！返回上级菜单！\033[0m"
+		fi
 	fi
-  fi
-  clashsh
+	clashsh
 elif [[ $num == 6 ]];then
-  if [ ! -n "$Url" ];then
-    echo -----------------------------------------------
-    echo 没有找到你的订阅链接！请先输入链接！
-  clashlink
-  else
-    echo -----------------------------------------------
-    echo -----------------------------------------------
-    echo -e "\033[33m当前系统记录的订阅链接为：\033[0m"
-    echo -e "\033[4;32m$Url\033[0m"
-    echo -----------------------------------------------
-	read -p "确认更新配置文件？[1/0] > " res
-	  if [ "$res" = '1' ]; then
-	  source $clashdir/getdate.sh
-      getyaml
-	  fi
-	  clashlink
-  fi
+	if [ ! -n "$Url" ];then
+		echo -----------------------------------------------
+		echo 没有找到你的订阅链接！请先输入链接！
+		clashlink
+	else
+		echo -----------------------------------------------
+		echo -----------------------------------------------
+		echo -e "\033[33m当前系统记录的订阅链接为：\033[0m"
+		echo -e "\033[4;32m$Url\033[0m"
+		echo -----------------------------------------------
+		read -p "确认更新配置文件？[1/0] > " res
+		if [ "$res" = '1' ]; then
+			source $clashdir/getdate.sh
+			getyaml
+		fi
+			clashlink
+	fi
 elif [[ $num == 0 ]];then
-  clashsh
+	clashsh
 else
-  echo -----------------------------------------------
-  echo -e "\033[31m请输入正确的数字！\033[0m"
-  exit;
+	echo -----------------------------------------------
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+	exit;
 fi
 }
 clashadv(){
 #获取设置默认显示
 if [ ! -n "$skip_cert" ]; then
-skip_cert=已开启
+	skip_cert=已开启
 fi
 if [ ! -n "$common_ports" ]; then
-common_ports=未开启
+	common_ports=未开启
 fi
 if [ ! -n "$dns_mod" ]; then
-dns_mod=redir_host
+	dns_mod=redir_host
 fi
 if [ ! -n "$modify_yaml" ]; then
-modify_yaml=未开启
+	modify_yaml=未开启
+fi
+if [ ! -n "$ipv6_support" ]; then
+	ipv6_support=未开启
 fi
 #
 echo -----------------------------------------------
 echo -e "\033[33m欢迎使用高级模式菜单：\033[0m"
 echo -e "\033[32m修改配置后请手动重启clash服务！\033[0m"
-echo -e " 1 切换运行模式:    	\033[36m$redir_mod\033[0m"
+echo -e " 1 切换Clash运行模式: 	\033[36m$redir_mod\033[0m"
 echo -e " 2 切换DNS运行模式：	\033[36m$dns_mod\033[0m"
 echo -e " 3 跳过本地证书验证：	\033[36m$skip_cert\033[0m   ————解决节点证书验证错误"
 echo -e " 4 只代理常用端口： 	\033[36m$common_ports\033[0m   ————用于屏蔽P2P流量"
 echo -e " 5 不修饰config.yaml:	\033[36m$modify_yaml\033[0m   ————用于使用自定义配置"
+echo -e " 6 启用ipv6支持:     	\033[36m$ipv6_support\033[0m   ————实验性且不兼容Fake_ip"
 echo -e " 9 \033[32m重启\033[0mclash服务"
 echo -e " 0 返回上级菜单 \033[0m"
 read -p "请输入对应数字 > " num
 if [[ $num -le 9 ]] > /dev/null 2>&1; then 
-  if [[ $num == 0 ]]; then
-    clashsh
-  
-  elif [[ $num == 1 ]]; then
-    echo -----------------------------------------------
-    echo -e "当前代理模式为：\033[47;30m $redir_mod \033[0m"
-	echo -e "\033[33m切换模式后需要手动重启clash服务以生效！\033[0m"
-	echo " 1 Tun模式：  支持UDP转发且延迟低"
-	echo "              但CPU及内存占用更高"
-	echo "              适合外服游戏用户"
-	echo " 2 Redir模式：CPU以及内存占用较低"
-	echo "              但不支持UDP流量转发"
-	echo "              日常使用推荐此模式"
-	echo " 0 返回上级菜单"
-	read -p "请输入对应数字 > " num	
 	if [[ $num == 0 ]]; then
-		clashadv
+		clashsh  
 	elif [[ $num == 1 ]]; then
-		redir_mod=Tun模式
-	elif [[ $num == 2 ]]; then
-		redir_mod=Redir模式
-	else
 		echo -----------------------------------------------
-		echo -e "\033[31m请输入正确的数字！\033[0m"
+		echo -e "当前代理模式为：\033[47;30m $redir_mod \033[0m；Clash核心为：\033[47;30m $clashcore \033[0m"
+		echo -e "\033[33m切换模式后需要手动重启clash服务以生效！\033[0m"
+		echo -e "\033[36mTun及混合模式必须使用clashpre核心！\033[0m"
+		echo " 1 Redir模式：CPU以及内存占用较低"
+		echo "              但不支持UDP流量转发"
+		echo "              日常使用推荐此模式"
+		echo " 2 Tun模式：  支持UDP转发且延迟低"
+		echo "              但CPU及内存占用更高"
+		echo "              且不支持redir-host"
+		echo " 3 混合模式： 仅使用Tun转发UPD流量"
+		echo "              CPU和内存占用较高"
+		echo "              不推荐使用redir-host"
+		echo " 0 返回上级菜单"
+		read -p "请输入对应数字 > " num	
+		if [ -z $num ]; then
+			echo -----------------------------------------------
+			echo -e "\033[31m请输入正确的数字！\033[0m"
+			clashadv
+		elif [[ $num == 0 ]]; then
+			clashadv
+		elif [[ $num == 1 ]]; then
+			redir_mod=Redir模式
+		elif [[ $num == 2 ]]; then
+			if [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then
+				echo -----------------------------------------------
+				echo -e "\033[31m当前核心不支持开启Tun模式！请先切换clash核心！！！\033[0m"
+				clashadv
+			fi
+			redir_mod=Tun模式
+			dns_mod=fake-ip
+		elif [[ $num == 3 ]]; then
+			if [ "$clashcore" = "clash" ] || [ "$clashcore" = "clashr" ];then
+				echo -----------------------------------------------
+				echo -e "\033[31m当前核心不支持开启Tun模式！请先切换clash核心！！！\033[0m"
+				clashadv
+			fi
+			redir_mod=混合模式		
+		else
+			echo -----------------------------------------------
+			echo -e "\033[31m请输入正确的数字！\033[0m"
+			clashadv
+		fi
+		sed -i '/redir_mod*/'d $ccfg
+		sed -i "1i\redir_mod=$redir_mod" $ccfg
+		sed -i '/dns_mod*/'d $ccfg
+		sed -i "1i\dns_mod=$dns_mod" $ccfg
+		echo -----------------------------------------------	
+		echo -e "\033[36m已设为 $redir_mod ！！\033[0m"
 		clashadv
-	fi
-	sed -i '/redir_mod*/'d $ccfg
-	sed -i "1i\redir_mod=$redir_mod" $ccfg
-	echo -----------------------------------------------	
-	echo -e "\033[33m已设为 $redir_mod ！！\033[0m"
-	clashadv
 	  
-  elif [[ $num == 2 ]]; then
-    echo -----------------------------------------------
-    echo -e "当前DNS运行模式为：\033[47;30m $dns_mod \033[0m"
-	echo -e "\033[33m切换模式后需要手动重启clash服务以生效！\033[0m"
-	echo " 1 fake-ip模式：   响应速度更快"
-	echo "                   但可能和部分软件有冲突"
-	echo " 2 redir_host模式：使用稳定，兼容性好"
-	echo "                   响应速度略慢"
-	echo " 0 返回上级菜单"
-	read -p "请输入对应数字 > " num
-	if [[ $num == 0 ]]; then
-		clashadv
-	elif [[ $num == 1 ]]; then
-		dns_mod='fake-ip'
 	elif [[ $num == 2 ]]; then
-		dns_mod='redir_host'
-	else
 		echo -----------------------------------------------
-		echo -e "\033[31m请输入正确的数字！\033[0m"
+		echo -e "当前DNS运行模式为：\033[47;30m $dns_mod \033[0m"
+		echo -e "\033[33m切换模式后需要手动重启clash服务以生效！\033[0m"
+		echo " 1 fake-ip模式：   响应速度更快"
+		echo "                   但可能和部分软件有冲突"
+		echo " 2 redir_host模式：使用稳定，兼容性好"
+		echo "                   不支持Tun模式"
+		echo " 0 返回上级菜单"
+		read -p "请输入对应数字 > " num
+		if [ -z $num ]; then
+			echo -----------------------------------------------
+			echo -e "\033[31m请输入正确的数字！\033[0m"
+			clashadv
+		elif [[ $num == 0 ]]; then
+			clashadv
+		elif [[ $num == 1 ]]; then
+			dns_mod=fake-ip
+		elif [[ $num == 2 ]]; then
+			dns_mod=redir_host
+			redir_mod=Redir模式
+		else
+			echo -----------------------------------------------
+			echo -e "\033[31m请输入正确的数字！\033[0m"
+			clashadv
+		fi
+		sed -i '/dns_mod*/'d $ccfg
+		sed -i "1i\dns_mod=$dns_mod" $ccfg
+		sed -i '/redir_mod*/'d $ccfg
+		sed -i "1i\redir_mod=$redir_mod" $ccfg
+		echo -----------------------------------------------	
+		echo -e "\033[36m已设为 $dns_mod 模式！！\033[0m"
+		clashadv
+	
+	elif [[ $num == 3 ]]; then	
+		sed -i '/skip_cert*/'d $ccfg
+		echo -----------------------------------------------
+		if [ "$skip_cert" = "未开启" ] > /dev/null 2>&1; then 
+			sed -i "1i\skip_cert=已开启" $ccfg
+			echo -e "\033[33m已设为开启跳过本地证书验证！！\033[0m"
+			skip_cert=已开启
+		else
+			/etc/init.d/clash enable
+			sed -i "1i\skip_cert=未开启" $ccfg
+			echo -e "\033[33m已设为禁止跳过本地证书验证！！\033[0m"
+			skip_cert=未开启
+		fi
+		clashadv
+	
+	elif [[ $num == 4 ]]; then	
+		sed -i '/common_ports*/'d $ccfg
+		echo -----------------------------------------------
+		if [ "$common_ports" = "未开启" ] > /dev/null 2>&1; then 
+			sed -i "1i\common_ports=已开启" $ccfg
+			echo -e "\033[33m已设为仅代理（22,53,587,465,995,993,143,80,443）等常用端口！！\033[0m"
+			common_ports=已开启
+		else
+			/etc/init.d/clash enable
+			sed -i "1i\common_ports=未开启" $ccfg
+			echo -e "\033[33m已设为代理全部端口！！\033[0m"
+			common_ports=未开启
+		fi
+		clashadv  
+	
+	elif [[ $num == 5 ]]; then	
+		sed -i '/modify_yaml*/'d $ccfg
+		echo -----------------------------------------------
+		if [ "$modify_yaml" = "未开启" ] > /dev/null 2>&1; then 
+			sed -i "1i\modify_yaml=已开启" $ccfg
+			echo -e "\033[33m已设为使用用户完成自定义配置文件！！"
+			echo -e "\033[0m不明白原理的用户切勿随意开启此选项"
+			echo -e "\033[33m！！！必然会导致上不了网！！!\033[0m"
+			modify_yaml=已开启
+		else
+			/etc/init.d/clash enable
+			sed -i "1i\modify_yaml=未开启" $ccfg
+			echo -e "\033[32m已设为使用脚本内置规则管理config.yaml配置文件！！\033[0m"
+			modify_yaml=未开启
+		fi
+		clashadv  
+		
+	elif [[ $num == 6 ]]; then	
+		sed -i '/ipv6_support*/'d $ccfg
+		echo -----------------------------------------------
+		if [ "$ipv6_support" = "未开启" ] > /dev/null 2>&1; then 
+			sed -i "1i\ipv6_support=已开启" $ccfg
+			echo -e "\033[33m已开启对ipv6协议的支持！！\033[0m"
+			echo -e "Clash对ipv6的支持并不友好，如不能使用请静等修复！"
+			ipv6_support=已开启
+		else
+			/etc/init.d/clash enable
+			sed -i "1i\ipv6_support=未开启" $ccfg
+			echo -e "\033[32m已禁用对ipv6协议的支持！！\033[0m"
+			ipv6_support=未开启
+		fi
+		clashadv  
+	
+	elif [[ $num == 9 ]]; then	
+		if [ $status -gt 0 ];then
+			echo -----------------------------------------------
+			/etc/init.d/clash stop
+			echo -e "\033[31mClash服务已停止！\033[0m"
+		fi
+		clashstart
+		clashsh
+	else
+		echo -e "\033[31m暂未支持的选项！\033[0m"
 		clashadv
 	fi
-	sed -i '/dns_mod*/'d $ccfg
-	sed -i "1i\dns_mod=$dns_mod" $ccfg
-	echo -----------------------------------------------	
-	echo -e "\033[33m已设为 $dns_mod 模式！！\033[0m"
-	clashadv
-	
-  elif [[ $num == 3 ]]; then	
-	sed -i '/skip_cert*/'d $ccfg
-	echo -----------------------------------------------
-	if [ "$skip_cert" = "未开启" ] > /dev/null 2>&1; then 
-		sed -i "1i\skip_cert=已开启" $ccfg
-		echo -e "\033[33m已设为开启跳过本地证书验证！！\033[0m"
-		skip_cert=已开启
-	else
-		/etc/init.d/clash enable
-		sed -i "1i\skip_cert=未开启" $ccfg
-		echo -e "\033[33m已设为禁止跳过本地证书验证！！\033[0m"
-		skip_cert=未开启
-	fi
-	clashadv
-	
-  elif [[ $num == 4 ]]; then	
-	sed -i '/common_ports*/'d $ccfg
-	echo -----------------------------------------------
-	if [ "$common_ports" = "未开启" ] > /dev/null 2>&1; then 
-		sed -i "1i\common_ports=已开启" $ccfg
-		echo -e "\033[33m已设为仅代理（22,53,587,465,995,993,143,80,443）等常用端口！！\033[0m"
-		common_ports=已开启
-	else
-		/etc/init.d/clash enable
-		sed -i "1i\common_ports=未开启" $ccfg
-		echo -e "\033[33m已设为代理全部端口！！\033[0m"
-		common_ports=未开启
-	fi
-	clashadv  
-	
-  elif [[ $num == 5 ]]; then	
-	sed -i '/modify_yaml*/'d $ccfg
-	echo -----------------------------------------------
-	if [ "$modify_yaml" = "未开启" ] > /dev/null 2>&1; then 
-		sed -i "1i\modify_yaml=已开启" $ccfg
-		echo -e "\033[33m已设为使用用户完成自定义配置文件！！"
-		echo -e "\033[0m不明白原理的用户切勿随意开启此选项"
-		echo -e "\033[33m！！！必然会导致上不了网！！!\033[0m"
-		modify_yaml=已开启
-	else
-		/etc/init.d/clash enable
-		sed -i "1i\modify_yaml=未开启" $ccfg
-		echo -e "\033[32m已设为使用脚本内置规则管理config.yaml配置文件！！\033[0m"
-		modify_yaml=未开启
-	fi
-	clashadv  
-	
-  elif [[ $num == 9 ]]; then	
-	if [ $status -gt 0 ];then
-		echo -----------------------------------------------
-		/etc/init.d/clash stop
-		echo -e "\033[31mClash服务已停止！\033[0m"
-	fi
-	clashstart
-	clashsh
-  else
-    echo -e "\033[31m暂未支持的选项！\033[0m"
-    clashadv
-  fi
 else
-  echo -----------------------------------------------
-  echo -e "\033[31m请输入正确的数字！\033[0m"
-  clashsh
+	echo -----------------------------------------------
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+	clashsh
 fi
 exit;
 }
@@ -419,47 +469,47 @@ echo -e " 9 \033[31m卸载\033[34mClash for Miwfi\033[0m"
 echo -e " 0 返回上级菜单" 
 read -p "请输入对应数字 > " num
 if [[ $num -le 9 ]] > /dev/null 2>&1; then 
-  if [[ $num == 0 ]]; then
-    clashsh
+	if [[ $num == 0 ]]; then
+		clashsh
 	
-  elif [[ $num == 1 ]]; then	
-	source $clashdir/getdate.sh
-	getsh	
+	elif [[ $num == 1 ]]; then	
+		source $clashdir/getdate.sh
+		getsh	
 	
-  elif [[ $num == 2 ]]; then	
-	source $clashdir/getdate.sh
-	getcore
+	elif [[ $num == 2 ]]; then	
+		source $clashdir/getdate.sh
+		getcore
 
-  elif [[ $num == 3 ]]; then	
-	source $clashdir/getdate.sh
-	getgeo
+	elif [[ $num == 3 ]]; then	
+		source $clashdir/getdate.sh
+		getgeo
 	
-  elif [[ $num == 4 ]]; then	
-	source $clashdir/getdate.sh
-	getdb
+	elif [[ $num == 4 ]]; then	
+		source $clashdir/getdate.sh
+		getdb
 	
-  elif [[ $num == 9 ]]; then
-    read -p "确认卸载clash？（警告：该操作不可逆！）[1/0] " res
-	if [ "$res" = '1' ]; then
-    /etc/init.d/clash disable
-    /etc/init.d/clash stop
-    rm -rf $clashdir
-    rm -rf /etc/init.d/clash
-	rm -rf /www/clash
-    rm -rf $csh
-	sed -i '/alias clash=*/'d /etc/profile
-	sed -i '/export clashdir=*/'d /etc/profile
-    echo 已卸载clash相关文件！
+	elif [[ $num == 9 ]]; then
+		read -p "确认卸载clash？（警告：该操作不可逆！）[1/0] " res
+		if [ "$res" = '1' ]; then
+			/etc/init.d/clash disable
+			/etc/init.d/clash stop
+			rm -rf $clashdir
+			rm -rf /etc/init.d/clash
+			rm -rf /www/clash
+			rm -rf $csh
+			sed -i '/alias clash=*/'d /etc/profile
+			sed -i '/export clashdir=*/'d /etc/profile
+			echo 已卸载clash相关文件！
+		fi
+		exit;
+	else
+		echo -e "\033[31m暂未支持的选项！\033[0m"
+		update
 	fi
-    exit;
-  else
-    echo -e "\033[31m暂未支持的选项！\033[0m"
-    update
-  fi
 else
-  echo -----------------------------------------------
-  echo -e "\033[31m请输入正确的数字！\033[0m"
-  clashsh
+	echo -----------------------------------------------
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+	clashsh
 fi
 exit;
 }
@@ -478,34 +528,34 @@ echo -e " 9 \033[36m更新/卸载\033[0m"
 echo -e " 0 \033[0m退出脚本\033[0m"
 read -p "请输入对应数字 > " num
 if [[ $num -le 9 ]] > /dev/null 2>&1; then 
-  if [[ $num == 0 ]]; then
-	exit;
+	if [[ $num == 0 ]]; then
+		exit;
   
-  elif [[ $num == 1 ]]; then
-	if [ ! -f "$yaml" ];then
-		echo -----------------------------------------------
-		echo -e "\033[31m没有找到配置文件，请先导入节点/订阅链接！\033[0m"
-		clashlink
-	fi
-    if [ $status -gt 0 ];then
-		echo -----------------------------------------------
-		/etc/init.d/clash stop > /dev/null 2>&1
-		echo -e "\033[31mClash服务已停止！\033[0m"
-	fi
-	clashstart
-	clashsh
+	elif [[ $num == 1 ]]; then
+		if [ ! -f "$yaml" ];then
+			echo -----------------------------------------------
+			echo -e "\033[31m没有找到配置文件，请先导入节点/订阅链接！\033[0m"
+			clashlink
+		fi
+		if [ $status -gt 0 ];then
+			echo -----------------------------------------------
+			/etc/init.d/clash stop > /dev/null 2>&1
+			echo -e "\033[31mClash服务已停止！\033[0m"
+		fi
+		clashstart
+		clashsh
   
-  elif [[ $num == 2 ]]; then
-	clashadv
+	elif [[ $num == 2 ]]; then
+		clashadv
 
-  elif [[ $num == 3 ]]; then
+	elif [[ $num == 3 ]]; then
 		/etc/init.d/clash stop > /dev/null 2>&1
 		echo -----------------------------------------------
 		echo -e "\033[31mClash服务已停止！\033[0m"
 		echo -----------------------------------------------
 		exit;
 
-  elif [[ $num == 4 ]]; then
+	elif [[ $num == 4 ]]; then
 		echo -----------------------------------------------
 		if [ -f /etc/rc.d/*clash ]; then
 			/etc/init.d/clash disable
@@ -516,83 +566,89 @@ if [[ $num -le 9 ]] > /dev/null 2>&1; then
 		fi
 		clashsh
 
-  elif [[ $num == 5 ]]; then
-echo -----------------------------------------------
-echo -e "\033[31m正在施工中，敬请期待！\033[0m"
-echo -e "\033[32m正在施工中，敬请期待！\033[0m"
-echo -e "\033[33m正在施工中，敬请期待！\033[0m"
-echo -e "\033[34m正在施工中，敬请期待！\033[0m"
-echo -e "\033[35m正在施工中，敬请期待！\033[0m"
-echo -e "\033[36m正在施工中，敬请期待！\033[0m"
-  clashsh
-    
-  elif [[ $num == 6 ]]; then
-	clashlink
-
-  elif [[ $num == 8 ]]; then
-	echo -----------------------------------------------
-	echo -e "\033[31m这里是测试命令菜单\033[0m"
-	echo " 1 查看clash运行时的报错信息"
-	echo " 2 查看系统DNS端口(:53)占用 "
-	echo " 3 测试ssl加密（aes-128-gcm）跑分"
-	echo " 4 查看iptables端口转发详情"
-	echo " 5 查看config.yaml前40行"
-	echo " 6 测试代理服务器连通性（google.tw)"
-	echo " 0 返回上级目录！"
-	read -p "请输入对应数字 > " num
-	if [[ $num == 0 ]]; then
-		clashsh
-	elif [[ $num == 1 ]]; then
-		etc/init.d/clash stop
-		echo -e "\033[31m如有报错请截图后到TG群询问！！！\033[0m"
-		$clashdir/clash -d $clashdir & { sleep 3 ; kill $! & }
-		echo -e "\033[31m如有报错请截图后到TG群询问！！！\033[0m"
-		exit;
-	elif [[ $num == 2 ]]; then
-		echo -----------------------------------------------
-		netstat -ntulp |grep 53
-		echo -----------------------------------------------
-		exit;
-	elif [[ $num == 3 ]]; then
-		echo -----------------------------------------------
-		openssl speed -multi 4 -evp aes-128-gcm
-		echo -----------------------------------------------
-		exit;
-	elif [[ $num == 4 ]]; then
-		echo -----------------------------------------------
-		iptables  -t nat  -L PREROUTING --line-numbers
-		echo -----------------------------------------------
-		exit;
 	elif [[ $num == 5 ]]; then
 		echo -----------------------------------------------
-		sed -n '1,40p' $yaml
-		echo -----------------------------------------------
-		exit;
-	elif [[ $num == 6 ]]; then
-		echo 注意：测试结果不保证一定准确！
-		delay=`curl -kx 127.0.0.1:7890 -o /dev/null -s -w '%{time_starttransfer}' 'https://google.tw' & { sleep 3 ; kill $! & }` > /dev/null 2>&1
-		delay=`echo |awk "{print $delay*1000}"` > /dev/null 2>&1
-		echo -----------------------------------------------
-		if [ `echo ${#delay}` -gt 1 ];then
-			echo -e "\033[32m连接成功！响应时间为："$delay" ms\033[0m"
-		else
-			echo -e "\033[31m连接超时！请重试或检查节点配置！\033[0m"
-		fi
+		echo -e "\033[31m正在施工中，敬请期待！\033[0m"
+		echo -e "\033[32m正在施工中，敬请期待！\033[0m"
+		echo -e "\033[33m正在施工中，敬请期待！\033[0m"
+		echo -e "\033[34m正在施工中，敬请期待！\033[0m"
+		echo -e "\033[35m正在施工中，敬请期待！\033[0m"
+		echo -e "\033[36m正在施工中，敬请期待！\033[0m"
 		clashsh
+    
+	elif [[ $num == 6 ]]; then
+		clashlink
+
+	elif [[ $num == 8 ]]; then
+		echo -----------------------------------------------
+		echo -e "\033[36m这里是测试命令菜单\033[0m"
+		echo -e "\033[33m如遇问题尽量运行相应命令后截图发群\033[0m"
+		echo -----------------------------------------------
+		echo " 1 查看clash运行时的报错信息"
+		echo " 2 查看系统DNS端口(:53)占用 "
+		echo " 3 测试ssl加密（aes-128-gcm）跑分"
+		echo " 4 查看iptables端口转发详情"
+		echo " 5 查看config.yaml前40行"
+		echo " 6 测试代理服务器连通性（google.tw)"
+		echo " 0 返回上级目录！"
+		read -p "请输入对应数字 > " num
+		if [ -z $num ]; then
+			echo -----------------------------------------------
+			echo -e "\033[31m请输入正确的数字！\033[0m"
+			clashsh
+		elif [[ $num == 0 ]]; then
+			clashsh
+		elif [[ $num == 1 ]]; then
+			etc/init.d/clash stop
+			echo -e "\033[31m如有报错请截图后到TG群询问！！！\033[0m"
+			$clashdir/clash -d $clashdir & { sleep 3 ; kill $! & }
+			echo -e "\033[31m如有报错请截图后到TG群询问！！！\033[0m"
+			exit;
+		elif [[ $num == 2 ]]; then
+			echo -----------------------------------------------
+			netstat -ntulp |grep 53
+			echo -----------------------------------------------
+			exit;
+		elif [[ $num == 3 ]]; then
+			echo -----------------------------------------------
+			openssl speed -multi 4 -evp aes-128-gcm
+			echo -----------------------------------------------
+			exit;
+		elif [[ $num == 4 ]]; then
+			echo -----------------------------------------------
+			iptables  -t nat  -L PREROUTING --line-numbers
+			echo -----------------------------------------------
+			exit;
+		elif [[ $num == 5 ]]; then
+			echo -----------------------------------------------
+			sed -n '1,40p' $yaml
+			echo -----------------------------------------------
+			exit;
+		elif [[ $num == 6 ]]; then
+			echo 注意：测试结果不保证一定准确！
+			delay=`curl -kx 127.0.0.1:7890 -o /dev/null -s -w '%{time_starttransfer}' 'https://google.tw' & { sleep 3 ; kill $! & }` > /dev/null 2>&1
+			delay=`echo |awk "{print $delay*1000}"` > /dev/null 2>&1
+			echo -----------------------------------------------
+			if [ `echo ${#delay}` -gt 1 ];then
+				echo -e "\033[32m连接成功！响应时间为："$delay" ms\033[0m"
+			else
+				echo -e "\033[31m连接超时！请重试或检查节点配置！\033[0m"
+			fi
+			clashsh
+		else
+			echo -----------------------------------------------
+			echo -e "\033[31m请输入正确的数字！\033[0m"
+			clashsh
+		fi
+
+	elif [[ $num == 9 ]]; then
+		update
+	
 	else
 		echo -----------------------------------------------
 		echo -e "\033[31m请输入正确的数字！\033[0m"
-		clashsh
 	fi
-
-  elif [[ $num == 9 ]]; then
-	update
-	
-  else
-	echo -----------------------------------------------
-	echo -e "\033[31m请输入正确的数字！\033[0m"
-  fi
-  exit 1
+	exit 1
 else
 	echo -----------------------------------------------
 	echo -e "\033[31m请输入正确的数字！\033[0m"
diff --git a/scripts/clashservice b/scripts/clashservice
index d613623..4b610b8 100644
--- a/scripts/clashservice
+++ b/scripts/clashservice
@@ -19,6 +19,7 @@ EOF
 	common_ports=未开启
 	dns_mod=redir-host
 	modify_yaml=未开启
+	ipv6_support=未开启
 fi
 source $ccfg #加载配置文件
 #是否代理常用端口
@@ -30,21 +31,25 @@ if [ "$common_ports" = "已开启" ];then
 	ports='-m multiport --dports 22,53,587,465,995,993,143,80,443 '
 fi
 }
-modifyyaml(){
+modify_yaml(){
 ##########需要变更的配置###########
 mix='mixed-port: 7890'
 redir='redir-port: 7892'
 lan='allow-lan: true'
 mode='mode: Rule'
 log='log-level: info'
+if [ "$ipv6_support" = "已开启" ];then
 ipv6='ipv6: true'
+else
+ipv6='ipv6: false'
+fi
 external='external-controller: 0.0.0.0:9999'
 if [ "$dns_mod" = "fake-ip" ];then
 dns='dns: {enable: true, listen: 0.0.0.0:1053, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, nameserver: [114.114.114.114, 127.0.0.1:53], fallback: [tcp://1.0.0.1, 8.8.4.4]}'
 else
 dns='dns: {enable: true, ipv6: true, listen: 0.0.0.0:1053, enhanced-mode: redir-host, nameserver: [114.114.114.114, 127.0.0.1:53], fallback: [1.0.0.1, 8.8.4.4]}'
 fi
-if [ "$redir_mod" = "Tun模式" ];then
+if [ "$redir_mod" != "Redir模式" ];then
 tun='tun: {enable: true, stack: system}'
 else
 tun='tun: {enable: false}'
@@ -74,9 +79,9 @@ exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
 	#sed -i '/rules:/a \ - DOMAIN-SUFFIX,clash.razord.top,🎯 全球直连' $clashdir/config.yaml
 }
 mark_time(){
-start_time=`date +%s`
-sed -i '/start_time*/'d $ccfg
-sed -i "3i\start_time=$start_time" $ccfg
+	start_time=`date +%s`
+	sed -i '/start_time*/'d $ccfg
+	sed -i "3i\start_time=$start_time" $ccfg
 }
 start_redir(){
 	#修改iptables规则使流量进入clash
@@ -91,28 +96,35 @@ start_redir(){
 	iptables -t nat -A clash -d 240.0.0.0/4 -j RETURN
 	iptables -t nat -A clash -p tcp $ports-j REDIRECT --to-ports 7892
 	iptables -t nat -A PREROUTING -p tcp -j clash
-	#ip6tables -t nat -A PREROUTING -p tcp $ports-j REDIRECT --to-ports 7892
-	iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to 1053
-	ip6tables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to 1053
+	if [ "$ipv6_support" = "已开启" ];then
+		ip6tables -t nat -N clashv6
+		ip6tables -t nat -A clashv6 -p tcp $ports-j REDIRECT --to-ports 7892
+		ip6tables -t nat -A PREROUTING -p tcp -j clashv6
+	fi
 }
-stop_redir(){
+stop_iptables(){
     #重置iptables规则
 	iptables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1
 	iptables -t nat -F clash > /dev/null 2>&1
 	iptables -t nat -X clash > /dev/null 2>&1
 	iptables -t nat -D PREROUTING -p udp --dport 53 -j REDIRECT --to 1053 > /dev/null 2>&1
-	#ip6tables -t nat -A PREROUTING -p tcp $ports-j REDIRECT --to-ports 7892 > /dev/null 2>&1
 	ip6tables -t nat -D PREROUTING -p udp --dport 53 -j REDIRECT --to 1053 > /dev/null 2>&1
+	ip6tables -t nat -D PREROUTING -p tcp -j clashv6 > /dev/null 2>&1
+	ip6tables -t nat -F clashv6 > /dev/null 2>&1
+	ip6tables -t nat -X clashv6 > /dev/null 2>&1
 }
-start_tun(){
+start_dns(){
 	#允许tun网卡接受流量
 	iptables -I FORWARD -o utun -j ACCEPT
+	#设置dns转发
+	iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to 1053
+	ip6tables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to 1053
 }
 start_service() {
 	getconfig
 	#使用内置规则强行覆盖config配置文件
 	if [ "$modify_yaml" != "已开启" ];then
-	modifyyaml
+	modify_yaml
 	fi
     #创建clash后台进程
 	procd_open_instance
@@ -122,11 +134,13 @@ start_service() {
 	procd_set_param command $clashdir/clash -d $clashdir
 	procd_close_instance
 	#修改iptables规则使流量进入clash
-	stop_redir
-	start_tun
+	stop_iptables
+	start_dns
+	if [ "$redir_mod" != "Tun模式" ];then
 	start_redir
+	fi
 	mark_time
 }
 stop_service() {
-	stop_redir
+	stop_iptables
 }
\ No newline at end of file
diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index 465b07a..658da68 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -112,71 +112,72 @@ getlink(){
 i=1
 while [ $i -le 9 ]
 do
-echo -----------------------------------------------
-echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
-echo -----------------------------------------------
-echo -e "\033[33m支持批量导入\033[30;46m Http/Https/Clash \033[0;33m等格式的订阅链接"
-echo -e "支持批量导入\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0;33m等格式的节点链接"
-echo -e "\033[36m多个较短的链接可以用\033[30;47m | \033[0;36m分隔以一次性输入"
-echo -e "多个较长的链接请尽量分多次输入，可支持多达\033[30;47m 9 \033[0;36m次输入"
-echo -e "\033[31;47m注意SSR/SS不支持：\033[30;47mchacha20加密 \033[0m"
-echo -e "\033[44;37m直接输入回车以结束输入并开始导入链接！\033[0m"
-echo -e "\033[33m 0 返回上级目录！\033[0m"
-echo -----------------------------------------------
-read -p "请输入第"$i"个链接 > " url
-  test=$(echo $url | grep "://")
-  url=`echo ${url/\ \(*\)/''}`   #删除恶心的超链接内容
-  url=`echo ${url/*\&url\=/""}`   #将clash完整链接还原成单一链接
-  url=`echo ${url/\&config\=*/""}`   #将clash完整链接还原成单一链接
-  url=`echo ${url//\&/\%26}`   #将分隔符 & 替换成urlcode：%26
-  if [[ "$test" != "" ]];then
-	if [[ -z $Url ]];then
-	Url="$url"
-	else
-	Url="$Url"\|"$url"
-	fi
-  i=$(($i+1))
-  elif [ -z $url ];then
-	  if [ -n $Url ];then
-	  echo -----------------------------------------------
-	  echo -e 请检查输入的链接是否正确：
-      echo -e "\033[4m$Url\033[0m"
-	  read -p "确认导入配置文件？原配置文件将被更名为config.yaml.bak![1/0] > " res
-	    if [ "$res" = '1' ]; then
-		#将用户链接写入mark
-		sed -i '/Url=*/'d $ccfg
-		sed -i '/Https=*/'d $ccfg
-		sed -i "6i\Url=\'$Url\'" $ccfg
-		#获取在线yaml文件
-		getyaml
-	    fi
+	echo -----------------------------------------------
+	echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+	echo -----------------------------------------------
+	echo -e "\033[33m支持批量导入\033[30;46m Http/Https/Clash \033[0;33m等格式的订阅链接"
+	echo -e "支持批量导入\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0;33m等格式的节点链接"
+	echo -e "\033[36m多个较短的链接可以用\033[30;47m | \033[0;36m分隔以一次性输入"
+	echo -e "多个较长的链接请尽量分多次输入，可支持多达\033[30;47m 9 \033[0;36m次输入"
+	echo -e "\033[31;47m注意SSR/SS不支持：\033[30;47mchacha20加密 \033[0m"
+	echo -e "\033[44;37m直接输入回车以结束输入并开始导入链接！\033[0m"
+	echo -e "\033[33m 0 返回上级目录！\033[0m"
+	echo -----------------------------------------------
+	read -p "请输入第"$i"个链接 > " url
+	test=$(echo $url | grep "://")
+	url=`echo ${url/\ \(*\)/''}`   #删除恶心的超链接内容
+	url=`echo ${url/*\&url\=/""}`   #将clash完整链接还原成单一链接
+	url=`echo ${url/\&config\=*/""}`   #将clash完整链接还原成单一链接
+	url=`echo ${url//\&/\%26}`   #将分隔符 & 替换成urlcode：%26
+	if [[ "$test" != "" ]];then
+		if [[ -z $Url ]];then
+			Url="$url"
+		else
+			Url="$Url"\|"$url"
+		fi
+		i=$(($i+1))
+	elif [ -z $url ];then
+		if [ -n $Url ];then
+			echo -----------------------------------------------
+			echo -e 请检查输入的链接是否正确：
+			echo -e "\033[4m$Url\033[0m"
+			read -p "确认导入配置文件？原配置文件将被更名为config.yaml.bak![1/0] > " res
+			if [ "$res" = '1' ]; then
+				#将用户链接写入mark
+				sed -i '/Url=*/'d $ccfg
+				sed -i '/Https=*/'d $ccfg
+				sed -i "6i\Url=\'$Url\'" $ccfg
+				#获取在线yaml文件
+				getyaml
+			fi
+			clashlink
+		fi
+	elif [[ $url == 0 ]];then
 		clashlink
-	  fi
-  elif [[ $url == 0 ]];then
-    clashlink
-  else
-    echo -----------------------------------------------
-    echo -e "\033[31m请输入正确的订阅/分享链接！！！\033[0m"
-  fi
+	else
+		echo -----------------------------------------------
+		echo -e "\033[31m请输入正确的订阅/分享链接！！！\033[0m"
+	fi
 done
+####
 echo -----------------------------------------------
 echo 输入太多啦，可能会导致订阅失败！
 echo "多个较短的链接请尽量用“|”分隔以一次性输入！"
 echo -e "请检查输入的链接是否正确：\033[4m$Url\033[0m"
 read -p "确认导入配置文件？原配置文件将被更名为config.bak![1/0] > " res
-	    if [ "$res" = '1' ]; then
-		#将用户链接写入mark
-		sed -i '/Url=*/'d $ccfg
-		sed -i '/Https=*/'d $ccfg
-		sed -i "6i\Url=\'$Url\'" $ccfg
-		#获取在线yaml文件
-		getyaml
-		else
-		echo -----------------------------------------------
-		echo 操作已取消！返回上级菜单！
-		clashlink
-	    fi
-		clashlink
+if [ "$res" = '1' ]; then
+	#将用户链接写入mark
+	sed -i '/Url=*/'d $ccfg
+	sed -i '/Https=*/'d $ccfg
+	sed -i "6i\Url=\'$Url\'" $ccfg
+	#获取在线yaml文件
+	getyaml
+else
+	echo -----------------------------------------------
+	echo 操作已取消！返回上级菜单！
+	clashlink
+fi
+	clashlink
 } 
 getlink2(){
 echo -----------------------------------------------
@@ -188,91 +189,87 @@ echo -e "\033[31m注意如节点使用了chacha20加密协议，需将核心更
 echo -e "\033[33m0 返回上级目录！\033[0m"
 echo -----------------------------------------------
 read -p "请输入完整链接 > " Https
-	test=$(echo $Https | grep "://")
-	Https=`echo ${Https/\ \(*\)/''}`   #删除恶心的超链接内容
-	#Https=`echo ${Https//\&/\%26}`   #将分隔符 & 替换成Httpscode：%26
-	if [ -n $Https ];then
-		if [ -n $test ];then
+test=$(echo $Https | grep "://")
+Https=`echo ${Https/\ \(*\)/''}`   #删除恶心的超链接内容
+#Https=`echo ${Https//\&/\%26}`   #将分隔符 & 替换成Httpscode：%26
+if [ -n $Https ];then
+	if [ -n $test ];then
 		echo -----------------------------------------------
 		echo -e 请检查输入的链接是否正确：
 		echo -e "\033[4m$Https\033[0m"
 		read -p "确认导入配置文件？原配置文件将被更名为config.yaml.bak![1/0] > " res
 			if [ "$res" = '1' ]; then
-			#将用户链接写入mark
-			sed -i '/Url=*/'d $ccfg
-			sed -i '/Https=*/'d $ccfg
-			sed -i "6i\Https=\'$Https\'" $ccfg
-			#获取在线yaml文件
-			getyaml
+				#将用户链接写入mark
+				sed -i '/Url=*/'d $ccfg
+				sed -i '/Https=*/'d $ccfg
+				sed -i "6i\Https=\'$Https\'" $ccfg
+				#获取在线yaml文件
+				getyaml
 			fi
 			clashlink
-		fi
-	elif [[ $Https == 0 ]];then
-		clashlink
-	else
-		echo -----------------------------------------------
-		echo -e "\033[31m请输入正确的链接地址！！！\033[0m"
 	fi
+elif [[ $Https == 0 ]];then
+	clashlink
+else
+	echo -----------------------------------------------
+	echo -e "\033[31m请输入正确的链接地址！！！\033[0m"
+fi
 }
 getsh(){
 echo -----------------------------------------------
 echo -e "\033[33m正在检查更新！\033[0m"
 result=$(curl -w %{http_code} -skLo /tmp/clashversion $update_url/bin/version)
-[ "$result" != "200" ] && echo "无法连接到服务器！" && exit 1
+[ "$result" != "200" ] && echo "检查更新失败！" && exit 1
 source /tmp/clashversion
 echo -----------------------------------------------
 echo -e "当前脚本版本为：\033[33m $versionsh_l \033[0m"
 echo -e "最新脚本版本为：\033[32m $versionsh \033[0m"
 echo -----------------------------------------------
 read -p "是否更新脚本？[1/0] > " res
-	if [ "$res" = '1' ]; then
-		if command -v curl &> /dev/null; then
-			echo 正在获取更新文件
-			result=$(curl -w %{http_code} -kLo /tmp/clashfm.tar.gz $update_url/bin/clashfm.tar.gz)
-		else $result
-			wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O /tmp/clashfm.tar.gz $tarurl
-			[ $? -eq 0 ] && result="200"
-		fi
-		[ "$result" != "200" ] && echo "文件下载失败！" && exit 1
-		#解压
-		echo -----------------------------------------------
-		echo 开始解压文件！
-		mkdir -p $dir/clash > /dev/null
-		tar -zxvf '/tmp/clashfm.tar.gz' -C $dir/clash/ > /dev/null
-		[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 
-		#初始化文件目录
-		mv $dir/clash/clashservice /etc/init.d/clash #将clash服务文件移动到系统目录
-		chmod  777 $dir/clash/clash  #授予权限
-		chmod  777 /etc/init.d/clash #授予权限
-
-		#删除临时文件
-		rm -rf /tmp/clashfm.tar.gz 
-		rm -rf /tmp/clashversion
-		#提示
-		echo -----------------------------------------------
-		echo -e "\033[32m管理脚本更新成功!\033[0m"
-		echo -----------------------------------------------
-		exit;
-	else
-	clashsh
+if [ "$res" = '1' ]; then
+	if command -v curl &> /dev/null; then
+		echo 正在获取更新文件
+		result=$(curl -w %{http_code} -kLo /tmp/clashfm.tar.gz $update_url/bin/clashfm.tar.gz)
+	else $result
+		wget-ssl -q --no-check-certificate --tries=1 --timeout=10 -O /tmp/clashfm.tar.gz $tarurl
+		[ $? -eq 0 ] && result="200"
 	fi
+	[ "$result" != "200" ] && echo "文件下载失败！" && exit 1
+	#解压
+	echo -----------------------------------------------
+	echo 开始解压文件！
+	mkdir -p $dir/clash > /dev/null
+	tar -zxvf '/tmp/clashfm.tar.gz' -C $dir/clash/ > /dev/null
+	[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 
+	#初始化文件目录
+	mv $dir/clash/clashservice /etc/init.d/clash #将clash服务文件移动到系统目录
+	chmod  777 $dir/clash/clash  #授予权限
+	chmod  777 /etc/init.d/clash #授予权限
+
+	#删除临时文件
+	rm -rf /tmp/clashfm.tar.gz 
+	rm -rf /tmp/clashversion
+	#提示
+	echo -----------------------------------------------
+	echo -e "\033[32m管理脚本更新成功!\033[0m"
+	echo -----------------------------------------------
+	exit;
+else
+clashsh
+fi
 }
 getcore(){
 source $ccfg
 #获取核心及版本信息
 if [ ! -f $clashdir/clash ]; then
 	clashcore=没有安装核心！
-	version=''
-else
-	if [ -n $clashcore ]; then
-		clashcore=clashpre
-		version=1.0.0
-	fi
+	clashv=''
 fi
 
 cpucore=armv7
+clashcore_n=$clashcore
 echo -----------------------------------------------
-echo -e "当前clash核心：\033[47;30m $clashcore \033[46;30m$version\033[0m"
+echo -e "当前clash核心：\033[47;30m $clashcore \033[46;30m$clashv\033[0m"
 echo -e "\033[32m请选择需要下载的核心版本！\033[0m"
 echo
 echo "1 clash：     运行稳定，内存占用小"
@@ -286,7 +283,11 @@ echo "(高级预览版)  内存占用高，不支持chacha20加密"
 echo
 echo 0 返回上级菜单 
 read -p "请输入对应数字 > " num
-	if [[ $num == 0 ]]; then
+	if [ -z $num ]; then
+		echo -----------------------------------------------
+		echo -e "\033[31m请输入正确的数字！\033[0m"
+		update
+	elif [[ $num == 0 ]]; then
 		update
 	elif [[ $num == 1 ]]; then
 		clashcore=clash
@@ -295,23 +296,36 @@ read -p "请输入对应数字 > " num
 	elif [[ $num == 3 ]]; then
 		clashcore=clashpre
 	else
+		echo -----------------------------------------------
 		echo -e "\033[31m请输入正确的数字！\033[0m"
 		update
-		exit;
 	fi
+#生成链接
 corelink="$update_url/bin/$clashcore/clash-linux-$cpucore"
 versionlink="$update_url/bin/$clashcore/version"
+#检测版本
 echo -----------------------------------------------
-echo 正在连接服务器获取clash核心文件…………链接地址为：
-echo -e "\033[4;32m$corelink\033[0m"
-echo 如无法正常下载可以手动复制到浏览器下载核心文件！
-echo -e "\033[36m-----------------------------------------------"
-echo -e "|                                             |"
-echo -e "|         需要一点时间，请耐心等待！          |"
-echo -e "|       \033[0m如长时间没有数据请用ctrl+c退出        |"
-echo -e "-----------------------------------------------\033[0m"
-#获取在线clash核心文件
-result=$(curl -w %{http_code} -kLo /tmp/clash.new $corelink)
+echo -e "\033[33m正在检查更新！\033[0m"
+result=$(curl -w %{http_code} -skLo /tmp/clashversion $versionlink)
+[ "$result" != "200" ] && echo "检查更新失败！" && exit 1
+source /tmp/clashversion
+echo -----------------------------------------------
+echo -e "当前clash核心：\033[0m $clashcore_n \033[33m$clashv\033[0m"
+echo -e "最新clash核心：\033[32m $clashcore \033[36m$version\033[0m"
+echo -----------------------------------------------
+read -p "是否更新？[1/0] > " res
+if [ "$res" = '1' ]; then
+	echo -----------------------------------------------
+	echo 正在连接服务器获取clash核心文件…………链接地址为：
+	echo -e "\033[4;32m$corelink\033[0m"
+	echo 如无法正常下载可以手动复制到浏览器下载核心文件！
+	echo -e "\033[36m-----------------------------------------------"
+	echo -e "|                                             |"
+	echo -e "|         需要一点时间，请耐心等待！          |"
+	echo -e "|       \033[0m如长时间没有数据请用ctrl+c退出        |"
+	echo -e "-----------------------------------------------\033[0m"
+	#获取在线clash核心文件
+	result=$(curl -w %{http_code} -kLo /tmp/clash.new $corelink)
 	if [ "$result" != "200" ];then
 		echo -----------------------------------------------
 		echo -e "\033[31m核心文件下载失败！\033[0m"
@@ -321,15 +335,18 @@ result=$(curl -w %{http_code} -kLo /tmp/clash.new $corelink)
 		echo -e "\033[32m$clashcore核心下载成功，正在替换！\033[0m"
 		mv /tmp/clash.new $clashdir/clash
 		chmod  777 $clashdir/clash  #授予权限
-		sed -i '/clashcore*/'d $ccfg
+		sed -i '/clashcore=*/'d $ccfg
 		sed -i "1i\clashcore=$clashcore" $ccfg
-		#sed -i '/version*/'d $ccfg
-		#sed -i "1i\version=$version" $ccfg
+		sed -i '/clashv=*/'d $ccfg
+		sed -i "1i\clashv=$version" $ccfg
+		rm -rf /tmp/clashversion
 		echo -----------------------------------------------
 		echo -e "\033[32m$clashcore核心替换成功，请手动启动clash服务！\033[0m"
 		clashsh
 	fi	
-			
+else
+getcore
+fi			
 }
 getgeo(){
 echo -----------------------------------------------
@@ -376,29 +393,41 @@ echo -e "\033[32m打开管理面板的速度更快且更稳定"
 echo -e "\033[33m需要占用约500kb的本地空间(目录：/www/clash)\033[0m"
 echo -e "\033[36m可以使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m"
 echo -----------------------------------------------
-read -p "是否安装/更新安装本地面板？[1/0] > " res
-	if [ "$res" = '1' ]; then
-		dblink="$update_url/bin/clashdb.tar.gz"
+read -p "是否安装本地面板？[1/0] > " res
+if [ "$res" = '1' ]; then
+	if [ -d /www/clash ];then
 		echo -----------------------------------------------
-		echo 正在连接服务器获取安装文件…………
-		result=$(curl -w %{http_code} -kLo /tmp/clashdb.tar.gz $dblink)
-		if [ "$result" != "200" ];then
-			echo -----------------------------------------------
-			echo -e "\033[31m文件下载失败！\033[0m"
-			echo -----------------------------------------------
-			getdb
+		echo -e "\033[31m检测到您已经安装过本地面板了！\033[0m"
+		echo -----------------------------------------------
+		read -p "是否覆盖安装？[1/0] > " res
+		if [ -z "$res" ]; then
+			update
+		elif [ "$res" = 1 ]; then
+			rm -rf /www/clash
 		else
-			echo -e "\033[33m下载成功，正在解压文件！\033[0m"
-			mkdir -p /www/clash > /dev/null
-			tar -zxvf '/tmp/clashdb.tar.gz' -C /www/clash > /dev/null
-			[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 
-			echo -e "\033[32m面板安装成功！"
-			echo -----------------------------------------------
-			echo -e "\033[36m请使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m"
-			rm -rf /tmp/clashdb.tar.gz
 			update
 		fi
-	fi		
+	fi
+	dblink="$update_url/bin/clashdb.tar.gz"
+	echo -----------------------------------------------
+	echo 正在连接服务器获取安装文件…………
+	result=$(curl -w %{http_code} -kLo /tmp/clashdb.tar.gz $dblink)
+	if [ "$result" != "200" ];then
+		echo -----------------------------------------------
+		echo -e "\033[31m文件下载失败！\033[0m"
+		echo -----------------------------------------------
+		getdb
+	else
+		echo -e "\033[33m下载成功，正在解压文件！\033[0m"
+		mkdir -p /www/clash > /dev/null
+		tar -zxvf '/tmp/clashdb.tar.gz' -C /www/clash > /dev/null
+		[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 
+		echo -e "\033[32m面板安装成功！"
+		echo -----------------------------------------------
+		echo -e "\033[36m请使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m"
+		rm -rf /tmp/clashdb.tar.gz
+		update
+	fi
+fi		
 update
 }
-