X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_helper_macros.h;h=57502570f118c85495c512e141aeb168b7b7ed65;hb=f5db3711b;hp=ce80f0e0e20667e494146c2a2094ea78ae3ee551;hpb=81119e86bdf47f41f06218f91e52024bc4d00e7c;p=vpp.git diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h index ce80f0e0e20..57502570f11 100644 --- a/src/vlibapi/api_helper_macros.h +++ b/src/vlibapi/api_helper_macros.h @@ -59,6 +59,46 @@ do { \ 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 +115,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; \ @@ -94,7 +150,7 @@ do { \ if (!rmp) \ return; \ \ - memset (rmp, 0, sizeof (*rmp)); \ + clib_memset (rmp, 0, sizeof (*rmp)); \ rv = VNET_API_ERROR_TABLE_TOO_BIG; \ is_error = 1; \ } \ @@ -106,6 +162,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 @@ -115,7 +199,7 @@ vnet_sw_if_index_is_api_valid (u32 sw_if_index) } #define VALIDATE_SW_IF_INDEX(mp) \ - do { u32 __sw_if_index = ntohl(mp->sw_if_index); \ + do { u32 __sw_if_index = ntohl((mp)->sw_if_index); \ if (!vnet_sw_if_index_is_api_valid(__sw_if_index)) { \ rv = VNET_API_ERROR_INVALID_SW_IF_INDEX; \ goto bad_sw_if_index; \ @@ -129,7 +213,7 @@ bad_sw_if_index: \ } while (0); #define VALIDATE_RX_SW_IF_INDEX(mp) \ - do { u32 __rx_sw_if_index = ntohl(mp->rx_sw_if_index); \ + do { u32 __rx_sw_if_index = ntohl((mp)->rx_sw_if_index); \ if (!vnet_sw_if_index_is_api_valid(__rx_sw_if_index)) { \ rv = VNET_API_ERROR_INVALID_SW_IF_INDEX; \ goto bad_rx_sw_if_index; \ @@ -183,7 +267,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 { \ @@ -207,7 +291,25 @@ static void vl_api_want_##lca##_t_handler ( \ \ reply: \ REPLY_MACRO (VL_API_WANT_##UCA##_REPLY); \ -} +} \ + \ +static clib_error_t * vl_api_want_##lca##_t_reaper (u32 client_index) \ +{ \ + vpe_api_main_t *vam = &vpe_api_main; \ + vpe_client_registration_t *rp; \ + uword *p; \ + \ + p = hash_get (vam->lca##_registration_hash, client_index); \ + if (p) \ + { \ + rp = pool_elt_at_index (vam->lca##_registrations, p[0]); \ + pool_put (vam->lca##_registrations, rp); \ + hash_unset (vam->lca##_registration_hash, client_index); \ + } \ + return (NULL); \ +} \ + \ +VL_MSG_API_REAPER_FUNCTION (vl_api_want_##lca##_t_reaper); \ #define foreach_registration_hash \ _(interface_events) \ @@ -217,10 +319,10 @@ _(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_pd_reply_events) \ +_(dhcp6_reply_events) typedef struct { @@ -228,24 +330,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;