nat: fixing cfg file parsing cli issues

[vpp.git] / src / plugins / nat / dslite / dslite_cli.c

diff --git a/src/plugins/nat/dslite/dslite_cli.c b/src/plugins/nat/dslite/dslite_cli.c
index 0819f95..193cb3f 100644 (file)
--- a/src/plugins/nat/dslite/dslite_cli.c
+++ b/src/plugins/nat/dslite/dslite_cli.c
@@ -14,6 +14,8 @@
  */
 #include <nat/dslite/dslite.h>
 
+#define DSLITE_EXPECTED_ARGUMENT "expected required argument(s)"
+
 static clib_error_t *
 dslite_add_del_pool_addr_command_fn (vlib_main_t * vm,
                                     unformat_input_t * input,
@@ -29,7 +31,7 @@ dslite_add_del_pool_addr_command_fn (vlib_main_t * vm,
 
   /* Get a line of input. */
   if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
+    return clib_error_return (0, DSLITE_EXPECTED_ARGUMENT);
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -115,7 +117,7 @@ dslite_set_aftr_tunnel_addr_command_fn (vlib_main_t * vm,
 
   /* Get a line of input. */
   if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
+    return clib_error_return (0, DSLITE_EXPECTED_ARGUMENT);
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -166,7 +168,7 @@ dslite_set_b4_tunnel_addr_command_fn (vlib_main_t * vm,
 
   /* Get a line of input. */
   if (!unformat_user (input, unformat_line_input, line_input))
-    return 0;
+    return clib_error_return (0, DSLITE_EXPECTED_ARGUMENT);
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -203,25 +205,6 @@ dslite_show_b4_ip6_addr_command_fn (vlib_main_t * vm,
   return 0;
 }
 
-static u8 *
-format_nat_protocol (u8 * s, va_list * args)
-{
-  u32 i = va_arg (*args, u32);
-  u8 *t = 0;
-
-  switch (i)
-    {
-#define _(N, j, n, str) case NAT_PROTOCOL_##N: t = (u8 *) str; break;
-      foreach_nat_protocol
-#undef _
-    default:
-      s = format (s, "unknown");
-      return s;
-    }
-  s = format (s, "%s", t);
-  return s;
-}
-
 static u8 *
 format_dslite_session (u8 * s, va_list * args)
 {
@@ -287,10 +270,10 @@ dslite_show_sessions_command_fn (vlib_main_t * vm,
   /* *INDENT-OFF* */
   vec_foreach (td, dm->per_thread_data)
     {
-      pool_foreach (b4, td->b4s,
-      ({
+      pool_foreach (b4, td->b4s)
+       {
         vlib_cli_output (vm, "%U", format_dslite_b4, td, b4);
-      }));
+      }
     }
   /* *INDENT-ON* */