X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetwork.c;h=d602dfc8651d7359aef343a30cb9cd9f09dd3931;hb=937d55ee67ce484065f5a5ece7dd59fc17097ca6;hp=e3d52786cdee3c6096b864ee35a112f94f43612c;hpb=265ceaf029ce259664f39dfd0852af94d4071d0d;p=collectd.git

diff --git a/src/network.c b/src/network.c
index e3d52786..d602dfc8 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1691,29 +1691,29 @@ static int network_bind_socket_to_addr(sockent_t *se,
   if (se->data.client.bind_addr == NULL)
     return 0;
 
-  DEBUG("fd %i: bind socket to address", se->data.client.fd);
+  DEBUG("network_plugin: fd %i: bind socket to address", se->data.client.fd);
   char pbuffer[64];
 
   if (ai->ai_family == AF_INET) {
     struct sockaddr_in *addr =
         (struct sockaddr_in *)(se->data.client.bind_addr);
     inet_ntop(AF_INET, &(addr->sin_addr), pbuffer, 64);
-    DEBUG("binding client socket to ipv4 address: %s", pbuffer);
+    DEBUG("network_plugin: binding client socket to ipv4 address: %s", pbuffer);
     if (bind(se->data.client.fd, (struct sockaddr *)addr, sizeof(*addr)) ==
         -1) {
-      ERROR("network_plugin: failed to bind client socket (ipv4): %s",
-            STRERRNO);
+      ERROR("network plugin: failed to bind client socket (ipv4) to %s: %s",
+            pbuffer, STRERRNO);
       return -1;
     }
   } else if (ai->ai_family == AF_INET6) {
     struct sockaddr_in6 *addr =
         (struct sockaddr_in6 *)(se->data.client.bind_addr);
-    inet_ntop(AF_INET, &(addr->sin6_addr), pbuffer, 64);
-    DEBUG("binding client socket to ipv6 address: %s", pbuffer);
+    inet_ntop(AF_INET6, &(addr->sin6_addr), pbuffer, 64);
+    DEBUG("network_plugin: binding client socket to ipv6 address: %s", pbuffer);
     if (bind(se->data.client.fd, (struct sockaddr *)addr, sizeof(*addr)) ==
         -1) {
-      ERROR("network_plugin: failed to bind client socket (ipv6): %s",
-            STRERRNO);
+      ERROR("network plugin: failed to bind client socket (ipv6) to %s: %s",
+            pbuffer, STRERRNO);
       return -1;
     }
   }
@@ -2729,7 +2729,7 @@ network_config_set_bind_address(const oconfig_item_t *ci,
                                 struct sockaddr_storage **bind_address) {
   if ((*bind_address) != NULL) {
     ERROR("network_plugin: only a single bind address is allowed");
-    return 1;
+    return -1;
   }
 
   char addr_text[256];
@@ -2738,19 +2738,24 @@ network_config_set_bind_address(const oconfig_item_t *ci,
     return -1;
 
   int ret;
-  struct addrinfo hint, *res = NULL;
-
-  memset(&hint, '\0', sizeof hint);
-  hint.ai_family = PF_UNSPEC;
-  hint.ai_flags = AI_NUMERICHOST;
+  struct addrinfo *res = NULL;
+  struct addrinfo ai_hints = {.ai_family = AF_UNSPEC,
+                              .ai_flags = AI_NUMERICHOST,
+                              .ai_protocol = IPPROTO_UDP,
+                              .ai_socktype = SOCK_DGRAM};
 
-  ret = getaddrinfo(addr_text, NULL, &hint, &res);
+  ret = getaddrinfo(addr_text, NULL, &ai_hints, &res);
   if (ret) {
-    ERROR("Bind address option has invalid address set: %s", gai_strerror(ret));
-    return 1;
+    ERROR("network plugin: Bind address option has invalid address set: %s",
+          gai_strerror(ret));
+    return -1;
   }
 
   *bind_address = malloc(sizeof(**bind_address));
+  if (*bind_address == NULL) {
+    ERROR("network plugin: network_config_set_bind_address: malloc failed.");
+    return -1;
+  }
   (*bind_address)->ss_family = res->ai_family;
   if (res->ai_family == AF_INET) {
     struct sockaddr_in *addr = (struct sockaddr_in *)(*bind_address);
@@ -2759,9 +2764,14 @@ network_config_set_bind_address(const oconfig_item_t *ci,
     struct sockaddr_in6 *addr = (struct sockaddr_in6 *)(*bind_address);
     inet_pton(AF_INET6, addr_text, &(addr->sin6_addr));
   } else {
-    ERROR("%s is an unknown address format %d\n", addr_text, res->ai_family);
+    ERROR("network plugin: %s is an unknown address format %d\n", addr_text,
+          res->ai_family);
+    sfree(*bind_address);
+    freeaddrinfo(res);
+    return -1;
   }
 
+  freeaddrinfo(res);
   return 0;
 } /* int network_config_set_bind_address */