mirrors/bgpq4
1
0
Fork 0
mirror of https://github.com/bgp/bgpq4 synced 2025-02-28 08:53:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adjust manpage, make -ARr incompatible with Nokia

Browse Source
This commit is contained in:
Alexandre Snarskii
2017-03-05 20:30:55 +03:00
parent 7308879fc9
commit 765996f26c
4 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bgpq3.8
View File

@@ -38,7 +38,7 @@
.Fl F Ar fmt |
.Fl G Ar asn
.Oc
.Op Fl 2346ABbDdJjsX
.Op Fl 2346ABbDdJjNsX
.Op Fl r Ar len
.Op Fl R Ar len
.Op Fl m Ar max
@@ -74,8 +74,8 @@ enable some debugging output.
.It Fl D
use asdot notation for Cisco as-path access-lists.
.It Fl E
generate extended access-list (Cisco) or policy-statement term using
route-filters (Juniper).
generate extended access-list (Cisco), policy-statement term using
route-filters (Juniper) or [ip|ipv6]-prefix-list (Nokia).
.It Fl f Ar number
generate input as-path access-list.
.It Fl F Ar fmt
@@ -88,15 +88,17 @@ host running IRRD database (default: whois.radb.net).
generate config for Juniper (default: Cisco).
.It Fl j
generate output in JSON format (default: Cisco).
.It Fl l Ar name
name of generated entry.
.It Fl L Ar limit
limit recursion depth when expanding as-sets.
.It Fl m Ar len
maximum prefix-length of accepted prefixes (default: 32 for IPv4 and
128 for IPv6).
.It Fl M Ar match
extra match conditions for Juniper route-filters.
.It Fl l Ar name
name of generated entry.
.It Fl L Ar limit
limit recursion depth when expanding as-sets.
.It Fl N
generate config for Nokia SR OS (Cisco IOS by default).
.It Fl p
accept routes registered for private ASNs (default: disabled)
.It Fl P

22
bgpq3.c
View File

@@ -39,8 +39,9 @@ usage(int ecode)
printf(" -b : generate BIRD output (Cisco IOS by default)\n");
printf(" -d : generate some debugging output\n");
printf(" -D : use asdot notation in as-path (Cisco only)\n");
printf(" -E : generate extended access-list(Cisco) or "
"route-filter(Juniper)\n");
printf(" -E : generate extended access-list(Cisco), "
"route-filter(Juniper) or\n"
" [ip|ipv6]-prefix-list (Nokia)\n");
printf(" -f number : generate input as-path access-list\n");
printf(" -F fmt : generate output in user-defined format\n");
printf(" -G number : generate output as-path access-list\n");
@@ -388,6 +389,12 @@ main(int argc, char* argv[])
exit(1);
};
if(aggregate && expander.vendor==V_NOKIA) {
sx_report(SX_FATAL, "Sorry, aggregation (-A) is not supported on "
"Nokia equipment (-N)\n");
exit(1);
};
if(aggregate && expander.generation<T_PREFIXLIST) {
sx_report(SX_FATAL, "Sorry, aggregation (-A) used only for prefix-"
"lists, extended access-lists and route-filters\n");
@@ -444,6 +451,17 @@ main(int argc, char* argv[])
"Use route-filters (-E) instead\n", refineLow);
};
};
if(expander.vendor==V_NOKIA) {
if(refine) {
sx_report(SX_FATAL, "Sorry, more-specific filters (-R %u) "
"not supported on Nokia (-N)\n", refine);
} else {
sx_report(SX_FATAL, "Sorry, more-specific filters (-r %u) "
"not supported on Nokia (-N)\n", refineLow);
};
};
if(expander.generation<T_PREFIXLIST) {
if(refine) {
sx_report(SX_FATAL, "Sorry, more-specific filter (-R %u) "

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.33.
# Generated by GNU Autoconf 2.69 for bgpq3 0.1.34.
#
# Report bugs to <snar@snar.spb.ru>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='bgpq3'
PACKAGE_TARNAME='bgpq3'
PACKAGE_VERSION='0.1.33'
PACKAGE_STRING='bgpq3 0.1.33'
PACKAGE_VERSION='0.1.34'
PACKAGE_STRING='bgpq3 0.1.34'
PACKAGE_BUGREPORT='snar@snar.spb.ru'
PACKAGE_URL=''
@@ -1228,7 +1228,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.33 to adapt to many kinds of systems.
\`configure' configures bgpq3 0.1.34 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1289,7 +1289,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of bgpq3 0.1.33:";;
short | recursive ) echo "Configuration of bgpq3 0.1.34:";;
esac
cat <<\_ACEOF
@@ -1369,7 +1369,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
bgpq3 configure 0.1.33
bgpq3 configure 0.1.34
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1738,7 +1738,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.33, which was
It was created by bgpq3 $as_me 0.1.34, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4102,7 +4102,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.33, which was
This file was extended by bgpq3 $as_me 0.1.34, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4164,7 +4164,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.33
bgpq3 config.status 0.1.34
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.33,snar@snar.spb.ru)
AC_INIT(bgpq3,0.1.34,snar@snar.spb.ru)
AC_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL