diff --git a/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_ADSL_Content.asp b/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_ADSL_Content.asp index 0a703427f7a..fb69c782394 100644 --- a/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_ADSL_Content.asp +++ b/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_ADSL_Content.asp @@ -556,6 +556,18 @@ function check_ginp_try(obj){ + + + G.INP Stability Adjustment + + + + + + diff --git a/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_VDSL_Content.asp b/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_VDSL_Content.asp index 643e69ea67b..f76535be0d8 100644 --- a/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_VDSL_Content.asp +++ b/release/src/router/www/sysdep/DSL-AC68U/www/Advanced_VDSL_Content.asp @@ -358,6 +358,8 @@ function showDSLWANList(){ function initial(){ show_menu(); + document.form.dsl_dhcp_clientid.value = decodeURIComponent('<% nvram_char_to_ascii("", "dsl_dhcp_clientid"); %>'); + // WAN port genWANSoption(); change_wan_unit(document.form.wan_unit); @@ -743,6 +745,7 @@ function disable_all_ctrl() { document.getElementById("DNSsetting").style.display = "none"; document.getElementById("dot1q_setting").style.display = "none"; document.getElementById("IPsetting").style.display = "none"; + document.getElementById("DHCP_option").style.display = "none"; document.getElementById("vpn_server").style.display = "none"; document.getElementById("btn_apply").style.display = "none"; } @@ -755,6 +758,7 @@ function enable_all_ctrl() { document.getElementById("DNSsetting").style.display = ""; document.getElementById("dot1q_setting").style.display = ""; document.getElementById("IPsetting").style.display = ""; + document.getElementById("DHCP_option").style.display = ""; document.getElementById("vpn_server").style.display = ""; document.getElementById("btn_apply").style.display = ""; } @@ -766,6 +770,10 @@ function change_dsl_type(dsl_type){ if(dsl_type == "pppoe" || dsl_type == "pppoa"){ //inputCtrl(document.form.dsl_dnsenable[0], 1); //inputCtrl(document.form.dsl_dnsenable[1], 1); + showhide("DHCP_option",0); + inputCtrl(document.form.dsl_dhcp_vendorid, 0); + inputCtrl(document.form.dsl_dhcp_clientid, 0); + document.form.dsl_dhcp_clientid_type.disabled = true; inputCtrl(document.form.dsl_pppoe_username, 1); inputCtrl(document.form.dsl_pppoe_passwd, 1); @@ -787,6 +795,10 @@ function change_dsl_type(dsl_type){ else if(dsl_type == "static"){ //inputCtrl(document.form.dsl_dnsenable[0], 0); //inputCtrl(document.form.dsl_dnsenable[1], 0); + showhide("DHCP_option",0); + inputCtrl(document.form.dsl_dhcp_vendorid, 0); + inputCtrl(document.form.dsl_dhcp_clientid, 0); + document.form.dsl_dhcp_clientid_type.disabled = true; inputCtrl(document.form.dsl_pppoe_username, 0); inputCtrl(document.form.dsl_pppoe_passwd, 0); @@ -807,6 +819,11 @@ function change_dsl_type(dsl_type){ else if(dsl_type == "dhcp"){ //inputCtrl(document.form.dsl_dnsenable[0], 1); //inputCtrl(document.form.dsl_dnsenable[1], 1); + showhide("DHCP_option",1); + inputCtrl(document.form.dsl_dhcp_vendorid, 1); + inputCtrl(document.form.dsl_dhcp_clientid, 1); + document.form.dsl_dhcp_clientid_type.disabled = false; + showDiableDHCPclientID(document.form.tmp_dhcp_clientid_type); inputCtrl(document.form.dsl_pppoe_username, 0); inputCtrl(document.form.dsl_pppoe_passwd, 0); @@ -828,7 +845,10 @@ function change_dsl_type(dsl_type){ else if(dsl_type == "bridge") { //inputCtrl(document.form.dsl_dnsenable[0], 0); //inputCtrl(document.form.dsl_dnsenable[1], 0); - + showhide("DHCP_option",0); + inputCtrl(document.form.dsl_dhcp_vendorid, 0); + inputCtrl(document.form.dsl_dhcp_clientid, 0); + document.form.dsl_dhcp_clientid_type.disabled = true; inputCtrl(document.form.dsl_pppoe_username, 0); inputCtrl(document.form.dsl_pppoe_passwd, 0); inputCtrl(document.form.dsl_pppoe_auth, 0); @@ -1111,6 +1131,19 @@ function pullDNSList(_this) { $element.hide(); } } + +function showDiableDHCPclientID(clientid_enable){ + if(clientid_enable.checked) { + document.form.dsl_dhcp_clientid_type.value = "1"; + document.form.dsl_dhcp_clientid.value = ""; + document.form.dsl_dhcp_clientid.style.display = "none"; + } + else { + document.form.dsl_dhcp_clientid_type.value = "0"; + document.form.dsl_dhcp_clientid.style.display = ""; + } +} + @@ -1150,6 +1183,7 @@ function pullDNSList(_this) { "> + @@ -1364,6 +1398,25 @@ function pullDNSList(_this) {
+ + + + + + + + + + + + +
<#ipv6_6rd_dhcp_option#>
Class-identifier (option 60): + " maxlength="126" autocapitalization="off" autocomplete="off"> +
Client-identifier (option 61): + >IAID/DUID
+ " maxlength="126" autocapitalization="off" autocomplete="off"> +
+ diff --git a/release/src/router/www/sysdep/DSL-AX82U/www/Advanced_ADSL_Content.asp b/release/src/router/www/sysdep/DSL-AX82U/www/Advanced_ADSL_Content.asp index 99df05ee069..b06f023251d 100644 --- a/release/src/router/www/sysdep/DSL-AX82U/www/Advanced_ADSL_Content.asp +++ b/release/src/router/www/sysdep/DSL-AX82U/www/Advanced_ADSL_Content.asp @@ -173,7 +173,7 @@ function valid_form(){
" /> " /> "> + @@ -1605,6 +1648,24 @@ function pullDNSList(_this) {
+
+ + + + + + + + + + + +
<#ipv6_6rd_dhcp_option#>
Class-identifier (option 60): + " maxlength="126" autocapitalization="off" autocomplete="off"> +
Client-identifier (option 61): + >IAID/DUID
+ " maxlength="126" autocapitalization="off" autocomplete="off"> +
diff --git a/release/src/router/www/sysdep/DSL-N55U/www/Advanced_DSL_Content.asp b/release/src/router/www/sysdep/DSL-N55U/www/Advanced_DSL_Content.asp index 5d3989a8846..478fd410612 100644 --- a/release/src/router/www/sysdep/DSL-N55U/www/Advanced_DSL_Content.asp +++ b/release/src/router/www/sysdep/DSL-N55U/www/Advanced_DSL_Content.asp @@ -410,6 +410,8 @@ function showDSLWANList(){ function initial(){ show_menu(); + document.form.dsl_dhcp_clientid.value = decodeURIComponent('<% nvram_char_to_ascii("", "dsl_dhcp_clientid"); %>'); + // WAN port genWANSoption(); change_wan_unit(document.form.wan_unit); @@ -889,6 +891,7 @@ function disable_all_ctrl() { document.getElementById("PPPsetting").style.display = "none"; document.getElementById("DNSsetting").style.display = "none"; document.getElementById("IPsetting").style.display = "none"; + document.getElementById("DHCP_option").style.display = "none"; document.getElementById("t2BC").style.display = "none"; document.getElementById("vpn_server").style.display = "none"; document.getElementById("btn_apply").style.display = "none"; @@ -902,6 +905,7 @@ function enable_all_ctrl() { document.getElementById("PPPsetting").style.display = ""; document.getElementById("DNSsetting").style.display = ""; document.getElementById("IPsetting").style.display = ""; + document.getElementById("DHCP_option").style.display = ""; document.getElementById("t2BC").style.display = ""; document.getElementById("vpn_server").style.display = ""; document.getElementById("btn_apply").style.display = ""; @@ -917,6 +921,10 @@ function change_dsl_type(dsl_type){ if(dsl_type == "pppoe" || dsl_type == "pppoa"){ //inputCtrl(document.form.dsl_dnsenable[0], 1); //inputCtrl(document.form.dsl_dnsenable[1], 1); + showhide("DHCP_option",0); + inputCtrl(document.form.dsl_dhcp_vendorid, 0); + inputCtrl(document.form.dsl_dhcp_clientid, 0); + document.form.dsl_dhcp_clientid_type.disabled = true; inputCtrl(document.form.dsl_pppoe_username, 1); inputCtrl(document.form.dsl_pppoe_passwd, 1); @@ -938,6 +946,10 @@ function change_dsl_type(dsl_type){ else if(dsl_type == "ipoa"){ //inputCtrl(document.form.dsl_dnsenable[0], 0); //inputCtrl(document.form.dsl_dnsenable[1], 0); + showhide("DHCP_option",0); + inputCtrl(document.form.dsl_dhcp_vendorid, 0); + inputCtrl(document.form.dsl_dhcp_clientid, 0); + document.form.dsl_dhcp_clientid_type.disabled = true; inputCtrl(document.form.dsl_pppoe_username, 0); inputCtrl(document.form.dsl_pppoe_passwd, 0); @@ -958,6 +970,11 @@ function change_dsl_type(dsl_type){ else if(dsl_type == "mer"){ //inputCtrl(document.form.dsl_dnsenable[0], 1); //inputCtrl(document.form.dsl_dnsenable[1], 1); + showhide("DHCP_option",1); + inputCtrl(document.form.dsl_dhcp_vendorid, 1); + inputCtrl(document.form.dsl_dhcp_clientid, 1); + document.form.dsl_dhcp_clientid_type.disabled = false; + showDiableDHCPclientID(document.form.tmp_dhcp_clientid_type); inputCtrl(document.form.dsl_pppoe_username, 0); inputCtrl(document.form.dsl_pppoe_passwd, 0); @@ -979,7 +996,10 @@ function change_dsl_type(dsl_type){ else if(dsl_type == "bridge") { //inputCtrl(document.form.dsl_dnsenable[0], 0); //inputCtrl(document.form.dsl_dnsenable[1], 0); - + showhide("DHCP_option",0); + inputCtrl(document.form.dsl_dhcp_vendorid, 0); + inputCtrl(document.form.dsl_dhcp_clientid, 0); + document.form.dsl_dhcp_clientid_type.disabled = true; inputCtrl(document.form.dsl_pppoe_username, 0); inputCtrl(document.form.dsl_pppoe_passwd, 0); inputCtrl(document.form.dsl_pppoe_auth, 0); @@ -1337,6 +1357,19 @@ function pullDNSList(_this) { $element.hide(); } } + +function showDiableDHCPclientID(clientid_enable){ + if(clientid_enable.checked) { + document.form.dsl_dhcp_clientid_type.value = "1"; + document.form.dsl_dhcp_clientid.value = ""; + document.form.dsl_dhcp_clientid.style.display = "none"; + } + else { + document.form.dsl_dhcp_clientid_type.value = "0"; + document.form.dsl_dhcp_clientid.style.display = ""; + } +} + @@ -1373,6 +1406,7 @@ function pullDNSList(_this) { "> +
@@ -1649,6 +1683,25 @@ function pullDNSList(_this) {
+ + + + + + + + + + + + +
<#ipv6_6rd_dhcp_option#>
Class-identifier (option 60): + " maxlength="126" autocapitalization="off" autocomplete="off"> +
Client-identifier (option 61): + >IAID/DUID
+ " maxlength="126" autocapitalization="off" autocomplete="off"> +
+ diff --git a/release/src/router/www/sysdep/RT-AC66U/www/Advanced_Wireless_Content.asp b/release/src/router/www/sysdep/RT-AC66U/www/Advanced_Wireless_Content.asp index c7f29143029..d685ac8067a 100644 --- a/release/src/router/www/sysdep/RT-AC66U/www/Advanced_Wireless_Content.asp +++ b/release/src/router/www/sysdep/RT-AC66U/www/Advanced_Wireless_Content.asp @@ -2510,7 +2510,7 @@ function handleMFP(){
<#WLANConfig11b_x_PSKKey_itemname#> - " autocorrect="off" autocapitalize="off" autocomplete="new-password" type="password" onBlur="switchType(this, false);" onFocus="switchType(this, true);"> + " autocorrect="off" autocapitalize="off">