From 765996f26c729ffdc1ceaac884be0397fb94a97d Mon Sep 17 00:00:00 2001 From: Alexandre Snarskii Date: Sun, 5 Mar 2017 20:30:55 +0300 Subject: [PATCH] adjust manpage, make -ARr incompatible with Nokia --- bgpq3.8 | 16 +++++++++------- bgpq3.c | 22 ++++++++++++++++++++-- configure | 18 +++++++++--------- configure.in | 2 +- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/bgpq3.8 b/bgpq3.8 index f7410e0..af30243 100644 --- a/bgpq3.8 +++ b/bgpq3.8 @@ -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 diff --git a/bgpq3.c b/bgpq3.c index 84e10d8..fb3e879 100644 --- a/bgpq3.c +++ b/bgpq3.c @@ -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. # @@ -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\\" diff --git a/configure.in b/configure.in index 014722a..50abda6 100644 --- a/configure.in +++ b/configure.in @@ -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