diff options
| author |   Filip Varga <fivarga@cisco.com> | 2020-09-08 16:22:44 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2020-09-16 10:15:15 +0000 |
| commit | 1f18c50174fcc0013e85f7f867e550c1e1871080 (patch) | |
| tree | 282afac0bfced7855806121cb3b1e3f544ead5e6 | |
| parent | 6c25154e9544810afc1179ce8b0977a9786a8027 (diff) | |
nat: endian mismatch
Type: fix
Change-Id: Icf6ce0ddb5fe9d078503e9d9ff7e7b26423f53f8
Signed-off-by: Filip Varga <fivarga@cisco.com>
(cherry picked from commit 2fe25370ba0deed78c1240fa6788c5b5f14d6f97)
| -rw-r--r-- | src/plugins/nat/nat_format.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/plugins/nat/nat_format.c b/src/plugins/nat/nat_format.c index 3dfe6046969..f0e7a5d5cd0 100644 --- a/src/plugins/nat/nat_format.c +++ b/src/plugins/nat/nat_format.c @@ -230,7 +230,8 @@ format_snat_static_mapping (u8 * s, va_list * args) else s = format (s, "identity mapping %U %U:%d", format_nat_protocol, m->proto, - format_ip4_address, &m->local_addr, m->local_port); + format_ip4_address, &m->local_addr, + clib_net_to_host_u16 (m->local_port)); /* *INDENT-OFF* */ pool_foreach (local, m->locals, @@ -256,7 +257,8 @@ format_snat_static_mapping (u8 * s, va_list * args) { s = format (s, "%U external %U:%d %s %s", format_nat_protocol, m->proto, - format_ip4_address, &m->external_addr, m->external_port, + format_ip4_address, &m->external_addr, + clib_net_to_host_u16 (m->external_port), m->twice_nat == TWICE_NAT ? "twice-nat" : m->twice_nat == TWICE_NAT_SELF ? "self-twice-nat" : "", is_out2in_only_static_mapping (m) ? "out2in-only" : ""); @@ -265,7 +267,8 @@ format_snat_static_mapping (u8 * s, va_list * args) pool_foreach (local, m->locals, ({ s = format (s, "\n local %U:%d vrf %d probability %d\%", - format_ip4_address, &local->addr, local->port, + format_ip4_address, &local->addr, + clib_net_to_host_u16 (local->port), local->vrf_id, local->probability); })); /* *INDENT-ON* */ @@ -274,8 +277,10 @@ format_snat_static_mapping (u8 * s, va_list * args) else s = format (s, "%U local %U:%d external %U:%d vrf %d %s %s", format_nat_protocol, m->proto, - format_ip4_address, &m->local_addr, m->local_port, - format_ip4_address, &m->external_addr, m->external_port, + format_ip4_address, &m->local_addr, + clib_net_to_host_u16 (m->local_port), + format_ip4_address, &m->external_addr, + clib_net_to_host_u16 (m->external_port), m->vrf_id, m->twice_nat == TWICE_NAT ? "twice-nat" : m->twice_nat == TWICE_NAT_SELF ? "self-twice-nat" : "", @@ -297,9 +302,10 @@ format_snat_static_map_to_resolve (u8 * s, va_list * args) else s = format (s, "%U local %U:%d external %U:%d vrf %d", format_nat_protocol, m->proto, - format_ip4_address, &m->l_addr, m->l_port, + format_ip4_address, &m->l_addr, + clib_net_to_host_u16 (m->l_port), format_vnet_sw_if_index_name, vnm, m->sw_if_index, - m->e_port, m->vrf_id); + clib_net_to_host_u16 (m->e_port), m->vrf_id); return s; } |