[HICN-683] Add clang format for hicn-plugin.

As vpp has moved away from the dear old indent, also
the hicn plugin should do the same and use clang-format.

Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: Iee896f3ce01cef53b1acfccbebeef66ca77add7d
Signed-off-by: Mauro Sardara <msardara@cisco.com>

2 files changed, 73 insertions, 97 deletions

diff --git a/hicn-plugin/src/faces/app/face_app_cli.c b/hicn-plugin/src/faces/app/face_app_cli.c
index 1aa27adc7..36f8bf3f7 100644
--- a/hicn-plugin/src/faces/app/face_app_cli.c
+++ b/hicn-plugin/src/faces/app/face_app_cli.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2021 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -23,14 +23,14 @@
 #include "face_prod.h"
 #include "face_cons.h"
 
-#define HICN_FACE_NONE 0
+#define HICN_FACE_NONE	 0
 #define HICN_FACE_DELETE 1
-#define HICN_FACE_ADD 2
+#define HICN_FACE_ADD	 2
 
 static clib_error_t *
-hicn_face_app_cli_set_command_fn (vlib_main_t * vm,
-				  unformat_input_t * main_input,
-				  vlib_cli_command_t * cmd)
+hicn_face_app_cli_set_command_fn (vlib_main_t *vm,
+				  unformat_input_t *main_input,
+				  vlib_cli_command_t *cmd)
 {
   vnet_main_t *vnm = vnet_get_main ();
   fib_prefix_t prefix;
@@ -42,7 +42,6 @@ hicn_face_app_cli_set_command_fn (vlib_main_t * vm,
   int face_op = HICN_FACE_NONE;
   int prod = 0;
 
-
   /* Get a line of input. */
   unformat_input_t _line_input, *line_input = &_line_input;
   if (!unformat_user (main_input, unformat_line_input, line_input))
@@ -56,8 +55,8 @@ hicn_face_app_cli_set_command_fn (vlib_main_t * vm,
 	{
 	  face_op = HICN_FACE_DELETE;
 	}
-      else if (face_op == HICN_FACE_DELETE
-	       && unformat (line_input, "id %d", &face_id1))
+      else if (face_op == HICN_FACE_DELETE &&
+	       unformat (line_input, "id %d", &face_id1))
 	;
       else if (unformat (line_input, "add"))
 	{
@@ -65,13 +64,12 @@ hicn_face_app_cli_set_command_fn (vlib_main_t * vm,
 	}
       else if (face_op == HICN_FACE_ADD)
 	{
-	  if (unformat (line_input, "intfc %U",
-			unformat_vnet_sw_interface, vnm, &sw_if))
+	  if (unformat (line_input, "intfc %U", unformat_vnet_sw_interface,
+			vnm, &sw_if))
 	    ;
-	  else
-	    if (unformat
-		(line_input, "prod prefix %U/%d", unformat_ip46_address,
-		 &prefix.fp_addr, IP46_TYPE_ANY, &prefix.fp_len))
+	  else if (unformat (line_input, "prod prefix %U/%d",
+			     unformat_ip46_address, &prefix.fp_addr,
+			     IP46_TYPE_ANY, &prefix.fp_len))
 	    {
 	      prod = 1;
 	    }
@@ -81,10 +79,9 @@ hicn_face_app_cli_set_command_fn (vlib_main_t * vm,
 	    ;
 	  else
 	    {
-	      return clib_error_return (0, "%s '%U'",
-					get_error_string
-					(HICN_ERROR_CLI_INVAL),
-					format_unformat_error, line_input);
+	      return clib_error_return (
+		0, "%s '%U'", get_error_string (HICN_ERROR_CLI_INVAL),
+		format_unformat_error, line_input);
 	    }
 	}
       else
@@ -116,20 +113,17 @@ hicn_face_app_cli_set_command_fn (vlib_main_t * vm,
 
 	if (prod)
 	  {
-	    prefix.fp_proto =
-	      ip46_address_is_ip4 (&prefix.
-				   fp_addr) ? FIB_PROTOCOL_IP4 :
-	      FIB_PROTOCOL_IP6;
-	    rv =
-	      hicn_face_prod_add (&prefix, sw_if, &cs_reserved, &prod_addr,
-				  &face_id1);
+	    prefix.fp_proto = ip46_address_is_ip4 (&prefix.fp_addr) ?
+				      FIB_PROTOCOL_IP4 :
+				      FIB_PROTOCOL_IP6;
+	    rv = hicn_face_prod_add (&prefix, sw_if, &cs_reserved, &prod_addr,
+				     &face_id1);
 	    if (rv == HICN_ERROR_NONE)
 	      {
 		u8 *sbuf = NULL;
-		sbuf =
-		  format (sbuf, "Face id: %d, producer address %U", face_id1,
-			  format_ip46_address, &prod_addr,
-			  0 /*IP46_ANY_TYPE */ );
+		sbuf = format (sbuf, "Face id: %d, producer address %U",
+			       face_id1, format_ip46_address, &prod_addr,
+			       0 /*IP46_ANY_TYPE */);
 		vlib_cli_output (vm, "%s", sbuf);
 	      }
 	    else
@@ -139,17 +133,16 @@ hicn_face_app_cli_set_command_fn (vlib_main_t * vm,
 	  }
 	else
 	  {
-	    rv =
-	      hicn_face_cons_add (&cons_addr4, &cons_addr6, sw_if, &face_id1,
-				  &face_id2);
+	    rv = hicn_face_cons_add (&cons_addr4, &cons_addr6, sw_if,
+				     &face_id1, &face_id2);
 	    if (rv == HICN_ERROR_NONE)
 	      {
 		u8 *sbuf = NULL;
-		sbuf =
-		  format (sbuf,
-			  "Face id: %d, address v4 %U, face id: %d address v6 %U",
-			  face_id1, format_ip4_address, &cons_addr4, face_id2,
-			  format_ip6_address, &cons_addr6);
+		sbuf = format (
+		  sbuf,
+		  "Face id: %d, address v4 %U, face id: %d address v6 %U",
+		  face_id1, format_ip4_address, &cons_addr4, face_id2,
+		  format_ip6_address, &cons_addr6);
 		vlib_cli_output (vm, "%s", sbuf);
 	      }
 	    else
@@ -181,20 +174,18 @@ hicn_face_app_cli_set_command_fn (vlib_main_t * vm,
       return clib_error_return (0, "Operation (%d) not implemented", face_op);
       break;
     }
-  return (rv == HICN_ERROR_NONE) ? 0 : clib_error_return (0, "%s\n",
-							  get_error_string
-							  (rv));
+  return (rv == HICN_ERROR_NONE) ?
+		 0 :
+		 clib_error_return (0, "%s\n", get_error_string (rv));
 }
 
 /* cli declaration for 'cfg face' */
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (hicn_face_app_cli_set_command, static) =
-{
+VLIB_CLI_COMMAND (hicn_face_app_cli_set_command, static) = {
   .path = "hicn face app",
-  .short_help = "hicn face app {add intfc <sw_if> { prod prefix <hicn_prefix> cs_size <size_in_packets>} {cons} | {del <face_id>}",
+  .short_help = "hicn face app {add intfc <sw_if> { prod prefix <hicn_prefix> "
+		"cs_size <size_in_packets>} {cons} | {del <face_id>}",
   .function = hicn_face_app_cli_set_command_fn,
 };
-/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON
diff --git a/hicn-plugin/src/faces/app/face_prod_node.c b/hicn-plugin/src/faces/app/face_prod_node.c
index 80c3e124c..a843a01ef 100644
--- a/hicn-plugin/src/faces/app/face_prod_node.c
+++ b/hicn-plugin/src/faces/app/face_prod_node.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2021 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -19,8 +19,8 @@
  * @brief Application interface node
  *
  * This node runs after the device-input node and perfoms some safety checks in
- * order to avoid unespected interest and data (i.e., hICN packets whose name do
- * not contain the prefix associated to the application face)
+ * order to avoid unespected interest and data (i.e., hICN packets whose name
+ * do not contain the prefix associated to the application face)
  */
 
 #include "face_prod.h"
@@ -56,7 +56,7 @@ typedef enum
 vlib_node_registration_t hicn_face_prod_input_node;
 
 static __clib_unused u8 *
-format_face_prod_input_trace (u8 * s, va_list * args)
+format_face_prod_input_trace (u8 *s, va_list *args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
@@ -64,13 +64,13 @@ format_face_prod_input_trace (u8 * s, va_list * args)
     va_arg (*args, hicn_face_prod_input_trace_t *);
   CLIB_UNUSED (u32 indent) = format_get_indent (s);
 
-  s = format (s, "prod-face: sw_if_index %d next-index %d",
-	      t->sw_if_index, t->next_index);
+  s = format (s, "prod-face: sw_if_index %d next-index %d", t->sw_if_index,
+	      t->next_index);
   return s;
 }
 
 static_always_inline int
-match_ip4_name (u32 * name, fib_prefix_t * prefix)
+match_ip4_name (u32 *name, fib_prefix_t *prefix)
 {
   u32 xor = 0;
 
@@ -80,7 +80,7 @@ match_ip4_name (u32 * name, fib_prefix_t * prefix)
 }
 
 static_always_inline int
-match_ip6_name (u8 * name, fib_prefix_t * prefix)
+match_ip6_name (u8 *name, fib_prefix_t *prefix)
 {
   union
   {
@@ -93,12 +93,12 @@ match_ip6_name (u8 * name, fib_prefix_t * prefix)
   xor_sum.as_u64[1] = ((u64 *) name)[1] & prefix->fp_addr.ip6.as_u64[1];
 
   return (xor_sum.as_u64[0] == prefix->fp_addr.ip6.as_u64[0]) &&
-    (xor_sum.as_u64[1] == prefix->fp_addr.ip6.as_u64[1]);
+	 (xor_sum.as_u64[1] == prefix->fp_addr.ip6.as_u64[1]);
 }
 
 static_always_inline u32
-hicn_face_prod_next_from_data_hdr (vlib_node_runtime_t * node,
-				   vlib_buffer_t * b, fib_prefix_t * prefix)
+hicn_face_prod_next_from_data_hdr (vlib_node_runtime_t *node, vlib_buffer_t *b,
+				   fib_prefix_t *prefix)
 {
   u8 *ptr = vlib_buffer_get_current (b);
   u8 v = *ptr & 0xf0;
@@ -106,21 +106,20 @@ hicn_face_prod_next_from_data_hdr (vlib_node_runtime_t * node,
 
   if (PREDICT_TRUE (v == 0x40 && ip46_address_is_ip4 (&prefix->fp_addr)))
     {
-      match_res = match_ip4_name ((u32 *) & (ptr[12]), prefix);
+      match_res = match_ip4_name ((u32 *) &(ptr[12]), prefix);
     }
   else if (PREDICT_TRUE (v == 0x60 && !ip46_address_is_ip4 (&prefix->fp_addr)))
     {
-      match_res = match_ip6_name (& (ptr[8]), prefix);
+      match_res = match_ip6_name (&(ptr[8]), prefix);
     }
 
-  return match_res ? HICN_FACE_PROD_NEXT_DATA_IP4 + (v ==
-						     0x60) :
-    HICN_FACE_PROD_NEXT_ERROR_DROP;
+  return match_res ? HICN_FACE_PROD_NEXT_DATA_IP4 + (v == 0x60) :
+			   HICN_FACE_PROD_NEXT_ERROR_DROP;
 }
 
 static_always_inline void
-hicn_face_prod_trace_buffer (vlib_main_t * vm, vlib_node_runtime_t * node,
-			     u32 swif, vlib_buffer_t * b, u32 next)
+hicn_face_prod_trace_buffer (vlib_main_t *vm, vlib_node_runtime_t *node,
+			     u32 swif, vlib_buffer_t *b, u32 next)
 {
   if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
 		     (b->flags & VLIB_BUFFER_IS_TRACED)))
@@ -133,9 +132,8 @@ hicn_face_prod_trace_buffer (vlib_main_t * vm, vlib_node_runtime_t * node,
 }
 
 static uword
-hicn_face_prod_input_node_fn (vlib_main_t * vm,
-			      vlib_node_runtime_t * node,
-			      vlib_frame_t * frame)
+hicn_face_prod_input_node_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
+			      vlib_frame_t *frame)
 {
   u32 n_left_from, *from, *to_next;
   hicn_face_prod_next_t next_index;
@@ -192,14 +190,10 @@ hicn_face_prod_input_node_fn (vlib_main_t * vm,
 	  b2 = vlib_get_buffer (vm, bi2);
 	  b3 = vlib_get_buffer (vm, bi3);
 
-	  prod_face0 =
-	    &face_state_vec[vnet_buffer (b0)->sw_if_index[VLIB_RX]];
-	  prod_face1 =
-	    &face_state_vec[vnet_buffer (b1)->sw_if_index[VLIB_RX]];
-	  prod_face2 =
-	    &face_state_vec[vnet_buffer (b2)->sw_if_index[VLIB_RX]];
-	  prod_face3 =
-	    &face_state_vec[vnet_buffer (b3)->sw_if_index[VLIB_RX]];
+	  prod_face0 = &face_state_vec[vnet_buffer (b0)->sw_if_index[VLIB_RX]];
+	  prod_face1 = &face_state_vec[vnet_buffer (b1)->sw_if_index[VLIB_RX]];
+	  prod_face2 = &face_state_vec[vnet_buffer (b2)->sw_if_index[VLIB_RX]];
+	  prod_face3 = &face_state_vec[vnet_buffer (b3)->sw_if_index[VLIB_RX]];
 
 	  next0 =
 	    hicn_face_prod_next_from_data_hdr (node, b0, &prod_face0->prefix);
@@ -212,18 +206,14 @@ hicn_face_prod_input_node_fn (vlib_main_t * vm,
 	  stats.pkts_data_count += 4;
 
 	  /* trace */
-	  hicn_face_prod_trace_buffer (vm, node,
-				       vnet_buffer (b0)->sw_if_index[VLIB_RX],
-				       b0, next0);
-	  hicn_face_prod_trace_buffer (vm, node,
-				       vnet_buffer (b1)->sw_if_index[VLIB_RX],
-				       b1, next1);
-	  hicn_face_prod_trace_buffer (vm, node,
-				       vnet_buffer (b2)->sw_if_index[VLIB_RX],
-				       b2, next2);
-	  hicn_face_prod_trace_buffer (vm, node,
-				       vnet_buffer (b3)->sw_if_index[VLIB_RX],
-				       b3, next3);
+	  hicn_face_prod_trace_buffer (
+	    vm, node, vnet_buffer (b0)->sw_if_index[VLIB_RX], b0, next0);
+	  hicn_face_prod_trace_buffer (
+	    vm, node, vnet_buffer (b1)->sw_if_index[VLIB_RX], b1, next1);
+	  hicn_face_prod_trace_buffer (
+	    vm, node, vnet_buffer (b2)->sw_if_index[VLIB_RX], b2, next2);
+	  hicn_face_prod_trace_buffer (
+	    vm, node, vnet_buffer (b3)->sw_if_index[VLIB_RX], b3, next3);
 
 	  /* enqueue */
 	  vlib_validate_buffer_enqueue_x4 (vm, node, next_index, to_next,
@@ -231,7 +221,6 @@ hicn_face_prod_input_node_fn (vlib_main_t * vm,
 					   next0, next1, next2, next3);
 
 	  stats.pkts_processed += 4;
-
 	}
 
       while (n_left_from > 0 && n_left_to_next > 0)
@@ -264,30 +253,27 @@ hicn_face_prod_input_node_fn (vlib_main_t * vm,
 	  stats.pkts_data_count++;
 
 	  /* trace */
-	  hicn_face_prod_trace_buffer (vm, node,
-				       vnet_buffer (b0)->sw_if_index[VLIB_RX],
-				       b0, next0);
+	  hicn_face_prod_trace_buffer (
+	    vm, node, vnet_buffer (b0)->sw_if_index[VLIB_RX], b0, next0);
 
 	  /* enqueue */
 	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
 					   n_left_to_next, bi0, next0);
 
 	  stats.pkts_processed += 1;
-
 	}
 
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, node->node_index,
-			       HICNFWD_ERROR_PROCESSED, stats.pkts_processed);
+  vlib_node_increment_counter (vm, node->node_index, HICNFWD_ERROR_PROCESSED,
+			       stats.pkts_processed);
   vlib_node_increment_counter (vm, node->node_index, HICNFWD_ERROR_DATAS,
 			       stats.pkts_data_count);
 
   return (frame->n_vectors);
 }
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE(hicn_face_prod_input_node) =
 {
   .function = hicn_face_prod_input_node_fn,
@@ -305,8 +291,7 @@ VLIB_REGISTER_NODE(hicn_face_prod_input_node) =
     [HICN_FACE_PROD_NEXT_ERROR_DROP] = "error-drop",
   },
 };
-/* *INDENT-ON* */
-
+	
 /*
  * fd.io coding-style-patch-verification: ON
  *