From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Thu, 12 Apr 2018 14:55:56 +0000 (+0200)
Subject: BGP: Fix extended next hop handling
X-Git-Tag: v2.0.3~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3a8cf050e6181e158dcde2fe885d7bf220eedc3;p=thirdparty%2Fbird.git

BGP: Fix extended next hop handling

For IPv4 with extended next hop, we use MP-BGP format and therefore no
independent NEXT_HOP attribute.

Thanks to Arvin Gan for the bugreport.
---

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 0f41f8183..9003feb2d 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -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));