commit 736d440845c8c0cfdb56b86254887bab5fc7f3f5
author Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr> Mon Jul 20 01:59:10 2009 +0300
committer Paul Jakma <paul@quagga.net> Tue Jul 28 15:02:07 2009 +0100
tree e1b7f27c18b03494509e9b9ef0a694b726630418
parent ca87e1d37b3c30648e9bacb476a3c89729512f6d

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.

bgpd/bgp_aspath.c

diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index e65541f..440815b 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -1208,6 +1208,10 @@
   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);