matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #15837 from acooks-at-bda/dev/fix-deprecated-cares-api

Browse source
This commit is contained in:
David Lamparter 2024-05-02 22:26:16 +02:00 committed by GitHub
parent 54ea38819f 89a2e4d825
commit afb3020e28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lib/resolver.c
View file

@ -104,7 +104,7 @@ static void resolver_cb_timeout(struct event *t)
{ {
struct resolver_state *r = EVENT_ARG(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); resolver_update_timeouts(r);
} }
@ -179,7 +179,56 @@ static void ares_socket_cb(void *data, ares_socket_t fd, int readable,
resolver_fd_drop_maybe(resfd); 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, static void ares_address_cb(void *arg, int status, int timeouts,
struct hostent *he) struct hostent *he)
{ {
@ -222,6 +271,8 @@ static void ares_address_cb(void *arg, int status, int timeouts,
callback(query, NULL, i, &addr[0]); callback(query, NULL, i, &addr[0]);
} }
#endif
static void resolver_cb_literal(struct event *t) static void resolver_cb_literal(struct event *t)
{ {
struct resolver_query *query = EVENT_ARG(t); struct resolver_query *query = EVENT_ARG(t);
@ -240,6 +291,14 @@ void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id,
int, union sockunion *)) int, union sockunion *))
{ {
int ret; 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) if (hostname == NULL)
return; return;
@ -278,7 +337,13 @@ void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id,
__func__, vrf_id, safe_strerror(errno)); __func__, vrf_id, safe_strerror(errno));
return; 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); ares_gethostbyname(state.channel, hostname, af, ares_address_cb, query);
#endif
ret = vrf_switchback_to_initial(); ret = vrf_switchback_to_initial();
if (ret < 0) if (ret < 0)
flog_err_sys(EC_LIB_SOCKET, flog_err_sys(EC_LIB_SOCKET,