IPSEC: remove byte swap operations in DP during SPD classify

[vpp.git] / src / vnet / dhcp / dhcp6_pd_client_cp.c

diff --git a/src/vnet/dhcp/dhcp6_pd_client_cp.c b/src/vnet/dhcp/dhcp6_pd_client_cp.c
index 3381378..a157b16 100644 (file)
--- a/src/vnet/dhcp/dhcp6_pd_client_cp.c
+++ b/src/vnet/dhcp/dhcp6_pd_client_cp.c
@@ -966,26 +966,33 @@ cp_ip6_address_add_del_command_function (vlib_main_t * vm,
   u32 prefix_length;
   u8 address_set = 0;
   u8 add = 1;
+  unformat_input_t _line_input, *line_input = &_line_input;
 
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat
-         (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index));
-      else if (unformat (input, "prefix group %s", &prefix_group));
+         (line_input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index));
+      else if (unformat (line_input, "prefix group %s", &prefix_group));
       else
-       if (unformat
-           (input, "%U/%d", unformat_ip6_address, &address, &prefix_length))
+       if (unformat (line_input, "%U/%d", unformat_ip6_address,
+                     &address, &prefix_length))
        address_set = 1;
-      else if (unformat (input, "del"))
+      else if (unformat (line_input, "del"))
        add = 0;
       else
        {
          error = clib_error_return (0, "unexpected input `%U'",
-                                    format_unformat_error, input);
+                                    format_unformat_error, line_input);
+         unformat_free (line_input);
          goto done;
        }
     }
 
+  unformat_free (line_input);
+
   if (sw_if_index == ~0)
     error = clib_error_return (0, "Missing sw_if_index");
   else if (address_set == 0)
@@ -1257,7 +1264,7 @@ dhcp6_pd_client_enable_disable (u32 sw_if_index, const u8 * prefix_group,
 
       vec_free (prefix_list);
 
-      memset (client_state, 0, sizeof (*client_state));
+      clib_memset (client_state, 0, sizeof (*client_state));
     }
 
   return 0;
@@ -1275,19 +1282,23 @@ dhcp6_pd_client_enable_disable_command_fn (vlib_main_t *
   u8 *prefix_group = 0;
   u32 sw_if_index = ~0;
   u8 enable = 1;
+  unformat_input_t _line_input, *line_input = &_line_input;
+
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
 
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat
-         (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+         (line_input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
        ;
-      else if (unformat (input, "prefix group %s", &prefix_group));
-      else if (unformat (input, "disable"))
+      else if (unformat (line_input, "prefix group %s", &prefix_group));
+      else if (unformat (line_input, "disable"))
        enable = 0;
       else
        {
          error = clib_error_return (0, "unexpected input `%U'",
-                                    format_unformat_error, input);
+                                    format_unformat_error, line_input);
          goto done;
        }
     }
@@ -1305,6 +1316,7 @@ dhcp6_pd_client_enable_disable_command_fn (vlib_main_t *
 
 done:
   vec_free (prefix_group);
+  unformat_free (line_input);
 
   return error;
 }