bgpd: Remove private AS numbers if local-as is defined

When using remove-private-AS together with local-as
aspath_remove_private_asns() is called before bgp_packet_attribute().

In this case, private AS will always appear in front of change_local_as.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 93603e00022493e3c5b45c8220c064f3e3718d68..76841d2dbb20e9d7b75ffa325df824064a72cd11 100644 (file)
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -2908,6 +2908,22 @@ void bgp_packet_mpattr_end(struct stream *s, size_t sizep)
        stream_putw_at(s, sizep, (stream_get_endp(s) - sizep) - 2);
 }
 
+static int bgp_append_local_as(struct peer *peer, afi_t afi, safi_t safi)
+{
+       if (!BGP_AS_IS_PRIVATE(peer->local_as)
+           || (BGP_AS_IS_PRIVATE(peer->local_as)
+               && !CHECK_FLAG(peer->af_flags[afi][safi],
+                              PEER_FLAG_REMOVE_PRIVATE_AS)
+               && !CHECK_FLAG(peer->af_flags[afi][safi],
+                              PEER_FLAG_REMOVE_PRIVATE_AS_ALL)
+               && !CHECK_FLAG(peer->af_flags[afi][safi],
+                              PEER_FLAG_REMOVE_PRIVATE_AS_REPLACE)
+               && !CHECK_FLAG(peer->af_flags[afi][safi],
+                              PEER_FLAG_REMOVE_PRIVATE_AS_ALL_REPLACE)))
+               return 1;
+       return 0;
+}
+
 /* Make attribute packet. */
 bgp_size_t bgp_packet_attribute(struct bgp *bgp, struct peer *peer,
                                struct stream *s, struct attr *attr,
@@ -2973,12 +2989,12 @@ bgp_size_t bgp_packet_attribute(struct bgp *bgp, struct peer *peer,
                                /* If replace-as is specified, we only use the
                                   change_local_as when
                                   advertising routes. */
-                               if (!CHECK_FLAG(
-                                           peer->flags,
-                                           PEER_FLAG_LOCAL_AS_REPLACE_AS)) {
-                                       aspath = aspath_add_seq(aspath,
-                                                               peer->local_as);
-                               }
+                               if (!CHECK_FLAG(peer->flags,
+                                               PEER_FLAG_LOCAL_AS_REPLACE_AS))
+                                       if (bgp_append_local_as(peer, afi,
+                                                               safi))
+                                               aspath = aspath_add_seq(
+                                                       aspath, peer->local_as);
                                aspath = aspath_add_seq(aspath,
                                                        peer->change_local_as);
                        } else {