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

api: register endian handlers for reply messages

Browse Source 
Endian handlers was not registered for reply messages.
Causing endian-neutral handlers to crash.

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: Id14173300ee1ab2601e92d58c70d2fa260814b69
This commit is contained in:
Ole Troan
2020-08-24 12:22:01 +02:00
committed by Andrew Yourtchenko
parent 3f54d96dac
commit bad679291a
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/dhcp/dhcp.api
View File

@ -264,7 +264,7 @@ typedef dhcp_server
/** \brief Tell client about a DHCP completion event /** \brief Tell client about a DHCP completion event
@param client_index - opaque cookie to identify the sender @param client_index - opaque cookie to identify the sender
*/ */
manual_endian manual_print define dhcp_proxy_details define dhcp_proxy_details
{ {
u32 context; u32 context;
u32 rx_vrf_id; u32 rx_vrf_id;

3
src/plugins/dhcp/dhcp_test.c
View File

@ -142,9 +142,6 @@ api_dhcp_proxy_config (vat_main_t * vam)
return ret; return ret;
} }
#define vl_api_dhcp_proxy_details_t_endian vl_noop_handler
#define vl_api_dhcp_proxy_details_t_print vl_noop_handler
static void static void
vl_api_dhcp_proxy_details_t_handler (vl_api_dhcp_proxy_details_t * mp) vl_api_dhcp_proxy_details_t_handler (vl_api_dhcp_proxy_details_t * mp)
{ {

13
src/tools/vppapigen/vppapigen_c.py
View File

@ -644,6 +644,19 @@ def generate_c_boilerplate(services, defines, file_crc, module, stream):
' .is_autoendian = 0}};\n' ' .is_autoendian = 0}};\n'
.format(n=s.caller, ID=s.caller.upper())) .format(n=s.caller, ID=s.caller.upper()))
write(' vl_msg_api_config (&c);\n') write(' vl_msg_api_config (&c);\n')
try:
d = define_hash[s.reply]
write(' c = (vl_msg_api_msg_config_t) {{.id = VL_API_{ID} + msg_id_base,\n'
' .name = "{n}",\n'
' .handler = 0,\n'
' .cleanup = vl_noop_handler,\n'
' .endian = vl_api_{n}_t_endian,\n'
' .print = vl_api_{n}_t_print,\n'
' .is_autoendian = 0}};\n'
.format(n=s.reply, ID=s.reply.upper()))
write(' vl_msg_api_config (&c);\n')
except KeyError:
pass
write(' return msg_id_base;\n') write(' return msg_id_base;\n')
write('}\n') write('}\n')

21
src/vlibapi/api_helper_macros.h
View File

@ -43,6 +43,25 @@ do { \
vl_api_send_msg (rp, (u8 *)rmp); \ vl_api_send_msg (rp, (u8 *)rmp); \
} while(0); } while(0);
#define REPLY_MACRO_END(t) \
do { \
vl_api_registration_t *rp; \
rv = vl_msg_api_pd_handler (mp, rv); \
rp = vl_api_client_index_to_registration (mp->client_index); \
if (rp == 0) \
return; \
\
rmp = vl_msg_api_alloc (sizeof (*rmp)); \
rmp->_vl_msg_id = t+(REPLY_MSG_ID_BASE); \
rmp->context = mp->context; \
rmp->retval = rv; \
api_main_t *am = vlibapi_get_main (); \
void (*endian_fp) (void *); \
endian_fp = am->msg_endian_handlers[t+(REPLY_MSG_ID_BASE)]; \
(*endian_fp) (rmp); \
vl_api_send_msg (rp, (u8 *)rmp); \
} while(0);
#define REPLY_MACRO2(t, body) \ #define REPLY_MACRO2(t, body) \
do { \ do { \
vl_api_registration_t *rp; \ vl_api_registration_t *rp; \
@ -74,7 +93,7 @@ do { \
do {body;} while (0); \ do {body;} while (0); \
api_main_t *am = vlibapi_get_main (); \ api_main_t *am = vlibapi_get_main (); \
void (*endian_fp) (void *); \ void (*endian_fp) (void *); \
endian_fp = am->msg_endian_handlers[t]; \ endian_fp = am->msg_endian_handlers[t+(REPLY_MSG_ID_BASE)]; \
(*endian_fp) (rmp); \ (*endian_fp) (rmp); \
vl_api_send_msg (rp, (u8 *)rmp); \ vl_api_send_msg (rp, (u8 *)rmp); \
} while(0); } while(0);