diff options
| author |   Neale Ranns <neale@graphiant.com> | 2021-05-13 15:28:27 +0000 |
|---|---|---|
| committer | Neale Ranns <neale@graphiant.com> | 2021-05-26 10:22:02 +0000 |
| commit | 1372178e0e674143bfec14b17050d5e92e4fcf1a (patch) | |
| tree | 1271c697e93b7b6614afd7cfa9606271a5329ee3 /src/vnet/mfib | |
| parent | 457271d71c05a59c79b42334e1252f091acf3fea (diff) | |
fib: During the mfib lookup set the unicast FIB index in the packet so that a uRPF check on a for-us packet is done in the correct VRF
Type: fix
Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: Iafa6efea0d96962aa9136dccefc148a961f74476
Diffstat (limited to 'src/vnet/mfib')
| -rw-r--r-- | src/vnet/mfib/mfib_forward.c | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/src/vnet/mfib/mfib_forward.c b/src/vnet/mfib/mfib_forward.c index e02c1d87f56..a7b7a6bed4b 100644 --- a/src/vnet/mfib/mfib_forward.c +++ b/src/vnet/mfib/mfib_forward.c @@ -150,32 +150,34 @@ mfib_forward_lookup (vlib_main_t * vm, { ip4_header_t * ip0; - fib_index0 = vec_elt (ip4_main.mfib_index_by_sw_if_index, - vnet_buffer(p0)->sw_if_index[VLIB_RX]); - ip0 = vlib_buffer_get_current (p0); - mfei0 = ip4_mfib_table_lookup(ip4_mfib_get(fib_index0), - &ip0->src_address, - &ip0->dst_address, - 64); - } - else - { - ip6_header_t * ip0; - - fib_index0 = vec_elt (ip6_main.mfib_index_by_sw_if_index, - vnet_buffer(p0)->sw_if_index[VLIB_RX]); - ip0 = vlib_buffer_get_current (p0); - mfei0 = ip6_mfib_table_fwd_lookup(ip6_mfib_get(fib_index0), - &ip0->src_address, - &ip0->dst_address); - } - - vnet_buffer (p0)->ip.adj_index[VLIB_TX] = mfei0; - } - - vlib_put_next_frame(vm, node, - MFIB_FORWARD_LOOKUP_NEXT_RPF, - n_left_to_next); + ip_lookup_set_buffer_fib_index ( + ip4_main.fib_index_by_sw_if_index, p0); + fib_index0 = vec_elt (ip4_main.mfib_index_by_sw_if_index, + vnet_buffer (p0)->sw_if_index[VLIB_RX]); + ip0 = vlib_buffer_get_current (p0); + mfei0 = ip4_mfib_table_lookup (ip4_mfib_get (fib_index0), + &ip0->src_address, + &ip0->dst_address, 64); + } + else + { + ip6_header_t *ip0; + + ip_lookup_set_buffer_fib_index ( + ip6_main.fib_index_by_sw_if_index, p0); + fib_index0 = vec_elt (ip6_main.mfib_index_by_sw_if_index, + vnet_buffer (p0)->sw_if_index[VLIB_RX]); + ip0 = vlib_buffer_get_current (p0); + mfei0 = ip6_mfib_table_fwd_lookup (ip6_mfib_get (fib_index0), + &ip0->src_address, + &ip0->dst_address); + } + + vnet_buffer (p0)->ip.adj_index[VLIB_TX] = mfei0; + } + + vlib_put_next_frame (vm, node, MFIB_FORWARD_LOOKUP_NEXT_RPF, + n_left_to_next); } if (node->flags & VLIB_NODE_FLAG_TRACE) |