X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_helper_macros.h;h=8fc0bd54c76b1f64adfd9a4abc7995dca7a0f570;hb=bad679291;hp=e324170643146eaaff756a1e7cfc9f124c997fed;hpb=b7b929931a07fbb27b43d5cd105f366c3e29807e;p=vpp.git diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h index e3241706431..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; \ @@ -59,6 +78,66 @@ do { \ vl_api_send_msg (rp, (u8 *)rmp); \ } while(0); +#define REPLY_MACRO2_END(t, body) \ +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; \ + do {body;} while (0); \ + 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_ZERO(t, body) \ +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_zero (sizeof (*rmp)); \ + rmp->_vl_msg_id = htons((t)+(REPLY_MSG_ID_BASE)); \ + rmp->context = mp->context; \ + rmp->retval = ntohl(rv); \ + do {body;} while (0); \ + vl_api_send_msg (rp, (u8 *)rmp); \ +} while(0); + +#define REPLY_MACRO_DETAILS2(t, body) \ +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 = htons((t)+(REPLY_MSG_ID_BASE)); \ + rmp->context = mp->context; \ + do {body;} while (0); \ + vl_api_send_msg (rp, (u8 *)rmp); \ +} while(0); + +#define REPLY_MACRO_DETAILS4(t, rp, context, body) \ +do { \ + rmp = vl_msg_api_alloc (sizeof (*rmp)); \ + rmp->_vl_msg_id = htons((t)+(REPLY_MSG_ID_BASE)); \ + rmp->context = context; \ + do {body;} while (0); \ + vl_api_send_msg (rp, (u8 *)rmp); \ +} while(0); + #define REPLY_MACRO3(t, n, body) \ do { \ vl_api_registration_t *rp; \ @@ -75,6 +154,22 @@ do { \ vl_api_send_msg (rp, (u8 *)rmp); \ } while(0); +#define REPLY_MACRO3_ZERO(t, n, body) \ +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_zero (sizeof (*rmp) + n); \ + rmp->_vl_msg_id = htons((t)+(REPLY_MSG_ID_BASE)); \ + rmp->context = mp->context; \ + rmp->retval = ntohl(rv); \ + do {body;} while (0); \ + vl_api_send_msg (rp, (u8 *)rmp); \ +} while(0); + #define REPLY_MACRO4(t, n, body) \ do { \ vl_api_registration_t *rp; \ @@ -106,6 +201,34 @@ do { \ vl_api_send_msg (rp, (u8 *)rmp); \ } while(0); +#define REPLY_AND_DETAILS_MACRO(t, p, body) \ +do { \ + vl_api_registration_t *rp; \ + rp = vl_api_client_index_to_registration (mp->client_index); \ + if (rp == 0) \ + return; \ + u32 cursor = clib_net_to_host_u32 (mp->cursor); \ + vlib_main_t *vm = vlib_get_main (); \ + f64 start = vlib_time_now (vm); \ + if (pool_is_free_index (p, cursor)) { \ + cursor = pool_next_index (p, cursor); \ + if (cursor == ~0) \ + rv = VNET_API_ERROR_INVALID_VALUE; \ + } \ + while (cursor != ~0) { \ + do {body;} while (0); \ + cursor = pool_next_index (p, cursor); \ + if (vl_api_process_may_suspend (vm, rp, start)) { \ + if (cursor != ~0) \ + rv = VNET_API_ERROR_EAGAIN; \ + break; \ + } \ + } \ + REPLY_MACRO2 (t, ({ \ + rmp->cursor = clib_host_to_net_u32 (cursor); \ + })); \ +} while(0); + /* "trust, but verify" */ static inline uword @@ -183,7 +306,7 @@ static void vl_api_want_##lca##_t_handler ( \ p = hash_get (vam->lca##_registration_hash, mp->client_index); \ if (p) { \ if (mp->enable_disable) { \ - clib_warning ("pid %d: already enabled...", mp->pid); \ + clib_warning ("pid %d: already enabled...", ntohl(mp->pid)); \ rv = VNET_API_ERROR_INVALID_REGISTRATION; \ goto reply; \ } else { \ @@ -235,8 +358,7 @@ _(to_netconf_client) \ _(from_netconf_client) \ _(oam_events) \ _(bfd_events) \ -_(wc_ip6_nd_events) \ -_(wc_ip4_arp_events) \ +_(l2_arp_term_events) \ _(ip6_ra_events) \ _(dhcp6_pd_reply_events) \ _(dhcp6_reply_events) @@ -247,24 +369,16 @@ typedef struct u32 client_pid; } vpe_client_registration_t; -struct _vl_api_ip4_arp_event; -struct _vl_api_ip6_nd_event; - typedef struct { -#define _(a) uword *a##_registration_hash; \ - vpe_client_registration_t * a##_registrations; +#define _(a) \ + uword *a##_registration_hash; \ + vpe_client_registration_t * a##_registrations; foreach_registration_hash #undef _ /* notifications happen really early in the game */ u8 link_state_process_up; - /* ip4 arp event registration pool */ - struct _vl_api_ip4_arp_event *arp_events; - - /* ip6 nd event registration pool */ - struct _vl_api_ip6_nd_event *nd_events; - /* convenience */ vlib_main_t *vlib_main; vnet_main_t *vnet_main;