ipsec: add support for chained buffers

[vpp.git] / src / vnet / crypto / cli.c

diff --git a/src/vnet/crypto/cli.c b/src/vnet/crypto/cli.c
index 792cc4b..ef6371a 100644 (file)
--- a/src/vnet/crypto/cli.c
+++ b/src/vnet/crypto/cli.c
@@ -53,33 +53,68 @@ VLIB_CLI_COMMAND (show_crypto_engines_command, static) =
   .function = show_crypto_engines_command_fn,
 };
 
-static clib_error_t *
-show_crypto_handlers_command_fn (vlib_main_t * vm,
-                       unformat_input_t * input, vlib_cli_command_t * cmd)
+static u8 *
+format_vnet_crypto_handlers (u8 * s, va_list * args)
 {
+  vnet_crypto_alg_t alg = va_arg (*args, vnet_crypto_alg_t);
   vnet_crypto_main_t *cm = &crypto_main;
-  unformat_input_t _line_input, *line_input = &_line_input;
-  u8 *s = 0;
-
-  if (unformat_user (input, unformat_line_input, line_input))
-    unformat_free (line_input);
+  vnet_crypto_alg_data_t *d = vec_elt_at_index (cm->algs, alg);
+  u32 indent = format_get_indent (s);
+  int i, first = 1;
 
-  vlib_cli_output (vm, "%-40s%-20s%s", "Name", "Active", "Candidates");
-  for (int i = 1; i < VNET_CRYPTO_N_OP_TYPES; i++)
+  for (i = 0; i < VNET_CRYPTO_OP_N_TYPES; i++)
     {
-      vnet_crypto_op_type_data_t *otd = cm->opt_data + i;
+      vnet_crypto_op_data_t *od;
       vnet_crypto_engine_t *e;
+      vnet_crypto_op_id_t id = d->op_by_type[i];
+
+      if (id == 0)
+       continue;
+
+      od = cm->opt_data + id;
+      if (first == 0)
+        s = format (s, "\n%U", format_white_space, indent);
+      s = format (s, "%-22U%-20U", format_vnet_crypto_op_type, od->type, 0,
+                 format_vnet_crypto_engine, od->active_engine_index_simple,s);
+
+      vec_foreach (e, cm->engines)
+       {
+         if (e->ops_handlers[id] != 0)
+           s = format (s, "%U ", format_vnet_crypto_engine, e - cm->engines);
+       }
 
-      vec_reset_length (s);
+      s = format (s, "\n%U", format_white_space, indent);
+      s = format (s, "%-22U%-20U", format_vnet_crypto_op_type, od->type, 1,
+                  format_vnet_crypto_engine,
+                  od->active_engine_index_chained);
       vec_foreach (e, cm->engines)
        {
-         if (e->ops_handlers[i] != 0)
+         if (e->chained_ops_handlers[id] != 0)
            s = format (s, "%U ", format_vnet_crypto_engine, e - cm->engines);
        }
-      vlib_cli_output (vm, "%-40U%-20U%v", format_vnet_crypto_op, i,
-                      format_vnet_crypto_engine, otd->active_engine_index,s);
+      first = 0;
     }
-  vec_free (s);
+  return s;
+}
+
+
+static clib_error_t *
+show_crypto_handlers_command_fn (vlib_main_t * vm,
+                       unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  int i;
+
+  if (unformat_user (input, unformat_line_input, line_input))
+    unformat_free (line_input);
+
+  vlib_cli_output (vm, "%-20s%-22s%-20s%s", "Algo", "Type", "Active",
+                  "Candidates");
+
+  for (i = 0; i < VNET_CRYPTO_N_ALGS; i++)
+    vlib_cli_output (vm, "%-20U%U", format_vnet_crypto_alg, i,
+                    format_vnet_crypto_handlers, i);
+
   return 0;
 }
 
@@ -103,6 +138,7 @@ set_crypto_handler_command_fn (vlib_main_t * vm,
   char **args = 0, *s, **arg, *engine = 0;
   int all = 0;
   clib_error_t *error = 0;
+  crypto_op_class_type_t oct = CRYPTO_OP_BOTH;
 
   if (!unformat_user (input, unformat_line_input, line_input))
     return 0;
@@ -111,6 +147,12 @@ set_crypto_handler_command_fn (vlib_main_t * vm,
     {
       if (unformat (line_input, "all"))
        all = 1;
+      else if (unformat (line_input, "simple"))
+       oct = CRYPTO_OP_SIMPLE;
+      else if (unformat (line_input, "chained"))
+       oct = CRYPTO_OP_CHAINED;
+      else if (unformat (line_input, "both"))
+       oct = CRYPTO_OP_BOTH;
       else if (unformat (line_input, "%s", &s))
        vec_add1 (args, s);
       else
@@ -135,10 +177,10 @@ set_crypto_handler_command_fn (vlib_main_t * vm,
       u8 *value;
 
       /* *INDENT-OFF* */
-      hash_foreach_mem (key, value, cm->ops_handler_index_by_name,
+      hash_foreach_mem (key, value, cm->alg_index_by_name,
       ({
         (void) value;
-        rc += vnet_crypto_set_handler (key, engine);
+        rc += vnet_crypto_set_handler2 (key, engine, oct);
       }));
       /* *INDENT-ON* */
 
@@ -149,7 +191,7 @@ set_crypto_handler_command_fn (vlib_main_t * vm,
     {
       vec_foreach (arg, args)
       {
-       rc = vnet_crypto_set_handler (arg[0], engine);
+       rc = vnet_crypto_set_handler2 (arg[0], engine, oct);
        if (rc)
          {
            vlib_cli_output (vm, "failed to set engine %s for %s!",
@@ -170,7 +212,8 @@ done:
 VLIB_CLI_COMMAND (set_crypto_handler_command, static) =
 {
   .path = "set crypto handler",
-  .short_help = "set crypto handler cipher [cipher2 cipher3 ...] engine",
+  .short_help = "set crypto handler cipher [cipher2 cipher3 ...] engine"
+    " [simple|chained]",
   .function = set_crypto_handler_command_fn,
 };
 /* *INDENT-ON* */