From 16845adf79f2dcd2fc33147713fa5d4ae9c1beaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Ganne?= Date: Fri, 24 Apr 2020 09:20:13 +0200 Subject: [PATCH] ioam: do not reuse existing vnet symbol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit vxlan_gpe_init() is already defined in libvnet. When loading ioam plugin we end up having 2 different objects using the same symbol. ASan in GCC-10 started to enforce the One-Definition-Rule and it seems like good hygiene anyway. Type: fix Change-Id: I2ea9af1821bca6482a290742e9a109fc25692f37 Signed-off-by: Benoît Ganne (cherry picked from commit 83ceffcd980494c6146ca67a0fa709b2c37ef13e) --- MAINTAINERS | 4 ++++ src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 586e3e0c722..1b52b737600 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -556,6 +556,10 @@ Plugin - SCTP I: sctp F: src/plugins/sctp/ +IOAM +I: ioam +F: src/plugins/ioam + THE REST I: misc C: Contact vpp-dev Mailing List diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c index e46d0fbf866..cafb83be38a 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c +++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c @@ -272,7 +272,7 @@ setup_message_id_table (vxlan_gpe_ioam_main_t * sm, api_main_t * am) } static clib_error_t * -vxlan_gpe_init (vlib_main_t * vm) +ioam_vxlan_gpe_init (vlib_main_t * vm) { vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main; clib_error_t *error = 0; @@ -321,7 +321,7 @@ vxlan_gpe_init (vlib_main_t * vm) return error; } -VLIB_INIT_FUNCTION (vxlan_gpe_init); +VLIB_INIT_FUNCTION (ioam_vxlan_gpe_init); /* * fd.io coding-style-patch-verification: ON