v4.34.9

cary-sas · Apr 26, 2021 · 78aaabe · 78aaabe
1 parent 9982db2
commit 78aaabe
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 11 deletions.
diff --git a/380_armv5_packge/4.34.9/md5sum.txt b/380_armv5_packge/4.34.9/md5sum.txt
@@ -0,0 +1 @@
+9f567256296712934b115aea8a429443
diff --git a/380_armv5_packge/4.34.9/shadowsocks.tar.gz b/380_armv5_packge/4.34.9/shadowsocks.tar.gz
diff --git a/380_armv5_packge/latest.txt b/380_armv5_packge/latest.txt
@@ -1 +1 @@
-4.34.8
+4.34.9
diff --git a/shadowsocks/bin/smartdns b/shadowsocks/bin/smartdns
diff --git a/shadowsocks/install.sh b/shadowsocks/install.sh
@@ -237,8 +237,8 @@ dbus set softcenter_module_shadowsocks_description="科学上网 for merlin armv
 dbus set softcenter_module_shadowsocks_home_url="Main_Ss_Content.asp"
 
 # 设置v2ray 版本号
-dbus set ss_basic_v2ray_version=4.34.8
-dbus set ss_basic_v2ray_date=20210415
+dbus set ss_basic_v2ray_version=4.34.9
+dbus set ss_basic_v2ray_date=20210426
 
 echo_date 一点点清理工作...
 rm -rf /tmp/shadowsocks* >/dev/null 2>&1

diff --git a/shadowsocks/scripts/ss_online_update.sh b/shadowsocks/scripts/ss_online_update.sh
@@ -282,7 +282,7 @@ get_ss_config(){
  password=$(echo $password | base64_encode)
  else
  paraminfo=$(base64decode_link `echo -n "$decode_link" | awk -F'#' '{print $1}'`)
- server=$(echo "$paraminfo" |awk -F'[@:]' '{print $(NF-1}')
+ server=$(echo "$paraminfo" |awk -F'[@:]' '{print $(NF-1)}')
  server_port=$(echo "$paraminfo" |awk -F'[:]' '{print $NF}')
  # 首段的加密方式跟密码进行解码，method_password=aes-128-gcm:VXPipi29nxMO
  # method_password=$(echo "$decode_link" |awk -F'[@:]' '{print $1}' | sed 's/-/+/g; s/_/\//g')

diff --git a/shadowsocks/ss/rules/smartdns_template.conf b/shadowsocks/ss/rules/smartdns_template.conf
@@ -44,6 +44,7 @@ cache-size 409600
 # prefetch domain
 # prefetch-domain [yes|no]
 # prefetch-domain yes
+prefetch-domain yes
 
 # List of hosts that supply bogus NX domain results 
 # bogus-nxdomain [ip/subnet]
@@ -120,6 +121,8 @@ server 114.114.114.114 -group china
 server 119.29.29.29 -group china
 server 223.5.5.5 -group china
 server 1.2.4.8 -group china
+server 8.8.8.8 -group foreign
+server 1.1.1.1 -group foreign
 # server 117.50.11.11 -group china
 # server 180.76.76.76 -group china
 
@@ -131,9 +134,11 @@ server 1.2.4.8 -group china
 # server-tcp 119.29.29.29
 # server-tcp 64.6.64.6
 # server-tcp 114.114.114.119
-server-tcp 202.38.93.153:5353 -group china
-server-tcp 202.141.176.93:5353 -group china
-server-tcp 202.141.162.123:5353 -group china
+server-tcp 202.38.93.153 -group china
+server-tcp 202.141.176.93 -group china
+server-tcp 202.141.162.123 -group china
+server-tcp 8.8.8.8 -group foreign
+server-tcp 1.1.1.1 -group foreign
 
 # remote tls dns server list
 # server-tls [IP]:[PORT] [-blacklist-ip] [-whitelist-ip] [-spki-pin [sha256-pin]] [-group [group] ...] [-exclude-default-group]
@@ -143,9 +148,11 @@ server-tcp 202.141.162.123:5353 -group china
 # Get SPKI with this command:
 # echo | openssl s_client -connect '[ip]:853' | openssl x509 -pubkey -noout | openssl pkey -pubin -outform der | openssl dgst -sha256 -binary | openssl enc -base64
 # default port is 853
-
+server-tls 202.38.93.153 -group china
+server-tls 202.141.176.93 -group china
+server-tls 202.141.162.123 -group china
 server-tls 8.8.8.8 -group foreign
-
+server-tls 1.1.1.1 -group foreign
 # remote https dns server list
 # server-https https://[host]:[port]/path [-blacklist-ip] [-whitelist-ip] [-spki-pin [sha256-pin]] [-group [group] ...] [-exclude-default-group]
 # -spki-pin: TLS spki pin to verify.
@@ -154,6 +161,7 @@ server-tls 8.8.8.8 -group foreign
 # -http-host: http host.
 # default port is 443
 server-https https://cloudflare-dns.com/dns-query -group foreign
+server-https https://dns.techdns.org:5053/dns-query -group china
 
 # specific nameserver to domain
 # nameserver /domain/[group|-]

diff --git a/shadowsocks/ss/ssconfig.sh b/shadowsocks/ss/ssconfig.sh
@@ -2611,7 +2611,7 @@ apply_ss(){
  [ "$ss_basic_type" == "0" ] || [ "$ss_basic_type" == "1" ] && start_ss_redir
  [ "$ss_basic_type" == "2" ] && start_koolgame
  [ "$ss_basic_type" == "3" ] || [ "$ss_basic_type" == "4" -a "$ss_basic_trojan_binary" == "Trojan" ] && start_v2ray_xray
- [ "$ss_basic_type" == "3" ] || [ "$ss_basic_type" == "4" -a "$ss_basic_trojan_binary" == "Trojan-Go" ] && start_trojango
+ [ "$ss_basic_type" == "4" -a "$ss_basic_trojan_binary" == "Trojan-Go" ] && start_trojango
  [ "$ss_basic_type" != "2" ] && start_kcp
  [ "$ss_basic_type" != "2" ] && start_dns
  #===load nat start===

diff --git a/shadowsocks/ss/version b/shadowsocks/ss/version
@@ -1 +1 @@
-4.34.8
+4.34.9