Skip to content

Commit

Permalink
Merge tag '386.8'
Browse files Browse the repository at this point in the history 
386.8
  • Loading branch information
@gnuton
gnuton committed Aug 15, 2022
2 parents c452904 + 3584987 commit 734c3ca
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 81 deletions.
8 changes: 4 additions & 4 deletions Changelog-NG.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Asuswrt-Merlin 386/NG Changelog
===============================

386.08_0-gnuton0 (xx-xxx-xxxx)
- This release is only available for the DSL-AX82U
- NOTE: This release is only available for the DSL-AX82U

386.8 (xx-xxx-xxxx)
386.8 (13-Aug-2022)
- NOTE: This release is only available for the RT-AX88U as
well as the two new models listed below.
- NEW: Added support for the GT-AXE16000.
Expand All @@ -13,7 +13,7 @@ Asuswrt-Merlin 386/NG Changelog
- UPDATED: Merged with GPL 386_49634.
- CHANGED: Re-enabled IPv6 DDNS support.
- CHANGED: Once again block router DNS access over IPv6 when
using DNSFilter on a pre-HND model (reverte back
using DNSFilter on a pre-HND model (reverted back
to 386.7 behaviour for that scenario)
- FIXED: inaccurate nvram usage on Sysinfo page for some HND
models. Now accurately report kernel nvram usage.
Expand All @@ -24,7 +24,7 @@ Asuswrt-Merlin 386/NG Changelog
- FIXED: OVPN client with DNS set to strict had lower priority
than DNSPrivacy servers.
- FIXED: IPv6 DNS may be missing if DNSPrivacy is enabled.
- FIXED: WiFI Radar pages missing on XT12.
- FIXED: Wifi Radar pages missing on XT12.
- FIXED: QRcode failing to generate if the SSID contained unicode
characters (like emojis or other UTF8 entities)

Expand Down
74 changes: 30 additions & 44 deletions README-merlin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,71 +74,57 @@ firmware.

(Note: HND platform = newer Broadcom models starting with RT-AC86U):


System:
- Various bugfixes and optimizations
- Some components were updated to newer versions, for improved
stability and security
- User scripts that run on specific events
- Cron jobs
- Ability to customize the config files used by the router services
- Ability to turn off router LEDs
- Entware easy setup script (alternative to Optware - the two are
mutually exclusive)
- SNMP support (except for HND devices)
- Various bugfixes
- Performance optimizations to some CPU-bound components like OpenVPN
- Some components were updated to their latest versions, for improved stability and security
- User scripts that run on specific events such as firewall restart
- Cron jobs for scheduled tasks
- Customizable config files for router services
- Third party software through Entware, with an easy setup script
- SNMP support (some models)
- Nano text editor (for more user-friendly script editing)
- NTP daemon, which can synchronize your client devices

- Third-party addons, with a management interface (AMTM)


Disk sharing:
- Enable/disable the use of shorter share names
- NFS sharing (through webui)
- Allow or disable WAN access to the FTP server
- TLS support for the FTP server
- Optionally use shorter share names (folder name only)
- NFS exporting of USB drives


Networking:
- Force acting as a Master Browser
- Act as a SMB Master Browser
- Act as a WINS server
- SSHD support for key-based authentication
- Allows tweaking TCP/UDP connection tracking timeouts
- CIFS client support (for mounting remote SMB share on the router)
- User-defined options for WAN DHCP queries (required by some ISPs)
- Advanced OpenVPN client and server support
- Support for new OpenVPN 2.4 features like NCP and LZ4
- Advanced OpenVPN client and server.
- Netfilter ipset module, for efficient blacklist implementation
- Configurable min/max UPNP ports
- DNS-based Filtering, can be applied globally or per client
- Custom DDNS (through user script or custom config file)
- TOR support, individual client control (based on experimental code
from Asus)
- Policy routing for the OpenVPN client (based on source or
destination IPs), sometimes referred to as "selective routing")
- DNSSEC support
- Wireless site survey page
- DNS-based Filtering, enforcing a specific DNS server, can be applied globally or per client
- Custom DDNS (through a user script)
- TOR support, individual client access control
- Policy-based routing for OpenVPN clients (based on source or destination IPs), sometimes referred to as "selective routing", or "split tunneling")
- DNSSEC validation
- fq_codel queue discipline for Traditional QoS
- Full cone NAT support (HND devices only)
- Detailed wireless troubleshooting information (HND devices
only)
- Modern DDNS client (In-a-Dyn), with HTTPS support
- DNS-over-TLS
- Detailed wireless troubleshooting information (on some models)
- Redirect NTP client queries to the router's own NTP daemon
- WS-Discovery support (alternative to SMBv1 network discovery)
- Cake QoS (HND devices only)

- Cake SQM QoS (on newer HND models)


Web interface:
- Performance improvements
- Optionally save traffic stats to disk (USB or JFFS partition)
- Enhanced traffic monitoring with graphical reports of
historical data
- Traffic report per IP (except on HND devices)
- Hostname field on the DHCP reservation page
- System information summary page
- Wifi icon reports the state of all radios
- Enhanced traffic monitoring: adding graphical charts, and traffic monitoring per client IP
- Hostname field on the DHCP reservation list and Wireless ACL list
- System info summary page
- Wifi icon reports the state of both radios
- Wireless site survey
- Advanced Wireless client list display, including automated refresh
- Advanced wireless client list display, including automated refresh
- Redesigned layout of the various System Log sections
- Editable fields for some pages
- Advanced traffic classification report
- Editable entries (on some pages)


Note that a number of features which first appeared in Asuswrt-Merlin
Expand Down
2 changes: 1 addition & 1 deletion release/src-rt/version.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KERNEL_VER=3.0
FS_VER=0.4
SERIALNO=386.8
EXTENDNO=beta2
EXTENDNO=0
RCNO=0
39 changes: 17 additions & 22 deletions release/src/router/www/Main_WStatus_Content.asp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
<script language="JavaScript" type="text/javascript" src="/js/httpApi.js"></script>
<script language="JavaScript" type="text/javascript" src="/client_function.js"></script>
<style>
.wifiheader{
background-color:#475a5f;
color:#FFCC00;
}
p{
font-weight: bolder;
}
Expand All @@ -33,7 +29,6 @@ p{
-moz-border-radius: 5px;
border-radius: 5px;
z-index:500;
background-color:#2B373B;
display:none;
margin-left: 18%;
top: 250px;
Expand Down Expand Up @@ -162,15 +157,15 @@ function redraw(){
}
if (dataarray24.length == 0) {
document.getElementById('wifi24headerblock').innerHTML='<span class="wifiheader" style="font-size: 125%;">Wireless 2.4 GHz is disabled.</span>';
document.getElementById('wifi24headerblock').innerHTML='<span class="hint-color" style="font-size: 125%;">Wireless 2.4 GHz is disabled.</span>';
} else {
display_header(dataarray24, 'Wireless 2.4 GHz', document.getElementById('wifi24headerblock'), []);
display_clients(wificlients24, document.getElementById('wifi24block'), 0);
}
if (band6g_support) {
if (dataarray6.length == 0) {
document.getElementById('wifi6headerblock').innerHTML='<span class="wifiheader" style="font-size: 125%;">Wireless 6 GHz is disabled.</span>';
document.getElementById('wifi6headerblock').innerHTML='<span class="hint-color" style="font-size: 125%;">Wireless 6 GHz is disabled.</span>';
} else {
display_header(dataarray6, 'Wireless 6 GHz', document.getElementById('wifi6headerblock'), []);
display_clients(wificlients6, document.getElementById('wifi6block'), 2);
Expand All @@ -180,20 +175,20 @@ function redraw(){
if (band5g_support) {
if (wl_info.band5g_2_support) {
if (dataarray5.length == 0) {
document.getElementById('wifi5headerblock').innerHTML='<span class="wifiheader" style="font-size: 125%;">Wireless 5 GHz-1 is disabled.</span>';
document.getElementById('wifi5headerblock').innerHTML='<span class="hint-color" style="font-size: 125%;">Wireless 5 GHz-1 is disabled.</span>';
} else {
display_header(dataarray5, 'Wireless 5 GHz-1', document.getElementById('wifi5headerblock'), dfs_statusarray5);
display_clients(wificlients5, document.getElementById('wifi5block'), 1);
}
if (dataarray52.length == 0) {
document.getElementById('wifi52headerblock').innerHTML='<span class="wifiheader" style="font-size: 125%;">Wireless 5 GHz-2 is disabled.</span>';
document.getElementById('wifi52headerblock').innerHTML='<span class="hint-color" style="font-size: 125%;">Wireless 5 GHz-2 is disabled.</span>';
} else {
display_header(dataarray52, 'Wireless 5 GHz-2', document.getElementById('wifi52headerblock'), dfs_statusarray52);
display_clients(wificlients52, document.getElementById('wifi52block'), 2);
}
} else {
if (dataarray5.length == 0) {
document.getElementById('wifi5headerblock').innerHTML='<span class="wifiheader" style="font-size: 125%;">Wireless 5 GHz is disabled.</span>';
document.getElementById('wifi5headerblock').innerHTML='<span class="hint-color" style="font-size: 125%;">Wireless 5 GHz is disabled.</span>';
} else {
display_header(dataarray5, 'Wireless 5 GHz', document.getElementById('wifi5headerblock'), dfs_statusarray5);
display_clients(wificlients5, document.getElementById('wifi5block'), 1);
Expand Down Expand Up @@ -320,25 +315,25 @@ function display_header(dataarray, title, obj, dfs_statusarray) {
var time, formatted_time;
code = '<table width="100%" style="border: none;">';
code += '<thead><tr><span class="wifiheader" style="font-size: 125%;">' + title +'</span></tr></thead>';
code += '<tr><td colspan="3"><span class="wifiheader">SSID: </span>' + dataarray[0] + '</td><td colspan="2"><span class="wifiheader">Mode: </span>' + dataarray[6] + '</td></tr>';
code += '<thead><tr><span class="hint-color" style="font-size: 125%;">' + title +'</span></tr></thead>';
code += '<tr><td colspan="3"><span class="hint-color">SSID: </span>' + dataarray[0] + '</td><td colspan="2"><span class="hint-color">Mode: </span>' + dataarray[6] + '</td></tr>';
code += '<tr>';
if (dataarray[1] != 0)
code += '<td><span class="wifiheader">RSSI: </span>' + dataarray[1] + ' dBm</td>';
code += '<td><span class="hint-color">RSSI: </span>' + dataarray[1] + ' dBm</td>';
if (dataarray[2] != 0)
code += '<td><span class="wifiheader">SNR: </span>' + dataarray[2] +' dB</td>';
code += '<td><span class="hint-color">SNR: </span>' + dataarray[2] +' dB</td>';
if (dataarray[3] != 0)
code += '<td><span class="wifiheader">Noise: </span>' + dataarray[3] + ' dBm</td>';
code += '<td><span class="hint-color">Noise: </span>' + dataarray[3] + ' dBm</td>';
code += '<td><span class="wifiheader">Channel: </span>'+ dataarray[4] + '</td> <td><span class="wifiheader">BSSID: </span>' + dataarray[5] +'</td></tr>';
code += '<td><span class="hint-color">Channel: </span>'+ dataarray[4] + '</td> <td><span class="hint-color">BSSID: </span>' + dataarray[5] +'</td></tr>';
if (dfs_statusarray.length > 1) {
code += '<tr><td colspan="2"><span class="wifiheader">DFS State: </span>' + dfs_statusarray[0] + '</td>';
code += '<tr><td colspan="2"><span class="hint-color">DFS State: </span>' + dfs_statusarray[0] + '</td>';
time = parseInt(dfs_statusarray[1]);
formatted_time = Math.floor(time / 3600) + "h " + Math.floor(time / 60) % 60 + "m " + time % 60 + "s";
code += '<td><span class="wifiheader">Time elapsed: </span>' + formatted_time + '</td>';
code += '<td><span class="wifiheader">Channel cleared for radar: </span>' + dfs_statusarray[2] + '</td></tr>';
code += '<td><span class="hint-color">Time elapsed: </span>' + formatted_time + '</td>';
code += '<td><span class="hint-color">Channel cleared for radar: </span>' + dfs_statusarray[2] + '</td></tr>';
}
code += '</table>';
Expand Down Expand Up @@ -465,8 +460,8 @@ function hide_details_window(){
<br><br>
<div id="wifi6headerblock"></div>
<div id="wifi6block"></div>
<div id="flags_mumimo_div" style="display:none;">Flags: <span class="wifiheader">P</span>=Powersave Mode, <span class="wifiheader">S</span>=Short GI, <span class="wifiheader">T</span>=STBC, <span class="wifiheader">M</span>=MU Beamforming, <span class="wifiheader">A</span>=Associated, <span class="wifiheader">U</span>=Authenticated</div>
<div id="flags_div">Flags: <span class="wifiheader">P</span>=Powersave Mode, <span class="wifiheader">S</span>=Short GI, <span class="wifiheader">T</span>=STBC, <span class="wifiheader">A</span>=Associated, <span class="wifiheader">U</span>=Authenticated</div>
<div id="flags_mumimo_div" style="display:none;">Flags: <span class="hint-color">P</span>=Powersave Mode, <span class="hint-color">S</span>=Short GI, <span class="hint-color">T</span>=STBC, <span class="hint-color">M</span>=MU Beamforming, <span class="hint-color">A</span>=Associated, <span class="hint-color">U</span>=Authenticated</div>
<div id="flags_div">Flags: <span class="hint-color">P</span>=Powersave Mode, <span class="hint-color">S</span>=Short GI, <span class="hint-color">T</span>=STBC, <span class="hint-color">A</span>=Associated, <span class="hint-color">U</span>=Authenticated</div>
<br>
<div class="apply_gen">
<input type="button" onClick="location.reload();" value="<#CTL_refresh#>" class="button_gen" >
Expand All @@ -483,7 +478,7 @@ function hide_details_window(){
<div id="footer"></div>
</form>

<div id="details_window" class="contentM_details" style="box-shadow: 1px 5px 10px #000;">
<div id="details_window" class="contentM_details pop_div_bg">
<div style="margin: 15px;">
<textarea id="wl_log" cols="63" rows="30" class="textarea_ssh_table" style="width:99%;font-family:'Courier New', Courier, mono; font-size:13px;" readonly="readonly" wrap="off"></textarea>
</div>
Expand Down
53 changes: 43 additions & 10 deletions release/src/router/www/require/menuTrees/menuTree_ROG.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ define(function(){
tab: [
{url: "GameBoost.asp", tabName: "<#Game_acceleration#>"},
{url: "QoS_EZQoS.asp", tabName: "<#menu5_3_2#>"},
{url: "QoS_Stats.asp", tabName: "Classification"},
//{url: "AdaptiveQoS_WebHistory.asp", tabName: "<#Adaptive_History#>"},
//{url: "Main_Spectrum_Content.asp", tabName: "<#Spectrum_title#>"},
{url: "Advanced_QOSUserPrio_Content.asp", tabName: "__INHERIT__"},
Expand Down Expand Up @@ -118,29 +119,47 @@ define(function(){
menuName: "VPN",
index: "menu_VPN",
tab: [
{url: "Advanced_VPN_PPTP.asp", tabName: "<#BOP_isp_heart_item#>"},
{url: "Advanced_VPN_OpenVPN.asp", tabName: "__INHERIT__"},
{url: "Advanced_VPNStatus.asp", tabName: "VPN Status"},
{url: "Advanced_VPNDirector.asp", tabName: "VPN Director"},
{url: "Advanced_VPN_OpenVPN.asp", tabName: "<#BOP_isp_heart_item#>"},
{url: "Advanced_VPN_PPTP.asp", tabName: "__INHERIT__"},
{url: "Advanced_VPN_IPSec.asp", tabName: "__INHERIT__"},
{url: "Advanced_VPNClient_Content.asp", tabName: (vpn_fusion_support) ? "<#VPN_Fusion#>" : "<#vpnc_title#>"},
{url: "Advanced_OpenVPNClient_Content.asp", tabName: (vpn_fusion_support) ? "<#VPN_Fusion#>" : "<#vpnc_title#>"},
{url: "Advanced_VPNClient_Content.asp", tabName: "__INHERIT__"},
{url: "Advanced_TOR_Content.asp", tabName: "TOR"},
{url: "Advanced_Instant_Guard.asp", tabName: "<#Instant_Guard_title#>"},
{url: "NULL", tabName: "__INHERIT__"}
{url: "Advanced_WireguardServer_Content.asp", tabName: "__INHERIT__"},
{url: "Advanced_WireguardClient_Content.asp", tabName: "__INHERIT__"},
{url: "NULL", tabName: "__INHERIT__"}
]
},
{
menuName: "<#Traffic_Analyzer#>",
index: "menu_TrafficAnalyzer",
tab: [
{url: "TrafficAnalyzer_Statistic.asp", tabName: "<#Statistic#>"},
{url: "AdaptiveQoS_Bandwidth_Monitor.asp", tabName: "<#Bandwidth_monitor#>"},
{url: "Main_TrafficMonitor_realtime.asp", tabName: "<#traffic_monitor#>"},
{url: "Main_TrafficMonitor_last24.asp", tabName: "__INHERIT__"},
{url: "Main_TrafficMonitor_daily.asp", tabName: "__INHERIT__"},
{url: "Main_TrafficMonitor_monthly.asp", tabName: "__INHERIT__"},
{url: "Main_TrafficMonitor_devrealtime.asp", tabName: "__INHERIT__"},
{url: "Main_TrafficMonitor_devdaily.asp", tabName: "__INHERIT__"},
{url: "Main_TrafficMonitor_devmonthly.asp", tabName: "__INHERIT__"},
{url: "TrafficAnalyzer_Statistic.asp", tabName: "<#Statistic#>"},
{url: "AdaptiveQoS_TrafficLimiter.asp", tabName: "Traffic Limiter"},
{url: "AdaptiveQoS_WebHistory.asp", tabName: "<#Adaptive_History#>"},
{url: "NULL", tabName: "__INHERIT__"}
]
},
{
menuName: "Tools",
index: "menu_Tools",
tab: [
{url: "Tools_Sysinfo.asp", tabName: "Sysinfo"},
{url: "Tools_OtherSettings.asp", tabName: "Other Settings"},
{url: "NULL", tabName: "__INHERIT__"}
]
},

/* ============================================================================================================ */

Expand Down Expand Up @@ -171,6 +190,7 @@ define(function(){
{url: "Advanced_WAdvanced_Content.asp", tabName: "<#menu5_1_6#>"},
{url: "Advanced_WProxy_Content.asp", tabName: "<#WiFi_Proxy_item#>"},
{url: "Advanced_Roaming_Block_Content.asp", tabName: "<#WiFi_Roaming_Block_List#>"},
{url: "Advanced_Wireless_Survey.asp", tabName: "Site Survey"},
{url: "NULL", tabName: "__INHERIT__"}
]
},
Expand Down Expand Up @@ -224,6 +244,7 @@ define(function(){
{url: "aidisk.asp", tabName: "__INHERIT__"},
{url: "mediaserver.asp", tabName: "<#UPnPMediaServer#>"},
{url: "Advanced_AiDisk_samba.asp", tabName: "<#menu5_4_1#>".concat(WebDav_support?" / <#Cloud_Disk#>":"")},
{url: "Advanced_AiDisk_NFS.asp", tabName: "NFS Exports"},
{url: "Advanced_AiDisk_ftp.asp", tabName: "<#menu5_4_2#>"},
{url: "PrinterServer.asp", tabName: "__INHERIT__"},
{url: "Advanced_Modem_Content.asp", tabName: "__INHERIT__"},
Expand Down Expand Up @@ -281,7 +302,7 @@ define(function(){
{url: "Advanced_System_Content.asp", tabName: "<#menu5_6_2#>"},
{url: "Advanced_FirmwareUpgrade_Content.asp", tabName: "<#menu5_6_3#>"},
{url: "Advanced_SettingBackup_Content.asp", tabName: "<#menu5_6_4#>"},
{url: "Advanced_PerformanceTuning_Content.asp", tabName: "<#fan_tuning#>"},
{url: "Advanced_PerformanceTuning_Content.asp", tabName: "Temperature"},
{url: "Advanced_ADSL_Content.asp", tabName: "<#menu_dsl_setting#>"},
{url: "Advanced_Feedback.asp", tabName: "<#menu_feedback#>"},
{url: "Feedback_Info.asp", tabName: "__INHERIT__"},
Expand Down Expand Up @@ -328,6 +349,14 @@ define(function(){
if(!wifiRadar_support){
retArray.push("menu_WifiRadar");
}
if(!nfsd_support){
retArray.push("Advanced_AiDisk_NFS.asp");
}

if(!dnsfilter_support){
retArray.push("DNSFilter.asp");
}


if(!multissid_support){
retArray.push("menu_GuestNetwork");
Expand Down Expand Up @@ -537,6 +566,8 @@ define(function(){

if(!openvpnd_support){
retArray.push("Advanced_VPN_OpenVPN.asp");
retArray.push("Advanced_OpenVPNClient_Content.asp");
retArray.push("Advanced_VPNDirector.asp");
}

if(!ipsec_srv_support){
Expand Down Expand Up @@ -685,9 +716,9 @@ define(function(){
retArray.push("Captive_Portal_Advanced.asp");
}

if(!cooler_support){
retArray.push("Advanced_PerformanceTuning_Content.asp");
}
// if(!cooler_support){
// retArray.push("Advanced_PerformanceTuning_Content.asp");
// }

if(!rrsut_support)
retArray.push("cloud_router_sync.asp");
Expand Down Expand Up @@ -786,7 +817,9 @@ define(function(){
retArray.push("Advanced_WMode_Content.asp");
retArray.push("Advanced_IPTV_Content.asp");
}

if(hnd_support){
retArray.push("Advanced_Wireless_Survey.asp");
}
if(based_modelid === '4G-AC55U' || based_modelid === '4G-AC68U'){
retArray.push("Advanced_Modem_Content.asp");
}
Expand Down

0 comments on commit 734c3ca

Please sign in to comment.