diff --git a/release/src/router/httpd/data_arrays.c b/release/src/router/httpd/data_arrays.c index 085e8decf7b..2505ed541fa 100644 --- 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 index e7d457f9162..796790088fa 100644 --- 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 index 64f47c87035..c186a6bd91a 100644 --- 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 index 7fb8f0725bc..255d805ee0e 100644 --- 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 new file mode 100644 index 00000000000..f29872f8dc3 --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/tools/publish.sh b/tools/publish.sh deleted file mode 100755 index e197cff9822..00000000000 --- a/tools/publish.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -if [ "$1" == "beta" ] -then - SUFFIXE="Beta/" - SUFFIXESF="Beta/" -else - SUFFIXE="" - SUFFIXESF="Release/" -fi - -read -p "Deploy to $SUFFIXESF (y/n)?" choice -case "$choice" in - y|Y ) echo "Deploying to $SUFFIXESF";; - * ) echo "Aborting."; exit;; -esac - -eval $(ssh-agent -s) -ssh-add - -cd /media/sf_Share/images/ - -MODELS=(RT-AC68U RT-AC88U RT-AC3100 RT-AC5300 RT-AC86U RT-AX88U RT-AX56U RT-AX58U) - -for MODEL in "${MODELS[@]}" -do - : - echo "Deploying $MODEL to Onedrive..." - cp $MODEL*.zip /media/nas/OnedriveBusiness/Asuswrt-Merlin/Releases/$MODEL/$SUFFIXE - echo "Deploying $MODEL to Sourceforge..." - scp $MODEL*.zip rmerlin@frs.sourceforge.net:/home/pfs/project/asuswrt-merlin/$MODEL/$SUFFIXESF -done - -echo "Uploading documentation..." -cp README-merlin.txt /media/nas/OnedriveBusiness/Asuswrt-Merlin/Documentation/ -scp README-merlin.txt rmerlin@frs.sourceforge.net:/home/pfs/project/asuswrt-merlin/Documentation/ - -cp Changelog*.txt /media/nas/OnedriveBusiness/Asuswrt-Merlin/Documentation/ -scp Changelog*.txt rmerlin@frs.sourceforge.net:/home/pfs/project/asuswrt-merlin/Documentation/ - -# Only upload SHA256 checksums for non-beta releases -if [ "$SUFFIXE" == "Beta/" ] -then - mv sha256sums.txt sha256sums-beta.txt - mv sha256sums-ng.txt sha256sums-ng-beta.txt -fi - -cp sha256sums*.txt /media/nas/OnedriveBusiness/Asuswrt-Merlin/Documentation/ -scp sha256sums*.txt rmerlin@frs.sourceforge.net:/home/pfs/project/asuswrt-merlin/Documentation/ - -echo "Done deploying!" - -eval $(ssh-agent -k) -