diff --git a/README.md b/README.md index 92305ca..efca8a0 100644 --- a/README.md +++ b/README.md @@ -128,10 +128,6 @@ It's options are as follows: > generate config for Nokia SR OS classic CLI (Cisco IOS by default). -**-p** - -> accept routes registered for private ASNs (default: disabled) - **-r** *len* > allow more specific routes starting with specified masklen too. diff --git a/bgpq4.8 b/bgpq4.8 index c4801e0..65d3602 100644 --- a/bgpq4.8 +++ b/bgpq4.8 @@ -109,8 +109,6 @@ extra match conditions for Juniper route-filters. generate config for Nokia SR OS MD-CLI (Cisco IOS by default) .It Fl N generate config for Nokia SR OS classic CLI (Cisco IOS by default). -.It Fl p -accept routes registered for private ASNs (default: disabled) .It Fl r Ar len allow more specific routes starting with specified masklen too. .It Fl R Ar len diff --git a/expander.c b/expander.c index 422c3c7..5e58e71 100644 --- a/expander.c +++ b/expander.c @@ -50,7 +50,6 @@ int debug_expander = 0; int pipelining = 1; -int expand_special_asn = 0; static inline int tentry_cmp(struct sx_tentry *a, struct sx_tentry *b) @@ -196,8 +195,7 @@ bgpq_expander_add_as(struct bgpq_expander *b, char *as) return 0; } - if (!expand_special_asn && - ((asno >= 4200000000ul) || (asno >= 64496 && asno <= 65551))) { + if (asno >= 4200000000ul || (asno >= 64496 && asno <= 65551)) { sx_report(SX_ERROR,"Invalid AS number: %u\n", asno); return 0; } diff --git a/main.c b/main.c index 8d96266..aa7b008 100644 --- a/main.c +++ b/main.c @@ -45,7 +45,6 @@ extern int debug_expander; extern int debug_aggregation; extern int pipelining; -extern int expand_special_asn; static int usage(int ecode) @@ -197,7 +196,7 @@ main(int argc, char* argv[]) expander.sources=getenv("IRRD_SOURCES"); while ((c = getopt(argc, argv, - "46a:AbBdDEeF:S:jJKf:l:L:m:M:NnW:pr:R:G:H:tTh:UuwXsvz")) != EOF) { + "46a:AbBdDEeF:S:jJKf:l:L:m:M:NnW:r:R:G:H:tTh:UuwXsvz")) != EOF) { switch (c) { case '4': /* do nothing, expander already configured for IPv4 */ @@ -299,9 +298,6 @@ main(int argc, char* argv[]) vendor_exclusive(); expander.vendor = V_MIKROTIK; break; - case 'p': - expand_special_asn = 1; - break; case 'r': refineLow = strtoul(optarg, NULL, 10); if (!refineLow) {