ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ioam: do not reuse existing vnet symbol

Browse Source 
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 <bganne@cisco.com>
(cherry picked from commit 83ceffcd98)
This commit is contained in:
Benoît Ganne
2020-04-24 09:20:13 +02:00
committed by Andrew Yourtchenko
parent aa6207f44b
commit 16845adf79
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -556,6 +556,10 @@ Plugin - SCTP
I: sctp I: sctp
F: src/plugins/sctp/ F: src/plugins/sctp/
IOAM
I: ioam
F: src/plugins/ioam
THE REST THE REST
I: misc I: misc
C: Contact vpp-dev Mailing List <vpp-dev@fd.io> C: Contact vpp-dev Mailing List <vpp-dev@fd.io>

4
src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
View File

@ -272,7 +272,7 @@ setup_message_id_table (vxlan_gpe_ioam_main_t * sm, api_main_t * am)
} }
static clib_error_t * 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; vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
clib_error_t *error = 0; clib_error_t *error = 0;
@ -321,7 +321,7 @@ vxlan_gpe_init (vlib_main_t * vm)
return error; return error;
} }
VLIB_INIT_FUNCTION (vxlan_gpe_init); VLIB_INIT_FUNCTION (ioam_vxlan_gpe_init);
/* /*
* fd.io coding-style-patch-verification: ON * fd.io coding-style-patch-verification: ON