Initialize `addrlen' before using. This might be the reason for `getnameinfo' failing..

[collectd.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 546f5e2d142ad46d03548a5410d5c139ba361018..3fe25fd46274c5d508a4e38b7877dca7640f1a8a 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -23,34 +23,18 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <syslog.h>
 #include <errno.h>
-#include <assert.h>
 
 #include "network.h"
 #include "common.h"
 #include "utils_debug.h"
 
-/*
- * From RFC2365:
- *
- * The IPv4 Organization Local Scope -- 239.192.0.0/14
- *
- * 239.192.0.0/14 is defined to be the IPv4 Organization Local Scope, and is
- * the space from which an organization should allocate sub-ranges when
- * defining scopes for private use.
- *
- * Port 25826 is not assigned as of 2005-09-12
- */
-
-#define IPV4_MCAST_GROUP "239.192.74.66"
-#define UDP_PORT 25826
-
 /* 1500 - 40 - 8  =  Ethernet packet - IPv6 header - UDP header */
 /* #define BUFF_SIZE 1452 */
 
@@ -65,6 +49,7 @@ static int operating_mode = MODE_CLIENT;
 typedef struct sockent
 {
        int                      fd;
+       int                      mode;
        struct sockaddr_storage *addr;
        socklen_t                addrlen;
        struct sockent          *next;
@@ -76,6 +61,8 @@ static int network_bind_socket (const sockent_t *se, const struct addrinfo *ai)
 {
        int loop = 1;
 
+       DBG ("fd = %i; calling `bind'", se->fd);
+
        if (bind (se->fd, ai->ai_addr, ai->ai_addrlen) == -1)
        {
                syslog (LOG_ERR, "bind: %s", strerror (errno));
@@ -89,6 +76,8 @@ static int network_bind_socket (const sockent_t *se, const struct addrinfo *ai)
                {
                        struct ip_mreq mreq;
 
+                       DBG ("fd = %i; IPv4 multicast address found", se->fd);
+
                        mreq.imr_multiaddr.s_addr = addr->sin_addr.s_addr;
                        mreq.imr_interface.s_addr = htonl (INADDR_ANY);
 
@@ -115,6 +104,8 @@ static int network_bind_socket (const sockent_t *se, const struct addrinfo *ai)
                {
                        struct ipv6_mreq mreq;
 
+                       DBG ("fd = %i; IPv6 multicast address found", se->fd);
+
                        memcpy (&mreq.ipv6mr_multiaddr,
                                        &addr->sin6_addr,
                                        sizeof (addr->sin6_addr));
@@ -172,7 +163,7 @@ int network_create_socket (const char *node, const char *service)
        ai_hints.ai_flags    = AI_PASSIVE | AI_ADDRCONFIG;
        ai_hints.ai_family   = PF_UNSPEC;
        ai_hints.ai_socktype = SOCK_DGRAM;
-       ai_hints.ai_protocol = IPPROTO_UDP; /* XXX is this right here?!? */
+       ai_hints.ai_protocol = IPPROTO_UDP;
 
        if ((ai_return = getaddrinfo (node, service, &ai_hints, &ai_list)) != 0)
        {
@@ -205,6 +196,7 @@ int network_create_socket (const char *node, const char *service)
                memcpy (se->addr, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
                se->addrlen = ai_ptr->ai_addrlen;
 
+               se->mode = operating_mode;
                se->fd   = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol);
                se->next = NULL;
 
@@ -226,7 +218,8 @@ int network_create_socket (const char *node, const char *service)
 
                if (socklist_tail == NULL)
                {
-                       socklist_head = socklist_tail = se;
+                       socklist_head = se;
+                       socklist_tail = se;
                }
                else
                {
@@ -246,6 +239,33 @@ int network_create_socket (const char *node, const char *service)
        return (num_added);
 }
 
+static int network_connect_default (void)
+{
+       int ret;
+
+       if (socklist_head != NULL)
+               return (0);
+
+       DBG ("socklist_head is NULL");
+
+       ret = 0;
+
+       if (network_create_socket (NET_DEFAULT_V6_ADDR, NET_DEFAULT_PORT) > 0)
+               ret++;
+
+       /* Don't use IPv4 and IPv6 in parallel by default.. */
+       if ((operating_mode == MODE_CLIENT) && (ret != 0))
+               return (ret);
+
+       if (network_create_socket (NET_DEFAULT_V4_ADDR, NET_DEFAULT_PORT) > 0)
+               ret++;
+
+       if (ret == 0)
+               ret = -1;
+
+       return (ret);
+}
+
 static int network_get_listen_socket (void)
 {
        int fd;
@@ -255,43 +275,48 @@ static int network_get_listen_socket (void)
        fd_set readfds;
        sockent_t *se;
 
-       while (1)
+       if (socklist_head == NULL)
+               network_connect_default ();
+
+       FD_ZERO (&readfds);
+       max_fd = -1;
+       for (se = socklist_head; se != NULL; se = se->next)
        {
-               FD_ZERO (&readfds);
-               max_fd = -1;
-               for (se = socklist_head; se != NULL; se = se->next)
-               {
-                       FD_SET (se->fd, &readfds);
-                       if (se->fd >= max_fd)
-                               max_fd = se->fd + 1;
-               }
+               if (se->mode != operating_mode)
+                       continue;
 
-               if (max_fd == -1)
-               {
-                       syslog (LOG_WARNING, "No listen sockets found!");
-                       return (-1);
-               }
+               FD_SET (se->fd, &readfds);
+               if (se->fd >= max_fd)
+                       max_fd = se->fd + 1;
+       }
 
-               status = select (max_fd, &readfds, NULL, NULL, NULL);
+       if (max_fd == -1)
+       {
+               syslog (LOG_WARNING, "No listen sockets found!");
+               return (-1);
+       }
 
-               if ((status == -1) && (errno == EINTR))
-                       continue;
-               else if (status == -1)
-               {
+       status = select (max_fd, &readfds, NULL, NULL, NULL);
+
+       if (status == -1)
+       {
+               if (errno != EINTR)
                        syslog (LOG_ERR, "select: %s", strerror (errno));
-                       return (-1);
-               }
-               else
-                       break;
-       } /* while (true) */
+               return (-1);
+       }
 
        fd = -1;
        for (se = socklist_head; se != NULL; se = se->next)
+       {
+               if (se->mode != operating_mode)
+                       continue;
+
                if (FD_ISSET (se->fd, &readfds))
                {
                        fd = se->fd;
                        break;
                }
+       }
 
        if (fd == -1)
                syslog (LOG_WARNING, "No socket ready..?");
@@ -321,6 +346,7 @@ int network_receive (char **host, char **type, char **inst, char **value)
        if ((fd = network_get_listen_socket ()) < 0)
                return (-1);
 
+       addrlen = sizeof (addr);
        if (recvfrom (fd, buffer, BUFF_SIZE, 0, (struct sockaddr *) &addr, &addrlen) == -1)
        {
                syslog (LOG_ERR, "recvfrom: %s", strerror (errno));
@@ -403,9 +429,15 @@ int network_send (char *type, char *inst, char *value)
        buf[buflen] = '\0';
        buflen++;
 
+       if (socklist_head == NULL)
+               network_connect_default ();
+
        ret = 0;
        for (se = socklist_head; se != NULL; se = se->next)
        {
+               if (se->mode != operating_mode)
+                       continue;
+
                DBG ("fd = %i", se->fd);
 
                while (1)
@@ -423,6 +455,7 @@ int network_send (char *type, char *inst, char *value)
                                else
                                {
                                        syslog (LOG_ERR, "sendto: %s", strerror (errno));
+                                       ret = -1;
                                        break;
                                }
                        }