ikev2: refactor and test profile dump API

[vpp.git] / src / plugins / ikev2 / ikev2_cli.c

diff --git a/src/plugins/ikev2/ikev2_cli.c b/src/plugins/ikev2/ikev2_cli.c
index b991de4..687e6f2 100644 (file)
--- a/src/plugins/ikev2/ikev2_cli.c
+++ b/src/plugins/ikev2/ikev2_cli.c
@@ -88,9 +88,12 @@ show_ikev2_sa_command_fn (vlib_main_t * vm,
 
       vlib_cli_output(vm, "  SK_d    %U",
                       format_hex_bytes, sa->sk_d,  vec_len(sa->sk_d));
-      vlib_cli_output(vm, "  SK_a  i:%U\n        r:%U",
-                      format_hex_bytes, sa->sk_ai, vec_len(sa->sk_ai),
-                      format_hex_bytes, sa->sk_ar, vec_len(sa->sk_ar));
+      if (sa->sk_ai)
+        {
+          vlib_cli_output(vm, "  SK_a  i:%U\n        r:%U",
+                          format_hex_bytes, sa->sk_ai, vec_len(sa->sk_ai),
+                          format_hex_bytes, sa->sk_ar, vec_len(sa->sk_ar));
+        }
       vlib_cli_output(vm, "  SK_e  i:%U\n        r:%U",
                       format_hex_bytes, sa->sk_ei, vec_len(sa->sk_ei),
                       format_hex_bytes, sa->sk_er, vec_len(sa->sk_er));
@@ -352,6 +355,20 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
                                              dh_type, tmp1);
          goto done;
        }
+      else
+       if (unformat
+           (line_input,
+            "set %U ike-crypto-alg %U %u ike-dh %U",
+            unformat_token, valid_chars, &name,
+            unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1,
+            unformat_ikev2_transform_dh_type, &dh_type))
+       {
+         r =
+           ikev2_set_profile_ike_transforms (vm, name, crypto_alg,
+                                             IKEV2_TRANSFORM_INTEG_TYPE_NONE,
+                                             dh_type, tmp1);
+         goto done;
+       }
       else
        if (unformat
            (line_input,
@@ -362,7 +379,6 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
        {
          r =
            ikev2_set_profile_esp_transforms (vm, name, crypto_alg, integ_alg,
-                                             IKEV2_TRANSFORM_DH_TYPE_NONE,
                                              tmp1);
          goto done;
        }
@@ -373,9 +389,7 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
                unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1))
        {
          r =
-           ikev2_set_profile_esp_transforms (vm, name, crypto_alg, 0,
-                                             IKEV2_TRANSFORM_DH_TYPE_NONE,
-                                             tmp1);
+           ikev2_set_profile_esp_transforms (vm, name, crypto_alg, 0, tmp1);
          goto done;
        }
       else if (unformat (line_input, "set %U sa-lifetime %lu %u %u %lu",
@@ -509,11 +523,29 @@ show_ikev2_profile_command_fn (vlib_main_t * vm,
     if (~0 != p->tun_itf)
       vlib_cli_output(vm, "  protected tunnel %U",
                       format_vnet_sw_if_index_name, vnet_get_main(), p->tun_itf);
+    if (~0 != p->responder.sw_if_index)
+      vlib_cli_output(vm, "  responder %U %U",
+                      format_vnet_sw_if_index_name, vnet_get_main(), p->responder.sw_if_index,
+                      format_ip4_address, &p->responder.ip4);
     if (p->udp_encap)
       vlib_cli_output(vm, "  udp-encap");
 
     if (p->ipsec_over_udp_port != IPSEC_UDP_PORT_NONE)
       vlib_cli_output(vm, "  ipsec-over-udp port %d", p->ipsec_over_udp_port);
+
+    if (p->ike_ts.crypto_alg || p->ike_ts.integ_alg || p->ike_ts.dh_type || p->ike_ts.crypto_key_size)
+      vlib_cli_output(vm, "  ike-crypto-alg %U %u ike-integ-alg %U ike-dh %U",
+                    format_ikev2_transform_encr_type, p->ike_ts.crypto_alg, p->ike_ts.crypto_key_size,
+                    format_ikev2_transform_integ_type, p->ike_ts.integ_alg,
+                    format_ikev2_transform_dh_type, p->ike_ts.dh_type);
+
+    if (p->esp_ts.crypto_alg || p->esp_ts.integ_alg || p->esp_ts.dh_type)
+      vlib_cli_output(vm, "  esp-crypto-alg %U %u esp-integ-alg %U",
+                    format_ikev2_transform_encr_type, p->esp_ts.crypto_alg, p->esp_ts.crypto_key_size,
+                    format_ikev2_transform_integ_type, p->esp_ts.integ_alg);
+
+    vlib_cli_output(vm, "  lifetime %d jitter %d handover %d maxdata %d",
+                    p->lifetime, p->lifetime_jitter, p->handover, p->lifetime_maxdata);
   }));
   /* *INDENT-ON* */