nat: deal with flows instead of sessions

[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 90faeb9..2fbd749 100644 (file)
--- a/src/plugins/nat/nat_format.c
+++ b/src/plugins/nat/nat_format.c
@@ -121,9 +121,9 @@ format_snat_session (u8 * s, va_list * args)
       s = format (s, "  i2o %U proto %u fib %u\n",
                  format_ip4_address, &sess->in2out.addr,
                  sess->in2out.port, sess->in2out.fib_index);
-      s = format (s, "  o2i %U proto %u fib %u\n",
-                 format_ip4_address, &sess->out2in.addr,
-                 sess->out2in.port, sess->out2in.fib_index);
+      s =
+       format (s, "    o2i %U proto %u fib %u\n", format_ip4_address,
+               &sess->out2in.addr, sess->out2in.port, sess->out2in.fib_index);
     }
   else
     {
@@ -132,10 +132,9 @@ format_snat_session (u8 * s, va_list * args)
                  format_nat_protocol, sess->nat_proto,
                  clib_net_to_host_u16 (sess->in2out.port),
                  sess->in2out.fib_index);
-      s = format (s, "  o2i %U proto %U port %d fib %d\n",
-                 format_ip4_address, &sess->out2in.addr,
-                 format_nat_protocol, sess->nat_proto,
-                 clib_net_to_host_u16 (sess->out2in.port),
+      s = format (s, "    o2i %U proto %U port %d fib %d\n",
+                 format_ip4_address, &sess->out2in.addr, format_nat_protocol,
+                 sess->nat_proto, clib_net_to_host_u16 (sess->out2in.port),
                  sess->out2in.fib_index);
     }
   if (is_ed_session (sess) || is_fwd_bypass_session (sess))
@@ -155,6 +154,8 @@ format_snat_session (u8 * s, va_list * args)
                        format_ip4_address, &sess->ext_host_addr,
                        clib_net_to_host_u16 (sess->ext_host_port));
        }
+      s = format (s, "       i2o flow: %U\n", format_nat_6t_flow, &sess->i2o);
+      s = format (s, "       o2i flow: %U\n", format_nat_6t_flow, &sess->o2i);
     }
   s = format (s, "       index %llu\n", sess - tsm->sessions);
   s = format (s, "       last heard %.2f\n", sess->last_heard);