Bumped revision to 5.1.0

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.0.9
+export MERLINR_VER_MINOR :=5.1.0
 export MERLINR_VER := $(MERLINR_VER_MAJOR)$(MERLINR_VER_MINOR)
 export MERLINRVER := $(MERLINR_NAME)_$(MERLINR_VER)
 ifeq ($(MERLINR_NAME),RTACRH17)

release/src/router/busybox/config_base

@@ -606,8 +606,8 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_MKFS_REISER is not set
 # CONFIG_MKFS_VFAT is not set
-# CONFIG_GETOPT is not set
-# CONFIG_FEATURE_GETOPT_LONG is not set
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_FEATURE_HEXDUMP_REVERSE is not set
 # CONFIG_HD is not set
@@ -1018,7 +1018,7 @@ CONFIG_ASH_BASH_COMPAT=y
 CONFIG_ASH_IDLE_TIMEOUT=y
 # CONFIG_ASH_JOB_CONTROL is not set
 CONFIG_ASH_ALIAS=y
-# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_GETOPTS=y
 # CONFIG_ASH_BUILTIN_ECHO is not set
 # CONFIG_ASH_BUILTIN_PRINTF is not set
 # CONFIG_ASH_BUILTIN_TEST is not set

release/src/router/httpd/dbapi.h

@@ -2,9 +2,6 @@
 #define __DBAPI_H_
 #include "httpd.h"
 #define offsetof2(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#define container_of(ptr, type, member) ({                      \
-        const typeof( ((type *)0)->member ) *__mptr = (const typeof( ((type *)0)->member )*)(ptr);    \
-        (type *)( (char *)__mptr - offsetof2(type,member) );})
 
 #define MAGIC "magicv1 "
 #define MAGIC_LEN 8

release/src/router/httpd/httpd.c

@@ -1319,8 +1319,6 @@ handle_request(void)
 					&& !strstr(file, "ss_conf")
 					&& !strstr(file, "ss_status")
 					&& !strstr(file, "dbconf")
-					&& !strstr(file, "Main_S")
-					&& !strstr(file, "Module_")
 #endif
 					){
 				send_error( 404, "Not Found", (char*) 0, "File not found." );

release/src/router/httpd/merlinr.c

@@ -19,6 +19,9 @@
  * 
  */
 
+#include<stdlib.h>
+#include<string.h>
+
 //unlock all languages for cn
 int get_lang_num_merlinr()
 {

release/src/router/httpd/sysinfo.c

@@ -129,9 +129,9 @@ int ej_show_sysinfo(int eid, webs_t wp, int argc, char_t ** argv)
 			char *buffer = read_whole_file("/proc/cpuinfo");
 
 			if (buffer) {
-#if defined(RTCONFIG_BCMARM) || defined(RTCONFIG_HND_ROUTER) || defined(RTCONFIG_QCA)
 				int count = 0;
 				char model[64];
+#if defined(RTCONFIG_BCMARM) || defined(RTCONFIG_HND_ROUTER) || defined(RTCONFIG_QCA)
 #if !defined(RTCONFIG_HND_ROUTER_AX_675X) && !defined(RTCONFIG_HND_ROUTER_AX_6710) && !defined(RTCONFIG_QCA)
 				tmp = strstr(buffer, "Processor");
 				if (tmp)
@@ -166,7 +166,17 @@ int ej_show_sysinfo(int eid, webs_t wp, int argc, char_t ** argv)
 					else
 						sprintf(model, "Implementer: %s, Part: %s, Variant: %s, Arch: %s",impl, part, variant, arch);
 				}
-
+#elif defined(RTCONFIG_LANTIQ) || defined(RTCONFIG_RALINK)
+				tmp = strstr(buffer, "system type");
+				if (tmp)
+					sscanf(tmp, "system type  :  %[^\n]", model);
+				else
+#if defined(RTCONFIG_LANTIQ)
+					strcpy(model, "GRX500 rev 1.2");
+#elif defined(RTCONFIG_RALINK)
+					strcpy(model, "MT7621");
+#endif
+#endif
 				count = sysconf(_SC_NPROCESSORS_CONF);
 				if (count > 1) {
 					tmp = nvram_safe_get("cpurev");
@@ -177,23 +187,18 @@ int ej_show_sysinfo(int eid, webs_t wp, int argc, char_t ** argv)
 				} else {
 					strcpy(result, model);
 				}
-#elif defined(RTCONFIG_LANTIQ)
-				tmp = strstr(buffer, "system type");
-				if (tmp)
-					sscanf(tmp, "system type  :  %[^\n]", result);
-				else
-					strcpy(result, "GRX500 rev 1.2");
-#endif
+
 				free(buffer);
 			}
 
 		} else if(strcmp(type,"cpu.freq") == 0) {
-#if defined(RTCONFIG_HND_ROUTER_AX_675X)  || defined(RTCONFIG_HND_ROUTER_AX_6710)
+#if defined(RTCONFIG_HND_ROUTER_AX_675X) || defined(RTCONFIG_HND_ROUTER_AX_6710)
 			strcpy(result, "1500");
-#elif defined(RTCONFIG_BCMARM) || defined(HND_ROUTER)
-#if defined(HND_ROUTER)
+#elif defined(RTCONFIG_HND_ROUTER) || defined(RTCONFIG_BCMARM)
+#if defined(RTCONFIG_HND_ROUTER)
 			int freq = 0;
 			char *buffer;
+
 			buffer = read_whole_file("/sys/devices/system/cpu/bcm_arm_cpuidle/admin_max_freq");
 
 			if (buffer) {
@@ -208,7 +213,7 @@ int ej_show_sysinfo(int eid, webs_t wp, int argc, char_t ** argv)
 				if (tmp)
 					sscanf(tmp,"%[^,]s", result);
 			}
-#elif defined(RTCONFIG_LANTIQ) || defined(RTCONFIG_QCA)		
+#elif defined(RTCONFIG_LANTIQ) || defined(RTCONFIG_QCA)
 			int freq = 0;
 			char *buffer;
 
@@ -221,7 +226,8 @@ int ej_show_sysinfo(int eid, webs_t wp, int argc, char_t ** argv)
 			}
 			else
 				strcpy(result, "0");//bug?
-
+#elif defined(RTCONFIG_RALINK)
+			strcpy(result, "880");
 #endif
 		} else if(strcmp(type,"memory.total") == 0) {
 			sysinfo(&sys);
@@ -398,7 +404,7 @@ int ej_show_sysinfo(int eid, webs_t wp, int argc, char_t ** argv)
 				free(buffer);
 			}
 			unlink("/rom/opt/lantiq/etc/wave_components.ver");
-#elif defined(RTCONFIG_QCA)
+#elif defined(RTCONFIG_QCA) || defined(RTCONFIG_RALINK)
 					strcpy(result,"Unknow");
 #endif
 #ifdef RTCONFIG_QTN

release/src/router/httpd/web.c

@@ -10006,7 +10006,7 @@ int ej_shown_language_css(int eid, webs_t wp, int argc, char **argv){
 	#ifdef RTCONFIG_AUTODICT
 				if (memcmp(buffer, header, 3) == 0) offset = 3;
 	#endif
-				if (strncmp(follow_info+offset, "LANG_", 5))    // 5 = strlen("LANG_")
+				if (strncmp(follow_info+offset, "LANG_", 5) || !strncmp(follow_info+offset, "LANG_select", 11))    // 5 = strlen("LANG_")
 					continue;
 
 				follow_info += 5;
@@ -10015,18 +10015,14 @@ int ej_shown_language_css(int eid, webs_t wp, int argc, char **argv){
 				memset(key, 0, sizeof(key));
 				strncpy(key, follow_info, len);
 
-				for (pLang = language_tables; pLang->Lang != NULL; ++pLang){
-					if (strcmp(key, pLang->Target_Lang))
-						continue;
-					follow_info = follow_info_end+1;
-					follow_info_end = strstr(follow_info, "\n");
-					len = follow_info_end-follow_info;
-					memset(target, 0, sizeof(target));
-					strncpy(target, follow_info, len);
-					if (check_lang_support_merlinr(key) && strcmp(key,lang))
-						websWrite(wp, "<dd><a onclick=\"submit_language(this)\" id=\"%s\">%s</a></dd>\\n", key, target);
-					break;
-				}
+				follow_info = follow_info_end+1;
+				follow_info_end = strstr(follow_info, "\n");
+				len = follow_info_end-follow_info;
+				memset(target, 0, sizeof(target));
+				strncpy(target, follow_info, len);
+
+				if (check_lang_support_merlinr(key) && strcmp(key,lang))
+					websWrite(wp, "<dd><a onclick=\"submit_language(this)\" id=\"%s\">%s</a></dd>\\n", key, target);
 			}
 			else
 				break;
@@ -11299,7 +11295,7 @@ apply_cgi(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg,
 #endif
 			snprintf(event_msg, sizeof(event_msg), HTTPD_GENERIC_MSG, EID_HTTPD_FW_CHECK);
 #if defined(MERLINR_VER_MAJOR_B)
-			system("/usr/sbin/webs_update.sh");
+			doSystem("/usr/sbin/webs_update.sh");
 		}
 #endif
 		else if (!strcmp(action_mode, "firmware_upgrade"))
@@ -11308,7 +11304,7 @@ apply_cgi(webs_t wp, char_t *urlPrefix, char_t *webDir, int arg,
 #endif
 			snprintf(event_msg, sizeof(event_msg), HTTPD_GENERIC_MSG, EID_HTTPD_FW_UPGRADE);
 #if defined(MERLINR_VER_MAJOR_B)
-			system("/usr/sbin/webs_upgrade.sh");
+			doSystem("/usr/sbin/webs_upgrade.sh");
 		}
 #endif
 		if (strlen(event_msg))

release/src/router/rc/merlinr.c

@@ -34,7 +34,7 @@
 #endif
 #include "merlinr.h"
 #include <curl/curl.h>
-
+#include <auth_common.h>
 
 void merlinr_insmod(){
 	eval("insmod", "nfnetlink");
@@ -67,6 +67,8 @@ void merlinr_init()
 	nvram_set("sc_wan_sig", "0");
 	nvram_set("sc_nat_sig", "0");
 	nvram_set("sc_mount_sig", "0");
+	nvram_set("sc_unmount_sig", "0");
+	nvram_set("sc_services_sig", "0");	
 #endif
 #if defined(TUFAX3000)
 //only an idiot would use 160 in china
@@ -81,11 +83,13 @@ void merlinr_init_done()
 #ifdef RTCONFIG_SOFTCENTER
 	if (!f_exists("/jffs/softcenter/scripts/ks_tar_intall.sh") && nvram_match("sc_mount","0")){
 		doSystem("/usr/sbin/jffsinit.sh &");
-		logmessage("软件中心", "开始安装......");
-		logmessage("软件中心", "1分钟后完成安装");
+		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"))
 		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");
 	if(f_exists("/jffs/.asusrouter")){
 		unlink("/jffs/.asusrouter");
 		doSystem("sed -i '/softcenter-wan.sh/d' /jffs/scripts/wan-start");
@@ -97,6 +101,9 @@ void merlinr_init_done()
 #if defined(RTCONFIG_QCA)
 	if(!nvram_get("bl_ver"))
 		nvram_set("bl_ver", "1.0.0.0");
+#elif defined(RTCONFIG_RALINK)
+	if(!nvram_get("bl_ver"))
+		nvram_set("bl_ver", nvram_get("blver"));
 #elif defined(RTCONFIG_LANTIQ)
 #if !defined(K3C)
 	if(!nvram_get("bl_ver"))
@@ -112,6 +119,8 @@ void merlinr_init_done()
 		nvram_set("modelname", "SBRAC1900P");
 #elif defined(SBRAC3200P)
 		nvram_set("modelname", "SBRAC3200P");
+#elif defined(EA6700)
+		nvram_set("modelname", "EA6700");
 #elif defined(R8000P) || defined(R7900P)
 		nvram_set("modelname", "R8000P");
 #elif defined(RTAC3100)
@@ -155,8 +164,8 @@ void merlinr_init_done()
 #endif
 #if defined(R8000P) || defined(R7900P)
 	nvram_set("ping_target","www.taobao.com");
-	nvram_commit();
 #endif
+	nvram_commit();
 #if defined(TUFAX3000) && defined(MERLINR_VER_MAJOR_X)
 //tufax3000=ax82u,ax58u=ax3000
 	//enable_4t4r();
@@ -349,6 +358,10 @@ int merlinr_firmware_check_update_main(int argc, char *argv[])
 	nvram_set("webs_state_error", "0");
 	nvram_set("webs_state_odm", "0");
 	nvram_set("webs_state_url", "");
+#ifdef RTCONFIG_AMAS
+	nvram_set("cfg_check", "0");
+	nvram_set("cfg_upgrade", "0");
+#endif
 	unlink("/tmp/webs_upgrade.log");
 	unlink("/tmp/wlan_update.txt");
 	unlink("/tmp/release_note0.txt");
@@ -359,10 +372,10 @@ int merlinr_firmware_check_update_main(int argc, char *argv[])
 	curlhandle = curl_easy_init();
 	snprintf(url, sizeof(url), "%s/%s", serverurl, serverupdate);
 	//snprintf(log, sizeof(log), "echo \"[FWUPDATE]---- update dl_path_info for general %s/%s ----\" >> /tmp/webs_upgrade.log", serverurl, serverupdate);
+	FWUPDATE_DBG("---- update dl_path_info for general %s/%s ----", serverurl, serverupdate);
 	download=curl_download_file(curlhandle , url,localupdate,8,3);
 	//system(log);
-	FWUPDATE_DBG("---- update dl_path_info for general %s/%s ----", serverurl, serverupdate);
-	_dprintf("%d\n",download);
+	//_dprintf("%d\n",download);
 	if(download)
 	{
 		fpupdate = fopen(localupdate, "r");
@@ -380,6 +393,8 @@ int merlinr_firmware_check_update_main(int argc, char *argv[])
 						nvram_set("webs_state_url", "");
 #if defined(SBRAC3200P) || defined(RTACRH17) || defined(RTAC3200) || defined(RTAC85P)
 						snprintf(info,sizeof(info),"3004_382_%s_%s-%s",modelname,fwver,tag);
+#elif defined(RTAC68U)
+						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);
 #endif
@@ -389,7 +404,10 @@ int merlinr_firmware_check_update_main(int argc, char *argv[])
 						nvram_set("webs_state_REQinfo", info);
 						nvram_set("webs_state_flag", "1");
 						nvram_set("webs_state_update", "1");
-
+#ifdef RTCONFIG_AMAS
+//						nvram_set("cfg_check", "9");
+//						nvram_set("cfg_upgrade", "0");
+#endif
 						memset(url,'\0',sizeof(url));
 						memset(log,'\0',sizeof(log));
 						char releasenote_file[100];
@@ -430,6 +448,8 @@ int merlinr_firmware_check_update_main(int argc, char *argv[])
 GODONE:
 #if defined(SBRAC3200P) || defined(RTACRH17) || defined(RTAC3200) || defined(RTAC85P)
 	snprintf(info,sizeof(info),"3004_382_%s",nvram_get("extendno"));
+#elif defined(RTAC68U)
+	snprintf(info,sizeof(info),"3004_385_%s",nvram_get("extendno"));
 #else
 	snprintf(info,sizeof(info),"3004_384_%s",nvram_get("extendno"));
 #endif
@@ -448,15 +468,16 @@ int merlinr_firmware_check_update_main(int argc, char *argv[])
 	FWUPDATE_DBG("---- firmware check update finish ----");
 	return 0;
 }
-#if !defined(GTAC2900)
-void exec_uu()
+#if !defined(BLUECAVE)
+void exec_uu_merlinr()
 {
 	FILE *fpmodel, *fpmac, *fpuu, *fpurl, *fpmd5, *fpcfg;
 	char buf[128];
 	int download,i;
 	char *dup_pattern, *g, *gg;
 	char p[10][100];
 	if(nvram_get_int("sw_mode") == 1){
+		add_rc_support("uu_accel");
 		if ((fpmodel = fopen("/var/model", "w"))){
 			fprintf(fpmodel, nvram_get("productid"));
 			fclose(fpmodel);
@@ -557,6 +578,13 @@ void softcenter_eval(int sig)
 	} else if (SOFTCENTER_MOUNT == sig){
 		snprintf(path, sizeof(path), "%s/softcenter-mount.sh", sc);
 		snprintf(action, sizeof(action), "start");
+	} else if (SOFTCENTER_SERVICES == sig){
+		snprintf(path, sizeof(path), "%s/softcenter-services.sh", sc);
+		snprintf(action, sizeof(action), "start");
+	//enable it after 1.3.0
+	//} else if (SOFTCENTER_UNMOUNT == sig){
+	//	snprintf(path, sizeof(path), "%s/softcenter-unmount.sh", sc);
+	//	snprintf(action, sizeof(action), "unmount");
 	} else {
 		logmessage("Softcenter", "sig=%s, bug?",sig);
 		return;

release/src/router/rc/merlinr.h

@@ -25,7 +25,7 @@
 extern void merlinr_init(void);
 extern void merlinr_init_done(void);
 #ifdef RTCONFIG_UUPLUGIN
-extern void exec_uu(void);
+extern void exec_uu_merlinr(void);
 #endif
 #ifdef RTCONFIG_FRS_LIVE_UPDATE
 extern int merlinr_firmware_check_update_main(int argc, char *argv[]);
@@ -34,7 +34,9 @@ extern int merlinr_firmware_check_update_main(int argc, char *argv[]);
 enum {
 	SOFTCENTER_WAN=1,
 	SOFTCENTER_NAT,
-	SOFTCENTER_MOUNT
+	SOFTCENTER_MOUNT,
+	SOFTCENTER_SERVICES,
+	SOFTCENTER_UNMOUNT
 };
 extern void softcenter_eval(int sig);
 #endif

release/src/router/rc/ntp.c

@@ -58,6 +58,14 @@ static void ntp_service()
 
 #ifdef RTCONFIG_DISK_MONITOR
 		notify_rc("restart_diskmon");
+#endif
+#ifdef RTCONFIG_UUPLUGIN
+		if(nvram_get_int("uu_enable"))
+#if defined(R8000P) || defined(R7900P) || defined(K3) || defined(SBRAC3200P) || defined(RTAC3100) || defined(RTAC3200) || defined(EA6700) || defined(RAX20) || defined(SBRAC1900P) || defined(XWR3100) || defined(RTAC82U)
+		exec_uu_merlinr();
+#else
+		exec_uu();
+#endif
 #endif
 	}
 }
@@ -206,3 +214,4 @@ int ntp_main(int argc, char *argv[])
 		pause();
 	}
 }
+