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

bugfix: no sources in command-line could lead to no source limit sent to IRRd.

Browse Source
This commit is contained in:
Alexandre Snarskii
2015-07-01 17:09:14 +03:00
parent 8a40db107c
commit 0b013b25cb
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
0.1.32-rc2 (2015-06-28)
- bugfix: when no sources provided in command line and via IRRD_SOURCES env,
no source limitation were sent to IRRd. Thanks to Mikhail A. Grishin.
0.1.32-rc (2015-06-28) 0.1.32-rc (2015-06-28)
- bugfix: F source(s) unavailable message from IRRD was ignored. - bugfix: F source(s) unavailable message from IRRD was ignored.
Please note: this error is caught only when all the specified sources Please note: this error is caught only when all the specified sources

3
bgpq3.c
View File

@@ -126,7 +126,8 @@ main(int argc, char* argv[])
unsigned long maxlen=0; unsigned long maxlen=0;
bgpq_expander_init(&expander,af); bgpq_expander_init(&expander,af);
expander.sources=getenv("IRRD_SOURCES"); if (getenv("IRRD_SOURCES"))
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,"2346AbdDES:jJf:l:m:M:W:Ppr:R:G:Th:X"))!=EOF) {
switch(c) { switch(c) {

2
bgpq_expander.c
View File

@@ -521,8 +521,10 @@ bgpq_expand(struct bgpq_expander* b)
if(b->sources && b->sources[0]!=0) { if(b->sources && b->sources[0]!=0) {
char sources[128]; char sources[128];
snprintf(sources,sizeof(sources),"!s%s\n", b->sources); snprintf(sources,sizeof(sources),"!s%s\n", b->sources);
SX_DEBUG(debug_expander,"Requesting sources %s", sources);
fwrite(sources,strlen(sources),1,f); fwrite(sources,strlen(sources),1,f);
fgets(sources,sizeof(sources),f); fgets(sources,sizeof(sources),f);
SX_DEBUG(debug_expander,"Got answer %s", sources);
if(sources[0]!='C') { if(sources[0]!='C') {
sx_report(SX_ERROR, "Invalid source(s) '%s': %s\n", b->sources, sx_report(SX_ERROR, "Invalid source(s) '%s': %s\n", b->sources,
sources); sources);

18
configure vendored
View File

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

2
configure.in
View File

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