nat: enable force session cleanup

[vpp.git] / src / plugins / nat / nat_format.c

diff --git a/src/plugins/nat/nat_format.c b/src/plugins/nat/nat_format.c
index 7dcdff6..b924154 100644 (file)
--- a/src/plugins/nat/nat_format.c
+++ b/src/plugins/nat/nat_format.c
@@ -18,6 +18,7 @@
  */
 
 #include <nat/nat.h>
+#include <nat/nat_inlines.h>
 #include <nat/nat_det.h>
 
 uword
@@ -116,7 +117,7 @@ format_snat_session_state (u8 * s, va_list * args)
 u8 *
 format_snat_session (u8 * s, va_list * args)
 {
-  snat_main_per_thread_data_t *sm =
+  snat_main_per_thread_data_t *tsm =
     va_arg (*args, snat_main_per_thread_data_t *);
   snat_session_t *sess = va_arg (*args, snat_session_t *);
 
@@ -152,7 +153,7 @@ format_snat_session (u8 * s, va_list * args)
                        clib_net_to_host_u16 (sess->ext_host_port));
        }
     }
-  s = format (s, "       index %llu\n", sess - sm->sessions);
+  s = format (s, "       index %llu\n", sess - tsm->sessions);
   s = format (s, "       last heard %.2f\n", sess->last_heard);
   s = format (s, "       total pkts %d, total bytes %lld\n",
              sess->total_pkts, sess->total_bytes);
@@ -173,7 +174,7 @@ format_snat_session (u8 * s, va_list * args)
 u8 *
 format_snat_user (u8 * s, va_list * args)
 {
-  snat_main_per_thread_data_t *sm =
+  snat_main_per_thread_data_t *tsm =
     va_arg (*args, snat_main_per_thread_data_t *);
   snat_user_t *u = va_arg (*args, snat_user_t *);
   int verbose = va_arg (*args, int);
@@ -191,20 +192,20 @@ format_snat_user (u8 * s, va_list * args)
   if (u->nsessions || u->nstaticsessions)
     {
       head_index = u->sessions_per_user_list_head_index;
-      head = pool_elt_at_index (sm->list_pool, head_index);
+      head = pool_elt_at_index (tsm->list_pool, head_index);
 
       elt_index = head->next;
-      elt = pool_elt_at_index (sm->list_pool, elt_index);
+      elt = pool_elt_at_index (tsm->list_pool, elt_index);
       session_index = elt->value;
 
       while (session_index != ~0)
        {
-         sess = pool_elt_at_index (sm->sessions, session_index);
+         sess = pool_elt_at_index (tsm->sessions, session_index);
 
-         s = format (s, "  %U\n", format_snat_session, sm, sess);
+         s = format (s, "  %U\n", format_snat_session, tsm, sess);
 
          elt_index = elt->next;
-         elt = pool_elt_at_index (sm->list_pool, elt_index);
+         elt = pool_elt_at_index (tsm->list_pool, elt_index);
          session_index = elt->value;
        }
     }
@@ -333,20 +334,6 @@ format_det_map_ses (u8 * s, va_list * args)
   return s;
 }
 
-u8 *
-format_nat44_reass_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  nat44_reass_trace_t *t = va_arg (*args, nat44_reass_trace_t *);
-
-  s = format (s, "NAT44_REASS: sw_if_index %d, next index %d, status %s",
-             t->sw_if_index, t->next_index,
-             t->cached ? "cached" : "translated");
-
-  return s;
-}
-
 /*
  * fd.io coding-style-patch-verification: ON
  *