dsl-ac68u: Prebuild imported from GPL_DSL-AC68U_3.0.0.4.384.81140

gnuton · Nov 21, 2019 · 80470ff · 80470ff
1 parent 73828cf
commit 80470ff
Show file tree

Hide file tree

Showing 63 changed files with 544 additions and 490 deletions.
diff --git a/release/src-rt-6.x.4708/tc_fw/fwver.conf b/release/src-rt-6.x.4708/tc_fw/fwver.conf
@@ -1 +1 @@
-1.0.4.7
+1.0.4.9
diff --git a/release/src-rt-6.x.4708/tc_fw/tclinux.bin b/release/src-rt-6.x.4708/tc_fw/tclinux.bin
diff --git a/release/src-rt-6.x.4708/wl/exe/prebuilt/wl b/release/src-rt-6.x.4708/wl/exe/prebuilt/wl
diff --git a/release/src/router/aaews/prebuild_arm/aaews b/release/src/router/aaews/prebuild_arm/aaews
diff --git a/release/src/router/aaews/prebuild_arm/mastiff b/release/src/router/aaews/prebuild_arm/mastiff
diff --git a/release/src/router/amas-utils/prebuild/DSL-AC68U/amas-utils-cli b/release/src/router/amas-utils/prebuild/DSL-AC68U/amas-utils-cli
diff --git a/release/src/router/amas-utils/prebuild/DSL-AC68U/amas-utils.h b/release/src/router/amas-utils/prebuild/DSL-AC68U/amas-utils.h
@@ -57,6 +57,9 @@ typedef struct _ob_status{
 	unsigned char modelname[64];
 	int obstatus; 		//1 (OB_OFF),  2 (OB_Available), 3 (OB_REQ), 4 (OB_LOCKED), 5 (OB_SUCCESS)
 	int timestamp;
+	int reboottime;
+	int conntimeout;
+	int traffictimeout;
 }ob_status,*ptr_obstatus;
 
 
@@ -131,4 +134,5 @@ AMAS_FUNC AMAS_RESULT   AMAS_API amas_get_wifisec(char *type, unsigned char *val
 AMAS_FUNC AMAS_RESULT   AMAS_API amas_get_obdinfo(id_info **P_idinfo, int *len);
 AMAS_FUNC AMAS_RESULT   AMAS_API amas_set_group(unsigned char *group);
 AMAS_FUNC AMAS_RESULT   AMAS_API amas_get_group(unsigned char *group, int *len);
+AMAS_FUNC void   AMAS_API amas_set_timeout(int rtime, int ctimeout, int ttimeout);
 #endif /* !__AMASUTILSH__ */
diff --git a/release/src/router/amas-utils/prebuild/DSL-AC68U/libamas-utils.so b/release/src/router/amas-utils/prebuild/DSL-AC68U/libamas-utils.so
diff --git a/release/src/router/bwdpi_source/asus/prebuild_arm/DSL-AC68U/libbwdpi.so b/release/src/router/bwdpi_source/asus/prebuild_arm/DSL-AC68U/libbwdpi.so
diff --git a/release/src/router/bwdpi_source/asus/prebuild_arm/hwinfo b/release/src/router/bwdpi_source/asus/prebuild_arm/hwinfo
diff --git a/release/src/router/bwdpi_source/asus_sql/prebuild_arm/bwdpi_sqlite b/release/src/router/bwdpi_source/asus_sql/prebuild_arm/bwdpi_sqlite
diff --git a/release/src/router/bwdpi_source/asus_sql/prebuild_arm/libbwdpi_sql.so b/release/src/router/bwdpi_source/asus_sql/prebuild_arm/libbwdpi_sql.so
diff --git a/release/src/router/cfg_mnt/prebuild/DSL-AC68U/cfg_client b/release/src/router/cfg_mnt/prebuild/DSL-AC68U/cfg_client
diff --git a/release/src/router/cfg_mnt/prebuild/DSL-AC68U/cfg_reportstatus b/release/src/router/cfg_mnt/prebuild/DSL-AC68U/cfg_reportstatus
diff --git a/release/src/router/cfg_mnt/prebuild/DSL-AC68U/cfg_server b/release/src/router/cfg_mnt/prebuild/DSL-AC68U/cfg_server
diff --git a/release/src/router/dblog/daemon/prebuild_arm/dblog b/release/src/router/dblog/daemon/prebuild_arm/dblog
diff --git a/release/src/router/dropbox_client/prebuild_arm/dropbox_client b/release/src/router/dropbox_client/prebuild_arm/dropbox_client
diff --git a/release/src/router/dsl_drv_tool/tp_init/prebuild/tp_init b/release/src/router/dsl_drv_tool/tp_init/prebuild/tp_init
diff --git a/release/src/router/et_arm/prebuilt/et.o b/release/src/router/et_arm/prebuilt/et.o
diff --git a/release/src/router/ftpclient/prebuild_arm/ftpclient b/release/src/router/ftpclient/prebuild_arm/ftpclient
diff --git a/release/src/router/httpd/prebuild/DSL-AC68U/web_hook.o b/release/src/router/httpd/prebuild/DSL-AC68U/web_hook.o
diff --git a/release/src/router/libasuslog/prebuild_arm/libasuslog.so b/release/src/router/libasuslog/prebuild_arm/libasuslog.so
diff --git a/release/src/router/libletsencrypt/prebuild_arm/libletsencrypt.so b/release/src/router/libletsencrypt/prebuild_arm/libletsencrypt.so
diff --git a/release/src/router/nas_arm/nas/prebuilt/nas b/release/src/router/nas_arm/nas/prebuilt/nas
diff --git a/release/src/router/networkmap/prebuild_arm/networkmap b/release/src/router/networkmap/prebuild_arm/networkmap
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/amas_bhctrl.o b/release/src/router/rc/prebuild/DSL-AC68U/amas_bhctrl.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/amas_lanctrl.o b/release/src/router/rc/prebuild/DSL-AC68U/amas_lanctrl.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/amas_lib.o b/release/src/router/rc/prebuild/DSL-AC68U/amas_lib.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/amas_wlcconnect.o b/release/src/router/rc/prebuild/DSL-AC68U/amas_wlcconnect.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/ate-broadcom.o b/release/src/router/rc/prebuild/DSL-AC68U/ate-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/ate.o b/release/src/router/rc/prebuild/DSL-AC68U/ate.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/broadcom.o b/release/src/router/rc/prebuild/DSL-AC68U/broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/bwdpi_check.o b/release/src/router/rc/prebuild/DSL-AC68U/bwdpi_check.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/bwdpi_db_10.o b/release/src/router/rc/prebuild/DSL-AC68U/bwdpi_db_10.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/bwdpi_wred_alive.o b/release/src/router/rc/prebuild/DSL-AC68U/bwdpi_wred_alive.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/dsl_diag.o b/release/src/router/rc/prebuild/DSL-AC68U/dsl_diag.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/dsl_fb.o b/release/src/router/rc/prebuild/DSL-AC68U/dsl_fb.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/nt_mail.o b/release/src/router/rc/prebuild/DSL-AC68U/nt_mail.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/obd-broadcom.o b/release/src/router/rc/prebuild/DSL-AC68U/obd-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/obd.o b/release/src/router/rc/prebuild/DSL-AC68U/obd.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/obd_eth.o b/release/src/router/rc/prebuild/DSL-AC68U/obd_eth.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/obd_monitor.o b/release/src/router/rc/prebuild/DSL-AC68U/obd_monitor.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/private.o b/release/src/router/rc/prebuild/DSL-AC68U/private.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/psta_monitor.o b/release/src/router/rc/prebuild/DSL-AC68U/psta_monitor.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/roamast-broadcom.o b/release/src/router/rc/prebuild/DSL-AC68U/roamast-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/roamast.o b/release/src/router/rc/prebuild/DSL-AC68U/roamast.o
diff --git a/release/src/router/rc/prebuild/DSL-AC68U/tcode_brcm.o b/release/src/router/rc/prebuild/DSL-AC68U/tcode_brcm.o
diff --git a/release/src/router/sambaclient/prebuild_arm/sambaclient b/release/src/router/sambaclient/prebuild_arm/sambaclient
diff --git a/release/src/router/shared/prebuild/DSL-AC68U/amas_dwb.o b/release/src/router/shared/prebuild/DSL-AC68U/amas_dwb.o
diff --git a/release/src/router/shared/prebuild/DSL-AC68U/notify_rc.o b/release/src/router/shared/prebuild/DSL-AC68U/notify_rc.o
diff --git a/release/src/router/shared/prebuild/DSL-AC68U/private.o b/release/src/router/shared/prebuild/DSL-AC68U/private.o
diff --git a/release/src/router/shared/prebuild/DSL-AC68U/tcode.o b/release/src/router/shared/prebuild/DSL-AC68U/tcode.o
diff --git a/release/src/router/sw-hw-auth/prebuild/DSL-AC68U/hw_auth.o b/release/src/router/sw-hw-auth/prebuild/DSL-AC68U/hw_auth.o
diff --git a/release/src/router/wb/prebuild_arm/libws.so b/release/src/router/wb/prebuild_arm/libws.so
diff --git a/release/src/router/wl_arm/prebuilt/DSL-AC68U/wl_apsta.o b/release/src/router/wl_arm/prebuilt/DSL-AC68U/wl_apsta.o
diff --git a/release/src/router/wlc_nt/prebuild_arm/wlc_nt b/release/src/router/wlc_nt/prebuild_arm/wlc_nt
diff --git a/release/src/router/wlceventd/prebuilt_arm/wlceventd b/release/src/router/wlceventd/prebuilt_arm/wlceventd
diff --git a/release/src/router/wps_arm/prebuilt/wps_monitor b/release/src/router/wps_arm/prebuilt/wps_monitor
diff --git a/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_Feedback.asp b/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_Feedback.asp
@@ -18,7 +18,6 @@
 <script language="JavaScript" type="text/javascript" src="/general.js"></script>
 <script language="JavaScript" type="text/javascript" src="/popup.js"></script>
 <script language="JavaScript" type="text/javascript" src="/help.js"></script>
-<script language="JavaScript" type="text/javascript" src="merlin.js"></script>
 <script language="JavaScript" type="text/javascript" src="js/jquery.js"></script>
 <script type="text/javascript" src="js/httpApi.js"></script>
 <style>
@@ -120,6 +119,7 @@ function check_wan_state(){
 		document.getElementById("fb_desc_disconnect").style.display = "";
 		document.form.fb_country.disabled = "true";
 		document.form.fb_email.disabled = "true";
+		document.form.fb_serviceno.disabled = "true";
 		document.form.attach_syslog.disabled = "true";
 		document.form.attach_cfgfile.disabled = "true";
 		document.form.attach_modemlog.disabled = "true";
@@ -145,6 +145,7 @@ function check_wan_state(){
 		document.getElementById("fb_desc_disconnect").style.display = "none";
 		document.form.fb_country.disabled = "";
 		document.form.fb_email.disabled = "";
+		document.form.fb_serviceno.disabled = "";
 		document.form.attach_syslog.disabled = "";
 		document.form.attach_modemlog.disabled = "";
 		document.form.attach_wlanlog.disabled = "";
@@ -353,26 +354,26 @@ function applyRule(){
 				return false;
 		}*/
 		if(document.form.attach_syslog.checked == true)
-			document.form.PM_attach_syslog.value = 1;
+			document.form.fb_attach_syslog.value = 1;
 		else
-			document.form.PM_attach_syslog.value = 0;
+			document.form.fb_attach_syslog.value = 0;
 		if(document.form.attach_cfgfile.checked == true)
-			document.form.PM_attach_cfgfile.value = 1;
+			document.form.fb_attach_cfgfile.value = 1;
 		else
-			document.form.PM_attach_cfgfile.value = 0;
+			document.form.fb_attach_cfgfile.value = 0;
 		if(document.form.attach_modemlog.checked == true)
-			document.form.PM_attach_modemlog.value = 1;
+			document.form.fb_attach_modemlog.value = 1;
 		else
-			document.form.PM_attach_modemlog.value = 0;
+			document.form.fb_attach_modemlog.value = 0;
 		if(document.form.attach_wlanlog.checked == true)
-			document.form.PM_attach_wlanlog.value = 1;
+			document.form.fb_attach_wlanlog.value = 1;
 		else
-			document.form.PM_attach_wlanlog.value = 0;
+			document.form.fb_attach_wlanlog.value = 0;
 		if(dsl_support){
 			if(document.form.attach_iptables.checked == true)
-				document.form.PM_attach_iptables.value = 1;
+				document.form.fb_attach_iptables.value = 1;
 			else
-				document.form.PM_attach_iptables.value = 0;
+				document.form.fb_attach_iptables.value = 0;
 		}	
                 
 		if(document.form.fb_email.value == ""){
@@ -388,7 +389,14 @@ function applyRule(){
 				return false;
 			}
 		}
-
+		
+		var re = new RegExp("^[a-zA-Z][0-9]{10}","gi");
+		if(!re.test(document.form.fb_serviceno.value) && document.form.fb_serviceno.value != ""){
+			alert("<#JS_validchar#>");
+			document.form.fb_serviceno.focus();
+			return false;
+		}
+		
 		if(fb_trans_id != "")
 		{
 			document.form.fb_transid.value = fb_trans_id;
@@ -435,19 +443,13 @@ function applyRule(){
 			}
 		}
 
-		if(document.form.PM_attach_wlanlog.value == "1")
+		if(document.form.fb_attach_wlanlog.value == "1")
 			httpApi.update_wlanlog();
 
 		document.form.fb_browserInfo.value = navigator.userAgent;
-		if(dsl_support){
-			if(document.form.dslx_diag_enable[0].checked == true){
-				document.form.action_wait.value="120";
-				showLoading(120);
-			}else	
-				showLoading(60);
-		}
-		else
-			showLoading(60);
+
+		startLogPrep();
+
 		document.form.submit();
 }
 
@@ -677,7 +679,7 @@ function diag_tune_service_option() {
 
 		return $labelHtml;
 	};
-	if(amesh_support && (isSwMode("rt") || isSwMode("ap"))) {
+	if(amesh_support && (isSwMode("rt") || isSwMode("ap")) && ameshRouter_support) {
 		if($(".dblog_service_item.AiMesh").length == 0)
 			$(".dblog_service_item.all").after(gen_service_option(8, "AiMesh", "AiMesh"));
 	}
@@ -700,6 +702,35 @@ function dblog_stop() {
 	showLoading(3);
 	document.stop_dblog_form.submit();
 }
+
+function startLogPrep(){
+	dr_advise();
+}
+
+var redirect_info = 0;
+function CheckFBSize(){
+	$.ajax({
+		url: '/ajax_fb_size.asp',
+		dataType: 'script',
+		timeout: 1500,
+		error: function(xhr){
+				redirect_info++;
+				if(redirect_info < 10){
+					setTimeout("CheckFBSize();", 1000);
+				}
+				else{
+					showLoading(35);
+					setTimeout("redirect()", 35000);
+				}
+		},
+		success: function(){
+				if(fb_state == 0)
+					setTimeout("CheckFBSize()", 3000);
+				else
+					setTimeout("redirect()", 1000);
+		}
+	});
+}
 </script>
 </head>
 <body onload="initial();" onunLoad="return unload_body();">
@@ -708,12 +739,10 @@ function dblog_stop() {
 <table cellpadding="5" cellspacing="0" id="dr_sweet_advise" class="dr_sweet_advise" align="center">
 <tr>
 <td>
-<div class="drword" id="drword" style="height:110px;"><#Main_alert_proceeding_desc4#> <#Main_alert_proceeding_desc1#>...
+<div class="drword" id="drword" style="height:110px;"><#Main_alert_proceeding_desc4#> <#QKSet_detect_waitdesc1#>...
 <br/>
 <br/>
 </div>
-<div class="drImg"><img src="/images/alertImg.png"></div>
-<div style="height:70px;"></div>
 </td>
 </tr>
 </table>
@@ -732,13 +761,13 @@ function dblog_stop() {
 <input type="hidden" name="preferred_lang" id="preferred_lang" value="<% nvram_get("preferred_lang"); %>">
 <input type="hidden" name="current_page" value="Advanced_Feedback.asp">
 <input type="hidden" name="action_mode" value="apply">
-<input type="hidden" name="action_script" value="restart_sendmail">
+<input type="hidden" name="action_script" value="restart_sendfeedback">
 <input type="hidden" name="action_wait" value="60">
-<input type="hidden" name="PM_attach_syslog" value="">
-<input type="hidden" name="PM_attach_cfgfile" value="">
-<input type="hidden" name="PM_attach_iptables" value="">	
-<input type="hidden" name="PM_attach_modemlog" value="">
-<input type="hidden" name="PM_attach_wlanlog" value="">
+<input type="hidden" name="fb_attach_syslog" value="">
+<input type="hidden" name="fb_attach_cfgfile" value="">
+<input type="hidden" name="fb_attach_iptables" value="">	
+<input type="hidden" name="fb_attach_modemlog" value="">
+<input type="hidden" name="fb_attach_wlanlog" value="">
 <input type="hidden" name="feedbackresponse" value="<% nvram_get("feedbackresponse"); %>">
 <input type="hidden" name="fb_experience" value="<% nvram_get("fb_experience"); %>">
 <input type="hidden" name="fb_browserInfo" value="">
@@ -768,7 +797,7 @@ function dblog_stop() {
 <div style="margin: 10px 0 10px 5px;" class="splitLine"></div>
 <div id="fb_desc0" class="formfontdesc" style="display:none;"><#Feedback_desc0#></div>
 <div id="fb_desc1" class="formfontdesc" style="display:none;"><#Feedback_desc1#></div>
-<div id="fb_desc_disconnect" class="formfontdesc" style="display:none;color:#FC0;"><#Feedback_desc_disconnect#> <a href="mailto:xdsl_feedback@asus.com?Subject=<%nvram_get("productid");%>" target="_top" style="color:#FFCC00;">xdsl_feedback@asus.com </a></div>
+<div id="fb_desc_disconnect" class="formfontdesc" style="display:none;color:#FC0;"><#Feedback_desc_disconnect#> <a href="mailto:broadband_feedback@asus.com?Subject=<%nvram_get("productid");%>" target="_top" style="color:#FFCC00;">broadband_feedback@asus.com </a></div>
 <table width="100%" border="1" align="center" cellpadding="4" cellspacing="0" bordercolor="#6b8fa3" class="FormTable">
 <tr>
 <th width="30%"><#feedback_country#> *</th>
@@ -795,6 +824,13 @@ function dblog_stop() {
 </td>
 </tr>
 
+<tr>
+<th><a class="hintstyle" href="javascript:void(0);" onClick="openHint(34,2);">ASUS Service No./Case#</a></th>
+<td>
+	<input type="text" name="fb_serviceno" maxlength="11" class="input_15_table" value="" autocorrect="off" autocapitalize="off">
+</td>
+</tr>
+
 <tr>
 <th><#feedback_extra_info#> *</th>
 <td>