summaryrefslogtreecommitdiffstats
path: root/src/vnet/adj/adj_mcast.c
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2018-01-29 10:43:33 -0800
committerFlorin Coras <florin.coras@gmail.com>2018-01-30 08:54:29 +0000
commitdb14f5aff69311d13a0a90baa3567e92f3faa783 (patch)
tree2ee6edb0d8b82b840fdc90b62f782ea0b95bc8f0 /src/vnet/adj/adj_mcast.c
parentbb16d3ffecd357907d01f2785ac78edf0292cfd3 (diff)
Allow the provider of a midchain adjacency to pass context data that is returned in the fixup function
Change-Id: I458e6e03b03e27775df33a2fd302743126d6ac44 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/adj/adj_mcast.c')
-rw-r--r--src/vnet/adj/adj_mcast.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vnet/adj/adj_mcast.c b/src/vnet/adj/adj_mcast.c
index 00a12ad330b..efc781de989 100644
--- a/src/vnet/adj/adj_mcast.c
+++ b/src/vnet/adj/adj_mcast.c
@@ -139,6 +139,7 @@ adj_mcast_update_rewrite (adj_index_t adj_index,
void
adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
adj_midchain_fixup_t fixup,
+ const void *fixup_data,
adj_flags_t flags,
u8 *rewrite,
u8 offset,
@@ -160,7 +161,7 @@ adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
*/
ASSERT(NULL != rewrite);
- adj_midchain_setup(adj_index, fixup, flags);
+ adj_midchain_setup(adj_index, fixup, fixup_data, flags);
/*
* update the adj's rewrite string and build the arc
@@ -354,14 +355,13 @@ format_adj_mcast_midchain (u8* s, va_list *ap)
{
index_t index = va_arg(*ap, index_t);
CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
- vnet_main_t * vnm = vnet_get_main();
ip_adjacency_t * adj = adj_get(index);
s = format(s, "%U-mcast-midchain: ",
format_fib_protocol, adj->ia_nh_proto);
s = format (s, "%U",
format_vnet_rewrite,
- vnm->vlib_main, &adj->rewrite_header,
+ &adj->rewrite_header,
sizeof (adj->rewrite_data), 0);
s = format (s, "\n%Ustacked-on:\n%U%U",
format_white_space, indent,