From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 9 Apr 2018 11:18:03 +0000 (+0200)
Subject: Merge pull request #2740 from melak/ros_radioname_null
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=e163fd022657f72711d507390fd28bdf76d8dbc1;hp=60b5ba7345634f8b66bd9387912782cdb4193708

Merge pull request #2740 from melak/ros_radioname_null

Fix routeros unset radio-name showing up as "(null)"
---

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);