From: Pierre-Yves Ritschard Date: Wed, 9 Jan 2013 09:02:50 +0000 (+0100) Subject: take into account PR comments from @octo X-Git-Tag: collectd-5.3.0~56^2~18 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b53792f620f86bdf1cd707d04d16352adf2dec49;p=collectd.git take into account PR comments from @octo Signed-off-by: Florian Forster --- diff --git a/src/riemann.c b/src/riemann.c index 5c4c35d1..7c784404 100644 --- a/src/riemann.c +++ b/src/riemann.c @@ -36,7 +36,6 @@ #define RIEMANN_EXTRA_TAGS 32 struct riemann_host { - struct riemann_host *next; #define F_CONNECT 0x01 u_int8_t flags; pthread_mutex_t lock; @@ -80,6 +79,7 @@ riemann_send(struct riemann_host *host, Msg *msg) msg__pack(msg, buf); if (write(host->s, buf, len) != len) { + host->flags &= ~F_CONNECT; WARNING("riemann_write: could not send out full packet"); free(buf); return -1; @@ -253,17 +253,19 @@ riemann_connect(struct riemann_host *host) { int e; struct addrinfo *ai, *res, hints; - struct sockaddr_in *sin4; - struct sockaddr_in6 *sin6; + char service[32]; if (host->flags & F_CONNECT) return 0; memset(&hints, 0, sizeof(hints)); + memset(&service, 0, sizeof(service)); hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_DGRAM; + + ssnprintf(service, sizeof(service), "%d", host->port); - if ((e = getaddrinfo(host->name, NULL, &hints, &res)) != 0) { + if ((e = getaddrinfo(host->name, service, &hints, &res)) != 0) { WARNING("could not resolve host \"%s\": %s", host->name, gai_strerror(e)); return -1; @@ -279,30 +281,15 @@ riemann_connect(struct riemann_host *host) return 0; } - if ((host->s = socket(ai->ai_family, SOCK_DGRAM, 0)) == -1) { + if ((host->s = socket(ai->ai_family, + ai->ai_socktype, + ai->ai_protocol)) == -1) { pthread_mutex_unlock(&host->lock); WARNING("riemann_connect: could not open socket"); freeaddrinfo(res); return -1; } - switch (ai->ai_family) { - case AF_INET: - sin4 = (struct sockaddr_in *)ai->ai_addr; - sin4->sin_port = ntohs(host->port); - break; - case AF_INET6: - sin6 = (struct sockaddr_in6 *)ai->ai_addr; - sin6->sin6_port = ntohs(host->port); - break; - default: - WARNING("riemann_connect: unsupported address family"); - close(host->s); - pthread_mutex_unlock(&host->lock); - freeaddrinfo(res); - return -1; - } - if (connect(host->s, ai->ai_addr, ai->ai_addrlen) != 0) { close(host->s); host->flags |= ~F_CONNECT;