Various plugins: Convert more plugins to use "derive" instead of "counter".

[collectd.git] / src / ipvs.c

diff --git a/src/ipvs.c b/src/ipvs.c
index 4c63058..ab76f1e 100644 (file)
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -54,18 +54,14 @@
 #define log_err(...) ERROR ("ipvs: " __VA_ARGS__)
 #define log_info(...) INFO ("ipvs: " __VA_ARGS__)
 
-
 /*
  * private variables
  */
-
-static int   sockfd    = -1;
-
+static int sockfd = -1;
 
 /*
  * libipvs API
  */
-
 static struct ip_vs_get_services *ipvs_get_services (void)
 {
        struct ip_vs_getinfo       ipvs_info;
@@ -134,11 +130,9 @@ static struct ip_vs_get_dests *ipvs_get_dests (struct ip_vs_service_entry *se)
        return ret;
 } /* ip_vs_get_dests */
 
-
 /*
  * collectd plugin API and helper functions
  */
-
 static int cipvs_init (void)
 {
        struct ip_vs_getinfo ipvs_info;
@@ -160,6 +154,7 @@ static int cipvs_init (void)
                log_err ("cipvs_init: getsockopt() failed: %s",
                                sstrerror (errno, errbuf, sizeof (errbuf)));
                close (sockfd);
+               sockfd = -1;
                return -1;
        }
 
@@ -168,6 +163,7 @@ static int cipvs_init (void)
                log_err ("cipvs_init: IPVS version too old (%d.%d.%d < %d.%d.%d)",
                                NVERSION (ipvs_info.version), 1, 1, 4);
                close (sockfd);
+               sockfd = -1;
                return -1;
        }
        else {
@@ -195,7 +191,7 @@ static int get_pi (struct ip_vs_service_entry *se, char *pi, size_t size)
 
        /* inet_ntoa() returns a pointer to a statically allocated buffer
         * I hope non-glibc systems behave the same */
-       len = snprintf (pi, size, "%s_%s%u", inet_ntoa (addr),
+       len = ssnprintf (pi, size, "%s_%s%u", inet_ntoa (addr),
                        (se->protocol == IPPROTO_TCP) ? "TCP" : "UDP",
                        ntohs (se->port));
 
@@ -219,7 +215,7 @@ static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size)
 
        /* inet_ntoa() returns a pointer to a statically allocated buffer
         * I hope non-glibc systems behave the same */
-       len = snprintf (ti, size, "%s_%u", inet_ntoa (addr),
+       len = ssnprintf (ti, size, "%s_%u", inet_ntoa (addr),
                        ntohs (de->port));
 
        if ((0 > len) || (size <= len)) {
@@ -229,49 +225,47 @@ static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size)
        return 0;
 } /* get_ti */
 
-static void cipvs_submit_connections (char *pi, char *ti, counter_t value)
+static void cipvs_submit_connections (char *pi, char *ti, 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 = 1;
 
-       vl.time     = time (NULL);
-       vl.interval = interval_g;
-
-       strcpy (vl.host, hostname_g);
-       strcpy (vl.plugin, "ipvs");
-       strcpy (vl.plugin_instance, pi);
-       strcpy (vl.type_instance, (NULL != ti) ? ti : "total");
+       sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+       sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin));
+       sstrncpy (vl.plugin_instance, pi, sizeof (vl.plugin_instance));
+       sstrncpy (vl.type, "connections", sizeof (vl.type));
+       sstrncpy (vl.type_instance, (NULL != ti) ? ti : "total",
+               sizeof (vl.type_instance));
 
-       plugin_dispatch_values ("connections", &vl);
+       plugin_dispatch_values (&vl);
        return;
 } /* cipvs_submit_connections */
 
 static void cipvs_submit_if (char *pi, char *t, char *ti,
-               counter_t rx, counter_t tx)
+               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 = 2;
 
-       vl.time     = time (NULL);
-       vl.interval = interval_g;
+       sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+       sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin));
+       sstrncpy (vl.plugin_instance, pi, sizeof (vl.plugin_instance));
+       sstrncpy (vl.type, t, sizeof (vl.type));
+       sstrncpy (vl.type_instance, (NULL != ti) ? ti : "total",
+               sizeof (vl.type_instance));
 
-       strcpy (vl.host, hostname_g);
-       strcpy (vl.plugin, "ipvs");
-       strcpy (vl.plugin_instance, pi);
-       strcpy (vl.type_instance, (NULL != ti) ? ti : "total");
-
-       plugin_dispatch_values (t, &vl);
+       plugin_dispatch_values (&vl);
        return;
 } /* cipvs_submit_if */
 
@@ -280,7 +274,7 @@ static void cipvs_submit_dest (char *pi, struct ip_vs_dest_entry *de) {
 
        char ti[DATA_MAX_NAME_LEN];
 
-       if (0 != get_ti (de, ti, DATA_MAX_NAME_LEN))
+       if (0 != get_ti (de, ti, sizeof (ti)))
                return;
 
        cipvs_submit_connections (pi, ti, stats.conns);
@@ -298,7 +292,7 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se)
 
        int i = 0;
 
-       if (0 != get_pi (se, pi, DATA_MAX_NAME_LEN))
+       if (0 != get_pi (se, pi, sizeof (pi)))
                return;
 
        cipvs_submit_connections (pi, NULL, stats.conns);
@@ -315,9 +309,11 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se)
 static int cipvs_read (void)
 {
        struct ip_vs_get_services *services = NULL;
-
        int i = 0;
 
+       if (sockfd < 0)
+               return (-1);
+
        if (NULL == (services = ipvs_get_services ()))
                return -1;
 
@@ -330,7 +326,10 @@ static int cipvs_read (void)
 
 static int cipvs_shutdown (void)
 {
-       close (sockfd);
+       if (sockfd >= 0)
+               close (sockfd);
+       sockfd = -1;
+
        return 0;
 } /* cipvs_shutdown */
 
@@ -343,4 +342,3 @@ void module_register (void)
 } /* module_register */
 
 /* vim: set sw=4 ts=4 tw=78 noexpandtab : */
-