From 50d4dbaf2885e44463560cba2b24167c56968a4b Mon Sep 17 00:00:00 2001
From: Job Snijders <job@instituut.net>
Date: Mon, 30 Dec 2019 18:33:35 +0000
Subject: [PATCH] Remove support to expand as23456 entirely

---
 README.md       |  8 ++------
 bgpq4.8         |  2 --
 bgpq4.c         | 10 ++--------
 bgpq_expander.c |  4 ----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 11260b4..d8d3bff 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ SYNOPSIS
 --------
 
 ```
-	bgpq4 [-h host[:port]] [-S sources] [-Ez] [-f asn | -F fmt | -G asn | -t] [-2346ABbDdJjNnpsUX] [-a asn] [-r len] [-R len] [-m max] [-W len] OBJECTS [...] EXCEPT OBJECTS
+	bgpq4 [-h host[:port]] [-S sources] [-Ez] [-f asn | -F fmt | -G asn | -t] [-346ABbDdJjNnpsUX] [-a asn] [-r len] [-R len] [-m max] [-W len] OBJECTS [...] EXCEPT OBJECTS
 ```
 
 DESCRIPTION
@@ -19,10 +19,6 @@ based on RADB data.
 
 The options are as follows:
 
-#### -2
-
-Allow routes registered for as23456 (transition-as) (default: false)
-
 #### -3      
 
 Assume that your device is asn32-capable.
@@ -277,7 +273,7 @@ and ASN32
       as-path-group NN {
        as-path a0 "^112(112)*$";
        as-path a1 "^112(.)*(1898|5539|8495|8763|8878|12136|12931|15909)$";
-       as-path a2 "^112(.)*(21358|23456|23600|24151|25152|31529|34127|34906)$";
+       as-path a2 "^112(.)*(21358|23600|24151|25152|31529|34127|34906)$";
        as-path a3 "^112(.)*(35052|41720|43628|44450|196611)$";
       }
      }
diff --git a/bgpq4.8 b/bgpq4.8
index bc9c7cc..3075d4e 100644
--- a/bgpq4.8
+++ b/bgpq4.8
@@ -56,8 +56,6 @@ access-lists, policy-statement terms and as-path lists) based on RADB data.
 .Pp
 The options are as follows: 
 .Bl -tag -width Ds
-.It Fl 2
-accept routes registered for as23456 (transition-as) (default: false)
 .It Fl 3
 assume that your device is asn32-safe.
 .It Fl 4 
diff --git a/bgpq4.c b/bgpq4.c
index 4c84727..60b4580 100644
--- a/bgpq4.c
+++ b/bgpq4.c
@@ -21,16 +21,13 @@
 extern int debug_expander;
 extern int debug_aggregation;
 extern int pipelining;
-extern int expand_as23456;
 extern int expand_special_asn;
 
 int
 usage(int ecode)
 {
 	printf("\nUsage: bgpq4 [-h host[:port]] [-S sources] [-E|G <num>"
-	    "|f <num>|t] [-2346ABbdJjKNnwXz] [-R len] <OBJECTS>...\n");
-	printf(" -2        : allow routes belonging to as23456 (transition-as) "
-		"(default: false)\n");
+	    "|f <num>|t] [-346ABbdJjKNnwXz] [-R len] <OBJECTS>...\n");
 	printf(" -3        : assume that your device is asn32-safe\n");
 	printf(" -4        : generate IPv4 prefix-lists (default)\n");
 	printf(" -6        : generate IPv6 prefix-lists\n");
@@ -150,12 +147,9 @@ main(int argc, char* argv[])
 	if (getenv("IRRD_SOURCES"))
 		expander.sources=getenv("IRRD_SOURCES");
 
-	while ((c = getopt(argc,argv,"2346a:AbBdDEF:S:jJKf:l:L:m:M:NnW:pr:R:G:tTh:UwXsz"))
+	while ((c = getopt(argc,argv,"346a:AbBdDEF:S:jJKf:l:L:m:M:NnW:pr:R:G:tTh:UwXsz"))
 	    !=EOF) {
 	switch (c) {
-		case '2':
-			expand_as23456 = 1;
-			break;
 		case '3':
 			expander.asn32 = 1;
 			break;
diff --git a/bgpq_expander.c b/bgpq_expander.c
index ce71d9b..18a9bf5 100644
--- a/bgpq_expander.c
+++ b/bgpq_expander.c
@@ -29,7 +29,6 @@
 
 int debug_expander = 0;
 int pipelining = 1;
-int expand_as23456 = 0;
 int expand_special_asn = 0;
 
 static inline int
@@ -226,9 +225,6 @@ bgpq_expander_add_as(struct bgpq_expander* b, char* as)
 		return 0;
 	};
 
-	if (asno == 23456 && !expand_as23456)
-		return 0;
-
 	if (!expand_special_asn && (asno >= 64496 && asno <= 65536))
 		return 0;