If `ping_add_host' failes, `ping_config' no longer returns an error condition. This...

[collectd.git] / src / ping.c

diff --git a/src/ping.c b/src/ping.c
index bdb8de9..303b278 100644 (file)
--- a/src/ping.c
+++ b/src/ping.c
@@ -24,17 +24,14 @@
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
+#include "utils_debug.h"
 
 #define MODULE_NAME "ping"
 
 #include <netinet/in.h>
-#include "libping/ping.h"
+#include "liboping/liboping.h"
 
-#define MAX_PINGHOSTS 32
-
-extern char *pinghosts[MAX_PINGHOSTS];
-extern int   num_pinghosts;
-static int   pingerrors[MAX_PINGHOSTS];
+static pingobj_t *pingobj = NULL;
 
 static char *file_template = "ping-%s.rrd";
 
@@ -54,11 +51,6 @@ static int config_keys_num = 1;
 
 static void ping_init (void)
 {
-       int i;
-
-       for (i = 0; i < num_pinghosts; i++)
-               pingerrors[i] = 0;
-
        return;
 }
 
@@ -68,20 +60,22 @@ static int ping_config (char *key, char *value)
        {
                return (-1);
        }
-       else if (num_pinghosts >= MAX_PINGHOSTS)
-       {
-               return (1);
-       }
-       else if ((pinghosts[num_pinghosts] = strdup (value)) == NULL)
+
+       if (pingobj == NULL)
        {
-               return (2);
+               if ((pingobj = ping_construct ()) == NULL)
+               {
+                       syslog (LOG_ERR, "ping: `ping_construct' failed.\n");
+                       return (-1);
+               }
        }
-       else
+
+       if (ping_host_add (pingobj, value) < 0)
        {
-               pingerrors[num_pinghosts] = 0;
-               num_pinghosts++;
-               return (0);
+               syslog (LOG_WARNING, "ping: `ping_host_add' failed.\n");
        }
+
+       return (0);
 }
 
 static void ping_write (char *host, char *inst, char *val)
@@ -99,11 +93,11 @@ static void ping_write (char *host, char *inst, char *val)
 }
 
 #define BUFSIZE 256
-static void ping_submit (int ping_time, char *host)
+static void ping_submit (char *host, double latency)
 {
        char buf[BUFSIZE];
 
-       if (snprintf (buf, BUFSIZE, "%u:%u", (unsigned int) curtime, ping_time) >= BUFSIZE)
+       if (snprintf (buf, BUFSIZE, "%u:%f", (unsigned int) curtime, latency) >= BUFSIZE)
                return;
 
        plugin_submit (MODULE_NAME, host, buf);
@@ -112,48 +106,36 @@ static void ping_submit (int ping_time, char *host)
 
 static void ping_read (void)
 {
-       int ping;
-       int i;
+       pingobj_iter_t *iter;
+
+       char   *host;
+       double  latency;
+
+       if (pingobj == NULL)
+               return;
+
+       if (ping_send (pingobj) < 0)
+       {
+               syslog (LOG_ERR, "ping: `ping_send' failed.");
+               return;
+       }
 
-       for (i = 0; i < num_pinghosts; i++)
+       for (iter = ping_iterator_get (pingobj); iter != NULL; iter = ping_iterator_next (iter))
        {
-               if (pingerrors[i] & 0x30)
+               const char *tmp;
+
+               if ((tmp = ping_iterator_get_host (iter)) == NULL)
+                       continue;
+               if ((host = strdup (tmp)) == NULL)
                        continue;
-               
-               ping = tpinghost (pinghosts[i]);
 
-               switch (ping)
-               {
-                       case 0:
-                               if (!(pingerrors[i] & 0x01))
-                                       syslog (LOG_WARNING, "ping %s: Connection timed out.", pinghosts[i]);
-                               pingerrors[i] |= 0x01;
-                               break;
-
-                       case -1:
-                               if (!(pingerrors[i] & 0x02))
-                                       syslog (LOG_WARNING, "ping %s: Host or service is not reachable.", pinghosts[i]);
-                               pingerrors[i] |= 0x02;
-                               break;
-
-                       case -2:
-                               syslog (LOG_ERR, "ping %s: Socket error. Ping will be disabled.", pinghosts[i]);
-                               pingerrors[i] |= 0x10;
-                               break;
-
-                       case -3:
-                               if (!(pingerrors[i] & 0x04))
-                                       syslog (LOG_WARNING, "ping %s: Connection refused.", pinghosts[i]);
-                               pingerrors[i] |= 0x04;
-                               break;
-
-                       default:
-                               if (pingerrors[i] != 0x00)
-                                       syslog (LOG_NOTICE, "ping %s: Back to normal: %ims.", pinghosts[i], ping);
-                               pingerrors[i] = 0x00;
-                               ping_submit (ping, pinghosts[i]);
-               } /* switch (ping) */
-       } /* for (i = 0; i < num_pinghosts; i++) */
+               latency = ping_iterator_get_latency (iter);
+
+               DBG ("host = %s, latency = %f", host, latency);
+               ping_submit (host, latency);
+
+               free (host); host = NULL;
+       }
 }
 
 void module_register (void)