diff --git a/CHANGES b/CHANGES index 98d4e56..bd92892 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +0.1.22 (not tagged yet) + - bugfix: allow network object with stray spaces after prefix length. + Found by Tom Eichhorn in 2620:74:14::/48 (VeriSign Route6, RADB). + 0.1.21 (2014-06-05) - new flag -b: generate prefix-filters for BIRD (http://bird.network.cz), contributed by Job Snijders. diff --git a/configure b/configure index b217775..0bc7309 100755 --- a/configure +++ b/configure @@ -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.21. +# Generated by GNU Autoconf 2.69 for bgpq3 0.1.22. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bgpq3' PACKAGE_TARNAME='bgpq3' -PACKAGE_VERSION='0.1.21' -PACKAGE_STRING='bgpq3 0.1.21' +PACKAGE_VERSION='0.1.22' +PACKAGE_STRING='bgpq3 0.1.22' 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.21 to adapt to many kinds of systems. +\`configure' configures bgpq3 0.1.22 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.21:";; + short | recursive ) echo "Configuration of bgpq3 0.1.22:";; 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.21 +bgpq3 configure 0.1.22 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.21, which was +It was created by bgpq3 $as_me 0.1.22, 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.21, which was +This file was extended by bgpq3 $as_me 0.1.22, 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.21 +bgpq3 config.status 0.1.22 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 63bb29d..9b92cf3 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(bgpq3,0.1.21,snar@snar.spb.ru) +AC_INIT(bgpq3,0.1.22,snar@snar.spb.ru) AC_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL diff --git a/sx_prefix.c b/sx_prefix.c index 75e31f6..10606df 100644 --- a/sx_prefix.c +++ b/sx_prefix.c @@ -2,6 +2,7 @@ #include "config.h" #endif +#include #include #include #include @@ -56,7 +57,7 @@ sx_prefix_parse(struct sx_prefix* p, int af, char* text) char* eod; *c=0; masklen=strtol(c+1,&eod,10); - if(eod[0]) { + if(eod && eod[0] && !isspace(eod[0])) { *c='/'; sx_report(SX_ERROR,"Invalid masklen in prefix %s\n", text); goto fixups;