diff options
| -rw-r--r-- | modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua | 43 | ||||
| -rw-r--r-- | modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm | 50 |
2 files changed, 86 insertions, 7 deletions
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua index 2be88fcf80..385e1141ec 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua @@ -8,6 +8,49 @@ m = Map("network", translate("Interfaces")) m.pageaction = false m:section(SimpleSection).template = "admin_network/iface_overview" +if fs.access("/etc/init.d/dsl_control") then + dsl = m:section(TypedSection, "dsl", translate("DSL")) + + dsl.anonymous = true + + annex = dsl:option(ListValue, "annex", translate("Annex")) + annex:value("a", translate("Annex A + L + M (all)")) + annex:value("b", translate("Annex B (all)")) + annex:value("j", translate("Annex J (all)")) + annex:value("m", translate("Annex M (all)")) + annex:value("bdmt", translate("Annex B G.992.1")) + annex:value("b2", translate("Annex B G.992.3")) + annex:value("b2p", translate("Annex B G.992.5")) + annex:value("at1", translate("ANSI T1.413")) + annex:value("admt", translate("Annex A G.992.1")) + annex:value("alite", translate("Annex A G.992.2")) + annex:value("a2", translate("Annex A G.992.3")) + annex:value("a2p", translate("Annex A G.992.5")) + annex:value("l", translate("Annex L G.992.3 POTS 1")) + annex:value("m2", translate("Annex M G.992.3")) + annex:value("m2p", translate("Annex M G.992.5")) + + tone = dsl:option(ListValue, "tone", translate("Tone")) + tone:value("", translate("auto")) + tone:value("a", translate("A43C + J43 + A43")) + tone:value("av", translate("A43C + J43 + A43 + V43")) + tone:value("b", translate("B43 + B43C")) + tone:value("bv", translate("B43 + B43C + V43")) + + xfer_mode = dsl:option(ListValue, "xfer_mode", translate("Encapsulation mode")) + xfer_mode:value("atm", translate("ATM (Asynchronous Transfer Mode)")) + xfer_mode:value("ptm", translate("PTM/EFM (Packet Transfer Mode)")) + + line_mode = dsl:option(ListValue, "line_mode", translate("DSL line mode")) + line_mode:value("", translate("auto")) + line_mode:value("adsl", translate("ADSL")) + line_mode:value("vdsl", translate("VDSL")) + + firmware = dsl:option(Value, "firmware", translate("Firmware File")) + + m.pageaction = true +end + -- Show ATM bridge section if we have the capabilities if fs.access("/usr/sbin/br2684ctl") then atm = m:section(TypedSection, "atm-bridge", translate("ATM Bridges"), diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm index 8bfc61b99b..2abb370762 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm @@ -276,20 +276,56 @@ var s = String.format( '<strong><%:Status%>: </strong>%s<br />' + '<strong><%:Line State%>: </strong>%s [0x%x]<br />' + - '<strong><%:Line Speed%>: </strong>%s/s / %s/s<br />' + - '<strong><%:Line Attenuation%>: </strong>%s dB / %s dB<br />' + - '<strong><%:Noise Margin%>: </strong>%s dB / %s dB<br />', + '<strong><%:Line Mode%>: </strong>%s<br />' + + '<strong><%:Annex%>: </strong>%s<br />' + + '<strong><%:Profile%>: </strong>%s<br />' + + '<strong><%:Data Rate%>: </strong>%s/s / %s/s<br />' + + '<strong><%:Max. Attainable Data Rate (ATTNDR)%>: </strong>%s/s / %s/s<br />' + + '<strong><%:Latency%>: </strong>%s / %s<br />' + + '<strong><%:Line Attenuation (LATN)%>: </strong>%s dB / %s dB<br />' + + '<strong><%:Signal Attenuation (SATN)%>: </strong>%s dB / %s dB<br />' + + '<strong><%:Noise Margin (SNR)%>: </strong>%s dB / %s dB<br />' + + '<strong><%:Aggregate Transmit Power(ACTATP)%>: </strong>%s dB / %s dB<br />' + + '<strong><%:Forward Error Correction Seconds (FECS)%>: </strong>%s / %s<br />' + + '<strong><%:Errored seconds (ES)%>: </strong>%s / %s<br />' + + '<strong><%:Severely Errored Seconds (SES)%>: </strong>%s / %s<br />' + + '<strong><%:Loss of Signal Seconds (LOSS)%>: </strong>%s / %s<br />' + + '<strong><%:Unavailable Seconds (UAS)%>: </strong>%s / %s<br />' + + '<strong><%:Header Error Code Errors (HEC)%>: </strong>%s / %s<br />' + + '<strong><%:Non Pre-emtive CRC errors (CRC_P)%>: </strong>%s / %s<br />' + + '<strong><%:Pre-emtive CRC errors (CRCP_P)%>: </strong>%s / %s<br />' + + '<strong><%:Line Uptime%>: </strong>%s<br />' + + '<strong><%:ATU-C System Vendor ID%>: </strong>%s<br />' + + '<strong><%:Power Management Mode%>: </strong>%s<br />', info.dsl.line_state, info.dsl.line_state_detail, info.dsl.line_state_num, + info.dsl.line_mode_s, + info.dsl.annex_s, + info.dsl.profile_s, info.dsl.data_rate_down_s, info.dsl.data_rate_up_s, + info.dsl.max_data_rate_down_s, info.dsl.max_data_rate_up_s, + info.dsl.latency_num_down, info.dsl.latency_num_up, info.dsl.line_attenuation_down, info.dsl.line_attenuation_up, - info.dsl.noise_margin_down, info.dsl.noise_margin_up + info.dsl.noise_margin_down, info.dsl.noise_margin_up, + info.dsl.signal_attenuation_down, info.dsl.signal_attenuation_up, + info.dsl.actatp_down, info.dsl.actatp_up, + info.dsl.errors_fec_near, info.dsl.errors_fec_far, + info.dsl.errors_es_near, info.dsl.errors_es_far, + info.dsl.errors_ses_near, info.dsl.errors_ses_far, + info.dsl.errors_loss_near, info.dsl.errors_loss_far, + info.dsl.errors_uas_near, info.dsl.errors_uas_far, + info.dsl.errors_hec_near, info.dsl.errors_hec_far, + info.dsl.errors_crc_p_near, info.dsl.errors_crc_p_far, + info.dsl.errors_crcp_p_near, info.dsl.errors_crcp_p_far, + info.dsl.line_uptime_s, + info.dsl.atuc_vendor_id, + info.dsl.power_mode_s ); dsl_s.innerHTML = String.format('<small>%s</small>', s); dsl_i.innerHTML = String.format( '<img src="<%=resource%>/icons/ethernet.png" />' + - '<br /><small>ADSL</small>' + '<br /><small>DSL</small>' ); <% end %> @@ -707,9 +743,9 @@ <% if has_dsl then %> <fieldset class="cbi-section"> - <legend><%:ADSL%></legend> + <legend><%:DSL%></legend> <table width="100%" cellspacing="10"> - <tr><td width="33%" style="vertical-align:top"><%:ADSL Status%></td><td> + <tr><td width="33%" style="vertical-align:top"><%:DSL Status%></td><td> <table><tr> <td id="dsl_i" style="width:16px; text-align:center; padding:3px"><img src="<%=resource%>/icons/ethernet_disabled.png" /><br /><small>?</small></td> <td id="dsl_s" style="vertical-align:middle; padding: 3px"><em><%:Collecting data...%></em></td> |