X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fping.c;h=ffb16910eaff3655d7326e30592595dc1da31410;hp=d269cd18b9bc33e16f22c273556cd787fd5b9389;hb=ec51ddee94fa2ba1e01fe0e336ccc9c190a198ff;hpb=1019a2002f891f9661fbc9f0f5ebf83c3194ac97

diff --git a/src/ping.c b/src/ping.c
index d269cd18..ffb16910 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -69,14 +69,14 @@ typedef struct hostlist_s hostlist_t;
 /*
  * Private variables
  */
-static hostlist_t *hostlist_head = NULL;
+static hostlist_t *hostlist_head;
 
-static char *ping_af = NULL;
-static char *ping_source = NULL;
+static int ping_af = PING_DEF_AF;
+static char *ping_source;
 #ifdef HAVE_OPING_1_3
-static char *ping_device = NULL;
+static char *ping_device;
 #endif
-static char *ping_data = NULL;
+static char *ping_data;
 static int ping_ttl = PING_DEF_TTL;
 static double ping_interval = 1.0;
 static double ping_timeout = 0.9;
@@ -84,8 +84,8 @@ static int ping_max_missed = -1;
 
 static pthread_mutex_t ping_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t ping_cond = PTHREAD_COND_INITIALIZER;
-static int ping_thread_loop = 0;
-static int ping_thread_error = 0;
+static int ping_thread_loop;
+static int ping_thread_error;
 static pthread_t ping_thread_id;
 
 static const char *config_keys[] = {"Host",    "SourceAddress", "AddressFamily",
@@ -243,18 +243,8 @@ static void *ping_thread(void *arg) /* {{{ */
     return (void *)-1;
   }
 
-  if (ping_af != NULL) {
-    int af = PING_DEF_AF;
-    if (strncmp(ping_af, "any", 3) == 0) {
-      af = AF_UNSPEC;
-    } else if (strncmp(ping_af, "ipv4", 4) == 0) {
-      af = AF_INET;
-    } else if (strncmp(ping_af, "ipv6", 4) == 0) {
-      af = AF_INET6;
-    } else {
-      ERROR("ping plugin: Bad address family: %s. Using default.", ping_af);
-    }
-    if (ping_setopt(pingobj, PING_OPT_AF, &af) != 0)
+  if (ping_af != PING_DEF_AF) {
+    if (ping_setopt(pingobj, PING_OPT_AF, &ping_af) != 0)
       ERROR("ping plugin: Failed to set address family: %s",
             ping_get_error(pingobj));
   }
@@ -308,7 +298,7 @@ static void *ping_thread(void *arg) /* {{{ */
 
   pthread_mutex_lock(&ping_lock);
   while (ping_thread_loop > 0) {
-    _Bool send_successful = 0;
+    bool send_successful = false;
 
     if (gettimeofday(&tv_begin, NULL) < 0) {
       ERROR("ping plugin: gettimeofday failed: %s", STRERRNO);
@@ -324,7 +314,7 @@ static void *ping_thread(void *arg) /* {{{ */
                  ping_get_error(pingobj));
     } else {
       c_release(LOG_NOTICE, &complaint, "ping plugin: ping_send succeeded.");
-      send_successful = 1;
+      send_successful = true;
     }
 
     pthread_mutex_lock(&ping_lock);
@@ -486,9 +476,22 @@ static int ping_config(const char *key, const char *value) /* {{{ */
     hl->next = hostlist_head;
     hostlist_head = hl;
   } else if (strcasecmp(key, "AddressFamily") == 0) {
-    int status = config_set_string(key, &ping_af, value);
+    char *af = NULL;
+    int status = config_set_string(key, &af, value);
     if (status != 0)
       return status;
+
+    if (strncmp(af, "any", 3) == 0) {
+      ping_af = AF_UNSPEC;
+    } else if (strncmp(af, "ipv4", 4) == 0) {
+      ping_af = AF_INET;
+    } else if (strncmp(af, "ipv6", 4) == 0) {
+      ping_af = AF_INET6;
+    } else {
+      WARNING("ping plugin: Ignoring invalid AddressFamily value %s", af);
+    }
+    free(af);
+
   } else if (strcasecmp(key, "SourceAddress") == 0) {
     int status = config_set_string(key, &ping_source, value);
     if (status != 0)