From bad679291a9dbc4d9274b1697f7ff41283deabd7 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Mon, 24 Aug 2020 12:22:01 +0200 Subject: 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 Change-Id: Id14173300ee1ab2601e92d58c70d2fa260814b69 --- src/vlibapi/api_helper_macros.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src/vlibapi/api_helper_macros.h') 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); -- cgit 1.2.3-korg