bgpd: Do not filter no-export community for BGP OAD (one administration domain)

OAD is treated as an _internal_ BGP peer, and some of the rules (including BGP
attributes) can be relaxed.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit e63b1520f1ad1036455c1626a388ac3afb7f9d6d)

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 404d7b153ca10a359dfcc3fdc3b5b92286671b8c..15e771dffb1af883cb8864a9699c5446962dcd65 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1690,14 +1690,13 @@ static bool bgp_community_filter(struct peer *peer, struct attr *attr)
                        return true;
 
                /* NO_EXPORT check. */
-               if (peer->sort == BGP_PEER_EBGP &&
-                   community_include(bgp_attr_get_community(attr),
-                                     COMMUNITY_NO_EXPORT))
+               if (peer->sort == BGP_PEER_EBGP && peer->sub_sort != BGP_PEER_EBGP_OAD &&
+                   community_include(bgp_attr_get_community(attr), COMMUNITY_NO_EXPORT))
                        return true;
 
                /* NO_EXPORT_SUBCONFED check. */
-               if (peer->sort == BGP_PEER_EBGP
-                   || peer->sort == BGP_PEER_CONFED)
+               if ((peer->sort == BGP_PEER_EBGP && peer->sub_sort != BGP_PEER_EBGP_OAD) ||
+                   peer->sort == BGP_PEER_CONFED)
                        if (community_include(bgp_attr_get_community(attr),
                                              COMMUNITY_NO_EXPORT_SUBCONFED))
                                return true;