{
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
{
snat_static_mapping_t *m = va_arg (*args, snat_static_mapping_t *);
nat44_lb_addr_port_t *local;
+ 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 %U:%d",
+ format_snat_protocol, m->proto,
+ format_ip4_address, &m->local_addr, m->local_port);
+
+ /* *INDENT-OFF* */
+ pool_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,
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,
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",