#include <vlib/vlib.h>
#include <vlib/cli.h>
#include <vppinfra/format.h>
+#include <vppinfra/warnings.h>
#include <vnet/api_errno.h>
#include <vnet/ip/format.h>
#include <vnet/bfd/bfd_api.h>
format_bfd_session_cli (u8 * s, va_list * args)
{
vlib_main_t *vm = va_arg (*args, vlib_main_t *);
- bfd_main_t *bm = va_arg (*args, bfd_main_t *);
bfd_session_t *bs = va_arg (*args, bfd_session_t *);
switch (bs->transport)
{
bs->config_required_min_rx_usec, bs->remote_min_rx_usec);
s = format (s, "%10s %-32s %20u %20u\n", "",
"Desired Min Tx Interval (usec)",
- bs->config_desired_min_tx_usec, bfd_clocks_to_usec (bm,
- bs->remote_desired_min_tx_clocks));
+ bs->config_desired_min_tx_usec,
+ bfd_nsec_to_usec (bs->remote_desired_min_tx_nsec));
s =
format (s, "%10s %-32s %20u\n", "", "Transmit interval",
- bfd_clocks_to_usec (bm, bs->transmit_interval_clocks));
+ bfd_nsec_to_usec (bs->transmit_interval_nsec));
u64 now = clib_cpu_time_now ();
u8 *tmp = NULL;
- if (bs->last_tx_clocks > 0)
+ if (bs->last_tx_nsec > 0)
{
- tmp = format (tmp, "%.2fs ago", (now - bs->last_tx_clocks) *
+ tmp = format (tmp, "%.2fs ago", (now - bs->last_tx_nsec) *
vm->clib_time.seconds_per_clock);
s = format (s, "%10s %-32s %20v\n", "", "Last control frame tx", tmp);
vec_reset_length (tmp);
}
- if (bs->last_rx_clocks)
+ if (bs->last_rx_nsec)
{
- tmp = format (tmp, "%.2fs ago", (now - bs->last_rx_clocks) *
+ tmp = format (tmp, "%.2fs ago", (now - bs->last_rx_nsec) *
vm->clib_time.seconds_per_clock);
s = format (s, "%10s %-32s %20v\n", "", "Last control frame rx", tmp);
vec_reset_length (tmp);
1, bs->remote_min_echo_rx_usec);
if (bs->echo)
{
- s = format (s, "%10s %-32s %20u\n", "", "Echo transmit interval",
- bfd_clocks_to_usec (bm, bs->echo_transmit_interval_clocks));
- tmp = format (tmp, "%.2fs ago", (now - bs->echo_last_tx_clocks) *
- vm->clib_time.seconds_per_clock);
+ s =
+ format (s, "%10s %-32s %20u\n", "", "Echo transmit interval",
+ bfd_nsec_to_usec (bs->echo_transmit_interval_nsec));
+ tmp =
+ format (tmp, "%.2fs ago",
+ (now -
+ bs->echo_last_tx_nsec) * vm->clib_time.seconds_per_clock);
s = format (s, "%10s %-32s %20v\n", "", "Last echo frame tx", tmp);
vec_reset_length (tmp);
tmp = format (tmp, "%.6fs",
- (bs->echo_last_rx_clocks - bs->echo_last_tx_clocks) *
+ (bs->echo_last_rx_nsec - bs->echo_last_tx_nsec) *
vm->clib_time.seconds_per_clock);
s =
format (s, "%10s %-32s %20v\n", "", "Last echo frame roundtrip time",
{
bfd_main_t *bm = &bfd_main;
bfd_session_t *bs = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
+
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
- if (unformat (input, "keys"))
+ if (unformat (line_input, "keys"))
{
bfd_auth_key_t *key = NULL;
u8 *s = format (NULL, "%=10s %=25s %=10s\n", "Configuration Key ID",
vlib_cli_output (vm, "Number of configured BFD keys: %lu\n",
(u64) pool_elts (bm->auth_keys));
}
- else if (unformat (input, "sessions"))
+ else if (unformat (line_input, "sessions"))
{
u8 *s = format (NULL, "%=10s %=32s %=20s %=20s\n", "Index", "Property",
"Local value", "Remote value");
/* *INDENT-OFF* */
pool_foreach (bs, bm->sessions, {
- s = format (s, "%U", format_bfd_session_cli, vm, bm, bs);
+ s = format (s, "%U", format_bfd_session_cli, vm, bs);
});
/* *INDENT-ON* */
vlib_cli_output (vm, "%v", s);
vlib_cli_output (vm, "Number of configured BFD sessions: %lu\n",
(u64) pool_elts (bm->sessions));
}
- else if (unformat (input, "echo-source"))
+ else if (unformat (line_input, "echo-source"))
{
int is_set;
u32 sw_if_index;
if (is_set)
{
vnet_sw_interface_t *sw_if =
- vnet_get_sw_interface_safe (&vnet_main, sw_if_index);
+ vnet_get_sw_interface_or_null (&vnet_main, sw_if_index);
vnet_hw_interface_t *hw_if =
vnet_get_hw_interface (&vnet_main, sw_if->hw_if_index);
u8 *s = format (NULL, "UDP echo source is: %v\n", hw_if->name);
};
/* *INDENT-ON* */
-static u8 *
-format_vnet_api_errno (u8 * s, va_list * args)
-{
- vnet_api_error_t api_error = va_arg (*args, vnet_api_error_t);
-#define _(a, b, c) \
- case b: \
- s = format (s, "%s", c); \
- break;
- switch (api_error)
- {
- foreach_vnet_api_error default:s = format (s, "UNKNOWN");
- break;
- }
- return s;
-}
-
static clib_error_t *
bfd_cli_key_add (vlib_main_t * vm, unformat_input_t * input,
CLIB_UNUSED (vlib_cli_command_t * lmd))
u8 *vec_auth_type = NULL;
bfd_auth_type_e auth_type = BFD_AUTH_TYPE_reserved;
u8 *secret = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
static const u8 keyed_sha1[] = "keyed-sha1";
static const u8 meticulous_keyed_sha1[] = "meticulous-keyed-sha1";
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "conf-key-id %u", &key_id))
+ if (unformat (line_input, "conf-key-id %u", &key_id))
{
have_key_id = 1;
}
- else if (unformat (input, "type %U", unformat_token, "a-zA-Z0-9-",
+ else if (unformat (line_input, "type %U", unformat_token, "a-zA-Z0-9-",
&vec_auth_type))
{
if (vec_len (vec_auth_type) == sizeof (keyed_sha1) - 1 &&
goto out;
}
}
- else if (unformat (input, "secret %U", unformat_hex_string, &secret))
+ else
+ if (unformat (line_input, "secret %U", unformat_hex_string, &secret))
{
/* nothing to do here */
}
else
{
ret = clib_error_return (0, "Unknown input `%U'",
- format_unformat_error, input);
+ format_unformat_error, line_input);
goto out;
}
}
{
clib_error_t *ret = NULL;
u32 key_id = 0;
+ unformat_input_t _line_input, *line_input = &_line_input;
+
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (!unformat (input, "conf-key-id %u", &key_id))
+ if (!unformat (line_input, "conf-key-id %u", &key_id))
{
ret = clib_error_return (0, "Unknown input `%U'",
- format_unformat_error, input);
+ format_unformat_error, line_input);
goto out;
}
}
t n;
#define UNFORMAT(t, n, s, r, ...) \
- if (unformat (input, s " " __VA_ARGS__, &n)) \
+ if (unformat (line_input, s " " __VA_ARGS__, &n)) \
{ \
something_parsed = 1; \
have_##n = 1; \
}
-#if __GNUC__ >= 6
-#define PRAGMA_STR1 \
- _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"");
-#define PRAGMA_STR2 _Pragma ("GCC diagnostic pop");
-#else
-#define PRAGMA_STR1
-#define PRAGMA_STR2
-#endif
-
#define CHECK_MANDATORY(t, n, s, r, ...) \
- PRAGMA_STR1 \
+WARN_OFF(tautological-compare) \
if (mandatory == r && !have_##n) \
{ \
- PRAGMA_STR2 \
+ WARN_ON(tautological-compare) \
ret = clib_error_return (0, "Required parameter `%s' missing.", s); \
goto out; \
}
CLIB_UNUSED (vlib_cli_command_t * lmd))
{
clib_error_t *ret = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
#define foreach_bfd_cli_udp_session_add_cli_param(F) \
F (u32, sw_if_index, INTERFACE_STR, mandatory, "%U", \
unformat_vnet_sw_interface, &vnet_main) \
foreach_bfd_cli_udp_session_add_cli_param (DECLARE);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
int something_parsed = 0;
foreach_bfd_cli_udp_session_add_cli_param (UNFORMAT);
if (!something_parsed)
{
ret = clib_error_return (0, "Unknown input `%U'",
- format_unformat_error, input);
+ format_unformat_error, line_input);
goto out;
}
}
CLIB_UNUSED (vlib_cli_command_t * lmd))
{
clib_error_t *ret = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
#define foreach_bfd_cli_udp_session_mod_cli_param(F) \
F (u32, sw_if_index, INTERFACE_STR, mandatory, "%U", \
unformat_vnet_sw_interface, &vnet_main) \
foreach_bfd_cli_udp_session_mod_cli_param (DECLARE);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
int something_parsed = 0;
foreach_bfd_cli_udp_session_mod_cli_param (UNFORMAT);
if (!something_parsed)
{
ret = clib_error_return (0, "Unknown input `%U'",
- format_unformat_error, input);
+ format_unformat_error, line_input);
goto out;
}
}
CLIB_UNUSED (vlib_cli_command_t * lmd))
{
clib_error_t *ret = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
#define foreach_bfd_cli_udp_session_del_cli_param(F) \
F (u32, sw_if_index, INTERFACE_STR, mandatory, "%U", \
unformat_vnet_sw_interface, &vnet_main) \
foreach_bfd_cli_udp_session_del_cli_param (DECLARE);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
int something_parsed = 0;
foreach_bfd_cli_udp_session_del_cli_param (UNFORMAT);
if (!something_parsed)
{
ret = clib_error_return (0, "Unknown input `%U'",
- format_unformat_error, input);
+ format_unformat_error, line_input);
goto out;
}
}
CLIB_UNUSED (vlib_cli_command_t * lmd))
{
clib_error_t *ret = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
#define foreach_bfd_cli_udp_session_set_flags_cli_param(F) \
F (u32, sw_if_index, INTERFACE_STR, mandatory, "%U", \
unformat_vnet_sw_interface, &vnet_main) \
foreach_bfd_cli_udp_session_set_flags_cli_param (DECLARE);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
int something_parsed = 0;
foreach_bfd_cli_udp_session_set_flags_cli_param (UNFORMAT);
if (!something_parsed)
{
ret = clib_error_return (0, "Unknown input `%U'",
- format_unformat_error, input);
+ format_unformat_error, line_input);
goto out;
}
}
ADMIN_STR, admin_up_down_token);
goto out;
}
- vnet_api_error_t rv = bfd_udp_session_set_flags (sw_if_index, &local_addr,
- &peer_addr, admin_up_down);
+ vnet_api_error_t rv =
+ bfd_udp_session_set_flags (vm, sw_if_index, &local_addr,
+ &peer_addr, admin_up_down);
if (rv)
{
ret =
/* *INDENT-ON* */
static clib_error_t *
-bfd_cli_udp_session_auth_activate (vlib_main_t * vm, unformat_input_t * input,
+bfd_cli_udp_session_auth_activate (vlib_main_t * vm,
+ unformat_input_t * input,
CLIB_UNUSED (vlib_cli_command_t * lmd))
{
clib_error_t *ret = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
#define foreach_bfd_cli_udp_session_auth_activate_cli_param(F) \
F (u32, sw_if_index, INTERFACE_STR, mandatory, "%U", \
unformat_vnet_sw_interface, &vnet_main) \
foreach_bfd_cli_udp_session_auth_activate_cli_param (DECLARE);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
int something_parsed = 0;
foreach_bfd_cli_udp_session_auth_activate_cli_param (UNFORMAT);
if (!something_parsed)
{
ret = clib_error_return (0, "Unknown input `%U'",
- format_unformat_error, input);
+ format_unformat_error, line_input);
goto out;
}
}
CLIB_UNUSED (vlib_cli_command_t *lmd))
{
clib_error_t *ret = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
#define foreach_bfd_cli_udp_session_auth_deactivate_cli_param(F) \
F (u32, sw_if_index, INTERFACE_STR, mandatory, "%U", \
unformat_vnet_sw_interface, &vnet_main) \
foreach_bfd_cli_udp_session_auth_deactivate_cli_param (DECLARE);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
int something_parsed = 0;
foreach_bfd_cli_udp_session_auth_deactivate_cli_param (UNFORMAT);
CLIB_UNUSED (vlib_cli_command_t * lmd))
{
clib_error_t *ret = NULL;
+ unformat_input_t _line_input, *line_input = &_line_input;
#define foreach_bfd_cli_udp_set_echo_source_cli_param(F) \
F (u32, sw_if_index, INTERFACE_STR, mandatory, "%U", \
unformat_vnet_sw_interface, &vnet_main)
foreach_bfd_cli_udp_set_echo_source_cli_param (DECLARE);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
int something_parsed = 0;
foreach_bfd_cli_udp_set_echo_source_cli_param (UNFORMAT);
if (!something_parsed)
{
ret = clib_error_return (0, "Unknown input `%U'",
- format_unformat_error, input);
+ format_unformat_error, line_input);
goto out;
}
}