From: Pierre-Yves Ritschard <pyr@spootnik.org>
Date: Wed, 5 Aug 2015 09:07:27 +0000 (+0200)
Subject: Merge pull request #1178 from rubenk/fix-libmodbus-compilation-on-freebsd
X-Git-Tag: collectd-5.6.0~618
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=594aa45c1df64eadae54c415524f3a267c12d7f8;hp=-c;p=collectd.git

Merge pull request #1178 from rubenk/fix-libmodbus-compilation-on-freebsd

core: include <sys/socket.h> in collectd.h
---

594aa45c1df64eadae54c415524f3a267c12d7f8
diff --combined src/write_graphite.c
index f82f852f,997a8877..7fc9eb9f
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@@ -54,19 -54,36 +54,18 @@@
  /* Folks without pthread will need to disable this plugin. */
  #include <pthread.h>
  
- #include <sys/socket.h>
  #include <netdb.h>
  
 -#ifndef WG_DEFAULT_NODE
 -# define WG_DEFAULT_NODE "localhost"
 -#endif
 -
 -#ifndef WG_DEFAULT_SERVICE
 -# define WG_DEFAULT_SERVICE "2003"
 -#endif
 -
 -#ifndef WG_DEFAULT_PROTOCOL
 -# define WG_DEFAULT_PROTOCOL "tcp"
 -#endif
 -
 -#ifndef WG_DEFAULT_LOG_SEND_ERRORS
 -# define WG_DEFAULT_LOG_SEND_ERRORS 1
 -#endif
 -
 -#ifndef WG_DEFAULT_ESCAPE
 -# define WG_DEFAULT_ESCAPE '_'
 -#endif
 +#define WG_DEFAULT_NODE "localhost"
 +#define WG_DEFAULT_SERVICE "2003"
 +#define WG_DEFAULT_PROTOCOL "tcp"
 +#define WG_DEFAULT_LOG_SEND_ERRORS 1
 +#define WG_DEFAULT_ESCAPE '_'
  
  /* Ethernet - (IPv6 + TCP) = 1500 - (40 + 32) = 1428 */
 -#ifndef WG_SEND_BUF_SIZE
 -# define WG_SEND_BUF_SIZE 1428
 -#endif
 +#define WG_SEND_BUF_SIZE 1428
  
 -#ifndef WG_MIN_RECONNECT_INTERVAL
 -# define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1)
 -#endif
 +#define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1)
  
  /*
   * Private variables
@@@ -116,11 -133,13 +115,11 @@@ static int wg_send_buffer (struct wg_ca
      status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf));
      if (status < 0)
      {
 -        const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL;
 -
          if (cb->log_send_errors)
          {
              char errbuf[1024];
              ERROR ("write_graphite plugin: send to %s:%s (%s) failed with status %zi (%s)",
 -                    cb->node, cb->service, protocol,
 +                    cb->node, cb->service, cb->protocol,
                      status, sstrerror (errno, errbuf, sizeof (errbuf)));
          }
  
@@@ -173,6 -192,10 +172,6 @@@ static int wg_callback_init (struct wg_
      cdtime_t now;
      int status;
  
 -    const char *node = cb->node ? cb->node : WG_DEFAULT_NODE;
 -    const char *service = cb->service ? cb->service : WG_DEFAULT_SERVICE;
 -    const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL;
 -
      char connerr[1024] = "";
  
      if (cb->sock_fd > 0)
@@@ -191,18 -214,18 +190,18 @@@
  #endif
      ai_hints.ai_family = AF_UNSPEC;
  
 -    if (0 == strcasecmp ("tcp", protocol))
 +    if (0 == strcasecmp ("tcp", cb->protocol))
          ai_hints.ai_socktype = SOCK_STREAM;
      else
          ai_hints.ai_socktype = SOCK_DGRAM;
  
      ai_list = NULL;
  
 -    status = getaddrinfo (node, service, &ai_hints, &ai_list);
 +    status = getaddrinfo (cb->node, cb->service, &ai_hints, &ai_list);
      if (status != 0)
      {
          ERROR ("write_graphite plugin: getaddrinfo (%s, %s, %s) failed: %s",
 -                node, service, protocol, gai_strerror (status));
 +                cb->node, cb->service, cb->protocol, gai_strerror (status));
          return (-1);
      }
  
@@@ -241,14 -264,14 +240,14 @@@
              sstrerror (errno, connerr, sizeof (connerr));
          c_complain (LOG_ERR, &cb->init_complaint,
                    "write_graphite plugin: Connecting to %s:%s via %s failed. "
 -                  "The last error was: %s", node, service, protocol, connerr);
 +                  "The last error was: %s", cb->node, cb->service, cb->protocol, connerr);
          return (-1);
      }
      else
      {
          c_release (LOG_INFO, &cb->init_complaint,
                  "write_graphite plugin: Successfully connected to %s:%s via %s.",
 -                node, service, protocol);
 +                cb->node, cb->service, cb->protocol);
      }
  
      wg_reset_buffer (cb);
@@@ -359,7 -382,9 +358,7 @@@ static int wg_send_message (char const 
      cb->send_buf_free -= message_len;
  
      DEBUG ("write_graphite plugin: [%s]:%s (%s) buf %zu/%zu (%.1f %%) \"%s\"",
 -            cb->node,
 -            cb->service,
 -            cb->protocol,
 +            cb->node, cb->service, cb->protocol,
              cb->send_buf_fill, sizeof (cb->send_buf),
              100.0 * ((double) cb->send_buf_fill) / ((double) sizeof (cb->send_buf)),
              message);
@@@ -460,9 -485,9 +459,9 @@@ static int wg_config_node (oconfig_item
      memset (cb, 0, sizeof (*cb));
      cb->sock_fd = -1;
      cb->name = NULL;
 -    cb->node = NULL;
 -    cb->service = NULL;
 -    cb->protocol = NULL;
 +    cb->node = strdup (WG_DEFAULT_NODE);
 +    cb->service = strdup (WG_DEFAULT_SERVICE);
 +    cb->protocol = strdup (WG_DEFAULT_PROTOCOL);
      cb->log_send_errors = WG_DEFAULT_LOG_SEND_ERRORS;
      cb->prefix = NULL;
      cb->postfix = NULL;
@@@ -540,7 -565,9 +539,7 @@@
      /* FIXME: Legacy configuration syntax. */
      if (cb->name == NULL)
          ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s/%s/%s",
 -                cb->node != NULL ? cb->node : WG_DEFAULT_NODE,
 -                cb->service != NULL ? cb->service : WG_DEFAULT_SERVICE,
 -                cb->protocol != NULL ? cb->protocol : WG_DEFAULT_PROTOCOL);
 +                cb->node, cb->service, cb->protocol);
      else
          ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s",
                  cb->name);