mirror/bgp-bgpq4
1
0
Fork 0
mirror of https://github.com/bgp/bgpq4.git synced 2024-05-11 05:55:05 +00:00
Code Releases Activity

Replace RIPE-style queries with IRRD ones (-T route6 -i origin -> !6asNN).

Browse Source
This commit is contained in:
Alexandre Snarskii
2015-06-28 19:47:35 +03:00
parent cc2801a49a
commit c3212921b3
4 changed files with 37 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -6,6 +6,8 @@ untagged yet (2015-06-28)
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.
- RIPE-style queries (-T route6 -i origin asNNN) replaced with IRRd-style
!6asNNN queries.
0.1.31 (2015-06-23)
- pipelining mode now counts buffered requests and issues dequeue

206
bgpq_expander.c
View File

@ -223,147 +223,6 @@ bgpq_expanded_v6prefix(char* prefix, void* udata)
return 1;
};
int
bgpq_pipeline_dequeue_ripe(FILE* f, struct bgpq_expander* b)
{
int sawNL=0;
char buffer[128];
char* otype=NULL, *object=NULL;
if(!f || !b) {
sx_report(SX_FATAL, "Invalid arguments\n");
exit(1);
};
if(!b->firstpipe) {
sx_report(SX_FATAL, "No piped requests\n");
exit(1);
};
while(fgets(buffer,sizeof(buffer),f)) {
if(buffer[0]=='\n') {
if(b->family==AF_INET && otype && !strcmp(otype,"route")) {
SX_DEBUG(debug_expander,"dequeuer(ripe): got route %s\n",
object);
if(b->firstpipe->callback)
b->firstpipe->callback(object,b->firstpipe->udata);
} else if(b->family==AF_INET6 && otype && !strcmp(otype,"route6")){
SX_DEBUG(debug_expander,"dequeuer(ripe): got route6 %s\n",
object);
if(b->firstpipe->callback)
b->firstpipe->callback(object,b->firstpipe->udata);
};
if(otype) free(otype); otype=NULL;
if(object) free(object); object=NULL;
sawNL++;
if(sawNL==2) {
/* end of object */
struct bgpq_prequest* p=b->firstpipe;
b->firstpipe=b->firstpipe->next;
b->qsize-=p->size;
free(p);
b->piped--;
if(!b->piped) {
b->lastpipe=NULL;
return 0;
};
};
} else {
sawNL=0;
if(!otype) {
char* c=strchr(buffer,':');
if(c) {
*c=0;
otype=strdup(buffer);
c++;
while(isspace((int)*c)) c++;
object=strdup(c);
c=strchr(object,'\n');
if(c) *c=0;
};
};
};
};
if(feof(f)) {
sx_report(SX_FATAL,"EOF from RADB (dequeue, ripe)\n");
} else {
sx_report(SX_FATAL,"Error from RADB: %s (dequeue, ripe)\n",
strerror(errno));
};
return 0;
};
int
bgpq_expand_ripe(FILE* f, int (*callback)(char*, void*), void* udata,
char* fmt, ...)
{
char request[128];
char* otype=NULL, *object=NULL, *origin=NULL;
int sawNL=0, nObjects=0;
va_list ap;
struct bgpq_expander* b=(struct bgpq_expander*)udata;
if(!f) {
sx_report(SX_FATAL,"Invalid argments\n");
exit(1);
};
va_start(ap,fmt);
vsnprintf(request,sizeof(request),fmt,ap);
va_end(ap);
SX_DEBUG(debug_expander,"expander(ripe): sending '%s'\n", request);
fwrite(request,1,strlen(request),f);
fflush(f);
sawNL=0;
while(fgets(request,sizeof(request),f)) {
if(request[0]=='\n') {
if(b->family==AF_INET && otype && !strcmp(otype,"route")) {
SX_DEBUG(debug_expander,"expander(ripe): got route: %s\n",
object);
callback(object,udata);
} else if(b->family==AF_INET6 && otype&&!strcmp(otype,"route6")) {
SX_DEBUG(debug_expander,"expander(ripe): got route6: %s\n",
object);
callback(object,udata);
};
if(otype) free(otype); otype=NULL;
if(object) free(object); object=NULL;
if(origin) free(origin); origin=NULL;
nObjects++;
sawNL++;
if(sawNL==2) {
/* ok, that's end of input */
return nObjects;
};
} else {
sawNL=0;
if(!otype) {
/* that's the first line of object */
char* c=strchr(request,':');
if(c) {
*c=0;
otype=strdup(request);
c++;
while((isspace((int)*c))) c++;
object=strdup(c);
c=strchr(object,'\n');
if(c) *c=0;
};
} else if(!strncmp(request,"origin",6)) {
if(origin) free(origin);
origin=strdup(request);
};
};
};
if(feof(f)) {
sx_report(SX_FATAL,"EOF from server (expand, ripe)\n");
} else {
sx_report(SX_FATAL,"Error reading server: %s (expand, ripe)\n",
strerror(errno));
};
return 0;
};
int bgpq_pipeline_dequeue(FILE* f, struct bgpq_expander* b);
int
@ -383,11 +242,7 @@ bgpq_pipeline(FILE* f, int (*callback)(char*, void*), void* udata,
if(rlen+d->qsize >= d->socksize) {
SX_DEBUG(debug_expander, "looks like socket buffer shortage, "
"queued %i of %i, dequeueing\n", d->qsize, d->socksize);
if (d->family==AF_INET6) {
bgpq_pipeline_dequeue_ripe(f, d);
} else {
bgpq_pipeline_dequeue(f, d);
};
bgpq_pipeline_dequeue(f, d);
};
SX_DEBUG(debug_expander,"expander: sending '%s' (queued %i of %i)\n",
@ -404,7 +259,7 @@ bgpq_pipeline(FILE* f, int (*callback)(char*, void*), void* udata,
ret=fwrite(request,1,strlen(request),f);
if(ret!=rlen) {
sx_report(SX_FATAL,"Partial write to radb, only %i bytes written: %s\n",
sx_report(SX_FATAL,"Partial write to IRRd, only %i bytes written: %s\n",
ret,strerror(errno));
exit(1);
};
@ -510,7 +365,7 @@ bgpq_pipeline_dequeue(FILE* f, struct bgpq_expander* b)
};
int
bgpq_expand_radb(FILE* f, int (*callback)(char*, void*), void* udata,
bgpq_expand_irrd(FILE* f, int (*callback)(char*, void*), void* udata,
char* fmt, ...)
{
char request[128];
@ -525,18 +380,18 @@ bgpq_expand_radb(FILE* f, int (*callback)(char*, void*), void* udata,
ret=fwrite(request,1,strlen(request),f);
if(ret!=strlen(request)) {
sx_report(SX_FATAL,"Partial write to radb, only %i bytes written: %s\n",
sx_report(SX_FATAL,"Partial write to IRRd, only %i bytes written: %s\n",
ret,strerror(errno));
exit(1);
};
memset(request,0,sizeof(request));
if(!fgets(request,sizeof(request),f)) {
if(ferror(f)) {
sx_report(SX_FATAL,"Error reading data from radb: %s (expand,radb)"
sx_report(SX_FATAL,"Error reading data from IRRd: %s (expand)"
"\n", strerror(errno));
exit(1);
};
sx_report(SX_FATAL,"EOF from radb (expand,radb)\n");
sx_report(SX_FATAL,"EOF from IRRd (expand)\n");
exit(1);
};
SX_DEBUG(debug_expander>2,"expander: initially got %lu bytes, '%s'\n",
@ -554,10 +409,10 @@ bgpq_expand_radb(FILE* f, int (*callback)(char*, void*), void* udata,
if(fgets(recvbuffer,togot+1,f)==NULL) {
if(feof(f)) {
sx_report(SX_FATAL,"EOF from radb (expand,radb,result)\n");
sx_report(SX_FATAL,"EOF from IRRd (expand,result)\n");
} else {
sx_report(SX_FATAL,"Error reading radb: %s (expand,radb,"
"result)\n", strerror(errno));
sx_report(SX_FATAL,"Error reading IRRd: %s (expand,result)\n",
strerror(errno));
};
exit(1);
};
@ -574,9 +429,9 @@ bgpq_expand_radb(FILE* f, int (*callback)(char*, void*), void* udata,
if(fgets(recvbuffer,togot,f)==NULL) {
if(feof(f)) {
sx_report(SX_FATAL,"EOF from radb (expand,radb,final)\n");
sx_report(SX_FATAL,"EOF from IRRd (expand,final)\n");
} else {
sx_report(SX_FATAL,"ERROR from radb: %s\n", strerror(errno));
sx_report(SX_FATAL,"ERROR from IRRd: %s\n", strerror(errno));
};
exit(1);
};
@ -658,7 +513,7 @@ bgpq_expand(struct bgpq_expander* b)
};
if((ret=fwrite("!!\n",1,3,f))!=3) {
sx_report(SX_ERROR,"Partial fwrite to radb: %i bytes, %s\n",
sx_report(SX_ERROR,"Partial fwrite to IRRd: %i bytes, %s\n",
ret, strerror(errno));
exit(1);
};
@ -683,21 +538,16 @@ bgpq_expand(struct bgpq_expander* b)
};
for(mc=b->macroses;mc;mc=mc->next) {
bgpq_expand_radb(f,bgpq_expanded_macro,b,"!i%s,1\n",mc->text);
bgpq_expand_irrd(f,bgpq_expanded_macro,b,"!i%s,1\n",mc->text);
};
if(b->generation>=T_PREFIXLIST) {
unsigned i, j, k;
for(mc=b->rsets;mc;mc=mc->next) {
if(b->family==AF_INET) {
bgpq_expand_radb(f,bgpq_expanded_prefix,b,"!i%s,1\n",mc->text);
bgpq_expand_irrd(f,bgpq_expanded_prefix,b,"!i%s,1\n",mc->text);
} else {
if(!pipelining) {
bgpq_expand_ripe(f,bgpq_expanded_v6prefix,b,
"-T route6 -i member-of %s\n",mc->text);
} else {
bgpq_pipeline(f,bgpq_expanded_v6prefix,b,
"-T route6 -i member-of %s\n", mc->text);
};
bgpq_expand_irrd(f,bgpq_expanded_v6prefix,b,"!i%s,1\n",
mc->text);
};
};
for(k=0;k<sizeof(b->asn32s)/sizeof(unsigned char*);k++) {
@ -708,28 +558,26 @@ bgpq_expand(struct bgpq_expander* b)
if(b->family==AF_INET6) {
if(!pipelining) {
if(k>0)
bgpq_expand_ripe(f,bgpq_expanded_v6prefix,b,
"-T route6 -i origin as%u.%u\r\n", k,
i*8+j);
bgpq_expand_irrd(f,bgpq_expanded_v6prefix,b,
"!6as%u.%u\r\n", k, i*8+j);
else
bgpq_expand_ripe(f,bgpq_expanded_v6prefix,b,
"-T route6 -i origin as%u\r\n", i*8+j);
bgpq_expand_irrd(f,bgpq_expanded_v6prefix,b,
"!6as%u\r\n", i*8+j);
} else {
if(k>0)
bgpq_pipeline(f,bgpq_expanded_v6prefix,b,
"-T route6 -i origin as%u.%u\r\n", k,
i*8+j);
"!6as%u.%u\r\n", k, i*8+j);
else
bgpq_pipeline(f,bgpq_expanded_v6prefix,b,
"-T route6 -i origin as%u\r\n", i*8+j);
"!6as%u\r\n", i*8+j);
};
} else {
if(!pipelining) {
if(k>0)
bgpq_expand_radb(f,bgpq_expanded_prefix,b,
bgpq_expand_irrd(f,bgpq_expanded_prefix,b,
"!gas%u.%u\n", k, i*8+j);
else
bgpq_expand_radb(f,bgpq_expanded_prefix,b,
bgpq_expand_irrd(f,bgpq_expanded_prefix,b,
"!gas%u\n", i*8+j);
} else {
if(k>0)
@ -745,11 +593,7 @@ bgpq_expand(struct bgpq_expander* b)
};
};
if(pipelining && b->firstpipe) {
if(b->family==AF_INET6) {
bgpq_pipeline_dequeue_ripe(f,b);
} else {
bgpq_pipeline_dequeue(f,b);
};
bgpq_pipeline_dequeue(f,b);
};
};

18
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for bgpq3 0.1.31.
# Generated by GNU Autoconf 2.69 for bgpq3 0.1.32-rc.
#
# Report bugs to <snar@snar.spb.ru>.
#
@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='bgpq3'
PACKAGE_TARNAME='bgpq3'
PACKAGE_VERSION='0.1.31'
PACKAGE_STRING='bgpq3 0.1.31'
PACKAGE_VERSION='0.1.32-rc'
PACKAGE_STRING='bgpq3 0.1.32-rc'
PACKAGE_BUGREPORT='snar@snar.spb.ru'
PACKAGE_URL=''
@ -1187,7 +1187,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures bgpq3 0.1.31 to adapt to many kinds of systems.
\`configure' configures bgpq3 0.1.32-rc to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1248,7 +1248,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of bgpq3 0.1.31:";;
short | recursive ) echo "Configuration of bgpq3 0.1.32-rc:";;
esac
cat <<\_ACEOF
@ -1327,7 +1327,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
bgpq3 configure 0.1.31
bgpq3 configure 0.1.32-rc
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1495,7 +1495,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by bgpq3 $as_me 0.1.31, which was
It was created by bgpq3 $as_me 0.1.32-rc, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3413,7 +3413,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by bgpq3 $as_me 0.1.31, which was
This file was extended by bgpq3 $as_me 0.1.32-rc, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -3475,7 +3475,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
bgpq3 config.status 0.1.31
bgpq3 config.status 0.1.32-rc
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
configure.in
View File

@ -1,4 +1,4 @@
AC_INIT(bgpq3,0.1.31,snar@snar.spb.ru)
AC_INIT(bgpq3,0.1.32-rc,snar@snar.spb.ru)
AC_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL