From dabdb62dc5fe0b343cceb3a95140ca6c554d6181 Mon Sep 17 00:00:00 2001 From: Rinku Kothiya Date: Fri, 14 Jun 2019 07:53:06 +0000 Subject: core: replace inet_addr with inet_pton Fixes warning raised by RPMDiff on the use of inet_addr, which may impact Ipv6 support Backport of: > fixes: bz#1721385 > Change-Id: Id2d9afa1747efa64bc79d90dd2566bff54deedeb > Signed-off-by: Rinku Kothiya Fixes: bz#1807793 Change-Id: Id2d9afa1747efa64bc79d90dd2566bff54deedeb Signed-off-by: Rinku Kothiya --- libglusterfs/src/events.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libglusterfs/src/events.c b/libglusterfs/src/events.c index 5c39a1ae521..11b4c54c4d7 100644 --- a/libglusterfs/src/events.c +++ b/libglusterfs/src/events.c @@ -41,6 +41,7 @@ _gf_event(eventtypes_t event, const char *fmt, ...) char *host = NULL; struct addrinfo hints; struct addrinfo *result = NULL; + xlator_t *this = THIS; char *volfile_server_transport = NULL; /* Global context */ @@ -91,7 +92,12 @@ _gf_event(eventtypes_t event, const char *fmt, ...) /* Socket Configurations */ server.sin_family = AF_INET; server.sin_port = htons(EVENT_PORT); - server.sin_addr.s_addr = inet_addr(host); + ret = inet_pton(server.sin_family, host, &server.sin_addr); + if (ret <= 0) { + gf_msg(this->name, GF_LOG_ERROR, EINVAL, LG_MSG_INVALID_ARG, + "inet_pton failed with return code %d", ret); + goto out; + } memset(&server.sin_zero, '\0', sizeof(server.sin_zero)); va_start(arguments, fmt); -- cgit