X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fikev2%2Fikev2_cli.c;h=1acae91c777654531ecabde36a3fabbcf2985c68;hb=7f6d145accc6e63b150ab4efc282f19cbe996b57;hp=8801793be0b0e5cf537346656c48206687c03b53;hpb=7c44d78ef2e7bf0c8714be4184511ed8f23ff239;p=vpp.git

diff --git a/src/plugins/ikev2/ikev2_cli.c b/src/plugins/ikev2/ikev2_cli.c
index 8801793be0b..1acae91c777 100644
--- a/src/plugins/ikev2/ikev2_cli.c
+++ b/src/plugins/ikev2/ikev2_cli.c
@@ -125,10 +125,13 @@ show_ikev2_sa_command_fn (vlib_main_t * vm,
           vlib_cli_output(vm, "    SK_e  i:%U\n          r:%U",
                           format_hex_bytes, child->sk_ei, vec_len(child->sk_ei),
                           format_hex_bytes, child->sk_er, vec_len(child->sk_er));
-          vlib_cli_output(vm, "    SK_a  i:%U\n          r:%U",
-                          format_hex_bytes, child->sk_ai, vec_len(child->sk_ai),
-                          format_hex_bytes, child->sk_ar, vec_len(child->sk_ar));
-          vlib_cli_output(vm, "    traffic selectors (i):");
+          if (child->sk_ai)
+            {
+              vlib_cli_output(vm, "    SK_a  i:%U\n          r:%U",
+                              format_hex_bytes, child->sk_ai, vec_len(child->sk_ai),
+                              format_hex_bytes, child->sk_ar, vec_len(child->sk_ar));
+              vlib_cli_output(vm, "    traffic selectors (i):");
+            }
           vec_foreach(ts, child->tsi)
             {
               vlib_cli_output(vm, "      %u type %u protocol_id %u addr "
@@ -184,6 +187,7 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
   ip4_address_t ip4;
   ip4_address_t end_addr;
   u32 responder_sw_if_index = (u32) ~ 0;
+  u32 tun_sw_if_index = (u32) ~ 0;
   ip4_address_t responder_ip4;
   ikev2_transform_encr_type_t crypto_alg;
   ikev2_transform_integ_type_t integ_alg;
@@ -326,6 +330,13 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
 					 responder_ip4);
 	  goto done;
 	}
+      else if (unformat (line_input, "set %U tunnel %U",
+			 unformat_token, valid_chars, &name,
+			 unformat_vnet_sw_interface, vnm, &tun_sw_if_index))
+	{
+	  r = ikev2_set_profile_tunnel_interface (vm, name, tun_sw_if_index);
+	  goto done;
+	}
       else
 	if (unformat
 	    (line_input,
@@ -354,6 +365,18 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
 					      dh_type, tmp1);
 	  goto done;
 	}
+      else if (unformat
+	       (line_input,
+		"set %U esp-crypto-alg %U %u esp-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_esp_transforms (vm, name, crypto_alg, 0,
+					      dh_type, tmp1);
+	  goto done;
+	}
       else if (unformat (line_input, "set %U sa-lifetime %lu %u %u %lu",
 			 unformat_token, valid_chars, &name,
 			 &tmp4, &tmp1, &tmp2, &tmp5))
@@ -362,6 +385,12 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
 	    ikev2_set_profile_sa_lifetime (vm, name, tmp4, tmp1, tmp2, tmp5);
 	  goto done;
 	}
+      else if (unformat (line_input, "set %U udp-encap",
+			 unformat_token, valid_chars, &name))
+	{
+	  r = ikev2_set_profile_udp_encap (vm, name);
+	  goto done;
+	}
       else
 	break;
     }
@@ -384,12 +413,15 @@ VLIB_CLI_COMMAND (ikev2_profile_add_del_command, static) = {
     "ikev2 profile set <id> auth [rsa-sig|shared-key-mic] [cert-file|string|hex]"
     " <data>\n"
     "ikev2 profile set <id> id <local|remote> <type> <data>\n"
+    "ikev2 profile set <id> tunnel <interface>\n"
+    "ikev2 profile set <id> udp-encap\n"
     "ikev2 profile set <id> traffic-selector <local|remote> ip-range "
     "<start-addr> - <end-addr> port-range <start-port> - <end-port> "
     "protocol <protocol-number>\n"
     "ikev2 profile set <id> responder <interface> <addr>\n"
     "ikev2 profile set <id> ike-crypto-alg <crypto alg> <key size> ike-integ-alg <integ alg> ike-dh <dh type>\n"
-    "ikev2 profile set <id> esp-crypto-alg <crypto alg> <key size> esp-integ-alg <integ alg> esp-dh <dh type>\n"
+    "ikev2 profile set <id> esp-crypto-alg <crypto alg> <key size> "
+      "[esp-integ-alg <integ alg>] esp-dh <dh type>\n"
     "ikev2 profile set <id> sa-lifetime <seconds> <jitter> <handover> <max bytes>",
     .function = ikev2_profile_add_del_command_fn,
 };
@@ -465,6 +497,11 @@ show_ikev2_profile_command_fn (vlib_main_t * vm,
                       format_ip4_address, &p->rem_ts.end_addr,
                       p->rem_ts.start_port, p->rem_ts.end_port,
                       p->rem_ts.protocol_id);
+    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 (p->udp_encap)
+      vlib_cli_output(vm, "  udp-encap");
   }));
   /* *INDENT-ON* */
 
@@ -584,14 +621,46 @@ VLIB_CLI_COMMAND (ikev2_initiate_command, static) = {
 };
 /* *INDENT-ON* */
 
+void
+ikev2_cli_reference (void)
+{
+}
 
-clib_error_t *
-ikev2_cli_init (vlib_main_t * vm)
+static clib_error_t *
+ikev2_set_log_level_command_fn (vlib_main_t * vm,
+				unformat_input_t * input,
+				vlib_cli_command_t * cmd)
 {
-  return 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 log_level = IKEV2_LOG_NONE;
+  clib_error_t *error = 0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  if (!unformat (line_input, "%d", &log_level))
+    {
+      error = clib_error_return (0, "unknown input '%U'",
+				 format_unformat_error, line_input);
+      goto done;
+    }
+  int rc = ikev2_set_log_level (log_level);
+  if (rc < 0)
+    error = clib_error_return (0, "setting log level failed!");
+
+done:
+  unformat_free (line_input);
+  return error;
 }
 
-VLIB_INIT_FUNCTION (ikev2_cli_init);
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ikev2_set_log_level_command, static) = {
+  .path = "ikev2 set logging level",
+  .function = ikev2_set_log_level_command_fn,
+  .short_help = "ikev2 set logging level <0-5>",
+};
+/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON