diff --git a/CHANGES b/CHANGES index 2ecda4a..a557cd7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +0.1.28 (2015-03-10) + - minor changes: .spec update, non-silent failure on wrong af, + more room for masklen... + 0.1.27 (2015-03-10) - bugfix: some ipv6 prefixes were not parsed correctly since 0.1.26. Thanks to Job Snijders. diff --git a/bgpq3.c b/bgpq3.c index e47aa37..5c52965 100644 --- a/bgpq3.c +++ b/bgpq3.c @@ -414,10 +414,15 @@ main(int argc, char* argv[]) }; } else { char* c = strchr(argv[0], '^'); - if (!c && !bgpq_expander_add_prefix(&expander,argv[0])) + if (!c && !bgpq_expander_add_prefix(&expander,argv[0])) { + sx_report(SX_ERROR, "Unable to add prefix %s (bad prefix or " + "address-family)\n", argv[0]); exit(1); - else if (!bgpq_expander_add_prefix_range(&expander,argv[0])) + } else if (c && !bgpq_expander_add_prefix_range(&expander,argv[0])){ + sx_report(SX_ERROR, "Unable to add prefix-range %s (bad range " + "or address-family)\n", argv[0]); exit(1); + }; }; argv++; argc--; diff --git a/bgpq3.spec b/bgpq3.spec index 254da6f..39d4a0e 100644 --- a/bgpq3.spec +++ b/bgpq3.spec @@ -1,12 +1,12 @@ Name: bgpq3 -Version: 0.1.25 +Version: 0.1.28 Release: 0%{?dist} Group: System/Utilities Summary: Automate BGP filter generation based on routing database information URL: http://snar.spb.ru/prog/bgpq3/ License: BSD -Source0: http://snar.spb.ru/prog/bgpq3/bgpq3-0.1.25.tgz +Source0: http://snar.spb.ru/prog/bgpq3/bgpq3-0.1.28.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 10 Alexandre Snarskii 0.1.28 +- Version updated + * Wed Oct 29 Alexandre Snarskii 0.1.25 - Version updated diff --git a/configure b/configure index ff71282..1a077f6 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.27. +# Generated by GNU Autoconf 2.69 for bgpq3 0.1.28. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bgpq3' PACKAGE_TARNAME='bgpq3' -PACKAGE_VERSION='0.1.27' -PACKAGE_STRING='bgpq3 0.1.27' +PACKAGE_VERSION='0.1.28' +PACKAGE_STRING='bgpq3 0.1.28' 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.27 to adapt to many kinds of systems. +\`configure' configures bgpq3 0.1.28 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.27:";; + short | recursive ) echo "Configuration of bgpq3 0.1.28:";; 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.27 +bgpq3 configure 0.1.28 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.27, which was +It was created by bgpq3 $as_me 0.1.28, 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.27, which was +This file was extended by bgpq3 $as_me 0.1.28, 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.27 +bgpq3 config.status 0.1.28 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index efc7eca..e809264 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(bgpq3,0.1.27,snar@snar.spb.ru) +AC_INIT(bgpq3,0.1.28,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 910c779..10fd4e0 100644 --- a/sx_prefix.c +++ b/sx_prefix.c @@ -52,7 +52,7 @@ sx_prefix_parse(struct sx_prefix* p, int af, char* text) { char* c=NULL; int masklen, ret; - char mtext[INET6_ADDRSTRLEN+1]; + char mtext[INET6_ADDRSTRLEN+5]; strlcpy(mtext, text, sizeof(mtext)); c=strchr(mtext,'/');