X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbfd%2Fbfd_api.c;h=4d76f71fd9f0c14bf56fb2e709c047000c35e539;hb=a361a3951c5cc825fcb4e94c41255e2074261769;hp=fcd66950114ec840c1306b448327cc59636aa41e;hpb=2d3c7b9c4555ea4467253b0590c9aa1a6c644b4d;p=vpp.git diff --git a/src/vnet/bfd/bfd_api.c b/src/vnet/bfd/bfd_api.c index fcd66950114..4d76f71fd9f 100644 --- a/src/vnet/bfd/bfd_api.c +++ b/src/vnet/bfd/bfd_api.c @@ -28,58 +28,23 @@ #include #include #include +#include -#include - -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +#include +#include +#include +#define REPLY_MSG_ID_BASE bfd_main.msg_id_base #include -#define foreach_vpe_api_msg \ - _ (BFD_UDP_ADD, bfd_udp_add) \ - _ (BFD_UDP_MOD, bfd_udp_mod) \ - _ (BFD_UDP_DEL, bfd_udp_del) \ - _ (BFD_UDP_SESSION_DUMP, bfd_udp_session_dump) \ - _ (BFD_UDP_SESSION_SET_FLAGS, bfd_udp_session_set_flags) \ - _ (WANT_BFD_EVENTS, want_bfd_events) \ - _ (BFD_AUTH_SET_KEY, bfd_auth_set_key) \ - _ (BFD_AUTH_DEL_KEY, bfd_auth_del_key) \ - _ (BFD_AUTH_KEYS_DUMP, bfd_auth_keys_dump) \ - _ (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_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 @@ -105,6 +70,27 @@ vl_api_bfd_udp_add_t_handler (vl_api_bfd_udp_add_t * mp) REPLY_MACRO (VL_API_BFD_UDP_ADD_REPLY); } +static void +vl_api_bfd_udp_upd_t_handler (vl_api_bfd_udp_add_t *mp) +{ + vl_api_bfd_udp_upd_reply_t *rmp; + int rv; + + VALIDATE_SW_IF_INDEX (mp); + + BFD_UDP_API_PARAM_COMMON_CODE; + + rv = bfd_udp_upd_session ( + BFD_UDP_API_PARAM_FROM_MP (mp), clib_net_to_host_u32 (mp->desired_min_tx), + clib_net_to_host_u32 (mp->required_min_rx), mp->detect_mult, + mp->is_authenticated, clib_net_to_host_u32 (mp->conf_key_id), + mp->bfd_key_id); + + BAD_SW_IF_INDEX_LABEL; + REPLY_MACRO2 (VL_API_BFD_UDP_UPD_REPLY, + ({ rmp->stats_index = clib_host_to_net_u32 (0); })); +} + static void vl_api_bfd_udp_mod_t_handler (vl_api_bfd_udp_mod_t * mp) { @@ -151,18 +137,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)); - mp->_vl_msg_id = ntohs (VL_API_BFD_UDP_SESSION_DETAILS); + clib_memset (mp, 0, sizeof (*mp)); + mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + 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) { @@ -174,22 +159,53 @@ 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) + 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); + mp->desired_min_tx = clib_host_to_net_u32 (bs->config_desired_min_tx_usec); + mp->detect_mult = bs->local_detect_mult; + vl_api_send_msg (reg, (u8 *) mp); +} + +void +send_bfd_udp_session_event (vl_api_registration_t *reg, u32 pid, + bfd_session_t *bs) +{ + if (bs->transport != BFD_TRANSPORT_UDP4 && + bs->transport != BFD_TRANSPORT_UDP6) + { + return; + } + + vl_api_bfd_udp_session_event_t *mp = vl_msg_api_alloc (sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); + mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_BFD_UDP_SESSION_EVENT); + mp->pid = pid; + 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); + if ((!bs->auth.is_delayed && bs->auth.curr_key) || + (bs->auth.is_delayed && bs->auth.next_key)) + { + mp->is_authenticated = true; + } + if (bs->auth.is_delayed && bs->auth.next_key) { - clib_memcpy (mp->local_addr, &key->local_addr, - sizeof (key->local_addr)); - clib_memcpy (mp->peer_addr, &key->peer_addr, sizeof (key->peer_addr)); + mp->bfd_key_id = bs->auth.next_bfd_key_id; + mp->conf_key_id = clib_host_to_net_u32 (bs->auth.next_key->conf_key_id); } - else + else if (!bs->auth.is_delayed && bs->auth.curr_key) { - 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)); + 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); } + 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); + mp->required_min_rx = clib_host_to_net_u32 (bs->config_required_min_rx_usec); mp->desired_min_tx = clib_host_to_net_u32 (bs->config_desired_min_tx_usec); mp->detect_mult = bs->local_detect_mult; vl_api_send_msg (reg, (u8 *) mp); @@ -202,7 +218,7 @@ bfd_event (bfd_main_t * bm, bfd_session_t * bs) vpe_client_registration_t *reg; vl_api_registration_t *vl_reg; /* *INDENT-OFF* */ - pool_foreach (reg, vam->bfd_events_registrations, ({ + pool_foreach (reg, vam->bfd_events_registrations) { vl_reg = vl_api_client_index_to_registration (reg->client_index); if (vl_reg) { @@ -211,10 +227,10 @@ bfd_event (bfd_main_t * bm, bfd_session_t * bs) case BFD_TRANSPORT_UDP4: /* fallthrough */ case BFD_TRANSPORT_UDP6: - send_bfd_udp_session_details (vl_reg, 0, bs); + send_bfd_udp_session_event (vl_reg, 0, bs); } } - })); + } /* *INDENT-ON* */ } @@ -229,11 +245,11 @@ vl_api_bfd_udp_session_dump_t_handler (vl_api_bfd_udp_session_dump_t * mp) bfd_session_t *bs = NULL; /* *INDENT-OFF* */ - pool_foreach (bs, bfd_main.sessions, ({ + pool_foreach (bs, bfd_main.sessions) { if (bs->transport == BFD_TRANSPORT_UDP4 || bs->transport == BFD_TRANSPORT_UDP6) send_bfd_udp_session_details (reg, mp->context, bs); - })); + } /* *INDENT-ON* */ } @@ -246,8 +262,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); } @@ -284,16 +302,16 @@ vl_api_bfd_auth_keys_dump_t_handler (vl_api_bfd_auth_keys_dump_t * mp) vl_api_bfd_auth_keys_details_t *rmp = NULL; /* *INDENT-OFF* */ - pool_foreach (key, bfd_main.auth_keys, ({ + pool_foreach (key, bfd_main.auth_keys) { rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_BFD_AUTH_KEYS_DETAILS); + clib_memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + 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); - })); + } /* *INDENT-ON* */ } @@ -382,72 +400,45 @@ vl_api_bfd_udp_get_echo_source_t_handler (vl_api_bfd_udp_get_echo_source_t * rmp->sw_if_index = ntohl (sw_if_index); if (is_set) { - rmp->is_set = 1; + rmp->is_set = true; rmp->sw_if_index = clib_host_to_net_u32 (sw_if_index); if (have_usable_ip4) { - rmp->have_usable_ip4 = 1; - clib_memcpy (rmp->ip4_addr, &ip4, sizeof (ip4)); + rmp->have_usable_ip4 = true; + ip4_address_encode(&ip4, rmp->ip4_addr); } else { - rmp->have_usable_ip4 = 0; + rmp->have_usable_ip4 = false; } if (have_usable_ip6) { - rmp->have_usable_ip6 = 1; - clib_memcpy (rmp->ip6_addr, &ip6, sizeof (ip6)); + rmp->have_usable_ip6 = true; + ip6_address_encode(&ip6, rmp->ip6_addr); } else { - rmp->have_usable_ip6 = 0; + rmp->have_usable_ip6 = false; } } else { - rmp->is_set = 0; - rmp->have_usable_ip4 = 0; - rmp->have_usable_ip6 = 0; + 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 - * added the client registration handlers. - * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() - */ -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (api_main_t * am) -{ -#define _(id, n, crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_bfd; -#undef _ -} - +#include static clib_error_t * bfd_api_hookup (vlib_main_t * vm) { - api_main_t *am = &api_main; - -#define _(N, n) \ - vl_msg_api_set_handlers (VL_API_##N, #n, vl_api_##n##_t_handler, \ - vl_noop_handler, vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, sizeof (vl_api_##n##_t), 1); - foreach_vpe_api_msg; -#undef _ - /* * Set up the (msg_name, crc, message-id) table */ - setup_message_id_table (am); + REPLY_MSG_ID_BASE = setup_message_id_table (); return 0; }