One armed NAT (VPP-1035)

[vpp.git] / src / plugins / nat / nat64_cli.c

diff --git a/src/plugins/nat/nat64_cli.c b/src/plugins/nat/nat64_cli.c
index e55c4d5..4128eda 100644 (file)
--- a/src/plugins/nat/nat64_cli.c
+++ b/src/plugins/nat/nat64_cli.c
@@ -268,7 +268,9 @@ nat64_cli_interface_walk (snat_interface_t * i, void *ctx)
 
   vlib_cli_output (vm, " %U %s", format_vnet_sw_interface_name, vnm,
                   vnet_get_sw_interface (vnm, i->sw_if_index),
-                  i->is_inside ? "in" : "out");
+                  (nat_interface_is_inside (i)
+                   && nat_interface_is_outside (i)) ? "in out" :
+                  nat_interface_is_inside (i) ? "in" : "out");
   return 0;
 }
 
@@ -301,8 +303,8 @@ nat64_add_del_static_bib_command_fn (vlib_main_t *
   u8 is_add = 1;
   ip6_address_t in_addr;
   ip4_address_t out_addr;
-  u16 in_port = 0;
-  u16 out_port = 0;
+  u32 in_port = 0;
+  u32 out_port = 0;
   u32 vrf_id = 0, protocol;
   snat_protocol_t proto = 0;
   u8 p = 0;
@@ -362,8 +364,8 @@ nat64_add_del_static_bib_command_fn (vlib_main_t *
     }
 
   rv =
-    nat64_add_del_static_bib_entry (&in_addr, &out_addr, in_port, out_port, p,
-                                   vrf_id, is_add);
+    nat64_add_del_static_bib_entry (&in_addr, &out_addr, (u16) in_port,
+                                   (u16) out_port, p, vrf_id, is_add);
 
   switch (rv)
     {
@@ -511,7 +513,8 @@ nat64_set_timeouts_command_fn (vlib_main_t * vm, unformat_input_t * input,
          if (nat64_set_tcp_timeouts (tcp_trans, tcp_est, tcp_incoming_syn))
            {
              error =
-               clib_error_return (0, "Invalid TCP transitory tiemout value");
+               clib_error_return (0,
+                                  "Invalid TCP transitory timeouts value");
              goto done;
            }
        }
@@ -521,7 +524,7 @@ nat64_set_timeouts_command_fn (vlib_main_t * vm, unformat_input_t * input,
            {
              error =
                clib_error_return (0,
-                                  "Invalid TCP established tiemout value");
+                                  "Invalid TCP established timeouts value");
              goto done;
            }
        }
@@ -532,7 +535,7 @@ nat64_set_timeouts_command_fn (vlib_main_t * vm, unformat_input_t * input,
            {
              error =
                clib_error_return (0,
-                                  "Invalid TCP incoming SYN tiemout value");
+                                  "Invalid TCP incoming SYN timeouts value");
              goto done;
            }
        }
@@ -893,7 +896,7 @@ VLIB_CLI_COMMAND (set_nat64_timeouts_command, static) = {
 
 /*?
  * @cliexpar
- * @cliexstart{show nat64 tiemouts}
+ * @cliexstart{show nat64 timeoutss}
  * Show NAT64 session timeouts:
  *  vpp# show nat64 timeouts
  *  NAT64 session timeouts:
@@ -906,7 +909,7 @@ VLIB_CLI_COMMAND (set_nat64_timeouts_command, static) = {
 ?*/
 VLIB_CLI_COMMAND (show_nat64_timeouts_command, static) = {
   .path = "show nat64 timeouts",
-  .short_help = "show nat64 temeouts",
+  .short_help = "show nat64 timeouts",
   .function = nat64_show_timeouts_command_fn,
 };