From cf191cf7843ff95a1e52a4e9501a2dfdcf59c53b Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 7 Dec 2009 11:48:16 +0100 Subject: [PATCH] openvpn plugin: Rename the arguments of the submit functions. "Type" is being used for something different, don't use that argument name here. --- src/openvpn.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/openvpn.c b/src/openvpn.c index 0bc69dd4..c71071c0 100644 --- a/src/openvpn.c +++ b/src/openvpn.c @@ -85,9 +85,8 @@ static int openvpn_strsplit (char *string, char **fields, size_t size) return (i); } /* int openvpn_strsplit */ - /* dispatches stats about traffic (TCP or UDP) generated by the tunnel per single endpoint */ -static void iostats_submit (char *name, char *type, counter_t rx, counter_t tx) +static void iostats_submit (char *pinst, char *tinst, counter_t rx, counter_t tx) { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; @@ -105,23 +104,19 @@ static void iostats_submit (char *name, char *type, counter_t rx, counter_t tx) vl.values_len = STATIC_ARRAY_SIZE (values); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "openvpn", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, name, sizeof (vl.plugin_instance)); - - if (type) /* new naming schema - improved naming schema option */ - { - sstrncpy (vl.type, "io_octets", sizeof (vl.type)); - sstrncpy (vl.type_instance, type, sizeof (vl.type_instance)); - } - else /* old naming schema (multicontext only): plugin_instance = hostname rather than filename */ - { - sstrncpy (vl.type, "if_octets", sizeof (vl.type)); - } + if (pinst != NULL) + sstrncpy (vl.plugin_instance, pinst, + sizeof (vl.plugin_instance)); + sstrncpy (vl.type, "if_octets", sizeof (vl.type)); + if (tinst != NULL) + sstrncpy (vl.type_instance, tinst, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); } /* void traffic_submit */ /* dispatches stats about data compression shown when in single mode */ -static void compression_submit (char *name, char *type, counter_t uncompressed, counter_t compressed) +static void compression_submit (char *pinst, char *tinst, + counter_t uncompressed, counter_t compressed) { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; @@ -133,9 +128,12 @@ static void compression_submit (char *name, char *type, counter_t uncompressed, vl.values_len = STATIC_ARRAY_SIZE (values); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "openvpn", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, name, sizeof (vl.plugin_instance)); + if (pinst != NULL) + sstrncpy (vl.plugin_instance, pinst, + sizeof (vl.plugin_instance)); sstrncpy (vl.type, "compression", sizeof (vl.type)); - sstrncpy (vl.type_instance, type, sizeof (vl.type_instance)); + if (tinst != NULL) + sstrncpy (vl.type_instance, tinst, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); } /* void compression_submit */ -- 2.11.0