diff options
| author |   Neale Ranns <neale.ranns@cisco.com> | 2018-07-30 08:14:14 -0700 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-07-30 20:04:28 +0000 |
| commit | 579092c4ba3d11eede31da4339a61aceb02b101e (patch) | |
| tree | 65dcb6a69d50505236f497abd624054d4dfd9958 /src | |
| parent | c5d4317ad0425d01893dbb4afad9f16c2cde077d (diff) | |
SIXRD: fix post introduction of the directed subnet broadcast
Change-Id: I9ce801e9b257eaa6be0cbe2ad3bfe630717f8c67
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/vnet/adj/adj_midchain.c | 3 | ||||
| -rw-r--r-- | src/vnet/ipip/sixrd.c | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c index b6cb8240a52..268d9409abf 100644 --- a/src/vnet/adj/adj_midchain.c +++ b/src/vnet/adj/adj_midchain.c @@ -520,7 +520,8 @@ adj_nbr_midchain_update_rewrite (adj_index_t adj_index, * src,dst, this is all we need. */ ASSERT((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP) || - (adj->lookup_next_index == IP_LOOKUP_NEXT_GLEAN)); + (adj->lookup_next_index == IP_LOOKUP_NEXT_GLEAN) || + (adj->lookup_next_index == IP_LOOKUP_NEXT_BCAST)); /* * tunnels can always provide a rewrite. diff --git a/src/vnet/ipip/sixrd.c b/src/vnet/ipip/sixrd.c index 38ca899f274..a2609fdcce1 100644 --- a/src/vnet/ipip/sixrd.c +++ b/src/vnet/ipip/sixrd.c @@ -179,14 +179,6 @@ sixrd_tunnel_stack (adj_index_t ai, u32 fib_index) adj_nbr_midchain_stack (ai, &dpo); } -const static ip46_address_t sixrd_special_nh = { - .ip6 = { - .as_u64 = { - [0] = 0xffffffffffffffff, - [1] = 0xffffffffffffffff, - }, - }, -}; static void sixrd_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) @@ -197,8 +189,7 @@ sixrd_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) /* Not our tunnel */ if (!t) return; - if (!memcmp (&sixrd_special_nh, &adj->sub_type.nbr.next_hop, - sizeof (sixrd_special_nh))) + if (IP_LOOKUP_NEXT_BCAST == adj->lookup_next_index) { adj_nbr_midchain_update_rewrite (ai, sixrd_fixup, t, ADJ_FLAG_NONE, sixrd_build_rewrite (vnm, sw_if_index, @@ -363,7 +354,7 @@ sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, fib_table_entry_update_one_path (fib_index, &pfx6, FIB_SOURCE_CLI, FIB_ENTRY_FLAG_ATTACHED, DPO_PROTO_IP6, - &sixrd_special_nh, hi->sw_if_index, ~0, 1, + &ADJ_BCAST_ADDR, hi->sw_if_index, ~0, 1, NULL, FIB_ROUTE_PATH_FLAG_NONE); *sw_if_index = hi->sw_if_index; |