diff options
| author |   Ole Troan <ot@cisco.com> | 2020-08-24 12:22:01 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2020-08-25 07:35:49 +0000 |
| commit | bad679291a9dbc4d9274b1697f7ff41283deabd7 (patch) | |
| tree | fa1d94b9035af6f34667c60f0b06287966598b98 | |
| parent | 3f54d96dac7eda66096ad7068a86fdf4b86cea67 (diff) | |
api: register endian handlers for reply messages
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
| -rw-r--r-- | src/plugins/dhcp/dhcp.api | 2 | ||||
| -rw-r--r-- | src/plugins/dhcp/dhcp_test.c | 3 | ||||
| -rw-r--r-- | src/tools/vppapigen/vppapigen_c.py | 13 | ||||
| -rw-r--r-- | src/vlibapi/api_helper_macros.h | 21 |
4 files changed, 34 insertions, 5 deletions
diff --git a/src/plugins/dhcp/dhcp.api b/src/plugins/dhcp/dhcp.api index 9d8ca4c5b8d..4611d5fadd8 100644 --- a/src/plugins/dhcp/dhcp.api +++ b/src/plugins/dhcp/dhcp.api @@ -264,7 +264,7 @@ typedef dhcp_server /** \brief Tell client about a DHCP completion event @param client_index - opaque cookie to identify the sender */ -manual_endian manual_print define dhcp_proxy_details +define dhcp_proxy_details { u32 context; u32 rx_vrf_id; diff --git a/src/plugins/dhcp/dhcp_test.c b/src/plugins/dhcp/dhcp_test.c index 0eb87ab3257..c1894ec01ea 100644 --- a/src/plugins/dhcp/dhcp_test.c +++ b/src/plugins/dhcp/dhcp_test.c @@ -142,9 +142,6 @@ api_dhcp_proxy_config (vat_main_t * vam) 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 vl_api_dhcp_proxy_details_t_handler (vl_api_dhcp_proxy_details_t * mp) { diff --git a/src/tools/vppapigen/vppapigen_c.py b/src/tools/vppapigen/vppapigen_c.py index bf55739094d..59dbbc99fb6 100644 --- a/src/tools/vppapigen/vppapigen_c.py +++ b/src/tools/vppapigen/vppapigen_c.py @@ -644,6 +644,19 @@ def generate_c_boilerplate(services, defines, file_crc, module, stream): ' .is_autoendian = 0}};\n' .format(n=s.caller, ID=s.caller.upper())) 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('}\n') diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h index c7348cfde97..8fc0bd54c76 100644 --- a/src/vlibapi/api_helper_macros.h +++ b/src/vlibapi/api_helper_macros.h @@ -43,6 +43,25 @@ do { \ vl_api_send_msg (rp, (u8 *)rmp); \ } 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) \ do { \ vl_api_registration_t *rp; \ @@ -74,7 +93,7 @@ do { \ do {body;} while (0); \ api_main_t *am = vlibapi_get_main (); \ 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); \ vl_api_send_msg (rp, (u8 *)rmp); \ } while(0); |