X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_midchain.c;h=b6cb8240a52bc4600c229d29b093771f8a2750f1;hb=c819fc612f9a79eaba2981dc2e8f7c31552db5ea;hp=9fd3246b15a441d8db6a53ebf53e48ad9ed96e84;hpb=25d417f28680c78a709792d997884dd80227bb70;p=vpp.git 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);