VPP-260 Coding standards cleanup - vnet/vnet/lisp-cp

Change-Id: I29b84c44c12ab746e9e61c30efa0ac3418d1a09a
Signed-off-by: Florin Coras <fcoras@cisco.com>

1 files changed, 69 insertions, 55 deletions

diff --git a/vnet/vnet/lisp-cp/packets.c b/vnet/vnet/lisp-cp/packets.c
index f67164df84b..3a4f421b02a 100644
--- a/vnet/vnet/lisp-cp/packets.c
+++ b/vnet/vnet/lisp-cp/packets.c
@@ -17,17 +17,17 @@
 #include <vnet/lisp-cp/lisp_cp_messages.h>
 #include <vnet/ip/udp_packet.h>
 
-///* Returns IP ID for the packet */
-//static u16 ip_id = 0;
-//static inline u16
-//get_IP_ID()
-//{
-//    ip_id++;
-//    return (ip_id);
-//}
+/* Returns IP ID for the packet */
+/* static u16 ip_id = 0;
+static inline u16
+get_IP_ID()
+{
+    ip_id++;
+    return (ip_id);
+} */
 
 u16
-udp_ip4_checksum (const void *b, u32 len, u8 *src, u8 *dst)
+udp_ip4_checksum (const void *b, u32 len, u8 * src, u8 * dst)
 {
   const u16 *buf = b;
   u16 *ip_src = (u16 *) src;
@@ -39,7 +39,7 @@ udp_ip4_checksum (const void *b, u32 len, u8 *src, u8 *dst)
     {
       sum += *buf++;
       if (sum & 0x80000000)
-        sum = (sum & 0xFFFF) + (sum >> 16);
+	sum = (sum & 0xFFFF) + (sum >> 16);
       len -= 2;
     }
 
@@ -66,7 +66,7 @@ udp_ip4_checksum (const void *b, u32 len, u8 *src, u8 *dst)
 }
 
 u16
-udp_ip6_checksum (ip6_header_t *ip6, udp_header_t *up, u32 len)
+udp_ip6_checksum (ip6_header_t * ip6, udp_header_t * up, u32 len)
 {
   size_t i;
   register const u16 *sp;
@@ -85,14 +85,14 @@ udp_ip6_checksum (ip6_header_t *ip6, udp_header_t *up, u32 len)
   } phu;
 
   /* pseudo-header */
-  memset (&phu, 0, sizeof(phu));
+  memset (&phu, 0, sizeof (phu));
   phu.ph.ph_src = ip6->src_address;
   phu.ph.ph_dst = ip6->dst_address;
   phu.ph.ph_len = clib_host_to_net_u32 (len);
   phu.ph.ph_nxt = IP_PROTOCOL_UDP;
 
   sum = 0;
-  for (i = 0; i < sizeof(phu.pa) / sizeof(phu.pa[0]); i++)
+  for (i = 0; i < sizeof (phu.pa) / sizeof (phu.pa[0]); i++)
     sum += phu.pa[i];
 
   sp = (const u16 *) up;
@@ -111,14 +111,14 @@ udp_ip6_checksum (ip6_header_t *ip6, udp_header_t *up, u32 len)
 }
 
 u16
-udp_checksum (udp_header_t *uh, u32 udp_len, void *ih, u8 version)
+udp_checksum (udp_header_t * uh, u32 udp_len, void *ih, u8 version)
 {
   switch (version)
     {
     case IP4:
       return (udp_ip4_checksum (uh, udp_len,
-                                ((ip4_header_t *) ih)->src_address.as_u8,
-                                ((ip4_header_t *) ih)->dst_address.as_u8));
+				((ip4_header_t *) ih)->src_address.as_u8,
+				((ip4_header_t *) ih)->dst_address.as_u8));
     case IP6:
       return (udp_ip6_checksum (ih, uh, udp_len));
     default:
@@ -127,12 +127,12 @@ udp_checksum (udp_header_t *uh, u32 udp_len, void *ih, u8 version)
 }
 
 void *
-pkt_push_udp (vlib_main_t * vm, vlib_buffer_t *b, u16 sp, u16 dp)
+pkt_push_udp (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp)
 {
-  udp_header_t * uh;
-  u16 udp_len = sizeof(udp_header_t) + vlib_buffer_length_in_chain (vm, b);
+  udp_header_t *uh;
+  u16 udp_len = sizeof (udp_header_t) + vlib_buffer_length_in_chain (vm, b);
 
-  uh = vlib_buffer_push_uninit (b, sizeof(*uh));
+  uh = vlib_buffer_push_uninit (b, sizeof (*uh));
 
   uh->src_port = clib_host_to_net_u16 (sp);
   uh->dst_port = clib_host_to_net_u16 (dp);
@@ -142,22 +142,22 @@ pkt_push_udp (vlib_main_t * vm, vlib_buffer_t *b, u16 sp, u16 dp)
 }
 
 void *
-pkt_push_ipv4 (vlib_main_t * vm, vlib_buffer_t *b, ip4_address_t *src,
-               ip4_address_t *dst, int proto)
+pkt_push_ipv4 (vlib_main_t * vm, vlib_buffer_t * b, ip4_address_t * src,
+	       ip4_address_t * dst, int proto)
 {
-  ip4_header_t * ih;
+  ip4_header_t *ih;
 
   /* make some room */
-  ih = vlib_buffer_push_uninit(b, sizeof(ip4_header_t));
+  ih = vlib_buffer_push_uninit (b, sizeof (ip4_header_t));
 
   ih->ip_version_and_header_length = 0x45;
   ih->tos = 0;
-  ih->length = clib_host_to_net_u16(vlib_buffer_length_in_chain (vm, b));
+  ih->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b));
 
-  // iph->fragment_id = clib_host_to_net_u16(get_IP_ID ());
+  /* iph->fragment_id = clib_host_to_net_u16(get_IP_ID ()); */
 
   /* TODO: decide if we allow fragments in case of control */
-  ih->flags_and_fragment_offset = clib_host_to_net_u16(IP_DF);
+  ih->flags_and_fragment_offset = clib_host_to_net_u16 (IP_DF);
   ih->ttl = 255;
   ih->protocol = proto;
   ih->src_address.as_u32 = src->as_u32;
@@ -168,50 +168,54 @@ pkt_push_ipv4 (vlib_main_t * vm, vlib_buffer_t *b, ip4_address_t *src,
 }
 
 void *
-pkt_push_ipv6 (vlib_main_t * vm, vlib_buffer_t *b, ip6_address_t *src,
-               ip6_address_t *dst, int proto)
+pkt_push_ipv6 (vlib_main_t * vm, vlib_buffer_t * b, ip6_address_t * src,
+	       ip6_address_t * dst, int proto)
 {
   ip6_header_t *ip6h;
   u16 payload_length;
 
   /* make some room */
-  ip6h = vlib_buffer_push_uninit(b, sizeof(ip6_header_t));
+  ip6h = vlib_buffer_push_uninit (b, sizeof (ip6_header_t));
 
   ip6h->ip_version_traffic_class_and_flow_label =
-        clib_host_to_net_u32 (0x6<<28);
+    clib_host_to_net_u32 (0x6 << 28);
 
- /* calculate ip6 payload length */
-  payload_length = vlib_buffer_length_in_chain(vm, b);
+  /* calculate ip6 payload length */
+  payload_length = vlib_buffer_length_in_chain (vm, b);
   payload_length -= sizeof (*ip6h);
 
-  ip6h->payload_length = clib_host_to_net_u16(payload_length);
+  ip6h->payload_length = clib_host_to_net_u16 (payload_length);
 
   ip6h->hop_limit = 0xff;
   ip6h->protocol = proto;
-  clib_memcpy(ip6h->src_address.as_u8, src->as_u8, sizeof(ip6h->src_address));
-  clib_memcpy(ip6h->dst_address.as_u8, dst->as_u8, sizeof(ip6h->src_address));
+  clib_memcpy (ip6h->src_address.as_u8, src->as_u8,
+	       sizeof (ip6h->src_address));
+  clib_memcpy (ip6h->dst_address.as_u8, dst->as_u8,
+	       sizeof (ip6h->src_address));
 
   return ip6h;
 }
 
 void *
-pkt_push_ip (vlib_main_t * vm, vlib_buffer_t *b, ip_address_t *src,
-             ip_address_t *dst, u32 proto)
+pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
+	     ip_address_t * dst, u32 proto)
 {
-  if (ip_addr_version (src) != ip_addr_version(dst))
+  if (ip_addr_version (src) != ip_addr_version (dst))
     {
-      clib_warning("src %U and dst %U IP have different AFI! Discarding!",
-                   format_ip_address, src, format_ip_address, dst);
+      clib_warning ("src %U and dst %U IP have different AFI! Discarding!",
+		    format_ip_address, src, format_ip_address, dst);
       return 0;
     }
 
-  switch (ip_addr_version(src))
+  switch (ip_addr_version (src))
     {
     case IP4:
-      return pkt_push_ipv4 (vm, b, &ip_addr_v4(src), &ip_addr_v4(dst), proto);
+      return pkt_push_ipv4 (vm, b, &ip_addr_v4 (src), &ip_addr_v4 (dst),
+			    proto);
       break;
     case IP6:
-      return pkt_push_ipv6 (vm, b, &ip_addr_v6(src), &ip_addr_v6(dst), proto);
+      return pkt_push_ipv6 (vm, b, &ip_addr_v6 (src), &ip_addr_v6 (dst),
+			    proto);
       break;
     }
 
@@ -219,22 +223,22 @@ pkt_push_ip (vlib_main_t * vm, vlib_buffer_t *b, ip_address_t *src,
 }
 
 void *
-pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t *b, u16 sp, u16 dp,
-                     ip_address_t *sip, ip_address_t *dip)
+pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
+		     ip_address_t * sip, ip_address_t * dip)
 {
   u16 udpsum;
-  udp_header_t * uh;
-  void * ih;
+  udp_header_t *uh;
+  void *ih;
 
   uh = pkt_push_udp (vm, b, sp, dp);
 
   ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP);
 
   udpsum = udp_checksum (uh, clib_net_to_host_u16 (uh->length), ih,
-                         ip_addr_version(sip));
-  if (udpsum == (u16) ~0)
+			 ip_addr_version (sip));
+  if (udpsum == (u16) ~ 0)
     {
-      clib_warning("Failed UDP checksum! Discarding");
+      clib_warning ("Failed UDP checksum! Discarding");
       return 0;
     }
   uh->checksum = udpsum;
@@ -242,14 +246,24 @@ pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t *b, u16 sp, u16 dp,
 }
 
 void *
-pkt_push_ecm_hdr (vlib_buffer_t *b)
+pkt_push_ecm_hdr (vlib_buffer_t * b)
 {
-  ecm_hdr_t * h;
+  ecm_hdr_t *h;
   h = vlib_buffer_push_uninit (b, sizeof (h[0]));
 
-  memset(h, 0, sizeof(h[0]));
+  memset (h, 0, sizeof (h[0]));
   h->type = LISP_ENCAP_CONTROL_TYPE;
-  memset (h->reserved2, 0, sizeof(h->reserved2));
+  memset (h->reserved2, 0, sizeof (h->reserved2));
 
   return h;
 }
+
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */