From 3f2d5718b824a10a247ef08e23824d365f2f1626 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Sat, 7 Dec 2019 00:39:49 +0100 Subject: [PATCH] lacp: fix control_ping from plugins Type: fix Signed-off-by: Ole Troan Change-Id: I030f75234a346ef6a20640c1a0ed65f4934867f2 --- src/plugins/lacp/lacp_test.c | 2 ++ src/plugins/memif/memif_test.c | 4 ++++ src/tools/vppapigen/vppapigen_c.py | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/src/plugins/lacp/lacp_test.c b/src/plugins/lacp/lacp_test.c index cbff00d9502..4a705ff0140 100644 --- a/src/plugins/lacp/lacp_test.c +++ b/src/plugins/lacp/lacp_test.c @@ -114,6 +114,8 @@ api_sw_interface_lacp_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ + if (!lm->ping_id) + lm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); mp_ping->_vl_msg_id = htons (lm->ping_id); mp_ping->client_index = vam->my_client_index; diff --git a/src/plugins/memif/memif_test.c b/src/plugins/memif/memif_test.c index d2ab7e0844d..05f5c29b957 100644 --- a/src/plugins/memif/memif_test.c +++ b/src/plugins/memif/memif_test.c @@ -304,6 +304,8 @@ api_memif_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ + if (!mm->ping_id) + mm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); mp_ping->_vl_msg_id = htons (mm->ping_id); mp_ping->client_index = vam->my_client_index; @@ -356,6 +358,8 @@ api_memif_socket_filename_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ + if (!mm->ping_id) + mm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); mp_ping->_vl_msg_id = htons (mm->ping_id); mp_ping->client_index = vam->my_client_index; diff --git a/src/tools/vppapigen/vppapigen_c.py b/src/tools/vppapigen/vppapigen_c.py index e15a1417643..e84732e3f48 100644 --- a/src/tools/vppapigen/vppapigen_c.py +++ b/src/tools/vppapigen/vppapigen_c.py @@ -586,6 +586,10 @@ def generate_include_types(s, module, stream): write('} vl_api_%s_t;\n' % o.name) + for t in s['Define']: + write('#define VL_API_{ID}_CRC "{n}_{crc:08x}"\n' + .format(n=t.name, ID=t.name.upper(), crc=t.crc)) + write("\n#endif\n") -- 2.16.6