Browse Source

MT#55283 convert sockaddr_getaddrinfo to bool

Change-Id: I75e04bdda3b54fd9f7cbe9d6ff8c978e2bb2c2d1
pull/1910/head
Richard Fuchs 10 months ago
parent
commit
80f7c20429
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      daemon/main.c
  2. +1
    -1
      daemon/redis.c
  3. +2
    -2
      lib/socket.h

+ 1
- 1
daemon/main.c View File

@ -319,7 +319,7 @@ static bool if_add(intf_config_q *q, struct ifaddrs *ifas, const str *name,
if (adv_addr) { if (adv_addr) {
if (!sockaddr_parse_any(&adv, adv_addr)) { if (!sockaddr_parse_any(&adv, adv_addr)) {
ilog(LOG_DEBUG, "Could not parse '%s' as an address, attempting DNS lookup", 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); ilog(LOG_WARN, "DNS lookup for '%s' failed", adv_addr);
return false; return false;
} }


+ 1
- 1
daemon/redis.c View File

@ -281,7 +281,7 @@ static int redis_connect(struct redis *r, int wait, bool resolve) {
/* re-resolve if asked */ /* re-resolve if asked */
if (resolve && r->hostname) { 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'.", ilog(LOG_WARN, "Failed to re-resolve remote server hostname: '%s'. Just use older one: '%s'.",
r->hostname, r->host); r->hostname, r->host);
else { else {


+ 2
- 2
lib/socket.h View File

@ -325,8 +325,8 @@ INLINE bool endpoint_parse_any_getaddrinfo_full(endpoint_t *d, const char *s) {
return false; return false;
return true; 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) { INLINE bool endpoint_parse_any_getaddrinfo(endpoint_t *d, const char *s) {
return endpoint_parse_any_getaddrinfo_alt(d, NULL, s); return endpoint_parse_any_getaddrinfo_alt(d, NULL, s);


Loading…
Cancel
Save