X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmbmon.c;h=1f0a0d638814bdd2cd31b0255df039d7ca388914;hb=aa3811995bfae69f0d1a0f897acfa4a9a4c0138a;hp=2d6d77e21474c274af56c7c9e2cdcd7e41575af2;hpb=0d80072344ea5322c34f716ed77a5319a62bfc96;p=collectd.git diff --git a/src/mbmon.c b/src/mbmon.c index 2d6d77e2..1f0a0d63 100644 --- a/src/mbmon.c +++ b/src/mbmon.c @@ -84,19 +84,9 @@ static int mbmon_query_daemon (char *buffer, int buffer_size) const char *host; const char *port; - struct addrinfo ai_hints; struct addrinfo *ai_list, *ai_ptr; int ai_return; - memset (&ai_hints, '\0', sizeof (ai_hints)); - ai_hints.ai_flags = 0; -#ifdef AI_ADDRCONFIG - ai_hints.ai_flags |= AI_ADDRCONFIG; -#endif - ai_hints.ai_family = PF_UNSPEC; - ai_hints.ai_socktype = SOCK_STREAM; - ai_hints.ai_protocol = IPPROTO_TCP; - host = mbmon_host; if (host == NULL) host = MBMON_DEF_HOST; @@ -105,6 +95,13 @@ static int mbmon_query_daemon (char *buffer, int buffer_size) if (port == NULL) port = MBMON_DEF_PORT; + struct addrinfo ai_hints = { + .ai_family = PF_UNSPEC, + .ai_flags = AI_ADDRCONFIG, + .ai_protocol = IPPROTO_TCP, + .ai_socktype = SOCK_STREAM + }; + if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0) { char errbuf[1024];