Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4749 from dhewg/dsl

Browse source 
luci-mod-status: use the new ubus dsl metrics
This commit is contained in:
Hauke Mehrtens 2021-02-08 23:08:26 +00:00 committed by GitHub
commit c6bdaeb356
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
libs/rpcd-mod-luci/src/luci.c
View file

@ -1703,60 +1703,6 @@ rpc_luci_get_board_json(struct ubus_context *ctx, struct ubus_object *obj,
return UBUS_STATUS_OK; return UBUS_STATUS_OK;
} }
static int
rpc_luci_get_dsl_status(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
char line[128], *p, *s;
FILE *cmd;
cmd = popen("/etc/init.d/dsl_control lucistat", "r");
if (!cmd)
return UBUS_STATUS_NOT_FOUND;
blob_buf_init(&blob, 0);
while (fgets(line, sizeof(line), cmd)) {
if (strncmp(line, "dsl.", 4))
continue;
p = strchr(line, '=');
if (!p)
continue;
s = p + strlen(p) - 1;
while (s >= p && isspace(*s))
*s-- = 0;
*p++ = 0;
if (!strcmp(p, "nil"))
continue;
if (isdigit(*p)) {
blobmsg_add_u32(&blob, line + 4, strtoul(p, NULL, 0));
}
else if (*p == '"') {
s = p + strlen(p) - 1;
if (s >= p && *s == '"')
*s = 0;
blobmsg_add_string(&blob, line + 4, p + 1);
}
}
fclose(cmd);
ubus_send_reply(ctx, req, blob.head);
return UBUS_STATUS_OK;
}
enum { enum {
RPC_L_FAMILY, RPC_L_FAMILY,
__RPC_L_MAX, __RPC_L_MAX,
@ -1867,7 +1813,6 @@ rpc_luci_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
UBUS_METHOD_NOARG("getHostHints", rpc_luci_get_host_hints), UBUS_METHOD_NOARG("getHostHints", rpc_luci_get_host_hints),
UBUS_METHOD_NOARG("getDUIDHints", rpc_luci_get_duid_hints), UBUS_METHOD_NOARG("getDUIDHints", rpc_luci_get_duid_hints),
UBUS_METHOD_NOARG("getBoardJSON", rpc_luci_get_board_json), UBUS_METHOD_NOARG("getBoardJSON", rpc_luci_get_board_json),
UBUS_METHOD_NOARG("getDSLStatus", rpc_luci_get_dsl_status),
UBUS_METHOD("getDHCPLeases", rpc_luci_get_dhcp_leases, rpc_get_leases_policy) UBUS_METHOD("getDHCPLeases", rpc_luci_get_dhcp_leases, rpc_get_leases_policy)
}; };

55
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js
View file

@ -2,40 +2,39 @@
'require baseclass'; 'require baseclass';
'require rpc'; 'require rpc';
var callLuciDSLStatus = rpc.declare({ var callDSLMetrics = rpc.declare({
object: 'luci-rpc', object: 'dsl',
method: 'getDSLStatus', method: 'metrics',
expect: { '': {} } expect: { '': {} }
}); });
function renderbox(dsl) { function renderbox(dsl) {
return E('div', { class: 'ifacebox' }, [ return E('div', { class: 'ifacebox' }, [
E('div', { class: 'ifacebox-head center ' + ((dsl.line_state === 'UP') ? 'active' : '') }, E('div', { class: 'ifacebox-head center ' + (dsl.up ? 'active' : '') },
E('strong', _('DSL Status'))), E('strong', _('DSL Status'))),
E('div', { class: 'ifacebox-body left' }, [ E('div', { class: 'ifacebox-body left' }, [
L.itemlist(E('span'), [ L.itemlist(E('span'), [
_('Line State'), '%s [0x%x]'.format(dsl.line_state, dsl.line_state_detail), _('Line State'), dsl.state || '-',
_('Line Mode'), dsl.line_mode_s || '-', _('Line Mode'), dsl.mode || '-',
_('Line Uptime'), '%t'.format(dsl.line_uptime), _('Line Uptime'), '%t'.format(dsl.uptime),
_('Annex'), dsl.annex_s || '-', _('Annex'), dsl.annex || '-',
_('Profile'), dsl.profile_s || '-', _('Data Rate'), '%1000.3mb/s / %1000.3mb/s'.format(dsl.downstream.data_rate, dsl.upstream.data_rate),
_('Data Rate'), '%1000.3mb/s / %1000.3mb/s'.format(dsl.data_rate_down, dsl.data_rate_up), _('Max. Attainable Data Rate (ATTNDR)'), '%1000.3mb/s / %1000.3mb/s'.format(dsl.downstream.attndr, dsl.upstream.attndr),
_('Max. Attainable Data Rate (ATTNDR)'), '%1000.3mb/s / %1000.3mb/s'.format(dsl.max_data_rate_down, dsl.max_data_rate_up), _('Latency'), '%.2f ms / %.2f ms'.format(dsl.downstream.interleave_delay / 1000, dsl.upstream.interleave_delay / 1000),
_('Latency'), '%.2f ms / %.2f ms'.format(dsl.latency_down / 1000, dsl.latency_up / 1000), _('Line Attenuation (LATN)'), '%.1f dB / %.1f dB'.format(dsl.downstream.latn, dsl.upstream.latn),
_('Line Attenuation (LATN)'), '%.1f dB / %.1f dB'.format(dsl.line_attenuation_down, dsl.line_attenuation_up), _('Signal Attenuation (SATN)'), '%.1f dB / %.1f dB'.format(dsl.downstream.satn, dsl.upstream.satn),
_('Signal Attenuation (SATN)'), '%.1f dB / %.1f dB'.format(dsl.signal_attenuation_down, dsl.signal_attenuation_up), _('Noise Margin (SNR)'), '%.1f dB / %.1f dB'.format(dsl.downstream.snr, dsl.upstream.snr),
_('Noise Margin (SNR)'), '%.1f dB / %.1f dB'.format(dsl.noise_margin_down, dsl.noise_margin_up), _('Aggregate Transmit Power (ACTATP)'), '%.1f dB / %.1f dB'.format(dsl.downstream.actatp, dsl.upstream.actatp),
_('Aggregate Transmit Power (ACTATP)'), '%.1f dB / %.1f dB'.format(dsl.actatp_down, dsl.actatp_up), _('Forward Error Correction Seconds (FECS)'), '%d / %d'.format(dsl.errors.near.fecs, dsl.errors.far.fecs),
_('Forward Error Correction Seconds (FECS)'), '%d / %d'.format(dsl.errors_fecs_near, dsl.errors_fecs_far), _('Errored seconds (ES)'), '%d / %d'.format(dsl.errors.near.es, dsl.errors.far.es),
_('Errored seconds (ES)'), '%d / %d'.format(dsl.errors_es_near, dsl.errors_es_far), _('Severely Errored Seconds (SES)'), '%d / %d'.format(dsl.errors.near.ses, dsl.errors.far.ses),
_('Severely Errored Seconds (SES)'), '%d / %d'.format(dsl.errors_ses_near, dsl.errors_ses_far), _('Loss of Signal Seconds (LOSS)'), '%d / %d'.format(dsl.errors.near.loss, dsl.errors.far.loss),
_('Loss of Signal Seconds (LOSS)'), '%d / %d'.format(dsl.errors_loss_near, dsl.errors_loss_far), _('Unavailable Seconds (UAS)'), '%d / %d'.format(dsl.errors.near.uas, dsl.errors.far.uas),
_('Unavailable Seconds (UAS)'), '%d / %d'.format(dsl.errors_uas_near, dsl.errors_uas_far), _('Header Error Code Errors (HEC)'), '%d / %d'.format(dsl.errors.near.hec, dsl.errors.far.hec),
_('Header Error Code Errors (HEC)'), '%d / %d'.format(dsl.errors_hec_near, dsl.errors_hec_far), _('Non Pre-emptive CRC errors (CRC_P)'), '%d / %d'.format(dsl.errors.near.crc_p, dsl.errors.far.crc_p),
_('Non Pre-emptive CRC errors (CRC_P)'), '%d / %d'.format(dsl.errors_crc_p_near, dsl.errors_crc_p_far), _('Pre-emptive CRC errors (CRCP_P)'), '%d / %d'.format(dsl.errors.near.crcp_p, dsl.errors.far.crcp_p),
_('Pre-emptive CRC errors (CRCP_P)'), '%d / %d'.format(dsl.errors_crcp_p_near, dsl.errors_crcp_p_far), _('ATU-C System Vendor ID'), dsl.atu_c.vendor || dsl.atu_c.vendor_id,
_('ATU-C System Vendor ID'), dsl.atuc_vendor_id, _('Power Management Mode'), dsl.power_state
_('Power Management Mode'), dsl.power_mode_s
]) ])
]) ])
]); ]);
@ -45,11 +44,11 @@ return baseclass.extend({
title: _('DSL'), title: _('DSL'),
load: function() { load: function() {
return L.resolveDefault(callLuciDSLStatus(), {}); return L.resolveDefault(callDSLMetrics(), {});
}, },
render: function(dsl) { render: function(dsl) {
if (!dsl.line_state) if (!dsl.state)
return null; return null;
return E('div', { 'id': 'dsl_status_table', 'class': 'network-status-table' }, renderbox(dsl)); return E('div', { 'id': 'dsl_status_table', 'class': 'network-status-table' }, renderbox(dsl));

2
modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
View file

@ -120,7 +120,7 @@
"description": "Grant access to DSL status display", "description": "Grant access to DSL status display",
"read": { "read": {
"ubus": { "ubus": {
"luci-rpc": [ "getDSLStatus" ] "dsl": [ "metrics" ]
} }
} }
}, },