Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow providers to override glean behaviour
[vpp.git]
/
src
/
vnet
/
adj
/
adj_midchain.c
diff --git
a/src/vnet/adj/adj_midchain.c
b/src/vnet/adj/adj_midchain.c
index
9fd3246
..
b6cb824
100644
(file)
--- 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.
*/
* 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.
*/
/*
* 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);
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);
s = format (s, " %U",
format_vnet_rewrite,
&adj->rewrite_header, sizeof (adj->rewrite_data), indent);