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

vapi: Missing include file in vlib.api.vapi.h

Browse Source 
- A call to vapi_msg_control_ping_hton() is generated in
  a static inline function in vlib.api.vapi.h, which is
  defined/generated in memclnt.api.vapi.h without
  including memclnt.api.vapi.h in vlib.api.vapi.h.
  This breaks the compilation of plugins which include
  only vlib.api.vapi.h (e.g. hicn_plugin from the HICN
  project).

Type: fix
Fixes: a1400cecb

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I5574f4ed496183ea93265f493bf3624254a865a2
This commit is contained in:
Dave Wallace
2022-02-23 15:36:02 -05:00
parent 45207e0fb2
commit 14baada214
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/vpp-api/vapi/vapi_c_gen.py
View File

@ -648,22 +648,6 @@ class CMessage (Message):
]) ])
vapi_send_with_control_ping = """
static inline vapi_error_e
vapi_send_with_control_ping (vapi_ctx_t ctx, void *msg, u32 context)
{
vapi_msg_control_ping *ping = vapi_alloc_control_ping (ctx);
if (!ping)
{
return VAPI_ENOMEM;
}
ping->header.context = context;
vapi_msg_control_ping_hton (ping);
return vapi_send2 (ctx, msg, ping);
}
"""
def emit_definition(parser, json_file, emitted, o): def emit_definition(parser, json_file, emitted, o):
if o in emitted: if o in emitted:
return return
@ -746,6 +730,8 @@ def gen_json_unified_header(parser, logger, j, io, name):
print("") print("")
print("static inline vapi_error_e vapi_send_with_control_ping " print("static inline vapi_error_e vapi_send_with_control_ping "
"(vapi_ctx_t ctx, void * msg, u32 context);") "(vapi_ctx_t ctx, void * msg, u32 context);")
elif name == "vlib.api.vapi.h":
print("#include <vapi/memclnt.api.vapi.h>")
else: else:
print("#include <vapi/vlib.api.vapi.h>") print("#include <vapi/vlib.api.vapi.h>")
print("") print("")
@ -775,7 +761,21 @@ def gen_json_unified_header(parser, logger, j, io, name):
print("") print("")
if name == "vlib.api.vapi.h": if name == "vlib.api.vapi.h":
print("%s" % vapi_send_with_control_ping) vapi_send_with_control_ping_function = """
static inline vapi_error_e
vapi_send_with_control_ping (vapi_ctx_t ctx, void *msg, u32 context)
{
vapi_msg_control_ping *ping = vapi_alloc_control_ping (ctx);
if (!ping)
{
return VAPI_ENOMEM;
}
ping->header.context = context;
vapi_msg_control_ping_hton (ping);
return vapi_send2 (ctx, msg, ping);
}
"""
print("%s" % vapi_send_with_control_ping_function)
print("") print("")
print("#ifdef __cplusplus") print("#ifdef __cplusplus")