X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbfd%2Fbfd_api.c;h=cc28b0b6b553312f728b5dc627e84a24b33b6f62;hb=a316744bc5e003d0fa4c8aff82c619b300115f02;hp=48fcdefd91f17db72aa5fa060b9f7f2549037212;hpb=6c4dae27e75fc668f86c9cca0f3f58273b680621;p=vpp.git diff --git a/src/vnet/bfd/bfd_api.c b/src/vnet/bfd/bfd_api.c index 48fcdefd91f..cc28b0b6b55 100644 --- a/src/vnet/bfd/bfd_api.c +++ b/src/vnet/bfd/bfd_api.c @@ -28,6 +28,7 @@ #include #include #include +#include #include @@ -60,25 +61,16 @@ _ (BFD_UDP_AUTH_ACTIVATE, bfd_udp_auth_activate) \ _ (BFD_UDP_AUTH_DEACTIVATE, bfd_udp_auth_deactivate) \ _ (BFD_UDP_SET_ECHO_SOURCE, bfd_udp_set_echo_source) \ - _ (BFD_UDP_DEL_ECHO_SOURCE, bfd_udp_del_echo_source) + _ (BFD_UDP_DEL_ECHO_SOURCE, bfd_udp_del_echo_source) \ + _ (BFD_UDP_GET_ECHO_SOURCE, bfd_udp_get_echo_source) pub_sub_handler (bfd_events, BFD_EVENTS); #define BFD_UDP_API_PARAM_COMMON_CODE \ ip46_address_t local_addr; \ - memset (&local_addr, 0, sizeof (local_addr)); \ ip46_address_t peer_addr; \ - memset (&peer_addr, 0, sizeof (peer_addr)); \ - if (mp->is_ipv6) \ - { \ - clib_memcpy (&local_addr.ip6, mp->local_addr, sizeof (local_addr.ip6)); \ - clib_memcpy (&peer_addr.ip6, mp->peer_addr, sizeof (peer_addr.ip6)); \ - } \ - else \ - { \ - clib_memcpy (&local_addr.ip4, mp->local_addr, sizeof (local_addr.ip4)); \ - clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4)); \ - } + ip_address_decode(&mp->local_addr, &local_addr); \ + ip_address_decode(&mp->peer_addr, &peer_addr); #define BFD_UDP_API_PARAM_FROM_MP(mp) \ clib_net_to_host_u32 (mp->sw_if_index), &local_addr, &peer_addr @@ -150,18 +142,17 @@ send_bfd_udp_session_details (vl_api_registration_t * reg, u32 context, } vl_api_bfd_udp_session_details_t *mp = vl_msg_api_alloc (sizeof (*mp)); - memset (mp, 0, sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); mp->_vl_msg_id = ntohs (VL_API_BFD_UDP_SESSION_DETAILS); mp->context = context; - mp->state = bs->local_state; + mp->state = clib_host_to_net_u32 (bs->local_state); bfd_udp_session_t *bus = &bs->udp; bfd_udp_key_t *key = &bus->key; mp->sw_if_index = clib_host_to_net_u32 (key->sw_if_index); - mp->is_ipv6 = !(ip46_address_is_ip4 (&key->local_addr)); if ((!bs->auth.is_delayed && bs->auth.curr_key) || (bs->auth.is_delayed && bs->auth.next_key)) { - mp->is_authenticated = 1; + mp->is_authenticated = true; } if (bs->auth.is_delayed && bs->auth.next_key) { @@ -173,19 +164,8 @@ send_bfd_udp_session_details (vl_api_registration_t * reg, u32 context, mp->bfd_key_id = bs->auth.curr_bfd_key_id; mp->conf_key_id = clib_host_to_net_u32 (bs->auth.curr_key->conf_key_id); } - if (mp->is_ipv6) - { - clib_memcpy (mp->local_addr, &key->local_addr, - sizeof (key->local_addr)); - clib_memcpy (mp->peer_addr, &key->peer_addr, sizeof (key->peer_addr)); - } - else - { - clib_memcpy (mp->local_addr, key->local_addr.ip4.data, - sizeof (key->local_addr.ip4.data)); - clib_memcpy (mp->peer_addr, key->peer_addr.ip4.data, - sizeof (key->peer_addr.ip4.data)); - } + ip_address_encode (&key->local_addr, IP46_TYPE_ANY, &mp->local_addr); + ip_address_encode (&key->peer_addr, IP46_TYPE_ANY, &mp->peer_addr); mp->required_min_rx = clib_host_to_net_u32 (bs->config_required_min_rx_usec); @@ -245,8 +225,10 @@ vl_api_bfd_udp_session_set_flags_t_handler (vl_api_bfd_udp_session_set_flags_t BFD_UDP_API_PARAM_COMMON_CODE; - rv = bfd_udp_session_set_flags (BFD_UDP_API_PARAM_FROM_MP (mp), - mp->admin_up_down); + rv = bfd_udp_session_set_flags (vlib_get_main (), + BFD_UDP_API_PARAM_FROM_MP (mp), + clib_net_to_host_u32 (mp->flags) & + IF_STATUS_API_FLAG_ADMIN_UP); REPLY_MACRO (VL_API_BFD_UDP_SESSION_SET_FLAGS_REPLY); } @@ -285,13 +267,13 @@ vl_api_bfd_auth_keys_dump_t_handler (vl_api_bfd_auth_keys_dump_t * mp) /* *INDENT-OFF* */ pool_foreach (key, bfd_main.auth_keys, ({ rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); + clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_BFD_AUTH_KEYS_DETAILS); rmp->context = mp->context; rmp->conf_key_id = clib_host_to_net_u32 (key->conf_key_id); rmp->auth_type = key->auth_type; rmp->use_count = clib_host_to_net_u32 (key->use_count); - vl_api_send_msg (reg, (u8 *)&rmp); + vl_api_send_msg (reg, (u8 *)rmp); })); /* *INDENT-ON* */ } @@ -359,10 +341,63 @@ vl_api_bfd_udp_del_echo_source_t_handler (vl_api_bfd_udp_del_echo_source_t * REPLY_MACRO (VL_API_BFD_UDP_DEL_ECHO_SOURCE_REPLY); } +static void +vl_api_bfd_udp_get_echo_source_t_handler (vl_api_bfd_udp_get_echo_source_t * + mp) +{ + vl_api_bfd_udp_get_echo_source_reply_t *rmp; + int rv = 0; + int is_set; + u32 sw_if_index; + int have_usable_ip4; + ip4_address_t ip4; + int have_usable_ip6; + ip6_address_t ip6; + + bfd_udp_get_echo_source (&is_set, &sw_if_index, &have_usable_ip4, &ip4, + &have_usable_ip6, &ip6); + + /* *INDENT-OFF* */ + REPLY_MACRO2 (VL_API_BFD_UDP_GET_ECHO_SOURCE_REPLY, + ({ + rmp->sw_if_index = ntohl (sw_if_index); + if (is_set) + { + rmp->is_set = true; + rmp->sw_if_index = clib_host_to_net_u32 (sw_if_index); + if (have_usable_ip4) + { + rmp->have_usable_ip4 = true; + ip4_address_encode(&ip4, rmp->ip4_addr); + } + else + { + rmp->have_usable_ip4 = false; + } + if (have_usable_ip6) + { + rmp->have_usable_ip6 = true; + ip6_address_encode(&ip6, rmp->ip6_addr); + } + else + { + rmp->have_usable_ip6 = false; + } + } + else + { + rmp->is_set = false; + rmp->have_usable_ip4 = false; + rmp->have_usable_ip6 = false; + } + })) + /* *INDENT-ON* */ +} + /* * bfd_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() */ @@ -381,7 +416,7 @@ setup_message_id_table (api_main_t * am) static clib_error_t * bfd_api_hookup (vlib_main_t * vm) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); #define _(N, n) \ vl_msg_api_set_handlers (VL_API_##N, #n, vl_api_##n##_t_handler, \