[patch] patch-bgpd-bgp_nth.c-quagga-1.2.1-bgp-ipv6-linklocal-nexthop

patch-bgpd-bgp_nth.c-quagga-1.2.1-bgp-ipv6-linklocal-nexthop (text/plain), 1.39 KB, created by Jaco Kroon on 2017-12-19 16:31:25 UTC

--- a/bgpd/bgp_nht.c	2017-03-10 13:55:06.000000000 +0100
+++ b/bgpd/bgp_nht.c	2017-09-14 22:23:27.310570973 +0200
@@ -192,12 +192,44 @@ bgp_unlink_nexthop_by_peer (struct peer
   bgp_unlink_nexthop_check (bnc);
 }
 
+
+#define BGP_ATTR_NEXTHOP_AFI_IP6(attr) \
+  (! CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_NEXT_HOP)) && \
+   (attr)->extra && ((attr)->extra->mp_nexthop_len == 16 || \
+    (attr)->extra->mp_nexthop_len == 32))
+
 int
 bgp_ensure_nexthop (struct bgp_info *ri, struct peer *peer,
                     int connected)
 {
   struct bgp_node *rn;
   struct bgp_nexthop_cache *bnc;
+  struct prefix p;
+  int is_bgp_static_route = 0;
+
+  afi_t afi = 0;
+
+  if (ri)
+    {
+      is_bgp_static_route = ((ri->type == ZEBRA_ROUTE_BGP) &&
+                            (ri->sub_type == BGP_ROUTE_STATIC)) ? 1 : 0;
+
+      /* Since Extended Next-hop Encoding (RFC5549) support, we want to derive
+         address-family from the next-hop. */
+      if (!is_bgp_static_route)
+        afi = BGP_ATTR_NEXTHOP_AFI_IP6(ri->attr) ? AFI_IP6 : AFI_IP;
+
+      /* This will return TRUE if the global IPv6 NH is a link local addr */
+      if (make_prefix(afi, ri, &p) < 0)
+       return 1;
+    }
+  else if (peer)
+    {
+      /* Don't register link local NH */
+      if (afi == AFI_IP6 && IN6_IS_ADDR_LINKLOCAL (&peer->su.sin6.sin6_addr))
+       return 1;
+    }
+
   
   rn = bgp_get_nexthop_rn (ri, peer);