1 files changed, 119 insertions, 91 deletions

diff --git a/vnet/vnet/lisp-cp/gid_dictionary.c b/vnet/vnet/lisp-cp/gid_dictionary.c
index d4875f25d41..fc95c88c30f 100644
--- a/vnet/vnet/lisp-cp/gid_dictionary.c
+++ b/vnet/vnet/lisp-cp/gid_dictionary.c
@@ -19,13 +19,13 @@ static u32
 mac_lookup (gid_dictionary_t * db, u32 vni, u8 * key)
 {
   int rv;
-  BVT(clib_bihash_kv) kv, value;
+  BVT (clib_bihash_kv) kv, value;
 
-  kv.key[0] = mac_to_u64(key);
-  kv.key[1] = (u64)vni;
+  kv.key[0] = mac_to_u64 (key);
+  kv.key[1] = (u64) vni;
   kv.key[2] = 0;
 
-  rv = BV(clib_bihash_search_inline_2)(&db->mac_lookup_table, &kv, &value);
+  rv = BV (clib_bihash_search_inline_2) (&db->mac_lookup_table, &kv, &value);
   if (rv == 0)
     return value.value;
 
@@ -33,67 +33,70 @@ mac_lookup (gid_dictionary_t * db, u32 vni, u8 * key)
 }
 
 static u32
-ip4_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t *key)
+ip4_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t * key)
 {
   int i, len;
   int rv;
-  BVT(clib_bihash_kv) kv, value;
+  BVT (clib_bihash_kv) kv, value;
 
   len = vec_len (db->ip4_prefix_lengths_in_search_order);
 
   for (i = 0; i < len; i++)
     {
       int dst_address_length = db->ip4_prefix_lengths_in_search_order[i];
-      ip4_address_t * mask;
+      ip4_address_t *mask;
 
-      ASSERT(dst_address_length >= 0 && dst_address_length <= 32);
+      ASSERT (dst_address_length >= 0 && dst_address_length <= 32);
 
       mask = &db->ip4_fib_masks[dst_address_length];
 
-      kv.key[0] = ((u64) vni << 32) | (ip_prefix_v4(key).as_u32 & mask->as_u32);
+      kv.key[0] =
+	((u64) vni << 32) | (ip_prefix_v4 (key).as_u32 & mask->as_u32);
       kv.key[1] = 0;
       kv.key[2] = 0;
 
-      rv = BV(clib_bihash_search_inline_2)(&db->ip4_lookup_table, &kv, &value);
+      rv =
+	BV (clib_bihash_search_inline_2) (&db->ip4_lookup_table, &kv, &value);
       if (rv == 0)
-        return value.value;
+	return value.value;
     }
 
   return GID_LOOKUP_MISS;
 }
 
 static u32
-ip6_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t *key)
+ip6_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t * key)
 {
   int i, len;
   int rv;
-  BVT(clib_bihash_kv) kv, value;
+  BVT (clib_bihash_kv) kv, value;
 
   len = vec_len (db->ip6_prefix_lengths_in_search_order);
 
   for (i = 0; i < len; i++)
     {
       int dst_address_length = db->ip6_prefix_lengths_in_search_order[i];
-      ip6_address_t * mask;
+      ip6_address_t *mask;
 
-      ASSERT(dst_address_length >= 0 && dst_address_length <= 128);
+      ASSERT (dst_address_length >= 0 && dst_address_length <= 128);
 
       mask = &db->ip6_fib_masks[dst_address_length];
 
-      kv.key[0] = ip_prefix_v6(key).as_u64[0] & mask->as_u64[0];
-      kv.key[1] = ip_prefix_v6(key).as_u64[1] & mask->as_u64[1];
-      kv.key[2] = (u64)vni;
+      kv.key[0] = ip_prefix_v6 (key).as_u64[0] & mask->as_u64[0];
+      kv.key[1] = ip_prefix_v6 (key).as_u64[1] & mask->as_u64[1];
+      kv.key[2] = (u64) vni;
 
-      rv = BV(clib_bihash_search_inline_2)(&db->ip6_lookup_table, &kv, &value);
+      rv =
+	BV (clib_bihash_search_inline_2) (&db->ip6_lookup_table, &kv, &value);
       if (rv == 0)
-        return value.value;
+	return value.value;
     }
 
   return GID_LOOKUP_MISS;
 }
 
 static u32
-ip_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t *key)
+ip_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t * key)
 {
   /* XXX for now this only works with ip-prefixes, no lcafs */
   switch (ip_prefix_version (key))
@@ -105,7 +108,8 @@ ip_lookup (gid_dictionary_t * db, u32 vni, ip_prefix_t *key)
       return ip6_lookup (db, vni, key);
       break;
     default:
-      clib_warning ("address type %d not supported!", ip_prefix_version(key));
+      clib_warning ("address type %d not supported!",
+		    ip_prefix_version (key));
       break;
     }
   return ~0;
@@ -118,11 +122,11 @@ gid_dictionary_lookup (gid_dictionary_t * db, gid_address_t * key)
   switch (gid_address_type (key))
     {
     case GID_ADDR_IP_PREFIX:
-      return ip_lookup (db, gid_address_vni(key), &gid_address_ippref(key));
+      return ip_lookup (db, gid_address_vni (key), &gid_address_ippref (key));
     case GID_ADDR_MAC:
-      return mac_lookup (db, gid_address_vni(key), gid_address_mac(key));
+      return mac_lookup (db, gid_address_vni (key), gid_address_mac (key));
     default:
-      clib_warning ("address type %d not supported!", gid_address_type(key));
+      clib_warning ("address type %d not supported!", gid_address_type (key));
       break;
     }
   return GID_LOOKUP_MISS;
@@ -134,61 +138,65 @@ ip4_compute_prefix_lengths_in_search_order (gid_dictionary_t * db)
   int i;
   vec_reset_length (db->ip4_prefix_lengths_in_search_order);
   /* Note: bitmap reversed so this is in fact a longest prefix match */
+
+  /* *INDENT-OFF* */
   clib_bitmap_foreach (i, db->ip4_non_empty_dst_address_length_bitmap,
   ({
     int dst_address_length = 32 - i;
     vec_add1 (db->ip4_prefix_lengths_in_search_order, dst_address_length);
   }));
+  /* *INDENT-ON* */
+
 }
 
 static u32
-add_del_ip4_key (gid_dictionary_t *db, u32 vni, ip_prefix_t * pref, u32 val,
-                 u8 is_add)
+add_del_ip4_key (gid_dictionary_t * db, u32 vni, ip_prefix_t * pref, u32 val,
+		 u8 is_add)
 {
-  BVT(clib_bihash_kv) kv, value;
+  BVT (clib_bihash_kv) kv, value;
   u32 old_val = ~0;
   ip4_address_t key;
   u8 plen = ip_prefix_len (pref);
 
-  clib_memcpy (&key, &ip_prefix_v4(pref), sizeof(key));
+  clib_memcpy (&key, &ip_prefix_v4 (pref), sizeof (key));
   key.as_u32 &= db->ip4_fib_masks[plen].as_u32;
   if (is_add)
     {
-      db->ip4_non_empty_dst_address_length_bitmap = clib_bitmap_set (
-          db->ip4_non_empty_dst_address_length_bitmap, 32 - plen,
-          1);
+      db->ip4_non_empty_dst_address_length_bitmap =
+	clib_bitmap_set (db->ip4_non_empty_dst_address_length_bitmap,
+			 32 - plen, 1);
       ip4_compute_prefix_lengths_in_search_order (db);
 
       db->ip4_prefix_len_refcount[plen]++;
     }
   else
     {
-      ASSERT(db->ip4_prefix_len_refcount[plen] != 0);
+      ASSERT (db->ip4_prefix_len_refcount[plen] != 0);
 
       db->ip4_prefix_len_refcount[plen]--;
 
       if (db->ip4_prefix_len_refcount[plen] == 0)
-        {
-            db->ip4_non_empty_dst_address_length_bitmap = clib_bitmap_set (
-                db->ip4_non_empty_dst_address_length_bitmap, 32 - plen,
-                0);
-            ip4_compute_prefix_lengths_in_search_order (db);
-        }
+	{
+	  db->ip4_non_empty_dst_address_length_bitmap =
+	    clib_bitmap_set (db->ip4_non_empty_dst_address_length_bitmap,
+			     32 - plen, 0);
+	  ip4_compute_prefix_lengths_in_search_order (db);
+	}
     }
 
   kv.key[0] = ((u64) vni << 32) | key.as_u32;
   kv.key[1] = 0;
   kv.key[2] = 0;
 
-  if (BV(clib_bihash_search)(&db->ip4_lookup_table, &kv, &value) == 0)
+  if (BV (clib_bihash_search) (&db->ip4_lookup_table, &kv, &value) == 0)
     old_val = value.value;
 
   if (!is_add)
-    BV(clib_bihash_add_del) (&db->ip4_lookup_table, &kv, 0 /* is_add */);
+    BV (clib_bihash_add_del) (&db->ip4_lookup_table, &kv, 0 /* is_add */ );
   else
     {
       kv.value = val;
-      BV(clib_bihash_add_del) (&db->ip4_lookup_table, &kv, 1 /* is_add */);
+      BV (clib_bihash_add_del) (&db->ip4_lookup_table, &kv, 1 /* is_add */ );
     }
   return old_val;
 }
@@ -199,43 +207,48 @@ ip6_compute_prefix_lengths_in_search_order (gid_dictionary_t * db)
   int i;
   vec_reset_length (db->ip6_prefix_lengths_in_search_order);
   /* Note: bitmap reversed so this is in fact a longest prefix match */
+
+  /* *INDENT-OFF* */
   clib_bitmap_foreach (i, db->ip6_non_empty_dst_address_length_bitmap,
   ({
     int dst_address_length = 128 - i;
     vec_add1 (db->ip6_prefix_lengths_in_search_order, dst_address_length);
   }));
+  /* *INDENT-ON* */
 }
 
 static u32
-add_del_ip6_key (gid_dictionary_t *db, u32 vni, ip_prefix_t *pref, u32 val,
-                 u8 is_add)
+add_del_ip6_key (gid_dictionary_t * db, u32 vni, ip_prefix_t * pref, u32 val,
+		 u8 is_add)
 {
-  BVT(clib_bihash_kv) kv, value;
+  BVT (clib_bihash_kv) kv, value;
   u32 old_val = ~0;
   ip6_address_t key;
   u8 plen = ip_prefix_len (pref);
 
-  clib_memcpy (&key, &ip_prefix_v6(pref), sizeof(key));
+  clib_memcpy (&key, &ip_prefix_v6 (pref), sizeof (key));
   ip6_address_mask (&key, &db->ip6_fib_masks[plen]);
   if (is_add)
     {
-      db->ip6_non_empty_dst_address_length_bitmap = clib_bitmap_set (
-          db->ip6_non_empty_dst_address_length_bitmap, 128 - plen, 1);
+      db->ip6_non_empty_dst_address_length_bitmap =
+	clib_bitmap_set (db->ip6_non_empty_dst_address_length_bitmap,
+			 128 - plen, 1);
       ip6_compute_prefix_lengths_in_search_order (db);
       db->ip6_prefix_len_refcount[plen]++;
     }
   else
     {
-      ASSERT(db->ip6_prefix_len_refcount[plen] != 0);
+      ASSERT (db->ip6_prefix_len_refcount[plen] != 0);
 
       db->ip6_prefix_len_refcount[plen]--;
 
       if (db->ip6_prefix_len_refcount[plen] == 0)
-        {
-          db->ip6_non_empty_dst_address_length_bitmap = clib_bitmap_set (
-              db->ip6_non_empty_dst_address_length_bitmap, 128 - plen, 0);
-          ip6_compute_prefix_lengths_in_search_order (db);
-        }
+	{
+	  db->ip6_non_empty_dst_address_length_bitmap =
+	    clib_bitmap_set (db->ip6_non_empty_dst_address_length_bitmap,
+			     128 - plen, 0);
+	  ip6_compute_prefix_lengths_in_search_order (db);
+	}
     }
 
   kv.key[0] = key.as_u64[0];
@@ -243,15 +256,15 @@ add_del_ip6_key (gid_dictionary_t *db, u32 vni, ip_prefix_t *pref, u32 val,
   kv.key[2] = (u64) vni;
 //  kv.key[2] = ((u64)((fib - im->fibs))<<32) | ip_prefix_len(key);
 
-  if (BV(clib_bihash_search)(&db->ip6_lookup_table, &kv, &value) == 0)
+  if (BV (clib_bihash_search) (&db->ip6_lookup_table, &kv, &value) == 0)
     old_val = value.value;
 
   if (!is_add)
-    BV(clib_bihash_add_del) (&db->ip6_lookup_table, &kv, 0 /* is_add */);
+    BV (clib_bihash_add_del) (&db->ip6_lookup_table, &kv, 0 /* is_add */ );
   else
     {
       kv.value = val;
-      BV(clib_bihash_add_del) (&db->ip6_lookup_table, &kv, 1 /* is_add */);
+      BV (clib_bihash_add_del) (&db->ip6_lookup_table, &kv, 1 /* is_add */ );
     }
   return old_val;
 }
@@ -259,31 +272,31 @@ add_del_ip6_key (gid_dictionary_t *db, u32 vni, ip_prefix_t *pref, u32 val,
 static u32
 add_del_mac (gid_dictionary_t * db, u32 vni, u8 * mac, u32 val, u8 is_add)
 {
-  BVT(clib_bihash_kv) kv, value;
+  BVT (clib_bihash_kv) kv, value;
   u32 old_val = ~0;
 
-  kv.key[0] = ((u64 *)mac)[0];
-  kv.key[1] = (u64)vni;
+  kv.key[0] = ((u64 *) mac)[0];
+  kv.key[1] = (u64) vni;
   kv.key[2] = 0;
 
-  if (BV(clib_bihash_search) (&db->mac_lookup_table, &kv, &value) == 0)
+  if (BV (clib_bihash_search) (&db->mac_lookup_table, &kv, &value) == 0)
     old_val = value.value;
 
   if (!is_add)
-    BV(clib_bihash_add_del) (&db->mac_lookup_table, &kv, 0 /* is_add */);
+    BV (clib_bihash_add_del) (&db->mac_lookup_table, &kv, 0 /* is_add */ );
   else
     {
       kv.value = val;
-      BV(clib_bihash_add_del) (&db->mac_lookup_table, &kv, 1 /* is_add */);
+      BV (clib_bihash_add_del) (&db->mac_lookup_table, &kv, 1 /* is_add */ );
     }
   return old_val;
 }
 
 static u32
-add_del_ip (gid_dictionary_t *db, u32 vni, ip_prefix_t *key, u32 value,
-            u8 is_add)
+add_del_ip (gid_dictionary_t * db, u32 vni, ip_prefix_t * key, u32 value,
+	    u8 is_add)
 {
-  switch (ip_prefix_version(key))
+  switch (ip_prefix_version (key))
     {
     case IP4:
       return add_del_ip4_key (db, vni, key, value, is_add);
@@ -292,25 +305,26 @@ add_del_ip (gid_dictionary_t *db, u32 vni, ip_prefix_t *key, u32 value,
       return add_del_ip6_key (db, vni, key, value, is_add);
       break;
     default:
-      clib_warning("address type %d not supported!", ip_prefix_version (key));
+      clib_warning ("address type %d not supported!",
+		    ip_prefix_version (key));
       break;
     }
   return ~0;
 }
 
 u32
-gid_dictionary_add_del (gid_dictionary_t *db, gid_address_t *key, u32 value,
-                        u8 is_add)
+gid_dictionary_add_del (gid_dictionary_t * db, gid_address_t * key, u32 value,
+			u8 is_add)
 {
   /* XXX for now this only works with ip-prefixes, no lcafs */
   switch (gid_address_type (key))
     {
     case GID_ADDR_IP_PREFIX:
-      return add_del_ip (db, gid_address_vni(key), &gid_address_ippref(key),
-                         value, is_add);
+      return add_del_ip (db, gid_address_vni (key), &gid_address_ippref (key),
+			 value, is_add);
     case GID_ADDR_MAC:
-      return add_del_mac (db, gid_address_vni(key), gid_address_mac(key),
-                          value, is_add);
+      return add_del_mac (db, gid_address_vni (key), gid_address_mac (key),
+			  value, is_add);
     default:
       clib_warning ("address type %d not supported!", gid_address_type (key));
       break;
@@ -323,28 +337,31 @@ ip4_lookup_init (gid_dictionary_t * db)
 {
   uword i;
 
-  memset(db->ip4_prefix_len_refcount, 0, sizeof(db->ip4_prefix_len_refcount));
+  memset (db->ip4_prefix_len_refcount, 0,
+	  sizeof (db->ip4_prefix_len_refcount));
 
   for (i = 0; i < ARRAY_LEN (db->ip4_fib_masks); i++)
     {
       u32 m;
 
       if (i < 32)
-        m = pow2_mask (i) << (32 - i);
+	m = pow2_mask (i) << (32 - i);
       else
-        m = ~0;
+	m = ~0;
       db->ip4_fib_masks[i].as_u32 = clib_host_to_net_u32 (m);
     }
   if (db->ip4_lookup_table_nbuckets == 0)
     db->ip4_lookup_table_nbuckets = IP4_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
 
-  db->ip4_lookup_table_nbuckets = 1 << max_log2 (db->ip4_lookup_table_nbuckets);
+  db->ip4_lookup_table_nbuckets =
+    1 << max_log2 (db->ip4_lookup_table_nbuckets);
 
   if (db->ip4_lookup_table_size == 0)
     db->ip4_lookup_table_size = IP4_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
 
-  BV(clib_bihash_init) (&db->ip4_lookup_table, "ip4 lookup table",
-                         db->ip4_lookup_table_nbuckets, db->ip4_lookup_table_size);
+  BV (clib_bihash_init) (&db->ip4_lookup_table, "ip4 lookup table",
+			 db->ip4_lookup_table_nbuckets,
+			 db->ip4_lookup_table_size);
 }
 
 static void
@@ -352,9 +369,10 @@ ip6_lookup_init (gid_dictionary_t * db)
 {
   uword i;
 
-  memset(db->ip6_prefix_len_refcount, 0, sizeof(db->ip6_prefix_len_refcount));
+  memset (db->ip6_prefix_len_refcount, 0,
+	  sizeof (db->ip6_prefix_len_refcount));
 
-  for (i = 0; i < ARRAY_LEN(db->ip6_fib_masks); i++)
+  for (i = 0; i < ARRAY_LEN (db->ip6_fib_masks); i++)
     {
       u32 j, i0, i1;
 
@@ -362,23 +380,25 @@ ip6_lookup_init (gid_dictionary_t * db)
       i1 = i % 32;
 
       for (j = 0; j < i0; j++)
-        db->ip6_fib_masks[i].as_u32[j] = ~0;
+	db->ip6_fib_masks[i].as_u32[j] = ~0;
 
       if (i1)
-        db->ip6_fib_masks[i].as_u32[i0] = clib_host_to_net_u32 (
-            pow2_mask (i1) << (32 - i1));
+	db->ip6_fib_masks[i].as_u32[i0] =
+	  clib_host_to_net_u32 (pow2_mask (i1) << (32 - i1));
     }
 
   if (db->ip6_lookup_table_nbuckets == 0)
     db->ip6_lookup_table_nbuckets = IP6_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
 
-  db->ip6_lookup_table_nbuckets = 1 << max_log2 (db->ip6_lookup_table_nbuckets);
+  db->ip6_lookup_table_nbuckets =
+    1 << max_log2 (db->ip6_lookup_table_nbuckets);
 
   if (db->ip6_lookup_table_size == 0)
     db->ip6_lookup_table_size = IP6_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
 
-  BV(clib_bihash_init) (&db->ip6_lookup_table, "ip6 lookup table",
-                         db->ip6_lookup_table_nbuckets, db->ip6_lookup_table_size);
+  BV (clib_bihash_init) (&db->ip6_lookup_table, "ip6 lookup table",
+			 db->ip6_lookup_table_nbuckets,
+			 db->ip6_lookup_table_size);
 }
 
 static void
@@ -387,14 +407,15 @@ mac_lookup_init (gid_dictionary_t * db)
   if (db->mac_lookup_table_nbuckets == 0)
     db->mac_lookup_table_nbuckets = MAC_LOOKUP_DEFAULT_HASH_NUM_BUCKETS;
 
-  db->mac_lookup_table_nbuckets = 1 << max_log2 (db->mac_lookup_table_nbuckets);
+  db->mac_lookup_table_nbuckets =
+    1 << max_log2 (db->mac_lookup_table_nbuckets);
 
   if (db->mac_lookup_table_size == 0)
     db->mac_lookup_table_size = MAC_LOOKUP_DEFAULT_HASH_MEMORY_SIZE;
 
-  BV(clib_bihash_init) (&db->mac_lookup_table, "mac lookup table",
-                        db->mac_lookup_table_nbuckets,
-                        db->mac_lookup_table_size);
+  BV (clib_bihash_init) (&db->mac_lookup_table, "mac lookup table",
+			 db->mac_lookup_table_nbuckets,
+			 db->mac_lookup_table_size);
 }
 
 void
@@ -405,3 +426,10 @@ gid_dictionary_init (gid_dictionary_t * db)
   mac_lookup_init (db);
 }
 
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */