update 2023-02-14 09:42:31

cdnspeedtest/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=CloudflareSpeedTest
-PKG_VERSION:=2.2.1
+PKG_VERSION:=2.2.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/XIU2/CloudflareSpeedTest/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=138def3ebab9257d73eab05cb395494f75405d30114d25be0c118d580a446249
+PKG_HASH:=2fa3f1df1ae6632e81d8dc626e770150e4ded81e8a7cd8224bb30d40b6d0cf66
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE

luci-app-mosdns/root/etc/mosdns/rule/geoip_cn.txt

@@ -1938,6 +1938,8 @@
 103.84.64.0/22
 103.84.72.0/22
 103.84.136.0/22
+103.84.170.0/23
+103.84.204.0/23
 103.85.20.0/22
 103.85.24.0/22
 103.85.44.0/22
@@ -6358,7 +6360,9 @@
 2400:da60::/32
 2400:dd00::/28
 2400:dd40::/32
+2400:dda0::/32
 2400:de00::/32
+2400:de20::/32
 2400:de80::/32
 2400:e0c0::/32
 2400:e5c0::/32

luci-app-netspeedtest/luasrc/model/cbi/netspeedtest/homebox.lua

@@ -19,7 +19,7 @@ o.template ='netspeedtest/homebox'
 
 m.apply_on_parse = true
 m.on_after_apply = function(self,map)
-  io.popen("/etc/init.d/netspeedtest restart")
+  io.popen("/etc/init.d/netspeedtest start")
 end
 
 return m

luci-app-netspeedtest/root/etc/init.d/netspeedtest

@@ -40,7 +40,6 @@ nstest() {
     limit_log $LOG 200
     init_env
     touch $LOCK
-    
     echo -ne "\n  speedtest测速"       | tee -a $LOG
     /usr/bin/speedtest --share  > $TMP_T
     echo -ne  "\n  测服信息:$(cat  $TMP_T | grep 'Hosted by'| cut -c10- | awk -F: '{printf $1}')  延时：$(cat  $TMP_T | grep 'Hosted by' | awk -F: '{printf $2}')" >> $LOG
@@ -62,16 +61,11 @@ homebox_prepare() {
 	pgrep -f homebox | xargs kill -9 >/dev/null 2>&1 
 }
 
-stop_service() {
-	# homebox_prepare
-	echo "homebox stop"
-}
-
 start_service() {
 	homebox_prepare
 	config_load netspeedtest
         config_foreach get_config homebox
-	[ "x$enabled" == "x1" ] || return 1
+	[ "x$enabled" != "x1" ] && exit 1
 	procd_open_instance
 	procd_set_param command $PROG
 	[ "x$logger" == x1 ] && procd_set_param stderr 1