v0.1.28, minor changes.

This commit is contained in:
Alexandre Snarskii
2015-03-10 15:43:16 +03:00
parent 190fd07057
commit f795f0ac0e
6 changed files with 27 additions and 15 deletions

View File

@@ -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) 0.1.27 (2015-03-10)
- bugfix: some ipv6 prefixes were not parsed correctly since 0.1.26. - bugfix: some ipv6 prefixes were not parsed correctly since 0.1.26.
Thanks to Job Snijders. Thanks to Job Snijders.

View File

@@ -414,10 +414,15 @@ main(int argc, char* argv[])
}; };
} else { } else {
char* c = strchr(argv[0], '^'); 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); 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); exit(1);
};
}; };
argv++; argv++;
argc--; argc--;

View File

@@ -1,12 +1,12 @@
Name: bgpq3 Name: bgpq3
Version: 0.1.25 Version: 0.1.28
Release: 0%{?dist} Release: 0%{?dist}
Group: System/Utilities Group: System/Utilities
Summary: Automate BGP filter generation based on routing database information Summary: Automate BGP filter generation based on routing database information
URL: http://snar.spb.ru/prog/bgpq3/ URL: http://snar.spb.ru/prog/bgpq3/
License: BSD 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
@@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Mar 10 Alexandre Snarskii <snar@snar.spb.ru> 0.1.28
- Version updated
* Wed Oct 29 Alexandre Snarskii <snar@snar.spb.ru> 0.1.25 * Wed Oct 29 Alexandre Snarskii <snar@snar.spb.ru> 0.1.25
- Version updated - Version updated

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.27. # Generated by GNU Autoconf 2.69 for bgpq3 0.1.28.
# #
# 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.27' PACKAGE_VERSION='0.1.28'
PACKAGE_STRING='bgpq3 0.1.27' PACKAGE_STRING='bgpq3 0.1.28'
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.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]... 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.27:";; short | recursive ) echo "Configuration of bgpq3 0.1.28:";;
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.27 bgpq3 configure 0.1.28
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.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 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.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 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.27 bgpq3 config.status 0.1.28
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\\"

View File

@@ -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_CONFIG_HEADER(config.h)
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL

View File

@@ -52,7 +52,7 @@ sx_prefix_parse(struct sx_prefix* p, int af, char* text)
{ {
char* c=NULL; char* c=NULL;
int masklen, ret; int masklen, ret;
char mtext[INET6_ADDRSTRLEN+1]; char mtext[INET6_ADDRSTRLEN+5];
strlcpy(mtext, text, sizeof(mtext)); strlcpy(mtext, text, sizeof(mtext));
c=strchr(mtext,'/'); c=strchr(mtext,'/');