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

new flag -s: as-path sequencing for IOS/Arista.

Browse Source
This commit is contained in:
Alexandre Snarskii
2015-06-28 19:13:36 +03:00
parent c88911f335
commit b5f411fa7c
6 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGES
View File

@@ -1,12 +1,18 @@
untagged yet (2015-06-26)
- bugfix: F source(s) unavailable message from IRRD was ignored
untagged yet (2015-06-28)
- bugfix: F source(s) unavailable message from IRRD was ignored.
Please note: this error is caught only when all the specified sources
are invalid. For example, 'bgpq3 -s nonexistant' will fail, however,
'bgpq3 -s nonexistant,ripe' will not fail and will use only ripe source.
Thanks to Mikhail A. Grishin for reporting.
- new flag -s for IOS mode enables as-path sequencing. According to Job
Snijders this significantly speeds up Arista configuration load.
0.1.31 (2015-06-23)
- pipelining mode now counts buffered requests and issues dequeue
when new request can overflow allocated buffer. So, bgpq3 shall no
more require TCP tuning (it is still recomended, though).
- tcp tuning parameters decreased in README (sx_maxsockbuf will not
allow to grow buffer over 2Mb anyway).
allow buffer over 2Mb anyway).
0.1.30 (2015-06-16)
- bugfix: private asns with number > 2^31 were printed as negative integers.

7
README.md
View File

@@ -7,7 +7,7 @@ SYNOPSIS
--------
```
bgpq3 [-h host] [-S sources] [-EP] [-f asn | -G asn] [-2346AbDdJjpX] [-r len] [-R len] [-m max] [-W len] OBJECTS [...]
bgpq3 [-h host] [-S sources] [-EP] [-f asn | -G asn] [-2346AbDdJjpsX] [-r len] [-R len] [-m max] [-W len] OBJECTS [...]
```
DESCRIPTION
@@ -104,6 +104,11 @@ Allow more-specific routes with masklen starting with specified length.
Allow more-specific routes up to specified masklen too. (Please, note: objects
with prefix-length greater than specified length will be always allowed.)
#### -s
Add sequence numbers to as-path filters (can only be used in combination
with Cisco IOS output).
#### -S `sources`
Use specified sources only (default: RADB,RIPE,APNIC).

15
bgpq3.c
View File

@@ -26,7 +26,7 @@ int
usage(int ecode)
{
printf("\nUsage: bgpq3 [-h host] [-S sources] [-P|E|G <num>|f <num>]"
" [-2346AbDJjXd] [-R len] <OBJECTS>...\n");
" [-2346AbDJjsXd] [-R len] <OBJECTS>...\n");
printf(" -2 : allow routes belonging to as23456 (transition-as) "
"(default: false)\n");
printf(" -3 : assume that your device is asn32-safe\n");
@@ -54,6 +54,7 @@ usage(int ecode)
" compatibility)\n");
printf(" -r len : allow more specific routes from masklen specified\n");
printf(" -R len : allow more specific routes up to specified masklen\n");
printf(" -s : emit sequence numbers in IOS as-paths\n");
printf(" -S sources: use only specified sources (default:"
" RADB,RIPE,APNIC)\n");
printf(" -T : disable pipelining (experimental, faster mode)\n");
@@ -128,7 +129,7 @@ main(int argc, char* argv[])
bgpq_expander_init(&expander,af);
expander.sources=getenv("IRRD_SOURCES");
while((c=getopt(argc,argv,"2346AbdDES:jJf:l:m:M:W:Ppr:R:G:Th:X"))!=EOF) {
while((c=getopt(argc,argv,"2346AbdDEsS:jJf:l:m:M:W:Ppr:R:G:Th:X"))!=EOF) {
switch(c) {
case '2':
expand_as23456=1;
@@ -247,10 +248,12 @@ main(int argc, char* argv[])
break;
case 'T': pipelining=0;
break;
case 's': expander.ios_asn_sequence=1;
break;
case 'S': expander.sources=optarg;
break;
case 'W': expander.aswidth=atoi(optarg);
if(expander.aswidth<0) {
if(expander.aswidth<=0) {
sx_report(SX_FATAL,"Invalid as-width: %s\n", optarg);
exit(1);
};
@@ -325,6 +328,12 @@ main(int argc, char* argv[])
exit(1);
};
if(expander.ios_asn_sequence && expander.vendor!=V_CISCO) {
sx_report(SX_FATAL, "Sorry, -s (as-path sequencing) works for IOS "
"only\n");
exit(1);
};
if(refineLow && !refine) {
if(expander.family == AF_INET)
refine = 32;

1
bgpq3.h
View File

@@ -49,6 +49,7 @@ struct bgpq_expander {
unsigned maxlen;
int socksize;
int qsize;
int ios_asn_sequence;
};

53
bgpq3_printer.c
View File

@@ -20,18 +20,23 @@ int bgpq3_print_bird_aspath(FILE* f, struct bgpq_expander* b);
int
bgpq3_print_cisco_aspath(FILE* f, struct bgpq_expander* b)
{
int nc=0, i, j, k, empty=1;
int nc=0, i, j, k, empty=1, seq=1;
char sseq[16];
fprintf(f,"no ip as-path access-list %s\n", b->name?b->name:"NN");
if(b->asn32s[b->asnumber/65536] &&
b->asn32s[b->asnumber/65536][(b->asnumber%65536)/8]&
(0x80>>(b->asnumber%8))) {
if(b->ios_asn_sequence)
snprintf(sseq, sizeof(sseq), "seq %i ", seq++);
if(b->asdot && b->asnumber>65535) {
fprintf(f,"ip as-path access-list %s permit ^%u.%u(_%u.%u)*$\n",
fprintf(f,"ip as-path access-list %s%s permit ^%u.%u(_%u.%u)*$\n",
b->ios_asn_sequence?sseq:"",
b->name?b->name:"NN",b->asnumber/65536,b->asnumber%65536,
b->asnumber/65536,b->asnumber%65536);
empty=0;
} else {
fprintf(f,"ip as-path access-list %s permit ^%u(_%u)*$\n",
fprintf(f,"ip as-path access-list %s%s permit ^%u(_%u)*$\n",
b->ios_asn_sequence?sseq:"",
b->name?b->name:"NN",b->asnumber,b->asnumber);
empty=0;
};
@@ -44,14 +49,20 @@ bgpq3_print_cisco_aspath(FILE* f, struct bgpq_expander* b)
if(b->asn32s[k][i]&(0x80>>j)) {
if(k*65536+i*8+j==b->asnumber) continue;
if(!nc) {
if(b->ios_asn_sequence)
snprintf(sseq, sizeof(sseq), "seq %i ", seq++);
if(b->asdot && k>0) {
fprintf(f,"ip as-path access-list %s permit"
" ^%u(_[0-9]+)*_(%u.%u", b->name?b->name:"NN",
fprintf(f,"ip as-path access-list %s%s permit"
" ^%u(_[0-9]+)*_(%u.%u",
b->ios_asn_sequence?sseq:"",
b->name?b->name:"NN",
b->asnumber,k,i*8+j);
empty=0;
} else {
fprintf(f,"ip as-path access-list %s permit"
" ^%u(_[0-9]+)*_(%u", b->name?b->name:"NN",
fprintf(f,"ip as-path access-list %s%s permit"
" ^%u(_[0-9]+)*_(%u",
b->ios_asn_sequence?sseq:"",
b->name?b->name:"NN",
b->asnumber,k*65536+i*8+j);
empty=0;
};
@@ -81,17 +92,21 @@ bgpq3_print_cisco_aspath(FILE* f, struct bgpq_expander* b)
int
bgpq3_print_cisco_oaspath(FILE* f, struct bgpq_expander* b)
{
int nc=0, i, j, k, empty=1;
int nc=0, i, j, k, empty=1, seq=1;
char sseq[16];
fprintf(f,"no ip as-path access-list %s\n", b->name?b->name:"NN");
if(b->asn32s[b->asnumber/65536] &&
b->asn32s[b->asnumber/65536][(b->asnumber%65536)/8]&
(0x80>>(b->asnumber%8))) {
if(b->ios_asn_sequence)
snprintf(sseq, sizeof(sseq), "seq %i ", seq++);
if(b->asdot && b->asnumber>65535) {
fprintf(f,"ip as-path access-list %s permit ^(_%u.%u)*$\n",
b->name?b->name:"NN",b->asnumber/65536,b->asnumber%65536);
fprintf(f,"ip as-path access-list %s%s permit ^(_%u.%u)*$\n",
b->ios_asn_sequence?sseq:"",b->name?b->name:"NN",
b->asnumber/65536,b->asnumber%65536);
} else {
fprintf(f,"ip as-path access-list %s permit ^(_%u)*$\n",
b->name?b->name:"NN",b->asnumber);
fprintf(f,"ip as-path access-list %s%s permit ^(_%u)*$\n",
b->ios_asn_sequence?sseq:"",b->name?b->name:"NN",b->asnumber);
};
empty=0;
};
@@ -102,14 +117,20 @@ bgpq3_print_cisco_oaspath(FILE* f, struct bgpq_expander* b)
if(b->asn32s[k][i]&(0x80>>j)) {
if(k*65536+i*8+j==b->asnumber) continue;
if(!nc) {
if(b->ios_asn_sequence)
snprintf(sseq, sizeof(sseq), "seq %i ", seq++);
if(b->asdot && k>0) {
fprintf(f,"ip as-path access-list %s permit"
" ^(_[0-9]+)*_(%u.%u", b->name?b->name:"NN",
fprintf(f,"ip as-path access-list %s%s permit"
" ^(_[0-9]+)*_(%u.%u",
b->ios_asn_sequence?sseq:"",
b->name?b->name:"NN",
k,i*8+j);
empty=0;
} else {
fprintf(f,"ip as-path access-list %s permit"
" ^(_[0-9]+)*_(%u", b->name?b->name:"NN",
fprintf(f,"ip as-path access-list %s%s permit"
" ^(_[0-9]+)*_(%u",
b->ios_asn_sequence?sseq:"",
b->name?b->name:"NN",
k*65536+i*8+j);
empty=0;
};

2
bgpq_expander.c
View File

@@ -669,7 +669,7 @@ bgpq_expand(struct bgpq_expander* b)
fwrite(sources,strlen(sources),1,f);
fgets(sources,sizeof(sources),f);
if(sources[0]!='C') {
sx_report(SX_ERROR, "Invalid sources '%s': %s\n", b->sources,
sx_report(SX_ERROR, "Invalid source(s) '%s': %s\n", b->sources,
sources);
exit(1);
};