升级clash内核到1.18.2

统一tproxy监听到listeners
调整初始化配置

README.md

@@ -9,11 +9,11 @@
 - 支持自定义规则地址
 - 支持自动更新geoip和gfw规则
 - 支持手动编辑clash配置文件
-<img width="753" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/53351aba-f8ce-421f-b815-f5069e39e86c">
-<img width="812" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/d429f185-a93f-4389-aed3-9907329fbbb4">
-<img width="757" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/18482a26-5b31-4730-9de5-92d6add270e9">
-<img width="741" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/8a9fa861-b640-4ae6-aa3b-c010d121b39c">
-<img width="740" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/bfdaf823-37ab-4606-9d62-76af2d110b34">
+- <img width="753" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/53351aba-f8ce-421f-b815-f5069e39e86c">
+- <img width="812" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/d429f185-a93f-4389-aed3-9907329fbbb4">
+- <img width="757" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/18482a26-5b31-4730-9de5-92d6add270e9">
+- <img width="741" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/8a9fa861-b640-4ae6-aa3b-c010d121b39c">
+- <img width="740" alt="image" src="https://github.com/zhudan/clashg/assets/1744697/bfdaf823-37ab-4606-9d62-76af2d110b34">
 
 --------
 

clashg/base.sh

@@ -30,7 +30,7 @@ tproxy_port=""
 inbound_tfo=""
 if [ -f $clash_file ]; then
   shadowsocksport=$(grep shadowsocks $clash_file  | awk -F'[:,]' '{for(i=1;i<=NF;i++){if($i~/port/)print $(i+1)}}'| tr -d ' ')
-  tproxy_port=$(cat $clash_file | awk -F: '/^tproxy-port/{print $2}' | xargs echo -n)
+  tproxy_port=$(grep tproxy $clash_file  | awk -F'[:,]' '{for(i=1;i<=NF;i++){if($i~/port/)print $(i+1)}}'| tr -d ' ')
   inbound_tfo=$(cat $clash_file | awk -F: '/^inbound-tfo/{print $2}' | xargs echo -n)
 fi
 

clashg/clash_ro.yaml

@@ -1,9 +1,8 @@
 inbound-tfo: true
-listeners:
-  - {"name": "go-home","type": "shadowsocks","port": 29999,"listen": "0.0.0.0","cipher": "aes-128-gcm","password": "password","udp": true}
 allow-lan: true
-tproxy: true
-tproxy-port: 23458
+listeners:
+  - {"name":"tproxy","type":"tproxy","port":23458,"listen":"0.0.0.0","udp":true}
+  - {"name":"go-home","type":"shadowsocks","port":29999,"listen":"0.0.0.0","cipher":"aes-128-gcm","password":"password","udp":true}
 # off, 不匹配进程，推荐在路由器上使用此模式
 find-process-mode: off
 mode: rule
@@ -103,6 +102,6 @@ rule-providers:
     interval: 86400
 
 rules:
-  - "GEOIP,PRIVATE,DIRECT,no-resolve"
+  - "IP-CIDR,192.168.0.0/16,DIRECT,no-resolve"
   - "RULE-SET,openai,\U0001F4AC OpenAi"
   - "MATCH,\U0001F680 节点选择"