X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Frouteros.c;h=4ca9d5b2e77e6b3d059aee2e1d656b0d62cbf292;hp=a020692e4b1b5a1a26dd906a42fc2050fac4c96d;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hpb=48972087d132bca8221e01e0a556bcc39768dde4 diff --git a/src/routeros.c b/src/routeros.c index a020692e..4ca9d5b2 100644 --- a/src/routeros.c +++ b/src/routeros.c @@ -1,22 +1,27 @@ /** * collectd - src/routeros.c - * Copyright (C) 2009 Florian octo Forster + * Copyright (C) 2009,2010 Florian octo Forster * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" @@ -44,13 +49,13 @@ 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, counter_t rx, counter_t tx) + const char *type_instance, derive_t rx, derive_t tx) { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - values[0].counter = rx; - values[1].counter = tx; + values[0].derive = rx; + values[1].derive = tx; vl.values = values; vl.values_len = STATIC_ARRAY_SIZE (values); @@ -75,13 +80,13 @@ static void submit_interface (cr_data_t *rd, /* {{{ */ } cr_submit_io (rd, "if_packets", i->name, - (counter_t) i->rx_packets, (counter_t) i->tx_packets); + (derive_t) i->rx_packets, (derive_t) i->tx_packets); cr_submit_io (rd, "if_octets", i->name, - (counter_t) i->rx_bytes, (counter_t) i->tx_bytes); + (derive_t) i->rx_bytes, (derive_t) i->tx_bytes); cr_submit_io (rd, "if_errors", i->name, - (counter_t) i->rx_errors, (counter_t) i->tx_errors); + (derive_t) i->rx_errors, (derive_t) i->tx_errors); cr_submit_io (rd, "if_dropped", i->name, - (counter_t) i->rx_drops, (counter_t) i->tx_drops); + (derive_t) i->rx_drops, (derive_t) i->tx_drops); submit_interface (rd, i->next); } /* }}} void submit_interface */ @@ -116,16 +121,16 @@ static void cr_submit_gauge (cr_data_t *rd, const char *type, /* {{{ */ #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, counter_t value) + const char *type_instance, derive_t value) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].counter = value; + values[0].derive = value; vl.values = values; vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, rd->node, sizeof (vl.host)); /* FIXME */ + 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)); @@ -166,7 +171,7 @@ static void submit_regtable (cr_data_t *rd, /* {{{ */ ssnprintf (type_instance, sizeof (type_instance), "%s-%s", r->interface, r->radio_name); cr_submit_io (rd, "if_octets", type_instance, - (counter_t) r->rx_bytes, (counter_t) r->tx_bytes); + (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); @@ -182,7 +187,7 @@ static int handle_regtable (__attribute__((unused)) ros_connection_t *c, /* {{{ return (0); } /* }}} int handle_regtable */ -#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) /* FIXME */ +#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) @@ -212,7 +217,7 @@ static int handle_system_resource (__attribute__((unused)) ros_connection_t *c, if (rd->collect_disk) { - cr_submit_counter (rd, "counter", "secors_written", (counter_t) r->write_sect_total); + 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); } @@ -276,7 +281,7 @@ static int cr_read (user_data_t *user_data) /* {{{ */ } } -#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) /* FIXME */ +#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) if (rd->collect_cpu_load || rd->collect_memory || rd->collect_df @@ -341,7 +346,7 @@ static int cr_config_router (oconfig_item_t *ci) /* {{{ */ 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_string (child, &router_data->service); + 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) @@ -350,7 +355,7 @@ static int cr_config_router (oconfig_item_t *ci) /* {{{ */ 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) /* FIXME */ +#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)