From: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Date: Sun, 19 Jul 2009 22:59:10 +0000 (+0300)
Subject: bgpd: Delete AS_CONFED_SEQUENCE when prepending an AS_SEQUENCE type segment
X-Git-Tag: frr-2.0-rc1~2233
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=736d440845c8c0cfdb56b86254887bab5fc7f3f5;p=mirror%2Ffrr.git

bgpd: Delete AS_CONFED_SEQUENCE when prepending an AS_SEQUENCE type segment

AS_CONFED_SEQUENCE segment should always be deleted when prepending
(e.g. with a route-map) an AS_SEQUENCE segment to an AS path. Otherwise,
AS_CONFED_SEQUENCE will not be deleted later when updating EBGP peers (since
it is not the leftmost segment) and will leak outside the confederation.
---

diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index e65541f977..440815b468 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -1208,6 +1208,10 @@ aspath_prepend (struct aspath *as1, struct aspath *as2)
   while (seg1 && seg1->next)
     seg1 = seg1->next;
 
+  /* Delete any AS_CONFED_SEQUENCE segment from as2. */
+  if (seg1->type == AS_SEQUENCE && seg2->type == AS_CONFED_SEQUENCE)
+    as2 = aspath_delete_confed_seq (as2);
+
   /* Compare last segment type of as1 and first segment type of as2. */
   if (seg1->type != seg2->type)
     return aspath_merge (as1, as2);