nat: fix ED mode unknown proto session management

[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 8e5ac4c..7dcdff6 100644 (file)
--- a/src/plugins/nat/nat_format.c
+++ b/src/plugins/nat/nat_format.c
@@ -124,12 +124,10 @@ format_snat_session (u8 * s, va_list * args)
     {
       s = format (s, "  i2o %U proto %u fib %u\n",
                  format_ip4_address, &sess->in2out.addr,
-                 clib_net_to_host_u16 (sess->in2out.port),
-                 sess->in2out.fib_index);
+                 sess->in2out.port, sess->in2out.fib_index);
       s = format (s, "    o2i %U proto %u fib %u\n",
                  format_ip4_address, &sess->out2in.addr,
-                 clib_net_to_host_u16 (sess->out2in.port),
-                 sess->out2in.fib_index);
+                 sess->out2in.port, sess->out2in.fib_index);
     }
   else
     {
@@ -231,8 +229,10 @@ format_snat_static_mapping (u8 * s, va_list * args)
                    format_ip4_address, &m->local_addr, m->local_port);
 
       /* *INDENT-OFF* */
-      vec_foreach (local, m->locals)
+      pool_foreach (local, m->locals,
+      ({
         s = format (s, " vrf %d", local->vrf_id);
+      }));
       /* *INDENT-ON* */
 
       return s;
@@ -256,10 +256,16 @@ format_snat_static_mapping (u8 * s, va_list * args)
                      m->twice_nat == TWICE_NAT ? "twice-nat" :
                      m->twice_nat == TWICE_NAT_SELF ? "self-twice-nat" : "",
                      is_out2in_only_static_mapping (m) ? "out2in-only" : "");
-         vec_foreach (local, m->locals)
+
+          /* *INDENT-OFF* */
+          pool_foreach (local, m->locals,
+          ({
            s = format (s, "\n  local %U:%d vrf %d probability %d\%",
                        format_ip4_address, &local->addr, local->port,
                        local->vrf_id, local->probability);
+          }));
+          /* *INDENT-ON* */
+
        }
       else
        s = format (s, "%U local %U:%d external %U:%d vrf %d %s %s",