rename 'v2dns' to 'dnstt-client'

Author: llycoris

customize.sh

@@ -107,7 +107,7 @@ mv ${clash_data_dir_kernel}/getcap ${MODPATH}${bin_path}/
 mv ${clash_data_dir}/scripts/clash.config ${clash_data_dir}/
 mv ${clash_data_dir}/scripts/mosdns ${clash_data_dir}/
 mv ${clash_data_dir}/mosdns/mosdns ${clash_data_dir_kernel}/
-mv ${clash_data_dir}/mosdns/v2dns ${clash_data_dir_kernel}/
+mv ${clash_data_dir}/mosdns/dnstt-client ${clash_data_dir_kernel}/
 
 if [ ! -f "${bin_path}/ss" ] ; then
     mv ${clash_data_dir_kernel}/ss ${MODPATH}${bin_path}/
@@ -149,7 +149,7 @@ set_perm  ${clash_data_dir}/scripts/clash.cron 0  0  0755
 set_perm  ${clash_data_dir}/scripts/start.sh 0  0  0755
 set_perm  ${clash_data_dir}/clash.config ${uid} ${gid} 0755
 set_perm  ${clash_data_dir}/kernel/mosdns  0  0  0755
-set_perm  ${clash_data_dir}/kernel/v2dns  0  0  0755
+set_perm  ${clash_data_dir}/kernel/dnstt-client  0  0  0755
 set_perm  ${clash_service_dir}/clash_service.sh  0  0  0755
 sleep 1
 ui_print "- Installation is complete, reboot your device"

scripts/clash.config

@@ -167,10 +167,12 @@ Clash_enhanced_mode=$(grep "enhanced-mode" ${Clash_template} | ${busybox_path} a
 
 # V2DNS, 0 is V2DNS OFF, 1 is V2DNS ON
 # CREATE akun V2DNS di WHYVPN , WEB LAIN BELUM TAU
-run_v2dns="0"
-dns_for_v2dns="1.1.1.1"
-pubkey="6a7a2617c8cb81957ab0241bb0c72db0acae392ad7c133f5b793c184a9360c20"
-nsdomain="ns-do3.kitu.xyz"
+dnstt_bin_name="dnstt-client"
+dnstt_client_bin="$Clash_bin/$dnstt_bin_name"
+run_dnstt="0"
+dns_for_dnstt="1.1.1.1"
+pubkey=""
+nsdomain=""
 
 # AIDs=(3005 9999)
 # INTERNET IPV4 & IPV6

scripts/clash.service

@@ -257,7 +257,7 @@ start_clash() {
     if [ "${run_mosdns}" == "1" ]; then
         mosdns
     else
-        echo $date_log"info: mosdns is disabled" >> ${CFM_logs_file}
+        echo $date_log"info: mos-dns is disabled" >> ${CFM_logs_file}
         rm -rf ${Clash_run_path}/mosdns.log
     fi
 
@@ -305,14 +305,14 @@ kill_mosdns() {
     fi
 }
 
-kil_v2dns() {
-    if (kill -15 `cat ${Clash_run_path}/v2dns.pid`); then
-        v2dnskill=$(ps -ef | grep root | grep "/data/clash/kernel/v2dns" | ${busybox_path} awk '{ print $2 }')
-        for v2kill in ${v2dnskill[*]} ; do
-           kill -15 ${v2kill}
+kil_dnstt() {
+    if (kill -15 `cat ${Clash_run_path}/dnstt.pid`); then
+        dnsttkill=$(ps -ef | grep root | grep "$dnstt_client_bin" | ${busybox_path} awk '{ print $2 }')
+        for dnskill in ${dnsttkill[*]} ; do
+           kill -15 ${dnskill}
         done
-        rm -rf ${Clash_run_path}/v2dns.pid
-        echo $date_log"warn: v2dns terminated。" >> ${CFM_logs_file}
+        rm -rf ${Clash_run_path}/dnstt.pid
+        echo $date_log"warn: $dnstt_bin_name terminated。" >> ${CFM_logs_file}
     fi
 }
 
@@ -321,7 +321,7 @@ stop_clash() {
     ceks_clash
     kill_crond
     kill_mosdns
-    kil_v2dns
+    kil_dnstt
 
     rm -rf ${Clash_pid_file} && rm -rf ${Clash_run_path}/appuid.list
     echo $date_log"warn: Clash terminated。" >> ${CFM_logs_file}

scripts/clash.tool

@@ -285,32 +285,33 @@ up_dashboard() {
     rm -rf ${file_dasboard}
 }
 
-v2dns() {
-    if [ "${run_v2dns}" == "1" ]; then
-        if [ -f /data/clash/kernel/v2dns ]; then
-            chmod 755 /data/clash/kernel/v2dns
+dnstt_client() {
+    if [ "${run_dnstt}" == "1" ]; then
+        if [ -f $dnstt_client_bin ]; then
+            chmod 0755 $dnstt_client_bin
+            chown root:net_admin ${dnstt_client_bin}
             if [ ! ${nsdomain} == "" ] && [ ! ${pubkey} == "" ]; then
-               nohup /data/clash/kernel/v2dns -udp ${dns_for_v2dns}:53 -pubkey ${pubkey} ${nsdomain} 127.0.0.1:9553 > /dev/null 2>&1 &
-               echo -n $! > ${Clash_run_path}/v2dns.pid
+               nohup $dnstt_client_bin -udp ${dns_for_dnstt}:53 -pubkey ${pubkey} ${nsdomain} 127.0.0.1:9553 > /dev/null 2>&1 &
+               echo -n $! > ${Clash_run_path}/dnstt.pid
 
                sleep 0.75
-               local v2dns_pid=`cat ${Clash_run_path}/v2dns.pid 2> /dev/null`
-               if (cat /proc/${v2dns_pid}/cmdline | grep -q v2dns) ; then
-                  echo ${date_log}"info: v2dns is enable." >> ${CFM_logs_file}
+               local dnstt_pid=`cat ${Clash_run_path}/dnstt.pid 2> /dev/null`
+               if (cat /proc/"$dnstt_pid"/cmdline | grep -q $dnstt_bin_name) ; then
+                  echo ${date_log}"info: $dnstt_bin_name is enable." >> ${CFM_logs_file}
                else
-                  echo ${date_log}"err: v2dns The configuration is incorrect," >> ${CFM_logs_file}
+                  echo ${date_log}"err: $dnstt_bin_name The configuration is incorrect," >> ${CFM_logs_file}
                   echo ${date_log}"err: the startup fails, and the following is the error" >> ${CFM_logs_file}
-                  kill -15 `cat ${Clash_run_path}/v2dns.pid`
+                  kill -15 `cat ${Clash_run_path}/dnstt.pid`
                fi
             else
-                echo ${date_log}"warn: v2dns tidak aktif,"  >> ${CFM_logs_file}
+                echo ${date_log}"warn: $dnstt_bin_name tidak aktif,"  >> ${CFM_logs_file}
                 echo ${date_log}"warn: 'nsdomain' & 'pubkey' kosong,"  >> ${CFM_logs_file}
             fi
         else
-            echo ${date_log}"err: kernel v2dns tidak ada." >> ${CFM_logs_file}
+            echo ${date_log}"err: kernel $dnstt_bin_name tidak ada." >> ${CFM_logs_file}
         fi
     else
-        echo "" #${date_log}"info: v2dns is disable." >> ${CFM_logs_file}
+        echo $date_log"info: $dnstt_bin_name is disabled" >> ${CFM_logs_file}
     fi
 }
 
@@ -363,7 +364,7 @@ while getopts ":fmspokldvg" signal ; do
             up_dashboard
             ;;
         v)
-            v2dns
+            dnstt_client
             ;;
         g)
             getmemory