X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fping.c;h=2a2f03eb39b80f062b652d4240c8fd3cddcee849;hb=refs%2Fheads%2Fcollectd-3.11;hp=661aa65f07fd39d20104c9d1bc00e6697b12b2cc;hpb=d3b918437ab91f7ad9c12f9157c6a19f973a64c4;p=collectd.git diff --git a/src/ping.c b/src/ping.c index 661aa65f..2a2f03eb 100644 --- a/src/ping.c +++ b/src/ping.c @@ -1,6 +1,6 @@ /** * collectd - src/ping.c - * Copyright (C) 2005 Florian octo Forster + * Copyright (C) 2005,2006 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 @@ -24,25 +24,30 @@ #include "common.h" #include "plugin.h" #include "configfile.h" +#include "utils_debug.h" #define MODULE_NAME "ping" #include -#include "libping/ping.h" +#include "liboping/oping.h" -#define MAX_PINGHOSTS 32 +struct hostlist_s +{ + char *host; + int wait_time; + int wait_left; + struct hostlist_s *next; +}; +typedef struct hostlist_s hostlist_t; -static char *hosts[MAX_PINGHOSTS]; -static int hosts_flags[MAX_PINGHOSTS]; -static int hosts_disable[MAX_PINGHOSTS]; -static int hosts_backoff[MAX_PINGHOSTS]; -static int num_pinghosts; +static pingobj_t *pingobj = NULL; +static hostlist_t *hosts = NULL; static char *file_template = "ping-%s.rrd"; static char *ds_def[] = { - "DS:ping:GAUGE:25:0:65535", + "DS:ping:GAUGE:"COLLECTD_HEARTBEAT":0:65535", NULL }; static int ds_num = 1; @@ -50,44 +55,119 @@ static int ds_num = 1; static char *config_keys[] = { "Host", + "TTL", NULL }; -static int config_keys_num = 1; +static int config_keys_num = 2; -static void ping_init (void) +static void add_hosts (void) { - int i; + hostlist_t *hl_this; + hostlist_t *hl_prev; - for (i = 0; i < MAX_PINGHOSTS; i++) + int step = atoi (COLLECTD_STEP); + + hl_this = hosts; + hl_prev = NULL; + while (hl_this != NULL) { - hosts_flags[i] = 0; - hosts_disable[i] = 0; - hosts_backoff[i] = 1; + DBG ("host = %s, wait_left = %i, wait_time = %i, next = %p", + hl_this->host, hl_this->wait_left, hl_this->wait_time, (void *) hl_this->next); + + if (hl_this->wait_left <= 0) + { + if (ping_host_add (pingobj, hl_this->host) == 0) + { + DBG ("Successfully added host %s", hl_this->host); + /* Remove the host from the linked list */ + if (hl_prev != NULL) + hl_prev->next = hl_this->next; + else + hosts = hl_this->next; + free (hl_this->host); + free (hl_this); + hl_this = (hl_prev != NULL) ? hl_prev : hosts; + } + else + { + hl_this->wait_left = hl_this->wait_time; + hl_this->wait_time *= 2; + if (hl_this->wait_time > 86400) + hl_this->wait_time = 86400; + } + } + else + { + hl_this->wait_left -= step; + } + + if (hl_this != NULL) + { + hl_prev = hl_this; + hl_this = hl_this->next; + } } +} - return; +static void ping_init (void) +{ + if (hosts != NULL) + add_hosts (); } static int ping_config (char *key, char *value) { - if (strcasecmp (key, "host")) + if (pingobj == NULL) { - return (-1); + if ((pingobj = ping_construct ()) == NULL) + { + syslog (LOG_ERR, "ping: `ping_construct' failed: %s", + ping_get_error (pingobj)); + return (1); + } } - else if (num_pinghosts >= MAX_PINGHOSTS) + + if (strcasecmp (key, "host") == 0) { - return (1); + hostlist_t *hl; + char *host; + int step = atoi (COLLECTD_STEP); + + if ((hl = (hostlist_t *) malloc (sizeof (hostlist_t))) == NULL) + { + syslog (LOG_ERR, "ping plugin: malloc failed: %s", + strerror (errno)); + return (1); + } + if ((host = strdup (value)) == NULL) + { + free (hl); + syslog (LOG_ERR, "ping plugin: strdup failed: %s", + strerror (errno)); + return (1); + } + + hl->host = host; + hl->wait_time = 2 * step; + hl->wait_left = 0; + hl->next = hosts; + hosts = hl; } - else if ((hosts[num_pinghosts] = strdup (value)) == NULL) + else if (strcasecmp (key, "ttl") == 0) { - return (2); + int ttl = atoi (value); + if (ping_setopt (pingobj, PING_DEF_TIMEOUT, (void *) &ttl)) + { + syslog (LOG_WARNING, "ping: liboping did not accept the TTL value %i", ttl); + return (1); + } } else { - hosts_flags[num_pinghosts] = 0; - num_pinghosts++; - return (0); + return (-1); } + + return (0); } static void ping_write (char *host, char *inst, char *val) @@ -105,11 +185,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); @@ -118,56 +198,42 @@ static void ping_submit (int ping_time, char *host) static void ping_read (void) { - int ping; - int i; + pingobj_iter_t *iter; + + char host[512]; + double latency; + size_t buf_len; + + if (pingobj == NULL) + return; + + if (hosts != NULL) + add_hosts (); - for (i = 0; i < num_pinghosts; i++) + if (ping_send (pingobj) < 0) { - if (hosts_disable[i] > 0) - { - hosts_disable[i]--; + syslog (LOG_ERR, "ping: `ping_send' failed: %s", + ping_get_error (pingobj)); + return; + } + + for (iter = ping_iterator_get (pingobj); + iter != NULL; + iter = ping_iterator_next (iter)) + { + buf_len = sizeof (host); + if (ping_iterator_get_info (iter, PING_INFO_HOSTNAME, + host, &buf_len)) continue; - } - - ping = tpinghost (hosts[i]); - switch (ping) - { - case 0: - if (!(hosts_flags[i] & 0x01)) - syslog (LOG_WARNING, "ping %s: Connection timed out.", hosts[i]); - hosts_flags[i] |= 0x01; - break; - - case -1: - if (!(hosts_flags[i] & 0x02)) - syslog (LOG_WARNING, "ping %s: Host or service is not reachable.", hosts[i]); - hosts_flags[i] |= 0x02; - break; - - case -2: - syslog (LOG_ERR, "ping %s: Socket error. Ping will be disabled for %i iteration(s).", - hosts[i], hosts_backoff[i]); - hosts_disable[i] = hosts_backoff[i]; - if (hosts_backoff[i] < 8192) /* 22 3/4 hours */ - hosts_backoff[i] *= 2; - hosts_flags[i] |= 0x10; - break; - - case -3: - if (!(hosts_flags[i] & 0x04)) - syslog (LOG_WARNING, "ping %s: Connection refused.", hosts[i]); - hosts_flags[i] |= 0x04; - break; - - default: - if (hosts_flags[i] != 0x00) - syslog (LOG_NOTICE, "ping %s: Back to normal: %ims.", hosts[i], ping); - hosts_flags[i] = 0x00; - hosts_backoff[i] = 1; - ping_submit (ping, hosts[i]); - } /* switch (ping) */ - } /* for (i = 0; i < num_pinghosts; i++) */ + buf_len = sizeof (latency); + if (ping_iterator_get_info (iter, PING_INFO_LATENCY, + &latency, &buf_len)) + continue; + + DBG ("host = %s, latency = %f", host, latency); + ping_submit (host, latency); + } } void module_register (void)