diff --git a/bgpq3.c b/bgpq3.c index d0f4db4..8b4e1c8 100644 --- a/bgpq3.c +++ b/bgpq3.c @@ -131,7 +131,11 @@ main(int argc, char* argv[]) if(!strncasecmp(argv[0],"AS-",3)) { bgpq_expander_add_asset(&expander,argv[0]); } else if(!strncasecmp(argv[0],"AS",2)) { - bgpq_expander_add_as(&expander,argv[0]); + if(strchr(argv[0],':')) { + bgpq_expander_add_asset(&expander,argv[0]); + } else { + bgpq_expander_add_as(&expander,argv[0]); + }; } else { if(!bgpq_expander_add_prefix(&expander,argv[0])) exit(1); diff --git a/bgpq3.h b/bgpq3.h index 38c20e6..9c42532 100644 --- a/bgpq3.h +++ b/bgpq3.h @@ -26,6 +26,7 @@ struct bgpq_expander { char* name; bgpq_vendor_t vendor; bgpq_gen_t generation; + int identify; }; int bgpq_expander_init(struct bgpq_expander* b, int af); diff --git a/bgpq_expander.c b/bgpq_expander.c index 8ac84cf..4caef96 100644 --- a/bgpq_expander.c +++ b/bgpq_expander.c @@ -358,6 +358,13 @@ bgpq_expand(struct bgpq_expander* b) fwrite(sources,strlen(sources),1,f); }; + if(b->identify) { + char ident[128]; + snprintf(ident,sizeof(ident),"!n" PACKAGE_STRING "\n"); + fseek(f,0,SEEK_END); + fwrite(ident,strlen(ident),1,f); + }; + for(mc=b->macroses;mc;mc=mc->next) { bgpq_expand_radb(f,bgpq_expanded_macro,b,"!i%s,1\n",mc->text); }; diff --git a/configure b/configure index 76295d0..b190041 100755 --- a/configure +++ b/configure @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.59 for bgpq3 0.1. +# +# Report bugs to . # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -265,13 +267,12 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='bgpq3' +PACKAGE_TARNAME='bgpq3' +PACKAGE_VERSION='0.1' +PACKAGE_STRING='bgpq3 0.1' +PACKAGE_BUGREPORT='snar@paranoia.ru' -ac_unique_file="bgpq3.c" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -737,7 +738,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 this package to adapt to many kinds of systems. +\`configure' configures bgpq3 0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -793,7 +794,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of bgpq3 0.1:";; + esac cat <<\_ACEOF Some influential environment variables: @@ -807,6 +810,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to . _ACEOF fi @@ -902,6 +906,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +bgpq3 configure 0.1 +generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -914,7 +920,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by bgpq3 $as_me 0.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1235,6 +1241,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + @@ -2688,7 +2702,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by bgpq3 $as_me 0.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2762,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +bgpq3 config.status 0.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 5363839..cea3260 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(bgpq3.c) +AC_INIT(bgpq3,0.1,snar@paranoia.ru) AC_CONFIG_HEADER(config.h) AC_PROG_CC