diff options
| author |   Neale Ranns <neale.ranns@cisco.com> | 2018-02-16 02:44:05 -0800 |
|---|---|---|
| committer | Neale Ranns <neale.ranns@cisco.com> | 2018-02-16 02:44:08 -0800 |
| commit | c819fc612f9a79eaba2981dc2e8f7c31552db5ea (patch) | |
| tree | ba19a3f7b2f223ebd28e3fe87ad5f73ef81d9745 /src/vnet/adj/adj_midchain.c | |
| parent | 25d417f28680c78a709792d997884dd80227bb70 (diff) | |
Allow providers to override glean behaviour
and update glean address on local interface MAC change
Change-Id: I530826d60c7e9db2b0fa2d45754139d82c5ea807
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Diffstat (limited to 'src/vnet/adj/adj_midchain.c')
| -rw-r--r-- | src/vnet/adj/adj_midchain.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c index 9fd3246b15a..b6cb8240a52 100644 --- a/src/vnet/adj/adj_midchain.c +++ b/src/vnet/adj/adj_midchain.c @@ -519,7 +519,9 @@ adj_nbr_midchain_update_rewrite (adj_index_t adj_index, * one time only update. since we don't support chainging the tunnel * src,dst, this is all we need. */ - ASSERT(adj->lookup_next_index == IP_LOOKUP_NEXT_ARP); + ASSERT((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP) || + (adj->lookup_next_index == IP_LOOKUP_NEXT_GLEAN)); + /* * tunnels can always provide a rewrite. */ @@ -590,8 +592,9 @@ format_adj_midchain (u8* s, va_list *ap) ip_adjacency_t * adj = adj_get(index); s = format (s, "%U", format_vnet_link, adj->ia_link); - s = format (s, " via %U ", - format_ip46_address, &adj->sub_type.nbr.next_hop); + s = format (s, " via %U", + format_ip46_address, &adj->sub_type.nbr.next_hop, + adj_proto_to_46(adj->ia_nh_proto)); s = format (s, " %U", format_vnet_rewrite, &adj->rewrite_header, sizeof (adj->rewrite_data), indent); |