Bumped revision to 5.1.1

release/src-rt/Makefile

@@ -70,7 +70,7 @@ export PATH := $(RELEASEDIR)/tools:$(SRCBASE)/ctools:$(PATH)
 #K3C/K3/SBRAC1900P/SBRAC3200P/R7000/R8000/R7900P/R8000P
 export MERLINR_NAME := RTACRH17
 export MERLINR_VER_MAJOR :=B
-export MERLINR_VER_MINOR :=5.1.0
+export MERLINR_VER_MINOR :=5.1.1
 export MERLINR_VER := $(MERLINR_VER_MAJOR)$(MERLINR_VER_MINOR)
 export MERLINRVER := $(MERLINR_NAME)_$(MERLINR_VER)
 ifeq ($(MERLINR_NAME),RTACRH17)

release/src-rt/target.mak

@@ -398,11 +398,6 @@ export VZW-AC1300 := IPV6SUPP=y HTTPS=y SSH=y QCA=y IPQ40XX=y PARENTAL2=y OPENVP
 	ATF=y QCA_TW_AUTO_BAND4=y STAINFO=y HIVE_LIB=y HIVE_BIN=y \
 	WIFICLONE=y QCA_VAP_LOCALMAC=y PSISTLOG=y LYRA_HIDE=y CSU2_2=y DUAL_BACKHAUL=n ETHBACKHAUL=n VZW_DMC=y
 
-export RT-ACRH17 := IPV6SUPP=y HTTPS=y SSH=y QCA=y IPQ40XX=y BBEXTRAS=y USBEXTRAS=y SAMBA3=y MEDIASRV=y PARENTAL2=y OPENVPN=y VPNC=y EMAIL=y YANDEXDNS=y ACCEL_PPTPD=y PRINTER=y USB="USB" APP="network" EBTABLES=y AUTODICT=y  LANWAN_LED=y BUILD_NAME="RT-AC82U" RTAC82U=y SHP=y NVRAM_64K=y TUNEK="n" OPTIMIZE_XBOX=y ODMPID=y BOOT_FLASH_TYPE=NAND MDNS=y FINDASUS=y XHCI=y ATEUSB3_FORCE=y EXT4FS=y TEMPROOTFS=y NTFS="tuxera" TFAT=y HFS="tuxera" DUMP_OOPS_MSG=y DEBUGFS=y \
-	REBOOT_SCHEDULE=y NOIPTV=y \
-	DISK_MONITOR=y UBI=y UBIFS=y PSISTLOG=y WPSMULTIBAND=y BLINK_LED=y LAN4WAN_LED=y WANRED_LED=y BTN_WPS_ALLLED=y \
-	NEW_USER_LOW_RSSI=y REDIRECT_DNAME=y ATF=y QCA_TW_AUTO_BAND4=y STAINFO=y NEWSSID_REV2=y LAN50=y NEW_APP_ARM=y SW_HW_AUTH=y NATNL_AIHOME=y UTF8_SSID=y SOFTCENTER=y SMARTDNS=y FRS_LIVE_UPDATE=y UUPLUGIN=y
-
 ############################################################################
 # Qualcomm Atheros little-endian ARM platform, linux-3.4.x
 # SOC: IPQ8064

release/src/router/httpd/dbapi.c

@@ -141,6 +141,22 @@ int dbclient_start(dbclient* client) {
     return 0;
 }
 
+int dbclient_rm(dbclient* client, const char* key, int nk) {
+    int n1,n2;
+
+    if(nk < 0) {
+        return -1;
+    }
+
+    n1 = nk + 2 + 6;
+    check_buf(client, n1 + HEADER_PREFIX);
+    n2 = snprintf(client->buf, client->buf_max, "%s%07d remove %s\n", MAGIC, n1, key);
+    client->buf[n2] = '\0';
+    write(client->remote_fd, client->buf, n2);
+
+    return 0;
+}
+
 int dbclient_bulk(dbclient* client, const char* command, const char* key, int nk, const char* value, int nv) {
     int n1,n2,nc;
 

release/src/router/httpd/dbapi.h

@@ -39,6 +39,7 @@ typedef struct _dbclient {
 typedef int (*fn_db_parse)(dbclient* client, webs_t wp, char* prefix, char* key, char* value);
 
 int dbclient_start(dbclient* client);
+int dbclient_rm(dbclient* client, const char* key, int nk);
 int dbclient_bulk(dbclient* client, const char* command, const char* key, int nk, const char* value, int nv);
 int dbclient_end(dbclient* client);
 int dbclient_list(dbclient* client, char* prefix, webs_t wp, fn_db_parse fn);

release/src/router/httpd/web.c

@@ -9715,7 +9715,7 @@ static int ej_get_simact_result(int eid, webs_t wp, int argc, char_t **argv){
 			if(len > 0){
 				if(buf[len] == '\n' || buf[len] == '\r')
 					buf[len] = '\0';
-				websWrite(wp, buf);
+				websWrite(wp, "\"%s\"",buf);
 				break;
 			}
 		}
@@ -15095,7 +15095,7 @@ applydb_cgi(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg,
 	char *result = NULL;
 	char *temp = NULL;
 	char *name = websGetVar(wp, "p","");
-	char *userm = strstr(url, "use_rm=1");
+	char *userm = websGetVar(wp, "use_rm", "");
 	char scPath[128];
 	char *post_db_buf = post_json_buf;
 
@@ -15133,8 +15133,8 @@ applydb_cgi(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg,
 				strcpy(dbval, temp+1);
 				strncpy(dbvar, dbjson[j], strlen(dbjson[j])-strlen(temp));
 			//logmessage("HTTPD", "name: %s post: %s", dbvar, dbval);
-			if(userm)
-				doSystem("dbus remove %s", dbvar);
+			if(*userm || dbval[0]=='\0')
+				dbclient_rm(&client, dbvar, strlen(dbvar));
 			else
 				dbclient_bulk(&client, "set", dbvar, strlen(dbvar), dbval, strlen(dbval));
 		}
@@ -15164,9 +15164,9 @@ applydb_cgi(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg,
 				temp=strstr(dbjson[j], "=");
 				strcpy(dbval, temp+1);
 				strncpy(dbvar, dbjson[j], strlen(dbjson[j])-strlen(temp));
-			//logmessage("HTTPD", "name: %s post: %s", dbvar, dbval);
-			if(userm)
-				doSystem("dbus remove %s", dbvar);
+			//logmessage("HTTPD", "dbvar: %s dbval: %s", dbvar, dbval);
+			if(*userm || dbval[0]=='\0')
+				dbclient_rm(&client, dbvar, strlen(dbvar));
 			else
 				dbclient_bulk(&client, "set", dbvar, strlen(dbvar), dbval, strlen(dbval));
 		}
@@ -15307,7 +15307,7 @@ do_logread(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg,
 	//sscanf(url, "logreaddb.cgi?%s", filename);
 	char *filename = websGetVar(wp, "p","");
 	char *script = websGetVar(wp, "script", "");
-	if(script){
+	if(*script){
 		sprintf(scPath, "/jffs/softcenter/scripts/%s", script);
 		strlcpy(SystemCmd, scPath, sizeof(SystemCmd));
 		sys_script("syscmd.sh");
@@ -23158,7 +23158,7 @@ ej_get_wan_lan_status(int eid, webs_t wp, int argc, char **argv)
 	if (wanLanStatus == NULL || wanLanLinkSpeed == NULL || wanLanCount == NULL)
 		goto error;
 
-#if defined(K3) || defined(R8000P) || defined(R7900P)
+#if defined(K3) || defined(R8000P) || defined(R7900P) || defined(EA6700)
 	fp = popen("rc Get_PhyStatus", "r");
 #else
 	fp = popen("ATE Get_WanLanStatus", "r");

release/src/router/rc/merlinr.c

@@ -81,12 +81,12 @@ void merlinr_init_done()
 {
 	_dprintf("############################ MerlinR init done #################################\n");
 #ifdef RTCONFIG_SOFTCENTER
-	if (!f_exists("/jffs/softcenter/scripts/ks_tar_intall.sh") && nvram_match("sc_mount","0")){
+	if (!f_exists("/jffs/softcenter/scripts/ks_tar_install.sh") && nvram_match("sc_mount","0")){
 		doSystem("/usr/sbin/jffsinit.sh &");
 		logmessage("Softcenter/软件中心", "Installing/开始安装......");
 		logmessage("Softcenter/软件中心", "Wait a minute/1分钟后完成安装");
 		_dprintf("....softcenter ok....\n");
-	} else if (f_exists("/jffs/softcenter/scripts/ks_tar_intall.sh") && nvram_match("sc_mount","0"))
+	} else if (f_exists("/jffs/softcenter/scripts/ks_tar_install.sh") && nvram_match("sc_mount","0"))
 		nvram_set("sc_installed","1");
 	//else if (!f_exists("/jffs/softcenter/scripts/ks_tar_intall.sh") && nvram_match("sc_mount","1"))
 		//nvram_set("sc_installed","0");
@@ -97,11 +97,9 @@ void merlinr_init_done()
 		doSystem("sed -i '/softcenter-mount.sh/d' /jffs/scripts/post-mount");
 
 	}
+	doSystem("dbus set softcenter_firmware_version=`nvram get extendno|cut -d \"_\" -f2|cut -d \"-\" -f1|cut -c2-6`");
 #endif
-#if defined(RTCONFIG_QCA)
-	if(!nvram_get("bl_ver"))
-		nvram_set("bl_ver", "1.0.0.0");
-#elif defined(RTCONFIG_RALINK)
+#if defined(RTCONFIG_QCA) || defined(RTCONFIG_RALINK)
 	if(!nvram_get("bl_ver"))
 		nvram_set("bl_ver", nvram_get("blver"));
 #elif defined(RTCONFIG_LANTIQ)
@@ -169,6 +167,10 @@ void merlinr_init_done()
 #if defined(TUFAX3000) && defined(MERLINR_VER_MAJOR_X)
 //tufax3000=ax82u,ax58u=ax3000
 	//enable_4t4r();
+#elif defined(GTAC2900) && defined(MERLINR_VER_MAJOR_X)
+//ac86u <--> gtac2900
+	patch_ac86();
+	//patch_gt2900();
 #endif
 }
 
@@ -391,9 +393,9 @@ int merlinr_firmware_check_update_main(int argc, char *argv[])
 					//_dprintf("%s#%s\n",fwver,cur_fwver);
 					if(versioncmp((cur_fwver+1),(fwver+1))==1){
 						nvram_set("webs_state_url", "");
-#if defined(SBRAC3200P) || defined(RTACRH17) || defined(RTAC3200) || defined(RTAC85P)
+#if defined(RTACRH17) || defined(RTAC3200) || defined(RTAC85P)
 						snprintf(info,sizeof(info),"3004_382_%s_%s-%s",modelname,fwver,tag);
-#elif defined(RTAC68U)
+#elif defined(RTAC68U) || defined(RTAC3100) || defined(RTAC88U)
 						snprintf(info,sizeof(info),"3004_385_%s_%s-%s",modelname,fwver,tag);
 #else
 						snprintf(info,sizeof(info),"3004_384_%s_%s-%s",modelname,fwver,tag);
@@ -446,9 +448,9 @@ int merlinr_firmware_check_update_main(int argc, char *argv[])
 	curl_global_cleanup();
 
 GODONE:
-#if defined(SBRAC3200P) || defined(RTACRH17) || defined(RTAC3200) || defined(RTAC85P)
+#if defined(RTACRH17) || defined(RTAC3200) || defined(RTAC85P)
 	snprintf(info,sizeof(info),"3004_382_%s",nvram_get("extendno"));
-#elif defined(RTAC68U)
+#elif defined(RTAC68U) || defined(RTAC3100) || defined(RTAC88U)
 	snprintf(info,sizeof(info),"3004_385_%s",nvram_get("extendno"));
 #else
 	snprintf(info,sizeof(info),"3004_384_%s",nvram_get("extendno"));
@@ -586,7 +588,7 @@ void softcenter_eval(int sig)
 	//	snprintf(path, sizeof(path), "%s/softcenter-unmount.sh", sc);
 	//	snprintf(action, sizeof(action), "unmount");
 	} else {
-		logmessage("Softcenter", "sig=%s, bug?",sig);
+		logmessage("Softcenter", "sig=%d, bug?",sig);
 		return;
 	}
 	char *eval_argv[] = { path, action, NULL };

release/src/router/rc/services.c

@@ -4130,9 +4130,19 @@ start_smartdns(void)
 	//fprintf(fp, "log-file /var/log/smartdns.log\n");
 	//fprintf(fp, "log-size 128k\n");
 	//fprintf(fp, "log-num 2\n");
-	fprintf(fp, "server 114.114.114.114\n");
-	fprintf(fp, "server 119.29.29.29\n");
-	fprintf(fp, "server 223.5.5.5\n");
+#if !defined(K3C) && !defined(K3) && !defined(SBRAC1900P) && !defined(SBRAC3200P) && !defined(R8000P)
+	if(!strncmp(nvram_get("territory_code"), "CN",2)){
+#endif
+		fprintf(fp, "server 114.114.114.114\n");
+		fprintf(fp, "server 119.29.29.29\n");
+		fprintf(fp, "server 223.5.5.5\n");
+#if !defined(K3C) && !defined(K3) && !defined(SBRAC1900P) && !defined(SBRAC3200P) && !defined(R8000P)
+	} else {
+		fprintf(fp, "server 8.8.8.8\n");
+		fprintf(fp, "server 208.67.222.222\n");
+		fprintf(fp, "server 1.1.1.1\n");
+	}
+#endif
 	for (unit = WAN_UNIT_FIRST; unit < WAN_UNIT_MAX; unit++) {
 		char *wan_xdns;
 		char wan_xdns_buf[sizeof("255.255.255.255 ")*2];

release/src/router/rc/watchdog.c

@@ -5382,6 +5382,9 @@ static void softcenter_sig_check()
 			if(f_exists("/jffs/softcenter/bin/softcenter.sh")) {
 				softcenter_eval(SOFTCENTER_MOUNT);
 				nvram_set_int("sc_mount_sig", 0);
+			} else if(!f_exists("/jffs/softcenter/bin/softcenter.sh") && nvram_match("sc_mount", "1")) {
+				//remount to sdb sdc not sda
+				doSystem("sh /jffs/softcenter/automount.sh &");
 			}
 		}
 		if(nvram_match("sc_services_sig", "1")) {
@@ -5774,7 +5777,7 @@ void ntevent_intranet_usage_insight()
 	tm = localtime(&now);
 
 	/* send event at 9:00 each Monday */
-	if (tm->tm_wday == 1 && tm->tm_hour == 9) {
+	if (tm->tm_wday == 1 && tm->tm_hour == 9 && tm->tm_min == 0) {
 		snprintf(str, 32, "0x%x", HINT_INTERNET_USAGE_INSIGHT_EVENT);
 		eval("Notify_Event2NC", str, "");
 	}

release/src/router/rom/webs_scripts/merlinr_webs_note.sh

@@ -1,33 +1,83 @@
 #!/bin/sh
 
-wget_timeout=`nvram get apps_wget_timeout`
-wget_options="-q -t 2 -T $wget_timeout --no-check-certificate"
+wget_options="-q -t 2 -T 30 --no-check-certificate"
+
+dl_path_SQ="https://dlcdnets.asus.com/pub/ASUS/LiveUpdate/Release/Wireless_SQ"
+dl_path_SQ_beta="https://dlcdnets.asus.com/pub/ASUS/LiveUpdate/Release/Wireless_SQ/app"
+dl_path_file="https://update.paldier.com"
 
 nvram set cfg_note=0
 get_preferred_lang=`nvram get preferred_lang`
 LANG="$get_preferred_lang"
 
+# get release note
+forsq=`nvram get apps_sq`
+if [ -z "$forsq" ]; then
+	forsq=0
+fi
+
+echo "---- Get amas release note start ----" >> /tmp/webs_upgrade.log
 if [ $# != 2 ]; then
-	echo "---- no model name or version ----" >> /tmp/webs_note.log
+	echo "---- no model name or version ----" >> /tmp/webs_upgrade.log
 	nvram set cfg_note=2
 	exit 0
 fi
 
 new_firm=`echo $2 | sed s/'\.'/_/4 | sed s/'\.'//g;`
-echo "---- $new_firm ----" >> /tmp/webs_note.log
+echo "---- $1 $new_firm ----" >> /tmp/webs_upgrade.log
 releasenote_file=$1_"$new_firm"_"$LANG"_note.zip
 releasenote_file_US=$1_"$new_firm"_US_note.zip
 releasenote_path="/tmp/release_note.txt"
-echo "---- download real release note for $1 ----" >> /tmp/webs_note.log
-wget $wget_options https://update.paldier.com/$releasenote_file -O $releasenote_path
-if [ "$?" != "0" ]; then
-	wget $wget_options https://update.paldier.com/$releasenote_file_US -O $releasenote_path
+
+wget_release=""
+wget_release2=""
+if [ "$forsq" -ge 2 ] && [ "$forsq" -le 9 ]; then
+	echo "---- download SQ beta_user release note ${dl_path_SQ_beta}${forsq}/$releasenote_file ----" >> /tmp/webs_upgrade.log
+	wget $wget_options ${dl_path_SQ_beta}${forsq}/$releasenote_file -O $releasenote_path
+	wget_release=$?
+	echo "---- [LiveUpdate] wget pLang release note, exit code: ${wget_release} ----" >> /tmp/webs_upgrade.log
+	if [ "$wget_release" != "0" ]; then
+		echo "---- download SQ beta_user release note ${dl_path_SQ_beta}${forsq}/$releasenote_file_US ----" >> /tmp/webs_upgrade.log
+		wget $wget_options ${dl_path_SQ_beta}${forsq}/$releasenote_file_US -O $releasenote_path
+		wget_release2=$?
+		echo "---- [LiveUpdate] wget US release note, exit code: ${wget_release2} ----" >> /tmp/webs_upgrade.log
+	fi
+elif [ "$forsq" == "1" ]; then
+	echo "---- download SQ release note ${dl_path_SQ}/$releasenote_file ----" >> /tmp/webs_upgrade.log
+	wget $wget_options ${dl_path_SQ}/$releasenote_file -O $releasenote_path
+	wget_release=$?
+	echo "---- [LiveUpdate] wget pLang release note, exit code: ${wget_release} ----" >> /tmp/webs_upgrade.log
+	if [ "$wget_release" != "0" ]; then
+		echo "---- download SQ release note ${dl_path_SQ}/$releasenote_file_US ----" >> /tmp/webs_upgrade.log
+		wget $wget_options ${dl_path_SQ}/$releasenote_file_US -O $releasenote_path
+		wget_release2=$?
+		echo "---- [LiveUpdate] wget US release note, exit code: ${wget_release2} ----" >> /tmp/webs_upgrade.log
+	fi
+else
+	echo "---- download real release note ${dl_path_file} for $1 ----" >> /tmp/webs_upgrade.log
+	wget $wget_options ${dl_path_file}/$releasenote_file -O $releasenote_path
+	wget_release=$?
+	echo "---- [LiveUpdate] wget pLang release note, exit code: ${wget_release} ----" >> /tmp/webs_upgrade.log
+	if [ "$wget_release" != "0" ]; then
+		echo "---- download real release note ${dl_path_file}/$releasenote_file_US ----" >> /tmp/webs_upgrade.log
+		wget $wget_options ${dl_path_file}/$releasenote_file_US -O $releasenote_path
+		wget_release2=$?
+		echo "---- [LiveUpdate] wget US release note, exit code: ${wget_release2} ----" >> /tmp/webs_upgrade.log
+	fi
 fi
-echo "---- https://update.paldier.com/$releasenote_file ----" >> /tmp/webs_note.log
 
-if [ "$?" != "0" ] || [ ! -s $releasenote_path ]; then
-	echo "---- download release note failed ----" >> /tmp/webs_note.log
+if [ "$wget_release" != "0" ] && [ "$wget_release2" != "0" ]; then
+	echo "---- download release note failed ----" >> /tmp/webs_upgrade.log
 	nvram set cfg_note=3
 	exit 0
+elif [ ! -s $releasenote_path ]; then
+	echo "---- no exist release note ----" >> /tmp/webs_upgrade.log
+	nvram set cfg_note=3
+	exit 0
+else
+	echo "---- Get release note successfully ----" >> /tmp/webs_upgrade.log
 fi
+
+echo "---- Get release note end. ----" >> /tmp/webs_upgrade.log
 nvram set cfg_note=1
+

release/src/router/smartdns/.clang-format

@@ -0,0 +1,10 @@
+#http://clang.llvm.org/docs/ClangFormatStyleOptions.html
+
+BasedOnStyle: LLVM
+IndentWidth: 4
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+MaxEmptyLinesToKeep: 1
+AllowShortFunctionsOnASingleLine: Empty
+BreakBeforeBraces: Linux
+ColumnLimit: 120

release/src/router/smartdns/.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,20 @@
+---
+name: 需求建议
+about: 需求建议描述
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**需求应用场景**
+请描述需求应用的场景和方式。
+
+**建议的方案**
+实现上述场景建议的方案。
+
+**设备信息**
+1. 设备信息（CPU，厂家）  
+
+2. 固件信息
+

release/src/router/smartdns/.github/ISSUE_TEMPLATE/issue.md

@@ -0,0 +1,29 @@
+---
+name: 问题报告
+about: 问题现象描述
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**问题现象**  
+简要描述问题出现的现象
+
+**运行环境**
+1. 固件型号  
+
+2. 运营商  
+
+**重现步骤**
+1. 上游DNS配置。  
+
+2. 访问的域名。  
+
+
+**信息收集**  
+1. 将/var/log/smrtdns.log日志作为附件上传。  
+2. 如进程异常，请将coredump功能开启，上传coredump信息文件。  
+在自定义界面，开启设置->自定义设置->生成coredump配置，重现问题后提交coredump文件
+coredump文件在/tmp目录下
+

release/src/router/smartdns/.gitignore

@@ -0,0 +1,4 @@
+.vscode
+.o
+.DS_Store
+.swp.