proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-28 23:33:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9878 from pguibert6WIND/resolver_vrf

Browse Source 
lib: resolver per vrf support
This commit is contained in:
Donatas Abraitis 2021-12-01 08:12:33 +02:00 committed by GitHub
commit e2144103f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_bmp.c
View File

@ -1833,6 +1833,7 @@ static int bmp_active_thread(struct thread *t)
socklen_t slen;
int status, ret;
char buf[SU_ADDRSTRLEN];
vrf_id_t vrf_id;
/* all 3 end up here, though only timer or read+write are active
* at a time */
@ -1843,7 +1844,12 @@ static int bmp_active_thread(struct thread *t)
ba->last_err = NULL;
if (ba->socket == -1) {
resolver_resolve(&ba->resq, AF_UNSPEC, ba->hostname,
/* get vrf_id */
if (!ba->targets || !ba->targets->bgp)
vrf_id = VRF_DEFAULT;
else
vrf_id = ba->targets->bgp->vrf_id;
resolver_resolve(&ba->resq, AF_UNSPEC, vrf_id, ba->hostname,
bmp_active_resolved);
return 0;
}

14
lib/resolver.c
View File

@ -21,6 +21,7 @@
#include "resolver.h"
#include "command.h"
#include "xref.h"
#include "vrf.h"
XREF_SETUP();
@ -244,7 +245,7 @@ static int resolver_cb_literal(struct thread *t)
return 0;
}
void resolver_resolve(struct resolver_query *query, int af,
void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id,
const char *hostname,
void (*callback)(struct resolver_query *, const char *,
int, union sockunion *))
@ -279,7 +280,18 @@ void resolver_resolve(struct resolver_query *query, int af,
if (resolver_debug)
zlog_debug("[%p] Resolving '%s'", query, hostname);
ret = vrf_switch_to_netns(vrf_id);
if (ret < 0) {
flog_err_sys(EC_LIB_SOCKET, "%s: Can't switch to VRF %u (%s)",
__func__, vrf_id, safe_strerror(errno));
return;
}
ares_gethostbyname(state.channel, hostname, af, ares_address_cb, query);
ret = vrf_switchback_to_initial();
if (ret < 0)
flog_err_sys(EC_LIB_SOCKET,
"%s: Can't switchback from VRF %u (%s)", __func__,
vrf_id, safe_strerror(errno));
resolver_update_timeouts(&state);
}

8
lib/resolver.h
View File

@ -27,10 +27,10 @@ struct resolver_query {
};
void resolver_init(struct thread_master *tm);
void resolver_resolve(struct resolver_query *query, int af,
const char *hostname, void (*cb)(struct resolver_query *,
const char *, int,
union sockunion *));
void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id,
const char *hostname,
void (*cb)(struct resolver_query *, const char *, int,
union sockunion *));
#ifdef __cplusplus
}

4
nhrpd/nhrp_nhs.c
View File

@ -324,8 +324,8 @@ static int nhrp_nhs_resolve(struct thread *t)
{
struct nhrp_nhs *nhs = THREAD_ARG(t);
resolver_resolve(&nhs->dns_resolve, AF_INET, nhs->nbma_fqdn,
nhrp_nhs_resolve_cb);
resolver_resolve(&nhs->dns_resolve, AF_INET, VRF_DEFAULT,
nhs->nbma_fqdn, nhrp_nhs_resolve_cb);
return 0;
}

2
tests/lib/test_resolver.c
View File

@ -63,7 +63,7 @@ DEFUN (test_resolve,
"DNS resolver\n"
"Name to resolve\n")
{
resolver_resolve(&query, AF_UNSPEC, argv[1]->arg, resolver_result);
resolver_resolve(&query, AF_UNSPEC, 0, argv[1]->arg, resolver_result);
return CMD_SUCCESS;
}