Merge remote-tracking branch 'upstream/45581' into DEV_45581_3

gnuton · Nov 7, 2021 · ae300d4 · ae300d4
2 parents c4a26c0 + a85421d
commit ae300d4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 58 deletions.
diff --git a/release/src/router/httpd/data_arrays.c b/release/src/router/httpd/data_arrays.c
@@ -1101,6 +1101,7 @@ int ej_connlist_array(int eid, webs_t wp, int argc, char **argv) {
 		                      proto, address, port1, dest, port2, state);
 	}
 	fclose(fp);
+	unlink("/tmp/connect.log");
 
 	ret += websWrite(wp, "[]];\n");
 

diff --git a/release/src/router/www/GameProfile.asp b/release/src/router/www/GameProfile.asp
@@ -204,9 +204,9 @@ function genListTable(){
 			var _target = gameProfile.profile[j];
 			if(_target.port == vts_rulelist_col[1]){	
 				if(vts_rulelist_col[0].split('@').length < 2){
-			if(_target.port == vts_rulelist_col[1] 
-			&& (_target.title == vts_rulelist_col[0] || vts_rulelist_col[0].indexOf(_target.title) != -1)){
-				_platform = _target.platform;
+					if(_target.port == vts_rulelist_col[1] 
+					&& (_target.title == vts_rulelist_col[0] || vts_rulelist_col[0].indexOf(_target.title) != -1)){
+						_platform = _target.platform;
 					}
 				}
 				else{

diff --git a/release/src/router/www/Main_LogStatus_Content.asp b/release/src/router/www/Main_LogStatus_Content.asp
@@ -121,7 +121,7 @@ var filter = [
     "not exist in UDB, can't update it"
 ]
 
-$.getJSON("https://nw-dlcdnet.asus.com/plugin/js/logFilter.json", function(data){
+$.getJSON("/ajax/logFilter.json", function(data){
 	filter = data.filter;
 })
 

diff --git a/release/src/router/www/Makefile b/release/src/router/www/Makefile
@@ -981,3 +981,4 @@ update:
 	wget http://nw-dlcdnet.asus.com/plugin/js/dns_db.json -O ajax/dns_db.json
 	wget http://nw-dlcdnet.asus.com/plugin/js/ouiDB.json -O ajax/ouiDB.json
 	wget http://nw-dlcdnet.asus.com/plugin/js/gameList.json -O ajax/gameList.json
+	wget http://nw-dlcdnet.asus.com/plugin/js/logFilter.json -O ajax/logFilter.json
diff --git a/release/src/router/www/ajax/logFilter.json b/release/src/router/www/ajax/logFilter.json
@@ -0,0 +1,7 @@
+{
+    "filter": [
+        "already exist in UDB, can't add it", 
+        "not mesh client, can't update it's ip",
+        "not exist in UDB, can't update it"
+    ]
+}
diff --git a/tools/publish.sh b/tools/publish.sh