mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-05-25 18:00:25 +00:00
83e0d67854
Fix duplicate definition of frr_affinity_map_cli_info in libfrr.so.0 and
libmgmt_be_nb.so.0
> =================================================================
> ==3860488==ERROR: AddressSanitizer: odr-violation (0x7f12c98c4d20):
> [1] size=296 'frr_affinity_map_cli_info' lib/affinitymap_cli.c:77:35
> [2] size=296 'frr_affinity_map_cli_info' lib/affinitymap_cli.c:77:35
> These globals were registered at these points:
> [1]:
> #0 0x7f12c9a36f40 in __asan_register_globals ../../../../src/libsanitizer/asan/asan_globals.cpp:341
> #1 0x7f12c9585b7d in _sub_I_00099_1 (/lib/libfrr.so.0+0x185b7d)
> #2 0x7f12ca437fe1 in call_init elf/dl-init.c:72
>
> [2]:
> #0 0x7f12c9a36f40 in __asan_register_globals ../../../../src/libsanitizer/asan/asan_globals.cpp:341
> #1 0x7f12c93824ed in _sub_I_00099_1 (/lib/libmgmt_be_nb.so.0+0x6f4ed)
> #2 0x7f12ca437fe1 in call_init elf/dl-init.c:72
>
> ==3860488==HINT: if you don't care about these errors you may set ASAN_OPTIONS=detect_odr_violation=0
> SUMMARY: AddressSanitizer: odr-violation: global 'frr_affinity_map_cli_info' at lib/affinitymap_cli.c:77:35
> ==3860488==ABORTING
Fixes: dc6ff4c0de ("lib: convert affinity-map to mgmtd")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
108 lines
2.2 KiB
Plaintext
108 lines
2.2 KiB
Plaintext
#
|
|
# mgmtd -- Mangagement Daemon
|
|
#
|
|
|
|
# dist_examples_DATA += \
|
|
# end
|
|
|
|
vtysh_daemons += mgmtd
|
|
|
|
# man8 += $(MANBUILD)/frr-mgmtd.8
|
|
# endif
|
|
|
|
clippy_scan += \
|
|
mgmtd/mgmt_vty.c \
|
|
# end
|
|
|
|
lib_LTLIBRARIES += mgmtd/libmgmt_be_nb.la
|
|
mgmtd_libmgmt_be_nb_la_SOURCES = \
|
|
zebra/zebra_cli.c \
|
|
# end
|
|
nodist_mgmtd_libmgmt_be_nb_la_SOURCES = \
|
|
# end
|
|
mgmtd_libmgmt_be_nb_la_CFLAGS = $(AM_CFLAGS) -DINCLUDE_MGMTD_CMDDEFS_ONLY
|
|
mgmtd_libmgmt_be_nb_la_CPPFLAGS = $(AM_CPPFLAGS) -DINCLUDE_MGMTD_CMDDEFS_ONLY
|
|
mgmtd_libmgmt_be_nb_la_LDFLAGS = -version-info 0:0:0
|
|
|
|
noinst_LIBRARIES += mgmtd/libmgmtd.a
|
|
mgmtd_libmgmtd_a_SOURCES = \
|
|
mgmtd/mgmt.c \
|
|
mgmtd/mgmt_ds.c \
|
|
mgmtd/mgmt_be_adapter.c \
|
|
mgmtd/mgmt_fe_adapter.c \
|
|
mgmtd/mgmt_history.c \
|
|
mgmtd/mgmt_memory.c \
|
|
mgmtd/mgmt_txn.c \
|
|
mgmtd/mgmt_vty.c \
|
|
# end
|
|
|
|
noinst_HEADERS += \
|
|
mgmtd/mgmt.h \
|
|
mgmtd/mgmt_be_adapter.h \
|
|
mgmtd/mgmt_ds.h \
|
|
mgmtd/mgmt_fe_adapter.h \
|
|
mgmtd/mgmt_history.h \
|
|
mgmtd/mgmt_memory.h \
|
|
mgmtd/mgmt_txn.h \
|
|
zebra/zebra_cli.h \
|
|
# end
|
|
|
|
sbin_PROGRAMS += mgmtd/mgmtd
|
|
|
|
if MGMTD_TESTC
|
|
sbin_PROGRAMS += mgmtd/mgmtd_testc
|
|
mgmtd_mgmtd_testc_SOURCES = mgmtd/mgmt_testc.c
|
|
mgmtd_mgmtd_testc_LDADD = lib/libfrr.la
|
|
endif
|
|
|
|
mgmtd_mgmtd_SOURCES = \
|
|
mgmtd/mgmt_main.c \
|
|
# end
|
|
nodist_mgmtd_mgmtd_SOURCES = \
|
|
yang/frr-zebra.yang.c \
|
|
yang/frr-zebra-route-map.yang.c \
|
|
yang/ietf/ietf-netconf-acm.yang.c \
|
|
yang/ietf/ietf-netconf.yang.c \
|
|
yang/ietf/ietf-netconf-with-defaults.yang.c \
|
|
# nothing
|
|
mgmtd_mgmtd_CFLAGS = $(AM_CFLAGS) -I ./
|
|
mgmtd_mgmtd_LDADD = mgmtd/libmgmtd.a lib/libfrr.la $(LIBCAP) $(LIBM) $(LIBYANG_LIBS) $(UST_LIBS)
|
|
mgmtd_mgmtd_LDADD += mgmtd/libmgmt_be_nb.la
|
|
|
|
|
|
if STATICD
|
|
nodist_mgmtd_mgmtd_SOURCES += yang/frr-bfdd.yang.c
|
|
else
|
|
if RIPD
|
|
nodist_mgmtd_mgmtd_SOURCES += yang/frr-bfdd.yang.c
|
|
endif
|
|
endif
|
|
|
|
if RIPD
|
|
nodist_mgmtd_mgmtd_SOURCES += \
|
|
yang/frr-ripd.yang.c \
|
|
# end
|
|
mgmtd_libmgmt_be_nb_la_SOURCES += \
|
|
ripd/rip_cli.c \
|
|
# end
|
|
endif
|
|
|
|
if RIPNGD
|
|
nodist_mgmtd_mgmtd_SOURCES += \
|
|
yang/frr-ripngd.yang.c \
|
|
# end
|
|
mgmtd_libmgmt_be_nb_la_SOURCES += \
|
|
ripngd/ripng_cli.c \
|
|
# end
|
|
endif
|
|
|
|
if STATICD
|
|
nodist_mgmtd_mgmtd_SOURCES += \
|
|
yang/frr-staticd.yang.c \
|
|
# end
|
|
nodist_mgmtd_libmgmt_be_nb_la_SOURCES += \
|
|
staticd/static_vty.c \
|
|
# end
|
|
endif
|
|
|