NAT44: identity NAT fix (VPP-1441)

[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 279d666..5ce00dc 100644 (file)
--- a/src/plugins/nat/nat_format.c
+++ b/src/plugins/nat/nat_format.c
@@ -220,24 +220,41 @@ format_snat_static_mapping (u8 * s, va_list * args)
   snat_static_mapping_t *m = va_arg (*args, snat_static_mapping_t *);
   nat44_lb_addr_port_t *local;
 
-  if (m->addr_only)
+  if (is_identity_static_mapping (m))
+    {
+      if (is_addr_only_static_mapping (m))
+       s = format (s, "identity mapping %U",
+                   format_ip4_address, &m->local_addr);
+      else
+       s = format (s, "identity mapping %U:%d",
+                   format_ip4_address, &m->local_addr, m->local_port);
+
+      /* *INDENT-OFF* */
+      vec_foreach (local, m->locals)
+        s = format (s, " vrf %d", local->vrf_id);
+      /* *INDENT-ON* */
+
+      return s;
+    }
+
+  if (is_addr_only_static_mapping (m))
     s = format (s, "local %U external %U vrf %d %s %s",
                format_ip4_address, &m->local_addr,
                format_ip4_address, &m->external_addr,
                m->vrf_id,
                m->twice_nat == TWICE_NAT ? "twice-nat" :
                m->twice_nat == TWICE_NAT_SELF ? "self-twice-nat" : "",
-               m->out2in_only ? "out2in-only" : "");
+               is_out2in_only_static_mapping (m) ? "out2in-only" : "");
   else
     {
-      if (vec_len (m->locals))
+      if (is_lb_static_mapping (m))
        {
          s = format (s, "%U external %U:%d %s %s",
                      format_snat_protocol, m->proto,
                      format_ip4_address, &m->external_addr, m->external_port,
                      m->twice_nat == TWICE_NAT ? "twice-nat" :
                      m->twice_nat == TWICE_NAT_SELF ? "self-twice-nat" : "",
-                     m->out2in_only ? "out2in-only" : "");
+                     is_out2in_only_static_mapping (m) ? "out2in-only" : "");
          vec_foreach (local, m->locals)
            s = format (s, "\n  local %U:%d vrf %d probability %d\%",
                        format_ip4_address, &local->addr, local->port,
@@ -251,7 +268,7 @@ format_snat_static_mapping (u8 * s, va_list * args)
                    m->vrf_id,
                    m->twice_nat == TWICE_NAT ? "twice-nat" :
                    m->twice_nat == TWICE_NAT_SELF ? "self-twice-nat" : "",
-                   m->out2in_only ? "out2in-only" : "");
+                   is_out2in_only_static_mapping (m) ? "out2in-only" : "");
     }
   return s;
 }