X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec-gre%2Fipsec_gre_api.c;h=c29b9b8816e2e9aea54a7ddc007a9356616d12e2;hb=bdc0e6b7204ea0211d4f7881497e4306586fb9ef;hp=af3003004b995e638af46c8214b9091dd3e2d3e3;hpb=e86a8edd3c14fb41ace2a12efd17bc7772bf623f;p=vpp.git diff --git a/src/vnet/ipsec-gre/ipsec_gre_api.c b/src/vnet/ipsec-gre/ipsec_gre_api.c index af3003004b9..c29b9b8816e 100644 --- a/src/vnet/ipsec-gre/ipsec_gre_api.c +++ b/src/vnet/ipsec-gre/ipsec_gre_api.c @@ -83,7 +83,7 @@ out: } static void send_ipsec_gre_tunnel_details - (ipsec_gre_tunnel_t * t, svm_queue_t * q, u32 context) + (ipsec_gre_tunnel_t * t, vl_api_registration_t * reg, u32 context) { vl_api_ipsec_gre_tunnel_details_t *rmp; @@ -97,22 +97,20 @@ static void send_ipsec_gre_tunnel_details rmp->remote_sa_id = htonl (t->remote_sa_id); rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_ipsec_gre_tunnel_dump_t_handler (vl_api_ipsec_gre_tunnel_dump_t * mp) { - svm_queue_t *q; + vl_api_registration_t *reg; ipsec_gre_main_t *igm = &ipsec_gre_main; ipsec_gre_tunnel_t *t; u32 sw_if_index; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) - { - return; - } + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; sw_if_index = ntohl (mp->sw_if_index); @@ -121,7 +119,7 @@ static void vl_api_ipsec_gre_tunnel_dump_t_handler /* *INDENT-OFF* */ pool_foreach (t, igm->tunnels, ({ - send_ipsec_gre_tunnel_details(t, q, mp->context); + send_ipsec_gre_tunnel_details(t, reg, mp->context); })); /* *INDENT-ON* */ } @@ -133,14 +131,14 @@ static void vl_api_ipsec_gre_tunnel_dump_t_handler return; } t = &igm->tunnels[igm->tunnel_index_by_sw_if_index[sw_if_index]]; - send_ipsec_gre_tunnel_details (t, q, mp->context); + send_ipsec_gre_tunnel_details (t, reg, mp->context); } } /* * ipsec_gre_api_hookup * Add vpe's API message handlers to the table. - * vlib has alread mapped shared memory and + * vlib has already mapped shared memory and * added the client registration handlers. * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() */