VPP-363: add ability to change mac address of the interface

[vpp.git] / vnet / vnet / ipsec / ikev2_cli.c

diff --git a/vnet/vnet/ipsec/ikev2_cli.c b/vnet/vnet/ipsec/ikev2_cli.c
index beba835..1369c18 100644 (file)
--- a/vnet/vnet/ipsec/ikev2_cli.c
+++ b/vnet/vnet/ipsec/ikev2_cli.c
@@ -65,26 +65,26 @@ show_ikev2_sa_command_fn (vlib_main_t * vm,
       vlib_cli_output(vm, " iip %U ispi %lx rip %U rspi %lx",
                       format_ip4_address, &sa->iaddr, sa->ispi,
                       format_ip4_address, &sa->raddr, sa->rspi);
-  
+
        tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
        s = format(s, "%U ", format_ikev2_sa_transform, tr);
-  
+
        tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_PRF);
        s = format(s, "%U ", format_ikev2_sa_transform, tr);
-  
+
        tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
        s = format(s, "%U ", format_ikev2_sa_transform, tr);
-  
+
        tr = ikev2_sa_get_td_for_type(sa->r_proposals, IKEV2_TRANSFORM_TYPE_DH);
        s = format(s, "%U ", format_ikev2_sa_transform, tr);
-  
+
       vlib_cli_output(vm, " %v", s);
       vec_free(s);
-  
+
       vlib_cli_output(vm, "  nonce i:%U\n        r:%U",
                       format_hex_bytes, sa->i_nonce,  vec_len(sa->i_nonce),
                       format_hex_bytes, sa->r_nonce,  vec_len(sa->r_nonce));
-  
+
       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",
@@ -96,32 +96,32 @@ show_ikev2_sa_command_fn (vlib_main_t * vm,
       vlib_cli_output(vm, "  SK_p  i:%U\n        r:%U",
                       format_hex_bytes, sa->sk_pi, vec_len(sa->sk_pi),
                       format_hex_bytes, sa->sk_pr, vec_len(sa->sk_pr));
-  
+
       vlib_cli_output(vm, "  identifier (i) %U",
                       format_ikev2_id_type_and_data, &sa->i_id);
       vlib_cli_output(vm, "  identifier (r) %U",
                       format_ikev2_id_type_and_data, &sa->r_id);
-  
+
       vec_foreach(child, sa->childs)
         {
           vlib_cli_output(vm, "  child sa %u:", child - sa->childs);
-  
+
           tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
           s = format(s, "%U ", format_ikev2_sa_transform, tr);
-  
+
           tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
           s = format(s, "%U ", format_ikev2_sa_transform, tr);
-  
+
           tr = ikev2_sa_get_td_for_type(child->r_proposals, IKEV2_TRANSFORM_TYPE_ESN);
           s = format(s, "%U ", format_ikev2_sa_transform, tr);
-  
+
           vlib_cli_output(vm, "    %v", s);
           vec_free(s);
-  
+
           vlib_cli_output(vm, "    spi(i) %lx spi(r) %lx",
                           child->i_proposals ? child->i_proposals[0].spi : 0,
                           child->r_proposals ? child->r_proposals[0].spi : 0);
-  
+
           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));
@@ -263,9 +263,8 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
        {
          data = vec_new (u8, 4);
          clib_memcpy (data, ip4.as_u8, 4);
-         r =
-           ikev2_set_profile_id (vm, name, (u8) id_type, data, /*remote */
-                                 0);
+         r = ikev2_set_profile_id (vm, name, (u8) id_type, data,       /*remote */
+                                   0);
          goto done;
        }
       else if (unformat (line_input, "set %U id remote %U 0x%U",
@@ -273,18 +272,16 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm,
                         unformat_ikev2_id_type, &id_type,
                         unformat_hex_string, &data))
        {
-         r =
-           ikev2_set_profile_id (vm, name, (u8) id_type, data, /*remote */
-                                 0);
+         r = ikev2_set_profile_id (vm, name, (u8) id_type, data,       /*remote */
+                                   0);
          goto done;
        }
       else if (unformat (line_input, "set %U id remote %U %v",
                         unformat_token, valid_chars, &name,
                         unformat_ikev2_id_type, &id_type, &data))
        {
-         r =
-           ikev2_set_profile_id (vm, name, (u8) id_type, data, /*remote */
-                                 0);
+         r = ikev2_set_profile_id (vm, name, (u8) id_type, data,       /*remote */
+                                   0);
          goto done;
        }
       else if (unformat (line_input, "set %U traffic-selector local "
@@ -438,7 +435,7 @@ set_ikev2_local_key_command_fn (vlib_main_t * vm,
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
-      if (unformat (line_input, "%v", &data))
+      if (unformat (line_input, "%s", &data))
        {
          r = ikev2_set_local_key (vm, data);
          goto done;