Skip to content

bgpd: Load resolver_init() not only when BMP is enabled #20048

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

Open
ton31337 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

bgpd: Load resolver_init() not only when BMP is enabled #20048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion bgpd/bgp_bmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3418,7 +3418,6 @@ static int bgp_bmp_init(struct event_loop *tm)

install_element(VIEW_NODE, &show_bmp_cmd);

resolver_init(tm);
return 0;
}

Expand Down
2 changes: 2 additions & 0 deletions bgpd/bgp_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,8 @@ int main(int argc, char **argv)
/* BGP related initialization. */
bgp_init((unsigned short)instance);

resolver_init(bm->master);

if (list_isempty(bm->addresses)) {
snprintf(bgpd_di.startinfo, sizeof(bgpd_di.startinfo),
", bgp@<all>:%d", bm->port);
Expand Down
1 change: 1 addition & 0 deletions bgpd/bgpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "srv6.h"
#include "iana_afi.h"
#include "asn.h"
#include "resolver.h"

PREDECL_LIST(zebra_announce);
PREDECL_LIST(zebra_l2_vni);
Expand Down
4 changes: 3 additions & 1 deletion bgpd/subdir.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ bgpd_bgp_btoa_SOURCES = bgpd/bgp_btoa.c

# RFPLDADD is set in bgpd/rfp-example/librfp/subdir.am
bgpd_bgpd_LDADD = bgpd/libbgp.a $(RFPLDADD) lib/libfrr.la $(LIBYANG_LIBS) $(LIBCAP) $(LIBM) $(UST_LIBS)
if CARES
bgpd_bgpd_LDADD += lib/libfrrcares.la
endif
bgpd_bgp_btoa_LDADD = bgpd/libbgp.a $(RFPLDADD) lib/libfrr.la $(LIBYANG_LIBS) $(LIBCAP) $(LIBM) $(UST_LIBS)

bgpd_bgpd_snmp_la_SOURCES = bgpd/bgp_snmp_bgp4.c bgpd/bgp_snmp_bgp4v2.c bgpd/bgp_snmp.c bgpd/bgp_mplsvpn_snmp.c
Expand All @@ -208,7 +211,6 @@ bgpd_bgpd_rpki_la_LDFLAGS = $(MODULE_LDFLAGS)
bgpd_bgpd_rpki_la_LIBADD = $(RTRLIB_LIBS)

bgpd_bgpd_bmp_la_SOURCES = bgpd/bgp_bmp.c
bgpd_bgpd_bmp_la_LIBADD = lib/libfrrcares.la
bgpd_bgpd_bmp_la_LDFLAGS = $(MODULE_LDFLAGS)

clippy_scan += \
Expand Down
Loading