From d807ea087f8d60e25eaef8c10168a40ca6545c57 Mon Sep 17 00:00:00 2001
From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
Date: Wed, 13 Dec 2017 15:57:44 +0100
Subject: [PATCH] BGP: Fix non-transitive ext communities

---
 nest/a-set.c      | 7 +++++++
 nest/attrs.h      | 2 ++
 proto/bgp/attrs.c | 4 +++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nest/a-set.c b/nest/a-set.c
index a2fb6953..048e522d 100644
--- a/nest/a-set.c
+++ b/nest/a-set.c
@@ -536,6 +536,13 @@ ec_set_sort(struct linpool *pool, struct adata *src)
   return dst;
 }
 
+void
+ec_set_sort_x(struct adata *set)
+{
+  /* Sort in place */
+  qsort(set->data, set->length / 8, 8, ec_set_cmp);
+}
+
 
 static int
 lc_set_cmp(const void *X, const void *Y)
diff --git a/nest/attrs.h b/nest/attrs.h
index f66d4f04..102f378a 100644
--- a/nest/attrs.h
+++ b/nest/attrs.h
@@ -197,4 +197,6 @@ struct adata *int_set_sort(struct linpool *pool, struct adata *src);
 struct adata *ec_set_sort(struct linpool *pool, struct adata *src);
 struct adata *lc_set_sort(struct linpool *pool, struct adata *src);
 
+void ec_set_sort_x(struct adata *set); /* Sort in place */
+
 #endif
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index dea3c4a6..fdc981ca 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -550,10 +550,12 @@ bgp_decode_mp_unreach_nlri(struct bgp_parse_state *s, uint code UNUSED, uint fla
 static void
 bgp_export_ext_community(struct bgp_export_state *s, eattr *a)
 {
+  a->u.ptr = ec_set_del_nontrans(s->pool, a->u.ptr);
+
   if (a->u.ptr->length == 0)
     UNSET(a);
 
-  a->u.ptr = ec_set_sort(s->pool, a->u.ptr);
+  ec_set_sort_x(a->u.ptr);
 }
 
 static void