scutclient: bump version

hanwckf · Nov 5, 2019 · 46674a3 · 46674a3
1 parent 18f1e62
commit 46674a3
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 4 deletions.
diff --git a/trunk/user/httpd/variables.c b/trunk/user/httpd/variables.c
@@ -787,6 +787,7 @@
 			{"scutclient_hash","",NULL,EVM_RESTART_SCUT },
 			{"scutclient_hostname","",NULL,EVM_RESTART_SCUT },
 			{"scutclient_watchcat","",NULL,FALSE},
+			{"scutclient_skip_udp_hb","",NULL,EVM_RESTART_SCUT},
 			{0,0,0,0}
 	};
 #endif

diff --git a/trunk/user/scutclient/Makefile b/trunk/user/scutclient/Makefile
@@ -1,13 +1,14 @@
-SRC_NAME = scutclient-3857f08268a0522b17e337217b3da173c4653ba1
-#https://github.com/hanwckf/scutclient.git
+# https://github.com/hanwckf/scutclient.git
+SRC_NAME := scutclient-upstream
+SRC_FILE := scutclient-a58996875c61d0cdf8ec435057befc1c87bd6863
 THISDIR = $(shell pwd)
 
 all: extract_test config_test
 	$(MAKE) -C $(SRC_NAME)/build
 
 extract_test:
 	( if [ ! -d $(THISDIR)/$(SRC_NAME) ]; then \
-		tar -xf $(SRC_NAME).tar.gz; \
+		tar -xf $(SRC_FILE).tar.gz; \
 	fi )
 
 config_test:

diff --git a/trunk/user/scutclient/scripts/scutclient.sh b/trunk/user/scutclient/scripts/scutclient.sh
@@ -13,6 +13,10 @@ get_arg_debug(){
 	[ "$(nvram get scutclient_debug)" = "1" ] && echo "-D"
 }
 
+get_arg_skip_udp_hb(){
+	[ "$(nvram get scutclient_skip_udp_hb)" = "1" ] && echo "-b"
+}
+
 func_start(){
 #	[ "$(mtk_esw 11)" = "WAN ports link state: 0" ] && func_log "WAN has no link!" && exit 1
 	auth_hook=$(nvram get scutclient_auth_exec)
@@ -28,7 +32,7 @@ func_start(){
 	-h "$(nvram get scutclient_hash)" \
 	-E "${auth_hook:-"echo 0 > /tmp/scutclient_status"}" \
 	-Q "${fail_hook:-"echo 1 > /tmp/scutclient_status"}" \
-	"$(get_arg_debug)"
+	"$(get_arg_debug) $(get_arg_skip_udp_hb)"
 
 	if [ $? -eq 0 ] ; then
 		echo "[  OK  ]"

diff --git a/trunk/user/scutclient/scutclient-3857f08268a0522b17e337217b3da173c4653ba1.tar.gz b/trunk/user/scutclient/scutclient-3857f08268a0522b17e337217b3da173c4653ba1.tar.gz
diff --git a/trunk/user/scutclient/scutclient-a58996875c61d0cdf8ec435057befc1c87bd6863.tar.gz b/trunk/user/scutclient/scutclient-a58996875c61d0cdf8ec435057befc1c87bd6863.tar.gz
diff --git a/trunk/user/shared/defaults.c b/trunk/user/shared/defaults.c
@@ -484,6 +484,7 @@ struct nvram_pair router_defaults[] = {
 	{ "scutclient_debug", "0" },
 	{ "scutclient_hostname", "Lenovo-PC" },
 	{ "scutclient_server_auth_ip", "202.38.210.131" },
+	{ "scutclient_skip_udp_hb", "0" },
 	{ "scutclient_version", "4472434f4d0096022a" },
 	{ "scutclient_hash", "2ec15ad258aee9604b18f2f8114da38db16efd00" },
 	{ "scutclient_username", "" },

diff --git a/trunk/user/www/dict/CN.dict b/trunk/user/www/dict/CN.dict
@@ -791,6 +791,7 @@ menu5_13_hash=DrAuthSvr.dll哈希值:
 menu5_13_debug=启用Debug模式
 menu5_13_watchcat=启用watchcat
 menu5_13_log=日志
+menu5_13_udpHB=忽略UDP心跳包检查
 menu5_14=ChinaDNS
 menu5_14_1=启用ChinaDNS
 menu5_14_2=监听地址:

diff --git a/trunk/user/www/dict/EN.footer b/trunk/user/www/dict/EN.footer
@@ -776,6 +776,7 @@ menu5_13_hash=DrAuthSvr.dll hash value:
 menu5_13_debug=Enable debug mode
 menu5_13_watchcat=Enable watchcat
 menu5_13_log=Log
+menu5_13_udpHB=Skip UDP Heartbeat check
 menu5_14=ChinaDNS
 menu5_14_1=Enable ChinaDNS
 menu5_14_2=Bind Address:

diff --git a/trunk/user/www/n56u_ribbon_fixed/scutclient.asp b/trunk/user/www/n56u_ribbon_fixed/scutclient.asp
@@ -30,6 +30,7 @@ $j(document).ready(function(){
 	init_itoggle('scutclient_enable');
 	init_itoggle('scutclient_debug');
 	init_itoggle('scutclient_watchcat');
+	init_itoggle('scutclient_skip_udp_hb');
 	fill_status(scutclient_status());
 });
 
@@ -229,6 +230,21 @@ function fill_status(status_code){
                                             </td>
                                         </tr>
 
+                                        <tr> <th><#menu5_13_udpHB#></th>
+                                            <td>
+                                                <div class="main_itoggle">
+                                                    <div id="scutclient_skip_udp_hb_on_of">
+                                                        <input type="checkbox" id="scutclient_skip_udp_hb_fake" <% nvram_match_x("", "scutclient_skip_udp_hb", "1", "value=1 checked"); %><% nvram_match_x("", "scutclient_skip_udp_hb", "0", "value=0"); %>>
+                                                    </div>
+                                                </div>
+
+                                                <div style="position: absolute; margin-left: -10000px;">
+                                                    <input type="radio" value="1" name="scutclient_skip_udp_hb" id="scutclient_skip_udp_hb_1" <% nvram_match_x("", "scutclient_skip_udp_hb", "1", "checked"); %>><#checkbox_Yes#>
+                                                    <input type="radio" value="0" name="scutclient_skip_udp_hb" id="scutclient_skip_udp_hb_0" <% nvram_match_x("", "scutclient_skip_udp_hb", "0", "checked"); %>><#checkbox_No#>
+                                                </div>
+                                            </td>
+                                        </tr>
+
                                         <tr>
                                             <td colspan="2">
                                                 <center><input class="btn btn-primary" style="width: 219px" type="button" value="<#CTL_apply#>" onclick="applyRule()" /></center>