mirrors/bgpq4
1
0
Fork 0
mirror of https://github.com/bgp/bgpq4 synced 2025-02-28 08:53:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the option to disable 32-bit ASN support

Browse Source 
This removes the '-3' command line option and fixes #3.
This commit is contained in:
Job Snijders
2019-12-30 23:58:47 +00:00
parent 484ae33948
commit 10cdd5656d
6 changed files with 88 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bgpq4.c
View File

@@ -27,8 +27,7 @@ int
usage(int ecode)
{
printf("\nUsage: bgpq4 [-h host[:port]] [-S sources] [-E|G <num>"
"|f <num>|t] [-346ABbdJjKNnwXz] [-R len] <OBJECTS>...\n");
printf(" -3 : assume that your device is asn32-safe\n");
"|f <num>|t] [-46ABbdJjKNnwXz] [-R len] <OBJECTS>...\n");
printf(" -4 : generate IPv4 prefix-lists (default)\n");
printf(" -6 : generate IPv6 prefix-lists\n");
printf(" -A : try to aggregate prefix-lists/route-filters\n");
@@ -36,7 +35,7 @@ usage(int ecode)
printf(" -b : generate BIRD output\n");
printf(" -d : generate some debugging output\n");
printf(" -E : generate extended access-list(Cisco), "
"route-filter(Juniper)\n"
"route-filter (Juniper)\n"
" [ip|ipv6]-prefix-list (Nokia) or prefix-set "
"(OpenBGPD)\n");
printf(" -F fmt : generate output in user-defined format\n");
@@ -147,12 +146,9 @@ main(int argc, char* argv[])
if (getenv("IRRD_SOURCES"))
expander.sources=getenv("IRRD_SOURCES");
while ((c = getopt(argc,argv,"346a:AbBdDEF:S:jJKf:l:L:m:M:NnW:pr:R:G:tTh:UwXsz"))
while ((c = getopt(argc,argv,"46a:AbBdDEF:S:jJKf:l:L:m:M:NnW:pr:R:G:tTh:UwXsz"))
!=EOF) {
switch (c) {
case '3':
expander.asn32 = 1;
break;
case '4':
/* do nothing, expander already configured for IPv4 */
if (expander.family == AF_INET6) {
@@ -189,7 +185,6 @@ main(int argc, char* argv[])
if (expander.vendor)
vendor_exclusive();
expander.vendor = V_OPENBGPD;
expander.asn32 = 1;
break;
case 'd':
debug_expander++;
@@ -455,9 +450,6 @@ main(int argc, char* argv[])
sx_report(SX_FATAL, "As-Sets (-t) supported for JSON (-j), OpenBGPD "
"(-B) and BIRD (-b) output only\n");
if (!expander.asn32 && expander.asnumber > 65535)
expander.asnumber = 23456;
if (aggregate && expander.vendor == V_JUNIPER && expander.generation == T_PREFIXLIST) {
sx_report(SX_FATAL, "Sorry, aggregation (-A) does not work in"
" Juniper prefix-lists\nYou can try route-filters (-E) "