X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frouteros.c;h=131b4da17fdd9a0a5ccc4f1c6c84ff96f67d198c;hb=0b7cd83a5e6bac068ea83a88a5ddcfb07c09fbec;hp=a270f484981dbde8a9e1ac2681a8205c445049ba;hpb=9c962b99a3acd77f1d6e2499052b47356819511a;p=collectd.git diff --git a/src/routeros.c b/src/routeros.c index a270f484..131b4da1 100644 --- a/src/routeros.c +++ b/src/routeros.c @@ -31,8 +31,7 @@ #include -struct cr_data_s -{ +struct cr_data_s { ros_connection_t *connection; char *node; @@ -49,288 +48,266 @@ struct cr_data_s }; typedef struct cr_data_s cr_data_t; -static void cr_submit_io (cr_data_t *rd, const char *type, /* {{{ */ - const char *type_instance, derive_t rx, derive_t tx) -{ - value_t values[2]; - value_list_t vl = VALUE_LIST_INIT; - - values[0].derive = rx; - values[1].derive = tx; - - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, rd->node, sizeof (vl.host)); - sstrncpy (vl.plugin, "routeros", sizeof (vl.plugin)); - sstrncpy (vl.type, type, sizeof (vl.type)); - sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - - plugin_dispatch_values (&vl); +static void cr_submit_io(cr_data_t *rd, const char *type, /* {{{ */ + const char *type_instance, derive_t rx, derive_t tx) { + value_list_t vl = VALUE_LIST_INIT; + value_t values[] = { + {.derive = rx}, {.derive = tx}, + }; + + vl.values = values; + vl.values_len = STATIC_ARRAY_SIZE(values); + sstrncpy(vl.host, rd->node, sizeof(vl.host)); + sstrncpy(vl.plugin, "routeros", sizeof(vl.plugin)); + sstrncpy(vl.type, type, sizeof(vl.type)); + sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance)); + + plugin_dispatch_values(&vl); } /* }}} void cr_submit_io */ -static void submit_interface (cr_data_t *rd, /* {{{ */ - const ros_interface_t *i) -{ +static void submit_interface(cr_data_t *rd, /* {{{ */ + const ros_interface_t *i) { if (i == NULL) return; - if (!i->running) - { - submit_interface (rd, i->next); + if (!i->running) { + submit_interface(rd, i->next); return; } - cr_submit_io (rd, "if_packets", i->name, - (derive_t) i->rx_packets, (derive_t) i->tx_packets); - cr_submit_io (rd, "if_octets", i->name, - (derive_t) i->rx_bytes, (derive_t) i->tx_bytes); - cr_submit_io (rd, "if_errors", i->name, - (derive_t) i->rx_errors, (derive_t) i->tx_errors); - cr_submit_io (rd, "if_dropped", i->name, - (derive_t) i->rx_drops, (derive_t) i->tx_drops); + cr_submit_io(rd, "if_packets", i->name, (derive_t)i->rx_packets, + (derive_t)i->tx_packets); + cr_submit_io(rd, "if_octets", i->name, (derive_t)i->rx_bytes, + (derive_t)i->tx_bytes); + cr_submit_io(rd, "if_errors", i->name, (derive_t)i->rx_errors, + (derive_t)i->tx_errors); + cr_submit_io(rd, "if_dropped", i->name, (derive_t)i->rx_drops, + (derive_t)i->tx_drops); - submit_interface (rd, i->next); + submit_interface(rd, i->next); } /* }}} void submit_interface */ -static int handle_interface (__attribute__((unused)) ros_connection_t *c, /* {{{ */ - const ros_interface_t *i, void *user_data) -{ +static int handle_interface(__attribute__((unused)) + ros_connection_t *c, /* {{{ */ + const ros_interface_t *i, + void *user_data) { if ((i == NULL) || (user_data == NULL)) - return (EINVAL); + return EINVAL; - submit_interface (user_data, i); - return (0); + submit_interface(user_data, i); + return 0; } /* }}} int handle_interface */ -static void cr_submit_gauge (cr_data_t *rd, const char *type, /* {{{ */ - const char *type_instance, gauge_t value) -{ - value_t values[1]; - value_list_t vl = VALUE_LIST_INIT; +static void cr_submit_gauge(cr_data_t *rd, const char *type, /* {{{ */ + const char *type_instance, gauge_t value) { + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = value; + values[0].gauge = value; - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, rd->node, sizeof (vl.host)); - sstrncpy (vl.plugin, "routeros", sizeof (vl.plugin)); - sstrncpy (vl.type, type, sizeof (vl.type)); - sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); + vl.values = values; + vl.values_len = STATIC_ARRAY_SIZE(values); + sstrncpy(vl.host, rd->node, sizeof(vl.host)); + sstrncpy(vl.plugin, "routeros", sizeof(vl.plugin)); + sstrncpy(vl.type, type, sizeof(vl.type)); + sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance)); - plugin_dispatch_values (&vl); + plugin_dispatch_values(&vl); } /* }}} void cr_submit_gauge */ #if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) -static void cr_submit_counter (cr_data_t *rd, const char *type, /* {{{ */ - const char *type_instance, derive_t value) -{ - value_t values[1]; - value_list_t vl = VALUE_LIST_INIT; +static void cr_submit_counter(cr_data_t *rd, const char *type, /* {{{ */ + const char *type_instance, derive_t value) { + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; - values[0].derive = value; + values[0].derive = value; - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, rd->node, sizeof (vl.host)); - sstrncpy (vl.plugin, "routeros", sizeof (vl.plugin)); - sstrncpy (vl.type, type, sizeof (vl.type)); - sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); + vl.values = values; + vl.values_len = STATIC_ARRAY_SIZE(values); + sstrncpy(vl.host, rd->node, sizeof(vl.host)); + sstrncpy(vl.plugin, "routeros", sizeof(vl.plugin)); + sstrncpy(vl.type, type, sizeof(vl.type)); + sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance)); - plugin_dispatch_values (&vl); + plugin_dispatch_values(&vl); } /* }}} void cr_submit_gauge */ #endif -static void submit_regtable (cr_data_t *rd, /* {{{ */ - const ros_registration_table_t *r) -{ +static void submit_regtable(cr_data_t *rd, /* {{{ */ + const ros_registration_table_t *r) { char type_instance[DATA_MAX_NAME_LEN]; if (r == NULL) return; /*** RX ***/ - ssnprintf (type_instance, sizeof (type_instance), "%s-%s-rx", - r->interface, r->radio_name); - cr_submit_gauge (rd, "bitrate", type_instance, - (gauge_t) (1000000.0 * r->rx_rate)); - cr_submit_gauge (rd, "signal_power", type_instance, - (gauge_t) r->rx_signal_strength); - cr_submit_gauge (rd, "signal_quality", type_instance, - (gauge_t) r->rx_ccq); + snprintf(type_instance, sizeof(type_instance), "%s-%s-rx", r->interface, + r->radio_name); + cr_submit_gauge(rd, "bitrate", type_instance, + (gauge_t)(1000000.0 * r->rx_rate)); + cr_submit_gauge(rd, "signal_power", type_instance, + (gauge_t)r->rx_signal_strength); + cr_submit_gauge(rd, "signal_quality", type_instance, (gauge_t)r->rx_ccq); /*** TX ***/ - ssnprintf (type_instance, sizeof (type_instance), "%s-%s-tx", - r->interface, r->radio_name); - cr_submit_gauge (rd, "bitrate", type_instance, - (gauge_t) (1000000.0 * r->tx_rate)); - cr_submit_gauge (rd, "signal_power", type_instance, - (gauge_t) r->tx_signal_strength); - cr_submit_gauge (rd, "signal_quality", type_instance, - (gauge_t) r->tx_ccq); + snprintf(type_instance, sizeof(type_instance), "%s-%s-tx", r->interface, + r->radio_name); + cr_submit_gauge(rd, "bitrate", type_instance, + (gauge_t)(1000000.0 * r->tx_rate)); + cr_submit_gauge(rd, "signal_power", type_instance, + (gauge_t)r->tx_signal_strength); + cr_submit_gauge(rd, "signal_quality", type_instance, (gauge_t)r->tx_ccq); /*** RX / TX ***/ - ssnprintf (type_instance, sizeof (type_instance), "%s-%s", - r->interface, r->radio_name); - 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); + snprintf(type_instance, sizeof(type_instance), "%s-%s", r->interface, + r->radio_name); + 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); - submit_regtable (rd, r->next); + submit_regtable(rd, r->next); } /* }}} void submit_regtable */ -static int handle_regtable (__attribute__((unused)) ros_connection_t *c, /* {{{ */ - const ros_registration_table_t *r, void *user_data) -{ +static int handle_regtable(__attribute__((unused)) + ros_connection_t *c, /* {{{ */ + const ros_registration_table_t *r, + void *user_data) { if ((r == NULL) || (user_data == NULL)) - return (EINVAL); + return EINVAL; - submit_regtable (user_data, r); - return (0); + submit_regtable(user_data, r); + return 0; } /* }}} int handle_regtable */ #if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) -static int handle_system_resource (__attribute__((unused)) ros_connection_t *c, /* {{{ */ - const ros_system_resource_t *r, - __attribute__((unused)) void *user_data) -{ +static int handle_system_resource(__attribute__((unused)) + ros_connection_t *c, /* {{{ */ + const ros_system_resource_t *r, + __attribute__((unused)) void *user_data) { cr_data_t *rd; if ((r == NULL) || (user_data == NULL)) - return (EINVAL); + return EINVAL; rd = user_data; if (rd->collect_cpu_load) - cr_submit_gauge (rd, "gauge", "cpu_load", (gauge_t) r->cpu_load); + cr_submit_gauge(rd, "gauge", "cpu_load", (gauge_t)r->cpu_load); - if (rd->collect_memory) - { - cr_submit_gauge (rd, "memory", "used", - (gauge_t) (r->total_memory - r->free_memory)); - cr_submit_gauge (rd, "memory", "free", (gauge_t) r->free_memory); + if (rd->collect_memory) { + cr_submit_gauge(rd, "memory", "used", + (gauge_t)(r->total_memory - r->free_memory)); + cr_submit_gauge(rd, "memory", "free", (gauge_t)r->free_memory); } - if (rd->collect_df) - { - cr_submit_gauge (rd, "df_complex", "used", - (gauge_t) (r->total_memory - r->free_memory)); - cr_submit_gauge (rd, "df_complex", "free", (gauge_t) r->free_memory); + if (rd->collect_df) { + cr_submit_gauge(rd, "df_complex", "used", + (gauge_t)(r->total_memory - r->free_memory)); + cr_submit_gauge(rd, "df_complex", "free", (gauge_t)r->free_memory); } - if (rd->collect_disk) - { - cr_submit_counter (rd, "counter", "secors_written", (derive_t) r->write_sect_total); - cr_submit_gauge (rd, "gauge", "bad_blocks", (gauge_t) r->bad_blocks); + if (rd->collect_disk) { + cr_submit_counter(rd, "counter", "secors_written", + (derive_t)r->write_sect_total); + cr_submit_gauge(rd, "gauge", "bad_blocks", (gauge_t)r->bad_blocks); } - return (0); + return 0; } /* }}} int handle_system_resource */ #endif -static int cr_read (user_data_t *user_data) /* {{{ */ +static int cr_read(user_data_t *user_data) /* {{{ */ { int status; cr_data_t *rd; if (user_data == NULL) - return (EINVAL); + return EINVAL; rd = user_data->data; if (rd == NULL) - return (EINVAL); - - if (rd->connection == NULL) - { - rd->connection = ros_connect (rd->node, rd->service, - rd->username, rd->password); - if (rd->connection == NULL) - { - char errbuf[128]; - ERROR ("routeros plugin: ros_connect failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - return (-1); + return EINVAL; + + if (rd->connection == NULL) { + rd->connection = + ros_connect(rd->node, rd->service, rd->username, rd->password); + if (rd->connection == NULL) { + ERROR("routeros plugin: ros_connect failed: %s", STRERRNO); + return -1; } } - assert (rd->connection != NULL); + assert(rd->connection != NULL); - if (rd->collect_interface) - { - status = ros_interface (rd->connection, handle_interface, - /* user data = */ rd); - if (status != 0) - { + if (rd->collect_interface) { + status = ros_interface(rd->connection, handle_interface, + /* user data = */ rd); + if (status != 0) { char errbuf[128]; - ERROR ("routeros plugin: ros_interface failed: %s", - sstrerror (status, errbuf, sizeof (errbuf))); - ros_disconnect (rd->connection); + ERROR("routeros plugin: ros_interface failed: %s", + sstrerror(status, errbuf, sizeof(errbuf))); + ros_disconnect(rd->connection); rd->connection = NULL; - return (-1); + return -1; } } - if (rd->collect_regtable) - { - status = ros_registration_table (rd->connection, handle_regtable, - /* user data = */ rd); - if (status != 0) - { + if (rd->collect_regtable) { + status = ros_registration_table(rd->connection, handle_regtable, + /* user data = */ rd); + if (status != 0) { char errbuf[128]; - ERROR ("routeros plugin: ros_registration_table failed: %s", - sstrerror (status, errbuf, sizeof (errbuf))); - ros_disconnect (rd->connection); + ERROR("routeros plugin: ros_registration_table failed: %s", + sstrerror(status, errbuf, sizeof(errbuf))); + ros_disconnect(rd->connection); rd->connection = NULL; - return (-1); + return -1; } } #if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) - if (rd->collect_cpu_load - || rd->collect_memory - || rd->collect_df - || rd->collect_disk) - { - status = ros_system_resource (rd->connection, handle_system_resource, - /* user data = */ rd); - if (status != 0) - { + if (rd->collect_cpu_load || rd->collect_memory || rd->collect_df || + rd->collect_disk) { + status = ros_system_resource(rd->connection, handle_system_resource, + /* user data = */ rd); + if (status != 0) { char errbuf[128]; - ERROR ("routeros plugin: ros_system_resource failed: %s", - sstrerror (status, errbuf, sizeof (errbuf))); - ros_disconnect (rd->connection); + ERROR("routeros plugin: ros_system_resource failed: %s", + sstrerror(status, errbuf, sizeof(errbuf))); + ros_disconnect(rd->connection); rd->connection = NULL; - return (-1); + return -1; } } #endif - return (0); + return 0; } /* }}} int cr_read */ -static void cr_free_data (cr_data_t *ptr) /* {{{ */ +static void cr_free_data(cr_data_t *ptr) /* {{{ */ { if (ptr == NULL) return; - ros_disconnect (ptr->connection); + ros_disconnect(ptr->connection); ptr->connection = NULL; - sfree (ptr->node); - sfree (ptr->service); - sfree (ptr->username); - sfree (ptr->password); + sfree(ptr->node); + sfree(ptr->service); + sfree(ptr->username); + sfree(ptr->password); - sfree (ptr); + sfree(ptr); } /* }}} void cr_free_data */ -static int cr_config_router (oconfig_item_t *ci) /* {{{ */ +static int cr_config_router(oconfig_item_t *ci) /* {{{ */ { cr_data_t *router_data; char read_name[128]; - user_data_t user_data; int status; - router_data = calloc (1, sizeof (*router_data)); + router_data = calloc(1, sizeof(*router_data)); if (router_data == NULL) - return (-1); + return -1; router_data->connection = NULL; router_data->node = NULL; router_data->service = NULL; @@ -338,109 +315,94 @@ static int cr_config_router (oconfig_item_t *ci) /* {{{ */ router_data->password = NULL; status = 0; - for (int i = 0; i < ci->children_num; i++) - { + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Host", child->key) == 0) - status = cf_util_get_string (child, &router_data->node); - else if (strcasecmp ("Port", child->key) == 0) - status = cf_util_get_service (child, &router_data->service); - else if (strcasecmp ("User", child->key) == 0) - status = cf_util_get_string (child, &router_data->username); - else if (strcasecmp ("Password", child->key) == 0) - status = cf_util_get_string (child, &router_data->password); - else if (strcasecmp ("CollectInterface", child->key) == 0) - cf_util_get_boolean (child, &router_data->collect_interface); - else if (strcasecmp ("CollectRegistrationTable", child->key) == 0) - cf_util_get_boolean (child, &router_data->collect_regtable); + if (strcasecmp("Host", child->key) == 0) + status = cf_util_get_string(child, &router_data->node); + else if (strcasecmp("Port", child->key) == 0) + status = cf_util_get_service(child, &router_data->service); + else if (strcasecmp("User", child->key) == 0) + status = cf_util_get_string(child, &router_data->username); + else if (strcasecmp("Password", child->key) == 0) + status = cf_util_get_string(child, &router_data->password); + else if (strcasecmp("CollectInterface", child->key) == 0) + cf_util_get_boolean(child, &router_data->collect_interface); + else if (strcasecmp("CollectRegistrationTable", child->key) == 0) + cf_util_get_boolean(child, &router_data->collect_regtable); #if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) - else if (strcasecmp ("CollectCPULoad", child->key) == 0) - cf_util_get_boolean (child, &router_data->collect_cpu_load); - else if (strcasecmp ("CollectMemory", child->key) == 0) - cf_util_get_boolean (child, &router_data->collect_memory); - else if (strcasecmp ("CollectDF", child->key) == 0) - cf_util_get_boolean (child, &router_data->collect_df); - else if (strcasecmp ("CollectDisk", child->key) == 0) - cf_util_get_boolean (child, &router_data->collect_disk); + else if (strcasecmp("CollectCPULoad", child->key) == 0) + cf_util_get_boolean(child, &router_data->collect_cpu_load); + else if (strcasecmp("CollectMemory", child->key) == 0) + cf_util_get_boolean(child, &router_data->collect_memory); + else if (strcasecmp("CollectDF", child->key) == 0) + cf_util_get_boolean(child, &router_data->collect_df); + else if (strcasecmp("CollectDisk", child->key) == 0) + cf_util_get_boolean(child, &router_data->collect_disk); #endif - else - { - WARNING ("routeros plugin: Unknown config option `%s'.", child->key); + else { + WARNING("routeros plugin: Unknown config option `%s'.", child->key); } if (status != 0) break; } - if (status == 0) - { - if (router_data->node == NULL) - { - ERROR ("routeros plugin: No `Host' option within a `Router' block. " - "Where should I connect to?"); + if (status == 0) { + if (router_data->node == NULL) { + ERROR("routeros plugin: No `Host' option within a `Router' block. " + "Where should I connect to?"); status = -1; } - if (router_data->password == NULL) - { - ERROR ("routeros plugin: No `Password' option within a `Router' block. " - "How should I authenticate?"); + if (router_data->password == NULL) { + ERROR("routeros plugin: No `Password' option within a `Router' block. " + "How should I authenticate?"); status = -1; } - if (!router_data->collect_interface - && !router_data->collect_regtable) - { - ERROR ("routeros plugin: No `Collect*' option within a `Router' block. " - "What statistics should I collect?"); + if (!router_data->collect_interface && !router_data->collect_regtable) { + ERROR("routeros plugin: No `Collect*' option within a `Router' block. " + "What statistics should I collect?"); status = -1; } } - if ((status == 0) && (router_data->username == NULL)) - { - router_data->username = sstrdup ("admin"); - if (router_data->username == NULL) - { - ERROR ("routeros plugin: sstrdup failed."); + if ((status == 0) && (router_data->username == NULL)) { + router_data->username = sstrdup("admin"); + if (router_data->username == NULL) { + ERROR("routeros plugin: sstrdup failed."); status = -1; } } - ssnprintf (read_name, sizeof (read_name), "routeros/%s", router_data->node); - user_data.data = router_data; - user_data.free_func = (void *) cr_free_data; - if (status == 0) - status = plugin_register_complex_read (/* group = */ NULL, read_name, - cr_read, /* interval = */ 0, &user_data); - - if (status != 0) - cr_free_data (router_data); + if (status != 0) { + cr_free_data(router_data); + return status; + } - return (status); + snprintf(read_name, sizeof(read_name), "routeros/%s", router_data->node); + return plugin_register_complex_read( + /* group = */ NULL, read_name, cr_read, /* interval = */ 0, + &(user_data_t){ + .data = router_data, .free_func = (void *)cr_free_data, + }); } /* }}} int cr_config_router */ -static int cr_config (oconfig_item_t *ci) -{ - for (int i = 0; i < ci->children_num; i++) - { +static int cr_config(oconfig_item_t *ci) { + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Router", child->key) == 0) - cr_config_router (child); - else - { - WARNING ("routeros plugin: Unknown config option `%s'.", child->key); + if (strcasecmp("Router", child->key) == 0) + cr_config_router(child); + else { + WARNING("routeros plugin: Unknown config option `%s'.", child->key); } } - return (0); + return 0; } /* }}} int cr_config */ -void module_register (void) -{ - plugin_register_complex_config ("routeros", cr_config); +void module_register(void) { + plugin_register_complex_config("routeros", cr_config); } /* void module_register */ - -/* vim: set sw=2 noet fdm=marker : */