X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbfd%2Fbfd_cli.c;h=a6953bd2687c91623ea88b879b843a24717172a2;hb=a316744bc5e003d0fa4c8aff82c619b300115f02;hp=cab20a65b0b689ec65491ee32e2b4980224ed92a;hpb=ff92efe1074e338f91e59d9c27125d102516e7bf;p=vpp.git

diff --git a/src/vnet/bfd/bfd_cli.c b/src/vnet/bfd/bfd_cli.c
index cab20a65b0b..a6953bd2687 100644
--- a/src/vnet/bfd/bfd_cli.c
+++ b/src/vnet/bfd/bfd_cli.c
@@ -30,7 +30,6 @@ static u8 *
 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)
     {
@@ -58,23 +57,23 @@ format_bfd_session_cli (u8 * s, va_list * args)
 	      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);
@@ -84,14 +83,17 @@ format_bfd_session_cli (u8 * s, va_list * args)
 	    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",
@@ -149,7 +151,7 @@ show_bfd (vlib_main_t * vm, unformat_input_t * input,
 		      "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);
@@ -170,7 +172,7 @@ show_bfd (vlib_main_t * vm, unformat_input_t * input,
       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);
@@ -684,8 +686,9 @@ bfd_cli_udp_session_set_flags (vlib_main_t * vm, unformat_input_t * input,
 			   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 =