From bc38b3329b5801305800a2fc7d6a6322c3654da2 Mon Sep 17 00:00:00 2001
From: laityts <laityts@gmail.com>
Date: Fri, 27 Dec 2024 06:34:04 +0800
Subject: [PATCH] cfst: update ipv4 and ipv6

---
 cfst.py  |   4 +--
 ip.txt   |  16 ++-------
 ipv6.txt | 102 ++++---------------------------------------------------
 3 files changed, 11 insertions(+), 111 deletions(-)

diff --git a/cfst.py b/cfst.py
index 0b4eb509..adea6314 100755
--- a/cfst.py
+++ b/cfst.py
@@ -112,7 +112,7 @@ def get_colo(ip_address):
 remove_file(log_file)
 
 # 执行 cfst 命令，使用变量传递 cfcolo
-subprocess.run(["./cfst", "-httping", "-cfcolo", cfcolo, "-tl", "200", "-tp", "443", "-sl", "5", "-dn", "20", "-p", "10"], check=True)
+subprocess.run(["./cfst", "-httping", "-cfcolo", cfcolo, "-tl", "200", "-tp", "443", "-sl", "5", "-dn", "10"], check=True)
 
 # 提取 IP 地址并保存到 cfip.txt
 ip_addresses = []
@@ -134,7 +134,7 @@ def get_colo(ip_address):
 
 # Git 上传步骤
 try:
-    subprocess.run(["git", "add", result_file, cfip_file, log_file], check=True)
+    subprocess.run(["git", "add", "."], check=True)
     subprocess.run(["git", "commit", "-m", commit_message], check=True)
     subprocess.run(["git", "push", "-u", "origin", "main"], check=True)
     print("已将文件上传到 GitHub 仓库。")
diff --git a/ip.txt b/ip.txt
index 68bddcc3..eeb8b7e2 100755
--- a/ip.txt
+++ b/ip.txt
@@ -9,17 +9,7 @@
 197.234.240.0/22
 198.41.128.0/17
 162.158.0.0/15
-104.16.0.0/12
-172.64.0.0/17
-172.64.128.0/18
-172.64.192.0/19
-172.64.224.0/22
-172.64.229.0/24
-172.64.230.0/23
-172.64.232.0/21
-172.64.240.0/21
-172.64.248.0/21
-172.65.0.0/16
-172.66.0.0/16
-172.67.0.0/16
+104.16.0.0/13
+104.24.0.0/14
+172.64.0.0/13
 131.0.72.0/22
\ No newline at end of file
diff --git a/ipv6.txt b/ipv6.txt
index 7cb8cc5d..58e91430 100755
--- a/ipv6.txt
+++ b/ipv6.txt
@@ -1,97 +1,7 @@
-2400:cb00:2049::/48
-2400:cb00:f00e::/48
+2400:cb00::/32
 2606:4700::/32
-2606:4700:10::/48
-2606:4700:130::/48
-2606:4700:3000::/48
-2606:4700:3001::/48
-2606:4700:3002::/48
-2606:4700:3003::/48
-2606:4700:3004::/48
-2606:4700:3005::/48
-2606:4700:3006::/48
-2606:4700:3007::/48
-2606:4700:3008::/48
-2606:4700:3009::/48
-2606:4700:3010::/48
-2606:4700:3011::/48
-2606:4700:3012::/48
-2606:4700:3013::/48
-2606:4700:3014::/48
-2606:4700:3015::/48
-2606:4700:3016::/48
-2606:4700:3017::/48
-2606:4700:3018::/48
-2606:4700:3019::/48
-2606:4700:3020::/48
-2606:4700:3021::/48
-2606:4700:3022::/48
-2606:4700:3023::/48
-2606:4700:3024::/48
-2606:4700:3025::/48
-2606:4700:3026::/48
-2606:4700:3027::/48
-2606:4700:3028::/48
-2606:4700:3029::/48
-2606:4700:3030::/48
-2606:4700:3031::/48
-2606:4700:3032::/48
-2606:4700:3033::/48
-2606:4700:3034::/48
-2606:4700:3035::/48
-2606:4700:3036::/48
-2606:4700:3037::/48
-2606:4700:3038::/48
-2606:4700:3039::/48
-2606:4700:a0::/48
-2606:4700:a1::/48
-2606:4700:a8::/48
-2606:4700:a9::/48
-2606:4700:a::/48
-2606:4700:b::/48
-2606:4700:c::/48
-2606:4700:d0::/48
-2606:4700:d1::/48
-2606:4700:d::/48
-2606:4700:e0::/48
-2606:4700:e1::/48
-2606:4700:e2::/48
-2606:4700:e3::/48
-2606:4700:e4::/48
-2606:4700:e5::/48
-2606:4700:e6::/48
-2606:4700:e7::/48
-2606:4700:e::/48
-2606:4700:f1::/48
-2606:4700:f2::/48
-2606:4700:f3::/48
-2606:4700:f4::/48
-2606:4700:f5::/48
-2606:4700:f::/48
-2803:f800:50::/48
-2803:f800:51::/48
-2a06:98c1:3100::/48
-2a06:98c1:3101::/48
-2a06:98c1:3102::/48
-2a06:98c1:3103::/48
-2a06:98c1:3104::/48
-2a06:98c1:3105::/48
-2a06:98c1:3106::/48
-2a06:98c1:3107::/48
-2a06:98c1:3108::/48
-2a06:98c1:3109::/48
-2a06:98c1:310a::/48
-2a06:98c1:310b::/48
-2a06:98c1:310c::/48
-2a06:98c1:310d::/48
-2a06:98c1:310e::/48
-2a06:98c1:310f::/48
-2a06:98c1:3120::/48
-2a06:98c1:3121::/48
-2a06:98c1:3122::/48
-2a06:98c1:3123::/48
-2a06:98c1:3200::/48
-2a06:98c1:50::/48
-2a06:98c1:51::/48
-2a06:98c1:54::/48
-2a06:98c1:58::/48
\ No newline at end of file
+2803:f800::/32
+2405:b500::/32
+2405:8100::/32
+2a06:98c0::/29
+2c0f:f248::/32
\ No newline at end of file