From 4682feb1f0b15d0f1940cd5984ae82ccaea168f7 Mon Sep 17 00:00:00 2001 From: Jakub Grajciar Date: Mon, 2 Sep 2019 13:28:52 +0200 Subject: bfd: API cleanup Use consistent API types. Type: fix Signed-off-by: Jakub Grajciar Change-Id: I4b91ebe8aadbec8b95716ed1cde4b0a13eee3a3f Signed-off-by: Jakub Grajciar --- src/vnet/bfd/bfd.api | 91 ++++++++++++++++++++++++++------------------------ src/vnet/bfd/bfd_api.c | 59 +++++++++++--------------------- 2 files changed, 66 insertions(+), 84 deletions(-) (limited to 'src') diff --git a/src/vnet/bfd/bfd.api b/src/vnet/bfd/bfd.api index afbcc731e5a..9fdd5b728d4 100644 --- a/src/vnet/bfd/bfd.api +++ b/src/vnet/bfd/bfd.api @@ -13,7 +13,17 @@ * limitations under the License. */ -option version = "1.0.0"; +option version = "2.0.0"; + +import "vnet/interface_types.api"; +import "vnet/ip/ip_types.api"; + +enum bfd_state { + BFD_STATE_API_ADMIN_DOWN = 0, + BFD_STATE_API_DOWN = 1, + BFD_STATE_API_INIT = 2, + BFD_STATE_API_UP = 3, +}; /** \brief Set BFD echo source @param client_index - opaque cookie to identify the sender @@ -24,7 +34,7 @@ autoreply define bfd_udp_set_echo_source { u32 client_index; u32 context; - u32 sw_if_index; + vl_api_interface_index_t sw_if_index; }; /** \brief Delete BFD echo source @@ -61,12 +71,12 @@ define bfd_udp_get_echo_source_reply { u32 context; i32 retval; - u32 sw_if_index; - u8 is_set; - u8 have_usable_ip4; - u8 ip4_addr[4]; - u8 have_usable_ip6; - u8 ip6_addr[16]; + vl_api_interface_index_t sw_if_index; + bool is_set; + bool have_usable_ip4; + vl_api_ip4_address_t ip4_addr; + bool have_usable_ip6; + vl_api_ip6_address_t ip6_addr; }; /** \brief Add UDP BFD session on interface @@ -87,14 +97,13 @@ autoreply define bfd_udp_add { u32 client_index; u32 context; - u32 sw_if_index; + vl_api_interface_index_t sw_if_index; u32 desired_min_tx; u32 required_min_rx; - u8 local_addr[16]; - u8 peer_addr[16]; - u8 is_ipv6; + vl_api_address_t local_addr; + vl_api_address_t peer_addr; u8 detect_mult; - u8 is_authenticated; + bool is_authenticated; u8 bfd_key_id; u32 conf_key_id; }; @@ -114,12 +123,11 @@ autoreply define bfd_udp_mod { u32 client_index; u32 context; - u32 sw_if_index; + vl_api_interface_index_t sw_if_index; u32 desired_min_tx; u32 required_min_rx; - u8 local_addr[16]; - u8 peer_addr[16]; - u8 is_ipv6; + vl_api_address_t local_addr; + vl_api_address_t peer_addr; u8 detect_mult; }; @@ -135,10 +143,9 @@ autoreply define bfd_udp_del { u32 client_index; u32 context; - u32 sw_if_index; - u8 local_addr[16]; - u8 peer_addr[16]; - u8 is_ipv6; + vl_api_interface_index_t sw_if_index; + vl_api_address_t local_addr; + vl_api_address_t peer_addr; }; /** \brief Get all BFD sessions @@ -168,12 +175,11 @@ define bfd_udp_session_dump define bfd_udp_session_details { u32 context; - u32 sw_if_index; - u8 local_addr[16]; - u8 peer_addr[16]; - u8 is_ipv6; - u8 state; - u8 is_authenticated; + vl_api_interface_index_t sw_if_index; + vl_api_address_t local_addr; + vl_api_address_t peer_addr; + vl_api_bfd_state_t state; + bool is_authenticated; u8 bfd_key_id; u32 conf_key_id; u32 required_min_rx; @@ -188,17 +194,16 @@ define bfd_udp_session_details @param local_addr - local address @param peer_addr - peer address @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4 - @param admin_up_down - set the admin state, 1 = up, 0 = down + @param flags - set the admin state, 1 = up, 0 = down */ autoreply define bfd_udp_session_set_flags { u32 client_index; u32 context; - u32 sw_if_index; - u8 local_addr[16]; - u8 peer_addr[16]; - u8 is_ipv6; - u8 admin_up_down; + vl_api_interface_index_t sw_if_index; + vl_api_address_t local_addr; + vl_api_address_t peer_addr; + vl_api_if_status_flags_t flags; }; /** \brief Register for BFD events @@ -211,7 +216,7 @@ autoreply define want_bfd_events { u32 client_index; u32 context; - u32 enable_disable; + bool enable_disable; u32 pid; }; @@ -286,11 +291,10 @@ autoreply define bfd_udp_auth_activate { u32 client_index; u32 context; - u32 sw_if_index; - u8 local_addr[16]; - u8 peer_addr[16]; - u8 is_ipv6; - u8 is_delayed; + vl_api_interface_index_t sw_if_index; + vl_api_address_t local_addr; + vl_api_address_t peer_addr; + bool is_delayed; u8 bfd_key_id; u32 conf_key_id; }; @@ -308,11 +312,10 @@ autoreply define bfd_udp_auth_deactivate { u32 client_index; u32 context; - u32 sw_if_index; - u8 local_addr[16]; - u8 peer_addr[16]; - u8 is_ipv6; - u8 is_delayed; + vl_api_interface_index_t sw_if_index; + vl_api_address_t local_addr; + vl_api_address_t peer_addr; + bool is_delayed; }; /* diff --git a/src/vnet/bfd/bfd_api.c b/src/vnet/bfd/bfd_api.c index 118bba9aac8..0671a5dd5f3 100644 --- a/src/vnet/bfd/bfd_api.c +++ b/src/vnet/bfd/bfd_api.c @@ -28,6 +28,7 @@ #include #include #include +#include #include @@ -67,19 +68,9 @@ pub_sub_handler (bfd_events, BFD_EVENTS); #define BFD_UDP_API_PARAM_COMMON_CODE \ ip46_address_t local_addr; \ - clib_memset (&local_addr, 0, sizeof (local_addr)); \ ip46_address_t peer_addr; \ - clib_memset (&peer_addr, 0, sizeof (peer_addr)); \ - if (mp->is_ipv6) \ - { \ - clib_memcpy_fast (&local_addr.ip6, mp->local_addr, sizeof (local_addr.ip6)); \ - clib_memcpy_fast (&peer_addr.ip6, mp->peer_addr, sizeof (peer_addr.ip6)); \ - } \ - else \ - { \ - clib_memcpy_fast (&local_addr.ip4, mp->local_addr, sizeof (local_addr.ip4)); \ - clib_memcpy_fast (&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 @@ -154,15 +145,14 @@ send_bfd_udp_session_details (vl_api_registration_t * reg, u32 context, 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) { @@ -174,20 +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_fast (mp->local_addr, &key->local_addr, - sizeof (key->local_addr)); - clib_memcpy_fast (mp->peer_addr, &key->peer_addr, - sizeof (key->peer_addr)); - } - else - { - clib_memcpy_fast (mp->local_addr, key->local_addr.ip4.data, - sizeof (key->local_addr.ip4.data)); - clib_memcpy_fast (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); @@ -248,7 +226,8 @@ 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); + clib_net_to_host_u32 (mp->flags) & + IF_STATUS_API_FLAG_ADMIN_UP); REPLY_MACRO (VL_API_BFD_UDP_SESSION_SET_FLAGS_REPLY); } @@ -383,32 +362,32 @@ 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_fast (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_fast (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* */ -- cgit 1.2.3-korg