summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Burns <alagalah@gmail.com>2016-08-09 19:01:52 +0000
committerKeith Burns <alagalah@gmail.com>2016-08-09 19:01:52 +0000
commitd5d5ffa427956fab49b28cd1088e373f97145a66 (patch)
tree1098ca0b2f63fc0f99c40ffb51fa0c85b8024a55
parentffc7ecace8304217104a5eade163aff5f8903935 (diff)
Revert "Custom adjacency formatting fix"
This reverts commit ffc7ecace8304217104a5eade163aff5f8903935. Change-Id: I32784a3e7ddf57abb9d70aa1e06884f028d78397 Signed-off-by: Keith Burns <alagalah@gmail.com>
-rw-r--r--vnet/vnet/ip/lookup.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/vnet/vnet/ip/lookup.c b/vnet/vnet/ip/lookup.c
index ebf2ba0cb18..8531f645629 100644
--- a/vnet/vnet/ip/lookup.c
+++ b/vnet/vnet/ip/lookup.c
@@ -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: