VPP-253 Coding standards cleanup - vnet/vnet/gre

Change-Id: I95f98b91faf74178c05f30da9eb3d6125193b7ef
Signed-off-by: Swarup Nayak <swarupnpvt@gmail.com>

1 files changed, 156 insertions, 134 deletions

diff --git a/src/vnet/gre/gre.c b/src/vnet/gre/gre.c
index 99421855bed..785476d0905 100644
--- a/src/vnet/gre/gre.c
+++ b/src/vnet/gre/gre.c
@@ -21,15 +21,19 @@
 
 gre_main_t gre_main;
 
-typedef struct {
-  union {
+typedef struct
+{
+  union
+  {
     ip4_and_gre_header_t ip4_and_gre;
     u64 as_u64[3];
   };
 } ip4_and_gre_union_t;
 
-typedef struct {
-  union {
+typedef struct
+{
+  union
+  {
     ip6_and_gre_header_t ip6_and_gre;
     u64 as_u64[3];
   };
@@ -37,7 +41,8 @@ typedef struct {
 
 
 /* Packet trace structure */
-typedef struct {
+typedef struct
+{
   /* Tunnel-id / index in tunnel vector */
   u32 tunnel_id;
 
@@ -49,11 +54,12 @@ typedef struct {
   ip46_address_t dst;
 } gre_tx_trace_t;
 
-u8 * format_gre_tx_trace (u8 * s, va_list * args)
+u8 *
+format_gre_tx_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 *);
-  gre_tx_trace_t * t = va_arg (*args, gre_tx_trace_t *);
+  gre_tx_trace_t *t = va_arg (*args, gre_tx_trace_t *);
 
   s = format (s, "GRE: tunnel %d len %d src %U dst %U",
 	      t->tunnel_id, clib_net_to_host_u16 (t->length),
@@ -62,11 +68,12 @@ u8 * format_gre_tx_trace (u8 * s, va_list * args)
   return s;
 }
 
-u8 * format_gre_protocol (u8 * s, va_list * args)
+u8 *
+format_gre_protocol (u8 * s, va_list * args)
 {
   gre_protocol_t p = va_arg (*args, u32);
-  gre_main_t * gm = &gre_main;
-  gre_protocol_info_t * pi = gre_get_protocol_info (gm, p);
+  gre_main_t *gm = &gre_main;
+  gre_protocol_info_t *pi = gre_get_protocol_info (gm, p);
 
   if (pi)
     s = format (s, "%s", pi->name);
@@ -76,10 +83,11 @@ u8 * format_gre_protocol (u8 * s, va_list * args)
   return s;
 }
 
-u8 * format_gre_header_with_length (u8 * s, va_list * args)
+u8 *
+format_gre_header_with_length (u8 * s, va_list * args)
 {
-  gre_main_t * gm = &gre_main;
-  gre_header_t * h = va_arg (*args, gre_header_t *);
+  gre_main_t *gm = &gre_main;
+  gre_header_t *h = va_arg (*args, gre_header_t *);
   u32 max_header_bytes = va_arg (*args, u32);
   gre_protocol_t p = clib_net_to_host_u16 (h->protocol);
   u32 indent, header_bytes;
@@ -94,8 +102,8 @@ u8 * format_gre_header_with_length (u8 * s, va_list * args)
 
   if (max_header_bytes != 0 && header_bytes > max_header_bytes)
     {
-      gre_protocol_info_t * pi = gre_get_protocol_info (gm, p);
-      vlib_node_t * node = vlib_get_node (gm->vlib_main, pi->node_index);
+      gre_protocol_info_t *pi = gre_get_protocol_info (gm, p);
+      vlib_node_t *node = vlib_get_node (gm->vlib_main, pi->node_index);
       if (node->format_buffer)
 	s = format (s, "\n%U%U",
 		    format_white_space, indent,
@@ -106,9 +114,10 @@ u8 * format_gre_header_with_length (u8 * s, va_list * args)
   return s;
 }
 
-u8 * format_gre_header (u8 * s, va_list * args)
+u8 *
+format_gre_header (u8 * s, va_list * args)
 {
-  gre_header_t * h = va_arg (*args, gre_header_t *);
+  gre_header_t *h = va_arg (*args, gre_header_t *);
   return format (s, "%U", format_gre_header_with_length, h, 0);
 }
 
@@ -117,15 +126,15 @@ uword
 unformat_gre_protocol_host_byte_order (unformat_input_t * input,
 				       va_list * args)
 {
-  u16 * result = va_arg (*args, u16 *);
-  gre_main_t * gm = &gre_main;
+  u16 *result = va_arg (*args, u16 *);
+  gre_main_t *gm = &gre_main;
   int i;
 
   /* Named type. */
   if (unformat_user (input, unformat_vlib_number_by_name,
 		     gm->protocol_info_by_name, &i))
     {
-      gre_protocol_info_t * pi = vec_elt_at_index (gm->protocol_infos, i);
+      gre_protocol_info_t *pi = vec_elt_at_index (gm->protocol_infos, i);
       *result = pi->protocol;
       return 1;
     }
@@ -137,29 +146,28 @@ uword
 unformat_gre_protocol_net_byte_order (unformat_input_t * input,
 				      va_list * args)
 {
-  u16 * result = va_arg (*args, u16 *);
-  if (! unformat_user (input, unformat_gre_protocol_host_byte_order, result))
+  u16 *result = va_arg (*args, u16 *);
+  if (!unformat_user (input, unformat_gre_protocol_host_byte_order, result))
     return 0;
-  *result = clib_host_to_net_u16 ((u16) *result);
+  *result = clib_host_to_net_u16 ((u16) * result);
   return 1;
 }
 
 uword
 unformat_gre_header (unformat_input_t * input, va_list * args)
 {
-  u8 ** result = va_arg (*args, u8 **);
-  gre_header_t _h, * h = &_h;
+  u8 **result = va_arg (*args, u8 **);
+  gre_header_t _h, *h = &_h;
   u16 p;
 
-  if (! unformat (input, "%U",
-		  unformat_gre_protocol_host_byte_order, &p))
+  if (!unformat (input, "%U", unformat_gre_protocol_host_byte_order, &p))
     return 0;
 
   h->protocol = clib_host_to_net_u16 (p);
 
   /* Add header to result. */
   {
-    void * p;
+    void *p;
     u32 n_bytes = sizeof (h[0]);
 
     vec_add2 (*result, p, n_bytes);
@@ -172,36 +180,35 @@ unformat_gre_header (unformat_input_t * input, va_list * args)
 static int
 gre_proto_from_vnet_link (vnet_link_t link)
 {
-    switch (link)
+  switch (link)
     {
     case VNET_LINK_IP4:
-        return (GRE_PROTOCOL_ip4);
+      return (GRE_PROTOCOL_ip4);
     case VNET_LINK_IP6:
-        return (GRE_PROTOCOL_ip6);
+      return (GRE_PROTOCOL_ip6);
     case VNET_LINK_MPLS:
-        return (GRE_PROTOCOL_mpls_unicast);
+      return (GRE_PROTOCOL_mpls_unicast);
     case VNET_LINK_ETHERNET:
-        return (GRE_PROTOCOL_teb);
+      return (GRE_PROTOCOL_teb);
     case VNET_LINK_ARP:
-        return (GRE_PROTOCOL_arp);
+      return (GRE_PROTOCOL_arp);
     case VNET_LINK_NSH:
-        ASSERT(0);
-        break;
+      ASSERT (0);
+      break;
     }
-    ASSERT(0);
-    return (GRE_PROTOCOL_ip4);
+  ASSERT (0);
+  return (GRE_PROTOCOL_ip4);
 }
 
-static u8*
+static u8 *
 gre_build_rewrite (vnet_main_t * vnm,
 		   u32 sw_if_index,
-		   vnet_link_t link_type,
-		   const void *dst_address)
+		   vnet_link_t link_type, const void *dst_address)
 {
-  gre_main_t * gm = &gre_main;
-  ip4_and_gre_header_t * h4;
-  ip6_and_gre_header_t * h6;
-  u8* rewrite = NULL;
+  gre_main_t *gm = &gre_main;
+  ip4_and_gre_header_t *h4;
+  ip6_and_gre_header_t *h6;
+  u8 *rewrite = NULL;
   gre_tunnel_t *t;
   u32 ti;
   u8 is_ipv6;
@@ -209,18 +216,19 @@ gre_build_rewrite (vnet_main_t * vnm,
   ti = gm->tunnel_index_by_sw_if_index[sw_if_index];
 
   if (~0 == ti)
-      /* not one of ours */
-      return (0);
+    /* not one of ours */
+    return (0);
 
-  t = pool_elt_at_index(gm->tunnels, ti);
+  t = pool_elt_at_index (gm->tunnels, ti);
 
   is_ipv6 = t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6 ? 1 : 0;
 
   if (!is_ipv6)
     {
-      vec_validate(rewrite, sizeof(*h4)-1);
-      h4 = (ip4_and_gre_header_t*)rewrite;
-      h4->gre.protocol = clib_host_to_net_u16(gre_proto_from_vnet_link(link_type));
+      vec_validate (rewrite, sizeof (*h4) - 1);
+      h4 = (ip4_and_gre_header_t *) rewrite;
+      h4->gre.protocol =
+	clib_host_to_net_u16 (gre_proto_from_vnet_link (link_type));
 
       h4->ip4.ip_version_and_header_length = 0x45;
       h4->ip4.ttl = 254;
@@ -232,11 +240,13 @@ gre_build_rewrite (vnet_main_t * vnm,
     }
   else
     {
-      vec_validate(rewrite, sizeof(*h6)-1);
-      h6 = (ip6_and_gre_header_t*)rewrite;
-      h6->gre.protocol = clib_host_to_net_u16(gre_proto_from_vnet_link(link_type));
+      vec_validate (rewrite, sizeof (*h6) - 1);
+      h6 = (ip6_and_gre_header_t *) rewrite;
+      h6->gre.protocol =
+	clib_host_to_net_u16 (gre_proto_from_vnet_link (link_type));
 
-      h6->ip6.ip_version_traffic_class_and_flow_label = clib_host_to_net_u32(6 << 28);
+      h6->ip6.ip_version_traffic_class_and_flow_label =
+	clib_host_to_net_u32 (6 << 28);
       h6->ip6.hop_limit = 255;
       h6->ip6.protocol = IP_PROTOCOL_GRE;
       /* fixup ip6 header length and checksum after-the-fact */
@@ -252,59 +262,55 @@ gre_build_rewrite (vnet_main_t * vnm,
 #define is_v4_packet(_h) ((*(u8*) _h) & 0xF0) == 0x40
 
 void
-gre4_fixup (vlib_main_t *vm,
-	   ip_adjacency_t *adj,
-	   vlib_buffer_t *b0)
+gre4_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b0)
 {
-    ip4_header_t * ip0;
+  ip4_header_t *ip0;
 
-    ip0 = vlib_buffer_get_current (b0);
+  ip0 = vlib_buffer_get_current (b0);
 
-    /* Fixup the checksum and len fields in the GRE tunnel encap
-     * that was applied at the midchain node */
-    ip0->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-    ip0->checksum = ip4_header_checksum (ip0);
+  /* Fixup the checksum and len fields in the GRE tunnel encap
+   * that was applied at the midchain node */
+  ip0->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
+  ip0->checksum = ip4_header_checksum (ip0);
 }
 
 void
-gre6_fixup (vlib_main_t *vm,
-	   ip_adjacency_t *adj,
-	   vlib_buffer_t *b0)
+gre6_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b0)
 {
-    ip6_header_t * ip0;
+  ip6_header_t *ip0;
 
-    ip0 = vlib_buffer_get_current (b0);
+  ip0 = vlib_buffer_get_current (b0);
 
-    /* Fixup the payload length field in the GRE tunnel encap that was applied
-     * at the midchain node */
-    ip0->payload_length =
-        clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0))
-        - sizeof(*ip0);
+  /* Fixup the payload length field in the GRE tunnel encap that was applied
+   * at the midchain node */
+  ip0->payload_length =
+    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0))
+    - sizeof (*ip0);
 }
 
 void
-gre_update_adj (vnet_main_t * vnm,
-		u32 sw_if_index,
-		adj_index_t ai)
+gre_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
 {
-    gre_main_t * gm = &gre_main;
-    gre_tunnel_t *t;
-    u32 ti;
-    u8 is_ipv6;
-
-    ti = gm->tunnel_index_by_sw_if_index[sw_if_index];
-    t = pool_elt_at_index(gm->tunnels, ti);
-    is_ipv6 = t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6 ? 1 : 0;
-
-    adj_nbr_midchain_update_rewrite (ai, !is_ipv6 ? gre4_fixup : gre6_fixup,
-                                     (VNET_LINK_ETHERNET == adj_get_link_type (ai) ?
-                                      ADJ_FLAG_MIDCHAIN_NO_COUNT :
-                                      ADJ_FLAG_NONE),
-				     gre_build_rewrite(vnm, sw_if_index,
-						       adj_get_link_type(ai),
-						       NULL));
-
-    gre_tunnel_stack(ai);
+  gre_main_t *gm = &gre_main;
+  gre_tunnel_t *t;
+  u32 ti;
+  u8 is_ipv6;
+
+  ti = gm->tunnel_index_by_sw_if_index[sw_if_index];
+  t = pool_elt_at_index (gm->tunnels, ti);
+  is_ipv6 = t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6 ? 1 : 0;
+
+  adj_nbr_midchain_update_rewrite (ai, !is_ipv6 ? gre4_fixup : gre6_fixup,
+				   (VNET_LINK_ETHERNET ==
+				    adj_get_link_type (ai) ?
+				    ADJ_FLAG_MIDCHAIN_NO_COUNT :
+				    ADJ_FLAG_NONE), gre_build_rewrite (vnm,
+								       sw_if_index,
+								       adj_get_link_type
+								       (ai),
+								       NULL));
+
+  gre_tunnel_stack (ai);
 }
 
 /**
@@ -312,13 +318,12 @@ gre_update_adj (vnet_main_t * vnm,
  */
 static uword
 gre_interface_tx_inline (vlib_main_t * vm,
-                         vlib_node_runtime_t * node,
-                         vlib_frame_t * frame)
+			 vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
-  gre_main_t * gm = &gre_main;
+  gre_main_t *gm = &gre_main;
   u32 next_index;
-  u32 * from, * to_next, n_left_from, n_left_to_next;
-  vnet_interface_output_runtime_t * rd = (void *) node->runtime_data;
+  u32 *from, *to_next, n_left_from, n_left_to_next;
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
   const gre_tunnel_t *gt = pool_elt_at_index (gm->tunnels, rd->dev_instance);
   u8 is_ipv6 = gt->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6 ? 1 : 0;
 
@@ -342,7 +347,7 @@ gre_interface_tx_inline (vlib_main_t * vm,
 
       while (n_left_from > 0 && n_left_to_next > 0)
 	{
-	  vlib_buffer_t * b0;
+	  vlib_buffer_t *b0;
 	  u32 bi0;
 
 	  bi0 = from[0];
@@ -352,18 +357,18 @@ gre_interface_tx_inline (vlib_main_t * vm,
 	  n_left_from -= 1;
 	  n_left_to_next -= 1;
 
-	  b0 = vlib_get_buffer(vm, bi0);
+	  b0 = vlib_get_buffer (vm, bi0);
 
-	  vnet_buffer(b0)->ip.adj_index[VLIB_TX] = gt->l2_adj_index;
+	  vnet_buffer (b0)->ip.adj_index[VLIB_TX] = gt->l2_adj_index;
 
-	  if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
 	    {
 	      gre_tx_trace_t *tr = vlib_add_trace (vm, node,
 						   b0, sizeof (*tr));
-          tr->tunnel_id = gt - gm->tunnels;
-          tr->src = gt->tunnel_src;
-          tr->dst = gt->tunnel_src;
-          tr->length = vlib_buffer_length_in_chain (vm, b0);
+	      tr->tunnel_id = gt - gm->tunnels;
+	      tr->src = gt->tunnel_src;
+	      tr->dst = gt->tunnel_src;
+	      tr->length = vlib_buffer_length_in_chain (vm, b0);
 	    }
 
 	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
@@ -375,7 +380,7 @@ gre_interface_tx_inline (vlib_main_t * vm,
     }
 
   vlib_node_increment_counter (vm, !is_ipv6 ? gre4_input_node.index :
-                   gre6_input_node.index,
+			       gre6_input_node.index,
 			       GRE_ERROR_PKTS_ENCAP, frame->n_vectors);
 
   return frame->n_vectors;
@@ -383,33 +388,34 @@ gre_interface_tx_inline (vlib_main_t * vm,
 
 static uword
 gre_interface_tx (vlib_main_t * vm,
-                  vlib_node_runtime_t * node,
-                  vlib_frame_t * frame)
+		  vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
-    return (gre_interface_tx_inline (vm, node, frame));
+  return (gre_interface_tx_inline (vm, node, frame));
 }
 
 static uword
 gre_teb_interface_tx (vlib_main_t * vm,
-                      vlib_node_runtime_t * node,
-                      vlib_frame_t * frame)
+		      vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
-    return (gre_interface_tx_inline (vm, node, frame));
+  return (gre_interface_tx_inline (vm, node, frame));
 }
 
-static u8 * format_gre_tunnel_name (u8 * s, va_list * args)
+static u8 *
+format_gre_tunnel_name (u8 * s, va_list * args)
 {
   u32 dev_instance = va_arg (*args, u32);
   return format (s, "gre%d", dev_instance);
 }
 
-static u8 * format_gre_tunnel_teb_name (u8 * s, va_list * args)
+static u8 *
+format_gre_tunnel_teb_name (u8 * s, va_list * args)
 {
   u32 dev_instance = va_arg (*args, u32);
   return format (s, "teb-gre%d", dev_instance);
 }
 
-static u8 * format_gre_device (u8 * s, va_list * args)
+static u8 *
+format_gre_device (u8 * s, va_list * args)
 {
   u32 dev_instance = va_arg (*args, u32);
   CLIB_UNUSED (int verbose) = va_arg (*args, int);
@@ -418,6 +424,7 @@ static u8 * format_gre_device (u8 * s, va_list * args)
   return s;
 }
 
+/* *INDENT-OFF* */
 VNET_DEVICE_CLASS (gre_device_class) = {
   .name = "GRE tunnel device",
   .format_device_name = format_gre_tunnel_name,
@@ -429,9 +436,12 @@ VNET_DEVICE_CLASS (gre_device_class) = {
   .clear counter = 0;
 #endif
 };
+/* *INDENT-ON* */
+
 
+/* *INDENT-OFF* */
 VLIB_DEVICE_TX_FUNCTION_MULTIARCH (gre_device_class,
-				   gre_interface_tx)
+                                   gre_interface_tx)
 
 VNET_DEVICE_CLASS (gre_device_teb_class) = {
   .name = "GRE TEB tunnel device",
@@ -445,8 +455,11 @@ VNET_DEVICE_CLASS (gre_device_teb_class) = {
 #endif
 };
 
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
 VLIB_DEVICE_TX_FUNCTION_MULTIARCH (gre_device_teb_class,
-				   gre_teb_interface_tx)
+                                   gre_teb_interface_tx)
 
 VNET_HW_INTERFACE_CLASS (gre_hw_interface_class) = {
   .name = "GRE",
@@ -456,12 +469,12 @@ VNET_HW_INTERFACE_CLASS (gre_hw_interface_class) = {
   .update_adjacency = gre_update_adj,
   .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
 };
+/* *INDENT-ON* */
 
-static void add_protocol (gre_main_t * gm,
-			  gre_protocol_t protocol,
-			  char * protocol_name)
+static void
+add_protocol (gre_main_t * gm, gre_protocol_t protocol, char *protocol_name)
 {
-  gre_protocol_info_t * pi;
+  gre_protocol_info_t *pi;
   u32 i;
 
   vec_add2 (gm->protocol_infos, pi, 1);
@@ -475,16 +488,17 @@ static void add_protocol (gre_main_t * gm,
   hash_set_mem (gm->protocol_info_by_name, pi->name, i);
 }
 
-static clib_error_t * gre_init (vlib_main_t * vm)
+static clib_error_t *
+gre_init (vlib_main_t * vm)
 {
-  gre_main_t * gm = &gre_main;
-  clib_error_t * error;
-  ip_main_t * im = &ip_main;
-  ip_protocol_info_t * pi;
+  gre_main_t *gm = &gre_main;
+  clib_error_t *error;
+  ip_main_t *im = &ip_main;
+  ip_protocol_info_t *pi;
 
   memset (gm, 0, sizeof (gm[0]));
   gm->vlib_main = vm;
-  gm->vnet_main = vnet_get_main();
+  gm->vnet_main = vnet_get_main ();
 
   if ((error = vlib_call_init_function (vm, ip_main_init)))
     return error;
@@ -503,20 +517,28 @@ static clib_error_t * gre_init (vlib_main_t * vm)
   gm->protocol_info_by_name = hash_create_string (0, sizeof (uword));
   gm->protocol_info_by_protocol = hash_create (0, sizeof (uword));
   gm->tunnel_by_key4 = hash_create (0, sizeof (uword));
-  gm->tunnel_by_key6 = hash_create_mem (0, sizeof(u64[4]), sizeof (uword));
+  gm->tunnel_by_key6 = hash_create_mem (0, sizeof (u64[4]), sizeof (uword));
 
 #define _(n,s) add_protocol (gm, GRE_PROTOCOL_##s, #s);
   foreach_gre_protocol
 #undef _
-
-  return vlib_call_init_function (vm, gre_input_init);
+    return vlib_call_init_function (vm, gre_input_init);
 }
 
 VLIB_INIT_FUNCTION (gre_init);
 
-gre_main_t * gre_get_main (vlib_main_t * vm)
+gre_main_t *
+gre_get_main (vlib_main_t * vm)
 {
   vlib_call_init_function (vm, gre_init);
   return &gre_main;
 }
 
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */