X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fping.c;h=5f66aab341f552cadb2d786bde09784d2272b2be;hb=4d370741101aeb037ae52f3529a4a0869e0dc08a;hp=5366b98fbcc1d309be5b4161c82f5dd9ca23ff85;hpb=1b0101fbde86c01590bec8e78fac3262b8542119;p=collectd.git diff --git a/src/ping.c b/src/ping.c index 5366b98f..5f66aab3 100644 --- a/src/ping.c +++ b/src/ping.c @@ -1,35 +1,44 @@ /** * collectd - src/ping.c - * Copyright (C) 2005-2009 Florian octo Forster + * Copyright (C) 2005-2012 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" + #include "common.h" #include "plugin.h" -#include "configfile.h" +#include "utils_complain.h" -#include #include #if HAVE_NETDB_H # include /* NI_MAXHOST */ #endif +#ifdef HAVE_SYS_CAPABILITY_H +# include +#endif + #include #ifndef NI_MAXHOST @@ -67,6 +76,7 @@ static char *ping_source = NULL; #ifdef HAVE_OPING_1_3 static char *ping_device = NULL; #endif +static char *ping_data = NULL; static int ping_ttl = PING_DEF_TTL; static double ping_interval = 1.0; static double ping_timeout = 0.9; @@ -85,6 +95,7 @@ static const char *config_keys[] = #ifdef HAVE_OPING_1_3 "Device", #endif + "Size", "TTL", "Interval", "Timeout", @@ -142,18 +153,110 @@ static void time_calc (struct timespec *ts_dest, /* {{{ */ time_normalize (ts_dest); } /* }}} void time_calc */ +static int ping_dispatch_all (pingobj_t *pingobj) /* {{{ */ +{ + hostlist_t *hl; + int status; + + for (pingobj_iter_t *iter = ping_iterator_get (pingobj); + iter != NULL; + iter = ping_iterator_next (iter)) + { /* {{{ */ + char userhost[NI_MAXHOST]; + double latency; + size_t param_size; + + param_size = sizeof (userhost); + status = ping_iterator_get_info (iter, +#ifdef PING_INFO_USERNAME + PING_INFO_USERNAME, +#else + PING_INFO_HOSTNAME, +#endif + userhost, ¶m_size); + if (status != 0) + { + WARNING ("ping plugin: ping_iterator_get_info failed: %s", + ping_get_error (pingobj)); + continue; + } + + for (hl = hostlist_head; hl != NULL; hl = hl->next) + if (strcmp (userhost, hl->host) == 0) + break; + + if (hl == NULL) + { + WARNING ("ping plugin: Cannot find host %s.", userhost); + continue; + } + + param_size = sizeof (latency); + status = ping_iterator_get_info (iter, PING_INFO_LATENCY, + (void *) &latency, ¶m_size); + if (status != 0) + { + WARNING ("ping plugin: ping_iterator_get_info failed: %s", + ping_get_error (pingobj)); + continue; + } + + hl->pkg_sent++; + if (latency >= 0.0) + { + hl->pkg_recv++; + hl->latency_total += latency; + hl->latency_squared += (latency * latency); + + /* reset missed packages counter */ + hl->pkg_missed = 0; + } else + hl->pkg_missed++; + + /* if the host did not answer our last N packages, trigger a resolv. */ + if ((ping_max_missed >= 0) + && (hl->pkg_missed >= ((uint32_t) ping_max_missed))) + { /* {{{ */ + /* we reset the missed package counter here, since we only want to + * trigger a resolv every N packages and not every package _AFTER_ N + * missed packages */ + hl->pkg_missed = 0; + + WARNING ("ping plugin: host %s has not answered %d PING requests," + " triggering resolve", hl->host, ping_max_missed); + + /* we trigger the resolv simply be removeing and adding the host to our + * ping object */ + status = ping_host_remove (pingobj, hl->host); + if (status != 0) + { + WARNING ("ping plugin: ping_host_remove (%s) failed.", hl->host); + } + else + { + status = ping_host_add (pingobj, hl->host); + if (status != 0) + ERROR ("ping plugin: ping_host_add (%s) failed.", hl->host); + } + } /* }}} ping_max_missed */ + } /* }}} for (iter) */ + + return (0); +} /* }}} int ping_dispatch_all */ + static void *ping_thread (void *arg) /* {{{ */ { - static pingobj_t *pingobj = NULL; + pingobj_t *pingobj = NULL; struct timeval tv_begin; struct timeval tv_end; struct timespec ts_wait; struct timespec ts_int; - hostlist_t *hl; int count; + c_complain_t complaint = C_COMPLAIN_INIT_STATIC; + pthread_mutex_lock (&ping_lock); pingobj = ping_construct (); @@ -180,14 +283,18 @@ static void *ping_thread (void *arg) /* {{{ */ ping_setopt (pingobj, PING_OPT_TIMEOUT, (void *) &ping_timeout); ping_setopt (pingobj, PING_OPT_TTL, (void *) &ping_ttl); + if (ping_data != NULL) + ping_setopt (pingobj, PING_OPT_DATA, (void *) ping_data); + /* Add all the hosts to the ping object. */ count = 0; - for (hl = hostlist_head; hl != NULL; hl = hl->next) + for (hostlist_t *hl = hostlist_head; hl != NULL; hl = hl->next) { - int status; - status = ping_host_add (pingobj, hl->host); - if (status != 0) - WARNING ("ping plugin: ping_host_add (%s) failed.", hl->host); + int tmp_status; + tmp_status = ping_host_add (pingobj, hl->host); + if (tmp_status != 0) + WARNING ("ping plugin: ping_host_add (%s) failed: %s", + hl->host, ping_get_error (pingobj)); else count++; } @@ -212,12 +319,14 @@ static void *ping_thread (void *arg) /* {{{ */ while (ping_thread_loop > 0) { - pingobj_iter_t *iter; int status; + _Bool send_successful = 0; if (gettimeofday (&tv_begin, NULL) < 0) { - ERROR ("ping plugin: gettimeofday failed"); + char errbuf[1024]; + ERROR ("ping plugin: gettimeofday failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); ping_thread_error = 1; break; } @@ -227,10 +336,13 @@ static void *ping_thread (void *arg) /* {{{ */ status = ping_send (pingobj); if (status < 0) { - ERROR ("ping plugin: ping_send failed: %s", ping_get_error (pingobj)); - pthread_mutex_lock (&ping_lock); - ping_thread_error = 1; - break; + c_complain (LOG_ERR, &complaint, "ping plugin: ping_send failed: %s", + ping_get_error (pingobj)); + } + else + { + c_release (LOG_NOTICE, &complaint, "ping plugin: ping_send succeeded."); + send_successful = 1; } pthread_mutex_lock (&ping_lock); @@ -238,91 +350,14 @@ static void *ping_thread (void *arg) /* {{{ */ if (ping_thread_loop <= 0) break; - for (iter = ping_iterator_get (pingobj); - iter != NULL; - iter = ping_iterator_next (iter)) - { /* {{{ */ - char userhost[NI_MAXHOST]; - double latency; - size_t param_size; - - param_size = sizeof (userhost); - status = ping_iterator_get_info (iter, -#ifdef PING_INFO_USERNAME - PING_INFO_USERNAME, -#else - PING_INFO_HOSTNAME, -#endif - userhost, ¶m_size); - if (status != 0) - { - WARNING ("ping plugin: ping_iterator_get_info failed: %s", - ping_get_error (pingobj)); - continue; - } - - for (hl = hostlist_head; hl != NULL; hl = hl->next) - if (strcmp (userhost, hl->host) == 0) - break; - - if (hl == NULL) - { - WARNING ("ping plugin: Cannot find host %s.", userhost); - continue; - } - - param_size = sizeof (latency); - status = ping_iterator_get_info (iter, PING_INFO_LATENCY, - (void *) &latency, ¶m_size); - if (status != 0) - { - WARNING ("ping plugin: ping_iterator_get_info failed: %s", - ping_get_error (pingobj)); - continue; - } - - hl->pkg_sent++; - if (latency >= 0.0) - { - hl->pkg_recv++; - hl->latency_total += latency; - hl->latency_squared += (latency * latency); - - /* reset missed packages counter */ - hl->pkg_missed = 0; - } else - hl->pkg_missed++; - - /* if the host did not answer our last N packages, trigger a resolv. */ - if (ping_max_missed >= 0 && hl->pkg_missed >= ping_max_missed) - { /* {{{ */ - /* we reset the missed package counter here, since we only want to - * trigger a resolv every N packages and not every package _AFTER_ N - * missed packages */ - hl->pkg_missed = 0; - - WARNING ("ping plugin: host %s has not answered %d PING requests," - " triggering resolve", hl->host, ping_max_missed); - - /* we trigger the resolv simply be removeing and adding the host to our - * ping object */ - status = ping_host_remove (pingobj, hl->host); - if (status != 0) - { - WARNING ("ping plugin: ping_host_remove (%s) failed.", hl->host); - } - else - { - status = ping_host_add (pingobj, hl->host); - if (status != 0) - WARNING ("ping plugin: ping_host_add (%s) failed.", hl->host); - } - } /* }}} ping_max_missed */ - } /* }}} for (iter) */ + if (send_successful) + (void) ping_dispatch_all (pingobj); if (gettimeofday (&tv_end, NULL) < 0) { - ERROR ("ping plugin: gettimeofday failed"); + char errbuf[1024]; + ERROR ("ping plugin: gettimeofday failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); ping_thread_error = 1; break; } @@ -331,7 +366,7 @@ static void *ping_thread (void *arg) /* {{{ */ * `ts_wait'. */ time_calc (&ts_wait, &ts_int, &tv_begin, &tv_end); - status = pthread_cond_timedwait (&ping_cond, &ping_lock, &ts_wait); + pthread_cond_timedwait (&ping_cond, &ping_lock, &ts_wait); if (ping_thread_loop <= 0) break; } /* while (ping_thread_loop > 0) */ @@ -351,12 +386,12 @@ static int start_thread (void) /* {{{ */ if (ping_thread_loop != 0) { pthread_mutex_unlock (&ping_lock); - return (-1); + return (0); } ping_thread_loop = 1; ping_thread_error = 0; - status = pthread_create (&ping_thread_id, /* attr = */ NULL, + status = plugin_thread_create (&ping_thread_id, /* attr = */ NULL, ping_thread, /* arg = */ (void *) 0); if (status != 0) { @@ -365,7 +400,7 @@ static int start_thread (void) /* {{{ */ pthread_mutex_unlock (&ping_lock); return (-1); } - + pthread_mutex_unlock (&ping_lock); return (0); } /* }}} int start_thread */ @@ -393,8 +428,10 @@ static int stop_thread (void) /* {{{ */ status = -1; } + pthread_mutex_lock (&ping_lock); memset (&ping_thread_id, 0, sizeof (ping_thread_id)); ping_thread_error = 0; + pthread_mutex_unlock (&ping_lock); return (status); } /* }}} int stop_thread */ @@ -414,10 +451,21 @@ static int ping_init (void) /* {{{ */ "Will use a timeout of %gs.", ping_timeout); } - if (start_thread () != 0) - return (-1); +#if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_NET_RAW) + if (check_capability (CAP_NET_RAW) != 0) + { + if (getuid () == 0) + WARNING ("ping plugin: Running collectd as root, but the CAP_NET_RAW " + "capability is missing. The plugin's read function will probably " + "fail. Is your init system dropping capabilities?"); + else + WARNING ("ping plugin: collectd doesn't have the CAP_NET_RAW capability. " + "If you don't want to run collectd as root, try running \"setcap " + "cap_net_raw=ep\" on the collectd binary."); + } +#endif - return (0); + return (start_thread ()); } /* }}} int ping_init */ static int config_set_string (const char *name, /* {{{ */ @@ -447,7 +495,7 @@ static int ping_config (const char *key, const char *value) /* {{{ */ hostlist_t *hl; char *host; - hl = (hostlist_t *) malloc (sizeof (hostlist_t)); + hl = malloc (sizeof (*hl)); if (hl == NULL) { char errbuf[1024]; @@ -508,6 +556,37 @@ static int ping_config (const char *key, const char *value) /* {{{ */ WARNING ("ping plugin: Ignoring invalid interval %g (%s)", tmp, value); } + else if (strcasecmp (key, "Size") == 0) { + size_t size = (size_t) atoi (value); + + /* Max IP packet size - (IPv6 + ICMP) = 65535 - (40 + 8) = 65487 */ + if (size <= 65487) + { + sfree (ping_data); + ping_data = malloc (size + 1); + if (ping_data == NULL) + { + ERROR ("ping plugin: malloc failed."); + return (1); + } + + /* Note: By default oping is using constant string + * "liboping -- ICMP ping library " + * which is exactly 56 bytes. + * + * Optimally we would follow the ping(1) behaviour, but we + * cannot use byte 00 or start data payload at exactly same + * location, due to oping library limitations. */ + for (size_t i = 0; i < size; i++) /* {{{ */ + { + /* This restricts data pattern to be only composed of easily + * printable characters, and not NUL character. */ + ping_data[i] = ('0' + i % 64); + } /* }}} for (i = 0; i < size; i++) */ + ping_data[size] = 0; + } else + WARNING ("ping plugin: Ignoring invalid Size %zu.", size); + } else if (strcasecmp (key, "Timeout") == 0) { double tmp; @@ -554,15 +633,13 @@ static void submit (const char *host, const char *type, /* {{{ */ static int ping_read (void) /* {{{ */ { - hostlist_t *hl; - if (ping_thread_error != 0) { ERROR ("ping plugin: The ping thread had a problem. Restarting it."); stop_thread (); - for (hl = hostlist_head; hl != NULL; hl = hl->next) + for (hostlist_t *hl = hostlist_head; hl != NULL; hl = hl->next) { hl->pkg_sent = 0; hl->pkg_recv = 0; @@ -575,7 +652,7 @@ static int ping_read (void) /* {{{ */ return (-1); } /* if (ping_thread_error != 0) */ - for (hl = hostlist_head; hl != NULL; hl = hl->next) /* {{{ */ + for (hostlist_t *hl = hostlist_head; hl != NULL; hl = hl->next) /* {{{ */ { uint32_t pkg_sent; uint32_t pkg_recv; @@ -659,6 +736,11 @@ static int ping_shutdown (void) /* {{{ */ hl = hl_next; } + if (ping_data != NULL) { + free (ping_data); + ping_data = NULL; + } + return (0); } /* }}} int ping_shutdown */