From 80f7c20429b25ac4e5cd95b5947e79f5818ffd9d Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 12 Feb 2025 11:48:00 -0400 Subject: [PATCH] MT#55283 convert sockaddr_getaddrinfo to bool Change-Id: I75e04bdda3b54fd9f7cbe9d6ff8c978e2bb2c2d1 --- daemon/main.c | 2 +- daemon/redis.c | 2 +- lib/socket.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/main.c b/daemon/main.c index a6e4d3114..a3697c967 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -319,7 +319,7 @@ static bool if_add(intf_config_q *q, struct ifaddrs *ifas, const str *name, if (adv_addr) { if (!sockaddr_parse_any(&adv, adv_addr)) { ilog(LOG_DEBUG, "Could not parse '%s' as an address, attempting DNS lookup", adv_addr); - if (sockaddr_getaddrinfo(&adv, adv_addr)) { + if (!sockaddr_getaddrinfo(&adv, adv_addr)) { ilog(LOG_WARN, "DNS lookup for '%s' failed", adv_addr); return false; } diff --git a/daemon/redis.c b/daemon/redis.c index eedafcf5e..127d8d80c 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -281,7 +281,7 @@ static int redis_connect(struct redis *r, int wait, bool resolve) { /* re-resolve if asked */ if (resolve && r->hostname) { - if (sockaddr_getaddrinfo(&a, r->hostname)) + if (!sockaddr_getaddrinfo(&a, r->hostname)) ilog(LOG_WARN, "Failed to re-resolve remote server hostname: '%s'. Just use older one: '%s'.", r->hostname, r->host); else { diff --git a/lib/socket.h b/lib/socket.h index 19eb46847..ccfd06e44 100644 --- a/lib/socket.h +++ b/lib/socket.h @@ -325,8 +325,8 @@ INLINE bool endpoint_parse_any_getaddrinfo_full(endpoint_t *d, const char *s) { return false; return true; } -INLINE int sockaddr_getaddrinfo(sockaddr_t *a, const char *s) { - return sockaddr_getaddrinfo_alt(a, NULL, s) ? 0 : 1; +INLINE bool sockaddr_getaddrinfo(sockaddr_t *a, const char *s) { + return sockaddr_getaddrinfo_alt(a, NULL, s); } INLINE bool endpoint_parse_any_getaddrinfo(endpoint_t *d, const char *s) { return endpoint_parse_any_getaddrinfo_alt(d, NULL, s);