Revert "Custom adjacency formatting fix" 98/2298/1
authorKeith Burns <alagalah@gmail.com>
Tue, 9 Aug 2016 19:01:52 +0000 (19:01 +0000)
committerKeith Burns <alagalah@gmail.com>
Tue, 9 Aug 2016 19:01:52 +0000 (19:01 +0000)
This reverts commit ffc7ecace8304217104a5eade163aff5f8903935.

Change-Id: I32784a3e7ddf57abb9d70aa1e06884f028d78397
Signed-off-by: Keith Burns <alagalah@gmail.com>
vnet/vnet/ip/lookup.c

index ebf2ba0..8531f64 100644 (file)
@@ -1045,17 +1045,16 @@ u8 * format_ip_adjacency (u8 * s, va_list * args)
   ip_adj_register_t *reg;
 
   if (adj->lookup_next_index < vec_len (lm->registered_adjacencies))
-  {
-    reg = vec_elt_at_index(lm->registered_adjacencies,
-                           adj->lookup_next_index);
-    if (reg->fn)
     {
-      s = format(s, " ");
-      s = reg->fn(s, lm, adj);
-      goto format_done;
+      reg = vec_elt_at_index(lm->registered_adjacencies, 
+                            adj->lookup_next_index);
+      if (reg->fn) 
+       {
+         s = format(s, " %U", reg->fn, lm, adj);
+         goto format_done;
+       }
     }
-  }
-
+  
   switch (adj->lookup_next_index)
     {
     case IP_LOOKUP_NEXT_REWRITE: