curl_xml plugin: add AddressFamily

In situations when hostnames in URLs resolve to both IPv4 and IPv6
addresses, sometimes it's useful to have separate statistics for both
of these separately.

With this commit, within <URL> block you can set
  AddressFamily "ipv6"
or
  AddressFamily "ipv4"
to specifically use one or the other.

Signed-off-by: Jakub Jankowski <shasta@toxcorp.com>

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index f1c82c5..7f5bda3 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -495,6 +495,7 @@
 
 #<Plugin curl_xml>
 #  <URL "http://localhost/stats.xml">
 
 #<Plugin curl_xml>
 #  <URL "http://localhost/stats.xml">

+#    AddressFamily "any"

 #    Host "my_host"
 #    #Plugin "stats"
 #    Instance "some_instance"
 #    Host "my_host"
 #    #Plugin "stats"
 #    Instance "some_instance"

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 70ed9bc..cf04872 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2087,6 +2087,7 @@ The B<curl_xml plugin> uses B<libcurl> (L<http://curl.haxx.se/>) and B<libxml2>
 
  <Plugin "curl_xml">
    <URL "http://localhost/stats.xml">
 
  <Plugin "curl_xml">
    <URL "http://localhost/stats.xml">

+     AddressFamily "any"

      Host "my_host"
      #Plugin "curl_xml"
      Instance "some_instance"
      Host "my_host"
      #Plugin "curl_xml"
      Instance "some_instance"


@@ -2123,6 +2124,18 @@ Within the B<URL> block the following options are accepted:
 
 =over 4
 
 
 =over 4
 

+=item B<AddressFamily> I<Type>
+
+IP version to resolve URL to. Useful in cases when hostname in URL resolves
+to both IPv4 and IPv6 addresses, and you are interested in using one of them
+specifically.
+Use C<ipv4> to enforce IPv4, C<ipv6> to enforce IPv6, or C<any> to keep the
+default behavior of resolving addresses to all IP versions your system allows.
+If C<libcurl> is compiled without IPv6 support, using C<ipv6> will result in
+a warning and fallback to C<any>.
+If C<Type> cannot be parsed, a warning will be printed and the whole B<URL>
+block will be ignored.
+

 =item B<Host> I<Name>
 
 Use I<Name> as the host name when submitting values. Defaults to the global
 =item B<Host> I<Name>
 
 Use I<Name> as the host name when submitting values. Defaults to the global

diff --git a/src/curl_xml.c b/src/curl_xml.c
index 0bed05a..a8bc3c0 100644 (file)
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@ -76,6 +76,7 @@ struct cx_s /* {{{ */
   char *host;
 
   char *url;
   char *host;
 
   char *url;

+  int address_family;

   char *user;
   char *pass;
   char *credentials;
   char *user;
   char *pass;
   char *credentials;


@@ -736,6 +737,7 @@ static int cx_init_curl(cx_t *db) /* {{{ */
   curl_easy_setopt(db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
   curl_easy_setopt(db->curl, CURLOPT_FOLLOWLOCATION, 1L);
   curl_easy_setopt(db->curl, CURLOPT_MAXREDIRS, 50L);
   curl_easy_setopt(db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
   curl_easy_setopt(db->curl, CURLOPT_FOLLOWLOCATION, 1L);
   curl_easy_setopt(db->curl, CURLOPT_MAXREDIRS, 50L);

+  curl_easy_setopt(db->curl, CURLOPT_IPRESOLVE, db->address_family);

 
   if (db->user != NULL) {
 #ifdef HAVE_CURLOPT_USERNAME
 
   if (db->user != NULL) {
 #ifdef HAVE_CURLOPT_USERNAME


@@ -814,6 +816,7 @@ static int cx_config_add_url(oconfig_item_t *ci) /* {{{ */
   }
 
   db->timeout = -1;
   }
 
   db->timeout = -1;

+  db->address_family = CURL_IPRESOLVE_WHATEVER;

 
   int status = cf_util_get_string(ci, &db->url);
   if (status != 0) {
 
   int status = cf_util_get_string(ci, &db->url);
   if (status != 0) {


@@ -863,6 +866,31 @@ static int cx_config_add_url(oconfig_item_t *ci) /* {{{ */
       db->stats = curl_stats_from_config(child);
       if (db->stats == NULL)
         status = -1;
       db->stats = curl_stats_from_config(child);
       if (db->stats == NULL)
         status = -1;

+    } else if (strcasecmp("AddressFamily", child->key) == 0) {
+      char *af = NULL;
+      status = cf_util_get_string(child, &af);
+      if (status != 0 || af == NULL) {
+        WARNING("curl_xml plugin: Cannot parse value of `%s' for URL `%s'.",
+                child->key, db->url);
+      } else if (strcasecmp("any", af) == 0) {
+        db->address_family = CURL_IPRESOLVE_WHATEVER;
+      } else if (strcasecmp("ipv4", af) == 0) {
+        db->address_family = CURL_IPRESOLVE_V4;
+      } else if (strcasecmp("ipv6", af) == 0) {
+        /* If curl supports ipv6, use it. If not, log a warning and
+         * fall back to default - don't set status to non-zero.
+         */
+        curl_version_info_data *curl_info = curl_version_info(CURLVERSION_NOW);
+        if (curl_info->features & CURL_VERSION_IPV6)
+          db->address_family = CURL_IPRESOLVE_V6;
+        else
+          WARNING("curl_xml plugin: IPv6 not supported by this libCURL. "
+                  "Using fallback `any'.");
+      } else {
+        WARNING("curl_xml plugin: Unsupported value of `%s' for URL `%s'.",
+                child->key, db->url);
+        status = -1;
+      }

     } else {
       WARNING("curl_xml plugin: Option `%s' not allowed here.", child->key);
       status = -1;
     } else {
       WARNING("curl_xml plugin: Option `%s' not allowed here.", child->key);
       status = -1;