X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetwork.c;h=64c6d24b2f4e187c073f70939c9f5b678af71bd0;hb=126d448bce2ab48300c05f13ee7eb0a75b214d81;hp=f2e4b47dd6292aa68ade06a9cdc9a42d45154b2c;hpb=b3a6a259606c93ddde88eb23cb26690673663c4b;p=collectd.git

diff --git a/src/network.c b/src/network.c
index f2e4b47d..64c6d24b 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1691,7 +1691,7 @@ 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) {
@@ -1701,8 +1701,8 @@ static int network_bind_socket_to_addr(sockent_t *se,
     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) {
@@ -1712,8 +1712,8 @@ static int network_bind_socket_to_addr(sockent_t *se,
     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;
     }
   }
@@ -1728,10 +1728,9 @@ static int network_bind_socket(int fd, const struct addrinfo *ai,
 #else
   int loop = 0;
 #endif
-  int yes = 1;
 
   /* allow multiple sockets to use the same PORT number */
-  if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) == -1) {
+  if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int)) == -1) {
     ERROR("network plugin: setsockopt (reuseaddr): %s", STRERRNO);
     return -1;
   }