Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix use of deprecated c-ares api #15837

Merged
merged 2 commits into from
May 2, 2024
Merged

fix use of deprecated c-ares api #15837

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4540fa0
lib: replace deprecated ares_process()
acooks Apr 24, 2024
89a2e4d
lib: replace deprecated ares_gethostbyname
acooks Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 66 additions & 1 deletion lib/resolver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ static void resolver_cb_timeout(struct event *t)
{
struct resolver_state *r = EVENT_ARG(t);

ares_process(r->channel, NULL, NULL);
ares_process_fd(r->channel, ARES_SOCKET_BAD, ARES_SOCKET_BAD);
resolver_update_timeouts(r);
}

Expand Down Expand Up @@ -179,7 +179,56 @@ static void ares_socket_cb(void *data, ares_socket_t fd, int readable,
resolver_fd_drop_maybe(resfd);
}

#if (ARES_VERSION >= 0x011c00)
static void ares_address_cb(void *arg, int status, int timeouts,
struct ares_addrinfo *result)
{
struct resolver_query *query = (struct resolver_query *)arg;
union sockunion addr[16];
void (*callback)(struct resolver_query *q, const char *err, int ret,
union sockunion *s);
size_t i;
struct ares_addrinfo_node *node;

callback = query->callback;
query->callback = NULL;

if (status != ARES_SUCCESS) {
if (resolver_debug)
zlog_debug("[%p] Resolving failed (%s)",
query, ares_strerror(status));

callback(query, ares_strerror(status), -1, NULL);
if (result)
ares_freeaddrinfo(result);
return;
}


node = result->nodes;
for (i = 0; i < array_size(addr) && node; i++) {
memset(&addr[i], 0, sizeof(addr[i]));
addr[i].sa.sa_family = node->ai_family;
switch (node->ai_family) {
case AF_INET:
memcpy(&addr[i].sin.sin_addr, node->ai_addr,
node->ai_addrlen);
break;
case AF_INET6:
memcpy(&addr[i].sin6.sin6_addr, node->ai_addr,
node->ai_addrlen);
break;
}
node = node->ai_next;
}

if (resolver_debug)
zlog_debug("[%p] Resolved with %d results", query, (int)i);

callback(query, NULL, i, &addr[0]);
ares_freeaddrinfo(result);
}
#else
static void ares_address_cb(void *arg, int status, int timeouts,
struct hostent *he)
{
Expand Down Expand Up @@ -222,6 +271,8 @@ static void ares_address_cb(void *arg, int status, int timeouts,
callback(query, NULL, i, &addr[0]);
}

#endif

static void resolver_cb_literal(struct event *t)
{
struct resolver_query *query = EVENT_ARG(t);
Expand All @@ -240,6 +291,14 @@ void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id,
int, union sockunion *))
{
int ret;
#if (ARES_VERSION >= 0x011c00)
struct ares_addrinfo_hints hints = {
.ai_flags = 0,
.ai_family = af,
.ai_socktype = 0, /* any of SOCK_STREAM or SOCK_DGRAM */
.ai_protocol = 0 /* any protocol */
};
#endif

if (hostname == NULL)
return;
Expand Down Expand Up @@ -278,7 +337,13 @@ void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id,
__func__, vrf_id, safe_strerror(errno));
return;
}

#if (ARES_VERSION >= 0x011c00)
ares_getaddrinfo(state.channel, hostname, NULL, &hints, ares_address_cb,
query);
#else
ares_gethostbyname(state.channel, hostname, af, ares_address_cb, query);
#endif
ret = vrf_switchback_to_initial();
if (ret < 0)
flog_err_sys(EC_LIB_SOCKET,
Expand Down
Loading