Merge branch 'int-new' into show-route

This commit is contained in:
Jan Maria Matejka
2018-04-17 15:39:44 +02:00
+1 -1
View File
@@ -295,7 +295,7 @@ bgp_encode_next_hop(struct bgp_write_state *s, eattr *a, byte *buf, uint size)
* store it and encode it later by AFI-specific hooks.
*/
if (s->channel->afi == BGP_AF_IPV4)
if ((s->channel->afi == BGP_AF_IPV4) && !s->channel->ext_next_hop)
{
ASSERT(a->u.ptr->length == sizeof(ip_addr));