From 7ac7c7720dc99bf8736a2fe2d28c82b053e67a46 Mon Sep 17 00:00:00 2001 From: Tamas TEVESZ Date: Wed, 4 Apr 2018 18:25:28 +0200 Subject: [PATCH] Fix routeros unset radio-name showing up as "(null)" This happens when the `radio-name` property is unset on a wireless interface. Why this is done is beyond me, but it does seem to be a thing. --- src/routeros.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routeros.c b/src/routeros.c index ec8956ca..c502c3da 100644 --- a/src/routeros.c +++ b/src/routeros.c @@ -142,7 +142,7 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ /*** RX ***/ snprintf(type_instance, sizeof(type_instance), "%s-%s-rx", r->interface, - r->radio_name); + r->radio_name ? r->radio_name : "default"); cr_submit_gauge(rd, "bitrate", type_instance, (gauge_t)(1000000.0 * r->rx_rate)); cr_submit_gauge(rd, "signal_power", type_instance, @@ -151,7 +151,7 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ /*** TX ***/ snprintf(type_instance, sizeof(type_instance), "%s-%s-tx", r->interface, - r->radio_name); + r->radio_name ? r->radio_name : "default"); cr_submit_gauge(rd, "bitrate", type_instance, (gauge_t)(1000000.0 * r->tx_rate)); cr_submit_gauge(rd, "signal_power", type_instance, @@ -160,7 +160,7 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ /*** RX / TX ***/ snprintf(type_instance, sizeof(type_instance), "%s-%s", r->interface, - r->radio_name); + r->radio_name ? r->radio_name : "default"); cr_submit_io(rd, "if_octets", type_instance, (derive_t)r->rx_bytes, (derive_t)r->tx_bytes); cr_submit_gauge(rd, "snr", type_instance, (gauge_t)r->signal_to_noise); -- 2.11.0