Smal typo? Mumber instead of Number?
Best Regards
Sebastian
> On Mar 9, 2021, at 12:36, Florian Eckert <f...@dev.tdt.de> wrote:
>
> With the old ubus dsl API, the numbers for the individual line_states and
> power_states were also returned. These were not ported to the new DSL
> C-API. This commit changes the following JSON output.
>
> * current JSON output for state:
> "state": "Showtime with TC-Layer sync"
>
> * new JSON output for state:
> "line_state": {
> "mumber": 2049,
> "string": "Showtime with TC-Layer sync"
> },
>
> * current JSON output for power_state:
> "power_state": "L0 - Synchronized"
>
> new JSON outpug for power_state:
> "power_state": {
> "mumber": 0,
> "string": "L0 - Synchronized"
> }
>
> Signed-off-by: Florian Eckert <f...@dev.tdt.de>
> ---
> .../ltq-vdsl-app/src/src/dsl_cpe_ubus.c | 22 +++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c
> b/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c
> index 52b2be20e1..9d78b61188 100644
> --- a/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c
> +++ b/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c
> @@ -306,7 +306,9 @@ static void version_information(int fd) {
> static void line_state(int fd) {
> IOCTL(DSL_LineState_t, DSL_FIO_LINE_STATE_GET)
>
> + void *c;
> const char *str;
> +
> switch (out.data.nLineState) {
> STR_CASE(DSL_LINESTATE_NOT_INITIALIZED, "Not initialized")
> STR_CASE(DSL_LINESTATE_EXCEPTION, "Exception")
> @@ -351,8 +353,13 @@ static void line_state(int fd) {
> str = NULL;
> break;
> };
> - if (str)
> - m_str("state", str);
> +
> + if (str) {
> + c = blobmsg_open_table(&b, "line_state");
> + m_u32("mumber", out.data.nLineState);
> + m_str("string", str);
> + blobmsg_close_table(&b, c);
> + }
>
> m_bool("up", out.data.nLineState == DSL_LINESTATE_SHOWTIME_TC_SYNC);
> }
> @@ -377,7 +384,9 @@ static void g997_line_inventory(int fd) {
> static void g997_power_management_status(int fd) {
> IOCTL(DSL_G997_PowerManagementStatus_t,
> DSL_FIO_G997_POWER_MANAGEMENT_STATUS_GET)
>
> + void *c;
> const char *str;
> +
> switch (out.data.nPowerManagementStatus) {
> STR_CASE(DSL_G997_PMS_NA, "Power management state is not available")
> STR_CASE(DSL_G997_PMS_L0, "L0 - Synchronized")
> @@ -388,8 +397,13 @@ static void g997_power_management_status(int fd) {
> str = NULL;
> break;
> };
> - if (str)
> - m_str("power_state", str);
> +
> + if (str) {
> + c = blobmsg_open_table(&b, "power_state");
> + m_u32("mumber", out.data.nPowerManagementStatus);
> + m_str("string", str);
> + blobmsg_close_table(&b, c);
> + }
> }
>
> static void g997_xtu_system_enabling(int fd, standard_t *standard) {
> --
> 2.20.1
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
