From: Maria Matejka <mq@ucw.cz>
Date: Mon, 30 May 2022 13:32:11 +0000 (+0200)
Subject: Merge commit 'd39ef961d1dde230c55fcc931b53f44cb34a1e63' into haugesund
X-Git-Tag: v3.0-alpha1~171^2~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81aeccbb00bdc457c53bb8ab96715537513f7b2c;p=thirdparty%2Fbird.git

Merge commit 'd39ef961d1dde230c55fcc931b53f44cb34a1e63' into haugesund
---

81aeccbb00bdc457c53bb8ab96715537513f7b2c
diff --cc proto/bgp/attrs.c
index f4f7d15a5,a7c49be59..9f31c28bb
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -2079,9 -2078,13 +2078,13 @@@ bgp_rte_mergable(rte *pri, rte *sec
      return 0;
  
    /* RFC 4271 9.1.2.1. Route resolvability test */
 -  if (rte_resolvable(pri) != rte_resolvable(sec))
 +  if (rta_resolvable(pri->attrs) != rta_resolvable(sec->attrs))
      return 0;
  
+   /* LLGR draft - depreference stale routes */
+   if (rte_stale(pri) != rte_stale(sec))
+     return 0;
+ 
    /* Start with local preferences */
    x = ea_find(pri->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF));
    y = ea_find(sec->attrs->eattrs, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF));