diff --git a/.gitignore b/.gitignore index ddaf6e240ef4..30006f7e2874 100644 --- a/.gitignore +++ b/.gitignore @@ -25,9 +25,8 @@ conftest conftest.err aclocal.m4 Makefile.in -zebra-[0-9.][0-9.][0-9.]*.tar.gz -quagga-[0-9.][0-9.][0-9.]*.tar.gz -quagga-[0-9.][0-9.][0-9.]*.tar.gz.asc +*.tar.gz +*.tar.gz.asc .nfs* libtool .arch-inventory diff --git a/INSTALL.quagga.txt b/INSTALL.quagga.txt deleted file mode 100644 index b414d948614b..000000000000 --- a/INSTALL.quagga.txt +++ /dev/null @@ -1,111 +0,0 @@ --------------------------------------------------------------------------- -Building and Installing Quagga from releases or snapshots: - -The 'INSTALL' file contains generic instructions on how to use 'configure' -scripts. - -Quagga requires a C compiler (and associated header files and -libraries) supporting the C99 standard. - -Quagga requires a reasonable make. It is considered a bug if quagga -does not compile with the system make on recent FreeBSD, NetBSD or -OpenBSD, and a very serious bug if it does not compile with GNU make. - -Quagga expects a POSIX.2 compliant system, more or less. Clean -workarounds for POSIX non-compliance are welcome. - -It is considered a bug if Quagga fails to build and run on any of the -following systems (where .x indicates the most recent release), or -such systems "-current" versions. Or, it might be that this list is -out of date and will be updated. (Note that considering it a bug is -not a guarantee of support, merely "we agree that it is broken".) - - Dragonfly ? - FreeBSD (stable branches currently supported, plus perhaps one) - FreeBSD-current - Linux [kernel/distribution information needed] - NetBSD 4.x - NetBSD 5.x - NetBSD 6.x - NetBSD-current - OpenBSD ? [info needed on what should work] - Solaris (modern/supported versions, including OpenSolaris forks) - -On BSD systems, installing libexecinfo is strongly recommended in order -to get backtrace support. - -For further Quagga specific information on 'configure' and build-time -configuration of the software, please read the Quagga info -documentation, (doc/quagga.info). To read the info page included with -the Quagga sources without first installing Quagga: - - cd doc - # one of the following, depending on your info viewer preferences - info quagga.info - pinfo -r quagga.info - emacs -eval '(info "quagga.info")' - -The Quagga website (http://www.quagga.net) currently has the info -files available in various formats. - --------------------------------------------------------------------------- -Building Quagga from git checkouts: - -In order to build from git, you will need recent versions of several GNU -tools, particularly autoconf, automake, libtool, GNU awk and texinfo. Note -that the CVS snapshots on the Quagga website should not require these tools; -everything is already setup ready to run 'configure'. If you have trouble -building from CVS checkout it is recommended that you try a CVS snapshot -instead. - -We declare that the following versions should work for building from -CVS checkouts. Earlier versions may work, but failure to do so is not -a bug. Required versions can be moved earlier if no problems, or -later after a judgement that a system without a higher version is -deficient is made. - - [TODO: this list is out of date as of 2013-07] - automake: 1.9.6 (released 2005-07-10) - autoconf: 2.59 (2.60 on 2006-06-26 is too recent to require) - libtool: 1.5.22 (released 2005-12-18) - texinfo: 4.7 (released 2004-04-10; 4.8 is not yet common) - -For running tests, one also needs: - - DejaGnu: - -[TODO: texinfo 4.6 is now ancient and this should be revisited/fixed] -Because some systems provide texinfo 4.6 (4.7 is new), quagga.info is -checked in so that texinfo will generally not be invoked. When -texinfo 4.7 is widespread, quagga.info will be removed from CVS and -texinfo will become required again. (4.7 has figure support, needed -for the route server docs, which is why 4.6 doesn't work.) - -In order to create PostScript or PDF versions of the Texinfo documentation, -you will need the convert utility, from the ImageMagick toolset installed, -and epstopdf from the TeTeX suite. - -To create the required autotools files (Makefile.in, configure, etc.), -run "./bootstrap.sh". After this you may run configure as for a -snapshot or release. - -Please refer to "Building and Installing Quagga" above for further -instructions. - --------------------------------------------------------------------------- -Notes on required versions: - -The general goal is to use a modern baseline of tools, while not -imposing pain on those tracking supported (or almost supported) stable -distributions. The notes below explain what versions are present in -various environments. - -NetBSD 4 provides texinfo 4.7. -NetBSD 5 and 6 provides texinfo 4.8 - -Fedora Core ? provides autoconf 2.59. - -OpenBSD 3.6 provides texinfo 4.2. -OpenBSD [3.6] ports provides automake 1.4-p6 autoconf 2.5.9 libtool 1.5.8 - --------------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 7a2cc29bd58b..d8b9844ffc36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \ isisd watchquagga vtysh ospfclient doc m4 pkgsrc redhat tests \ solaris pimd @LIBRFP@ @RFPTEST@ tools cumulus -EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS INSTALL.quagga.txt \ +EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \ update-autotools \ vtysh/Makefile.in vtysh/Makefile.am \ tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \ diff --git a/README b/README index 91a1d8d0fbcd..4476947490b5 100644 --- a/README +++ b/README @@ -3,9 +3,7 @@ protocols. Currently Quagga supports BGP4, BGP4+, OSPFv2, OSPFv3, RIPv1, RIPv2, RIPng, PIM-SSM and LDP as well as very early support for IS-IS. - -See the file INSTALL.quagga.txt for building and installation instructions. - + See the file REPORTING-BUGS to report bugs. - + Quagga is free software. See the file COPYING for copying conditions. diff --git a/README.NetBSD b/README.NetBSD index 6bbc680b95e9..6e454533e581 100755 --- a/README.NetBSD +++ b/README.NetBSD @@ -1,7 +1,5 @@ #!/bin/sh -# $QuaggaId: Format:%an, %ai, %h$ $ - # This file is helpful for building quagga from cvs on NetBSD, and # probably on any system using pkgsrc. # One should have readline installed already (pkgsrc/devel/readline). diff --git a/bgpd/bgp_btoa.c b/bgpd/bgp_btoa.c index cd52c94b1fc5..37bef9b85d72 100644 --- a/bgpd/bgp_btoa.c +++ b/bgpd/bgp_btoa.c @@ -44,9 +44,9 @@ static zebra_capabilities_t _caps_p [] = struct zebra_privs_t bgpd_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 91eacc9320e6..33191f0a982b 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -134,9 +134,9 @@ static zebra_capabilities_t _caps_p [] = struct zebra_privs_t bgpd_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, @@ -174,7 +174,7 @@ redistribution between different routing protocols.\n\n\ -C, --dryrun Check configuration for validity and exit\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit (status); @@ -547,7 +547,7 @@ main (int argc, char **argv) vty_serv_sock (vty_addr, vty_port, BGP_VTYSH_PATH); /* Print banner. */ - zlog_notice ("BGPd %s starting: vty@%d, bgp@%s:%d", QUAGGA_VERSION, + zlog_notice ("BGPd %s starting: vty@%d, bgp@%s:%d", FRR_COPYRIGHT, vty_port, (bm->address ? bm->address : ""), bm->port); diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c index e7272cc0aa44..c9af8419f270 100644 --- a/bgpd/bgp_mpath.c +++ b/bgpd/bgp_mpath.c @@ -1,5 +1,4 @@ -/* $QuaggaId: Format:%an, %ai, %h$ $ - * +/* * BGP Multipath * Copyright (C) 2010 Google Inc. * diff --git a/bgpd/bgp_mpath.h b/bgpd/bgp_mpath.h index 0a51c98d0660..9a38b5943d34 100644 --- a/bgpd/bgp_mpath.h +++ b/bgpd/bgp_mpath.h @@ -1,5 +1,4 @@ -/* $QuaggaId: Format:%an, %ai, %h$ $ - * +/* * BGP Multipath * Copyright (C) 2010 Google Inc. * diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index b0d96150a8fa..5b5fd01abe3d 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -13817,9 +13817,9 @@ DEFUN (show_ip_bgp_instance_peer_group, DEFUN (bgp_redistribute_ipv4, bgp_redistribute_ipv4_cmd, - "redistribute " QUAGGA_IP_REDIST_STR_BGPD, + "redistribute " FRR_IP_REDIST_STR_BGPD, "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD) + FRR_IP_REDIST_HELP_STR_BGPD) { int type; @@ -13835,9 +13835,9 @@ DEFUN (bgp_redistribute_ipv4, DEFUN (bgp_redistribute_ipv4_rmap, bgp_redistribute_ipv4_rmap_cmd, - "redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD", + "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD", "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD + FRR_IP_REDIST_HELP_STR_BGPD "Route map reference\n" "Pointer to route-map entries\n") { @@ -13858,9 +13858,9 @@ DEFUN (bgp_redistribute_ipv4_rmap, DEFUN (bgp_redistribute_ipv4_metric, bgp_redistribute_ipv4_metric_cmd, - "redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295>", + "redistribute " FRR_IP_REDIST_STR_BGPD " metric <0-4294967295>", "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD + FRR_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" "Default metric\n") { @@ -13883,9 +13883,9 @@ DEFUN (bgp_redistribute_ipv4_metric, DEFUN (bgp_redistribute_ipv4_rmap_metric, bgp_redistribute_ipv4_rmap_metric_cmd, - "redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", + "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD + FRR_IP_REDIST_HELP_STR_BGPD "Route map reference\n" "Pointer to route-map entries\n" "Metric for redistributed routes\n" @@ -13911,9 +13911,9 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric, DEFUN (bgp_redistribute_ipv4_metric_rmap, bgp_redistribute_ipv4_metric_rmap_cmd, - "redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", + "redistribute " FRR_IP_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD + FRR_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" "Default metric\n" "Route map reference\n" @@ -14145,10 +14145,10 @@ ALIAS (no_bgp_redistribute_ipv4_ospf, DEFUN (no_bgp_redistribute_ipv4, no_bgp_redistribute_ipv4_cmd, - "no redistribute " QUAGGA_IP_REDIST_STR_BGPD, + "no redistribute " FRR_IP_REDIST_STR_BGPD, NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD) + FRR_IP_REDIST_HELP_STR_BGPD) { int type; @@ -14163,28 +14163,28 @@ DEFUN (no_bgp_redistribute_ipv4, ALIAS (no_bgp_redistribute_ipv4, no_bgp_redistribute_ipv4_rmap_cmd, - "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD", + "no redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD", NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD + FRR_IP_REDIST_HELP_STR_BGPD "Route map reference\n" "Pointer to route-map entries\n") ALIAS (no_bgp_redistribute_ipv4, no_bgp_redistribute_ipv4_metric_cmd, - "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295>", + "no redistribute " FRR_IP_REDIST_STR_BGPD " metric <0-4294967295>", NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD + FRR_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" "Default metric\n") ALIAS (no_bgp_redistribute_ipv4, no_bgp_redistribute_ipv4_rmap_metric_cmd, - "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", + "no redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD + FRR_IP_REDIST_HELP_STR_BGPD "Route map reference\n" "Pointer to route-map entries\n" "Metric for redistributed routes\n" @@ -14192,10 +14192,10 @@ ALIAS (no_bgp_redistribute_ipv4, ALIAS (no_bgp_redistribute_ipv4, no_bgp_redistribute_ipv4_metric_rmap_cmd, - "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", + "no redistribute " FRR_IP_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP_REDIST_HELP_STR_BGPD + FRR_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" "Default metric\n" "Route map reference\n" @@ -14204,9 +14204,9 @@ ALIAS (no_bgp_redistribute_ipv4, #ifdef HAVE_IPV6 DEFUN (bgp_redistribute_ipv6, bgp_redistribute_ipv6_cmd, - "redistribute " QUAGGA_IP6_REDIST_STR_BGPD, + "redistribute " FRR_IP6_REDIST_STR_BGPD, "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD) + FRR_IP6_REDIST_HELP_STR_BGPD) { int type; @@ -14223,9 +14223,9 @@ DEFUN (bgp_redistribute_ipv6, DEFUN (bgp_redistribute_ipv6_rmap, bgp_redistribute_ipv6_rmap_cmd, - "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD", + "redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD", "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD + FRR_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" "Pointer to route-map entries\n") { @@ -14246,9 +14246,9 @@ DEFUN (bgp_redistribute_ipv6_rmap, DEFUN (bgp_redistribute_ipv6_metric, bgp_redistribute_ipv6_metric_cmd, - "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295>", + "redistribute " FRR_IP6_REDIST_STR_BGPD " metric <0-4294967295>", "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD + FRR_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" "Default metric\n") { @@ -14271,9 +14271,9 @@ DEFUN (bgp_redistribute_ipv6_metric, DEFUN (bgp_redistribute_ipv6_rmap_metric, bgp_redistribute_ipv6_rmap_metric_cmd, - "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", + "redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD + FRR_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" "Pointer to route-map entries\n" "Metric for redistributed routes\n" @@ -14299,9 +14299,9 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric, DEFUN (bgp_redistribute_ipv6_metric_rmap, bgp_redistribute_ipv6_metric_rmap_cmd, - "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", + "redistribute " FRR_IP6_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD + FRR_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" "Default metric\n" "Route map reference\n" @@ -14327,10 +14327,10 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap, DEFUN (no_bgp_redistribute_ipv6, no_bgp_redistribute_ipv6_cmd, - "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD, + "no redistribute " FRR_IP6_REDIST_STR_BGPD, NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD) + FRR_IP6_REDIST_HELP_STR_BGPD) { int type; @@ -14346,28 +14346,28 @@ DEFUN (no_bgp_redistribute_ipv6, ALIAS (no_bgp_redistribute_ipv6, no_bgp_redistribute_ipv6_rmap_cmd, - "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD", + "no redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD", NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD + FRR_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" "Pointer to route-map entries\n") ALIAS (no_bgp_redistribute_ipv6, no_bgp_redistribute_ipv6_metric_cmd, - "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295>", + "no redistribute " FRR_IP6_REDIST_STR_BGPD " metric <0-4294967295>", NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD + FRR_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" "Default metric\n") ALIAS (no_bgp_redistribute_ipv6, no_bgp_redistribute_ipv6_rmap_metric_cmd, - "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", + "no redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>", NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD + FRR_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" "Pointer to route-map entries\n" "Metric for redistributed routes\n" @@ -14375,10 +14375,10 @@ ALIAS (no_bgp_redistribute_ipv6, ALIAS (no_bgp_redistribute_ipv6, no_bgp_redistribute_ipv6_metric_rmap_cmd, - "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", + "no redistribute " FRR_IP6_REDIST_STR_BGPD " metric <0-4294967295> route-map WORD", NO_STR "Redistribute information from another routing protocol\n" - QUAGGA_IP6_REDIST_HELP_STR_BGPD + FRR_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" "Default metric\n" "Route map reference\n" diff --git a/configure.ac b/configure.ac index 99b23c5609c9..d0d5fbb19b6c 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ ## -## Configure template file for Quagga. +## Configure template file for FreeRangeRouting. ## autoconf will generate configure script. ## ## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro @@ -7,9 +7,14 @@ ## AC_PREREQ(2.60) -AC_INIT(Quagga, 2.0-rc0, [https://bugzilla.quagga.net]) +AC_INIT(frr, 2.0-rc0, [https://bugzilla.quagga.net]) +PACKAGE_URL="https://freerangerouting.org/" +PACKAGE_FULLNAME="FreeRangeRouting" +AC_SUBST(PACKAGE_FULLNAME) + CONFIG_ARGS="$ac_configure_args" AC_SUBST(CONFIG_ARGS) + AC_CONFIG_SRCDIR(lib/zebra.h) AC_CONFIG_MACRO_DIR([m4]) @@ -234,9 +239,9 @@ AC_ARG_ENABLE(ospfclient, AC_ARG_ENABLE(multipath, AS_HELP_STRING([--enable-multipath=ARG], [enable multipath function, ARG must be digit])) AC_ARG_ENABLE(user, - AS_HELP_STRING([--enable-user=USER], [user to run Quagga suite as (default quagga)])) + AS_HELP_STRING([--enable-user=USER], [user to run FRR suite as (default frr)])) AC_ARG_ENABLE(group, - AS_HELP_STRING([--enable-group=GROUP], [group to run Quagga suite as (default quagga)])) + AS_HELP_STRING([--enable-group=GROUP], [group to run FRR suite as (default frr)])) AC_ARG_ENABLE(vty_group, AS_HELP_STRING([--enable-vty-group=ARG], [set vty sockets to have specified group as owner])) AC_ARG_ENABLE(configfile_mask, @@ -422,18 +427,18 @@ if test x"${enable_user}" = x"no"; then enable_user="" else if test x"${enable_user}" = x"yes" || test x"${enable_user}" = x""; then - enable_user="quagga" + enable_user="frr" fi - AC_DEFINE_UNQUOTED(QUAGGA_USER, "${enable_user}", Quagga User) + AC_DEFINE_UNQUOTED(FRR_USER, "${enable_user}", frr User) fi if test x"${enable_group}" = x"no"; then enable_group="" else if test x"${enable_group}" = x"yes" || test x"${enable_group}" = x""; then - enable_group="quagga" + enable_group="frr" fi - AC_DEFINE_UNQUOTED(QUAGGA_GROUP, "${enable_group}", Quagga Group) + AC_DEFINE_UNQUOTED(FRR_GROUP, "${enable_group}", frr Group) fi if test x"${enable_vty_group}" = x"yes" ; then @@ -511,7 +516,7 @@ AC_CHECK_HEADERS([stropts.h sys/ksym.h \ sys/cdefs.h]) dnl Utility macro to avoid retyping includes all the time -m4_define([QUAGGA_INCLUDES], +m4_define([FRR_INCLUDES], [#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ @@ -538,10 +543,10 @@ dnl Same applies for HAVE_NET_IF_VAR_H, which HAVE_NETINET6_ND6_H and dnl HAVE_NETINET_IN_VAR_H depend upon. But if_var.h depends on if.h, hence dnl an additional round for it. -AC_CHECK_HEADERS([net/if_var.h], [], [], QUAGGA_INCLUDES) +AC_CHECK_HEADERS([net/if_var.h], [], [], FRR_INCLUDES) -m4_define([QUAGGA_INCLUDES], -QUAGGA_INCLUDES +m4_define([FRR_INCLUDES], +FRR_INCLUDES [#if HAVE_NET_IF_VAR_H # include #endif @@ -551,13 +556,13 @@ AC_CHECK_HEADERS([netinet/in_var.h \ net/if_dl.h net/netopt.h \ inet/nd.h netinet/ip_icmp.h \ sys/sysctl.h sys/sockio.h kvm.h sys/conf.h], - [], [], QUAGGA_INCLUDES) + [], [], FRR_INCLUDES) AC_CHECK_HEADERS([ucontext.h], [], [], [#ifndef __USE_GNU #define __USE_GNU #endif /* __USE_GNU */ -QUAGGA_INCLUDES +FRR_INCLUDES ]) m4_define([UCONTEXT_INCLUDES], @@ -572,8 +577,8 @@ AC_CHECK_MEMBERS([ucontext_t.uc_mcontext.regs], AC_CHECK_MEMBERS([ucontext_t.uc_mcontext.gregs], [], [], [UCONTEXT_INCLUDES]) -m4_define([QUAGGA_INCLUDES], -QUAGGA_INCLUDES +m4_define([FRR_INCLUDES], +FRR_INCLUDES [ #include #include @@ -701,13 +706,13 @@ if test "$with_libpam" = "yes"; then AC_DEFINE(PAM_CONV_FUNC,misc_conv,Have misc_conv) pam_conv_func="misc_conv" ], - [], QUAGGA_INCLUDES) + [], FRR_INCLUDES) AC_CHECK_HEADER([security/openpam.h], [AC_DEFINE(HAVE_OPENPAM_H,,Have openpam.h) AC_DEFINE(PAM_CONV_FUNC,openpam_ttyconv,Have openpam_ttyconv) pam_conv_func="openpam_ttyconv" ], - [], QUAGGA_INCLUDES[#include ]) + [], FRR_INCLUDES[#include ]) if test -z "$ac_cv_header_security_pam_misc_h$ac_cv_header_security_openpam_h" ; then AC_MSG_WARN([*** pam support will not be built ***]) with_libpam="no" @@ -795,7 +800,7 @@ AC_CHECK_FUNCS([ \ AC_CHECK_HEADER([asm-generic/unistd.h], [AC_CHECK_DECL(__NR_setns, AC_DEFINE(HAVE_NETNS,, Have netns),, - QUAGGA_INCLUDES [#include + FRR_INCLUDES [#include ]) AC_CHECK_FUNCS(setns)] ) @@ -882,25 +887,25 @@ main() dnl ------------------------------ dnl check kernel route read method dnl ------------------------------ -AC_CACHE_CHECK([route read method], [quagga_cv_rtread_method], +AC_CACHE_CHECK([route read method], [frr_cv_rtread_method], [if test "x$netlink" = xyes; then - quagga_cv_rtread_method="netlink" + frr_cv_rtread_method="netlink" else -for quagga_cv_rtread_method in /dev/ip /dev/null; +for frr_cv_rtread_method in /dev/ip /dev/null; do - test x`ls $quagga_cv_rtread_method 2>/dev/null` = x"$quagga_cv_rtread_method" && break + test x`ls $frr_cv_rtread_method 2>/dev/null` = x"$frr_cv_rtread_method" && break done -case $quagga_cv_rtread_method in +case $frr_cv_rtread_method in "/dev/ip") case "$host" in - *-freebsd*) quagga_cv_rtread_method="sysctl";; - *) quagga_cv_rtread_method="getmsg";; + *-freebsd*) frr_cv_rtread_method="sysctl";; + *) frr_cv_rtread_method="getmsg";; esac;; *) - quagga_cv_rtread_method="sysctl";; + frr_cv_rtread_method="sysctl";; esac fi]) -RTREAD_METHOD=rtread_${quagga_cv_rtread_method}.o +RTREAD_METHOD=rtread_${frr_cv_rtread_method}.o AC_SUBST(RTREAD_METHOD) dnl ----------------------------- @@ -935,7 +940,7 @@ AC_SUBST(IOCTL_METHOD) dnl --------------------------------------------------------------- dnl figure out how to specify an interface in multicast sockets API dnl --------------------------------------------------------------- -AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], [], QUAGGA_INCLUDES) +AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], [], FRR_INCLUDES) AC_CHECK_HEADERS([linux/mroute.h], [], [],[ #include @@ -944,8 +949,8 @@ AC_CHECK_HEADERS([linux/mroute.h], [], [],[ #include ]) -m4_define([QUAGGA_INCLUDES], -QUAGGA_INCLUDES +m4_define([FRR_INCLUDES], +FRR_INCLUDES [#if HAVE_LINUX_MROUTE_H # include #endif @@ -958,8 +963,8 @@ AC_CHECK_HEADERS([netinet/ip_mroute.h], [], [],[ #include ]) -m4_define([QUAGGA_INCLUDES], -QUAGGA_INCLUDES +m4_define([FRR_INCLUDES], +FRR_INCLUDES [#if HAVE_NETINET_IP_MROUTE_H # include #endif @@ -989,14 +994,14 @@ dnl figure out how to check link-state dnl --------------------------------------------------------------- AC_CHECK_HEADER( [net/if_media.h], [m4_define([LINK_DETECT_INCLUDES], - QUAGGA_INCLUDES + FRR_INCLUDES [#include ]) AC_CHECK_MEMBERS( [struct ifmediareq.ifm_status], AC_DEFINE(HAVE_BSD_LINK_DETECT,,[BSD link-detect]), [], LINK_DETECT_INCLUDES)], [], - QUAGGA_INCLUDES) + FRR_INCLUDES) dnl --------------------------------------------------------------- dnl Additional, newer way to check link-state using ifi_link_state. @@ -1004,7 +1009,7 @@ dnl Not available in all BSD's when ifmediareq available dnl --------------------------------------------------------------- AC_CHECK_MEMBERS([struct if_data.ifi_link_state], AC_DEFINE(HAVE_BSD_IFI_LINK_STATE,,[BSD ifi_link_state available]), - [], QUAGGA_INCLUDES) + [], FRR_INCLUDES) dnl ------------------------ dnl TCP_MD5SIG socket option @@ -1012,16 +1017,16 @@ dnl ------------------------ AC_CHECK_HEADER([netinet/tcp.h], [m4_define([MD5_INCLUDES], - QUAGGA_INCLUDES + FRR_INCLUDES [#include ]) AC_CHECK_DECLS([TCP_MD5SIG], [], [], MD5_INCLUDES)], [], - QUAGGA_INCLUDES) + FRR_INCLUDES) if test $ac_cv_have_decl_TCP_MD5SIG = no; then AC_CHECK_HEADER([linux/tcp.h], [m4_define([MD5_INCLUDES], - QUAGGA_INCLUDES + FRR_INCLUDES [#include ]) AC_CHECK_DECLS([TCP_MD5SIG], [], [], MD5_INCLUDES)]) @@ -1030,29 +1035,29 @@ fi dnl ----------------------------- dnl check ipforward detect method dnl ----------------------------- -AC_CACHE_CHECK([ipforward method], [quagga_cv_ipforward_method], +AC_CACHE_CHECK([ipforward method], [frr_cv_ipforward_method], [if test x$cross_compiling = xyes; then if test x"$opsys" = x"gnu-linux"; then - quagga_cv_ipforward_method=/proc/net/snmp + frr_cv_ipforward_method=/proc/net/snmp else - quagga_cv_ipforward_method=/dev/ip + frr_cv_ipforward_method=/dev/ip fi else - for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null; + for frr_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null; do - test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break + test x`ls $frr_cv_ipforward_method 2>/dev/null` = x"$frr_cv_ipforward_method" && break done fi -case $quagga_cv_ipforward_method in - "/proc/net/snmp") quagga_cv_ipforward_method="proc";; +case $frr_cv_ipforward_method in + "/proc/net/snmp") frr_cv_ipforward_method="proc";; "/dev/ip") case "$host" in - *-freebsd*) quagga_cv_ipforward_method="sysctl";; - *) quagga_cv_ipforward_method="solaris";; + *-freebsd*) frr_cv_ipforward_method="sysctl";; + *) frr_cv_ipforward_method="solaris";; esac;; - *) quagga_cv_ipforward_method="sysctl";; + *) frr_cv_ipforward_method="sysctl";; esac]) -IPFORWARD=ipforward_${quagga_cv_ipforward_method}.o +IPFORWARD=ipforward_${frr_cv_ipforward_method}.o AC_SUBST(IPFORWARD) dnl ---------------------------------------------------------------------------- @@ -1100,10 +1105,10 @@ dnl IPv6 header checks dnl ------------------ AC_CHECK_HEADERS([netinet6/in6.h netinet/in6_var.h \ netinet6/in6_var.h netinet6/nd6.h], [], [], - QUAGGA_INCLUDES) + FRR_INCLUDES) -m4_define([QUAGGA_INCLUDES],dnl -QUAGGA_INCLUDES +m4_define([FRR_INCLUDES],dnl +FRR_INCLUDES [#if HAVE_NETINET6_IN6_H #include #endif @@ -1313,14 +1318,14 @@ AC_CHECK_TYPES([ struct ifaliasreq, struct if6_aliasreq, struct in6_aliasreq, struct nd_opt_adv_interval, struct rt_addrinfo, struct nd_opt_homeagent_info, struct nd_opt_adv_interval], - [], [], QUAGGA_INCLUDES) + [], [], FRR_INCLUDES) AC_CHECK_MEMBERS([struct sockaddr.sa_len, struct sockaddr_in.sin_len, struct sockaddr_un.sun_len, struct sockaddr_dl.sdl_len, struct if6_aliasreq.ifra_lifetime, struct nd_opt_adv_interval.nd_opt_ai_type], - [], [], QUAGGA_INCLUDES) + [], [], FRR_INCLUDES) dnl --------------------------- dnl IRDP/pktinfo/icmphdr checks @@ -1332,10 +1337,10 @@ AC_CHECK_TYPES([struct in_pktinfo], fi], [if test "${enable_irdp}" = "yes"; then AC_MSG_ERROR(['IRDP requires in_pktinfo at the moment!']) - fi], [QUAGGA_INCLUDES])], + fi], [FRR_INCLUDES])], [if test "${enable_irdp}" = "yes"; then AC_MSG_ERROR(['IRDP requires in_pktinfo at the moment!']) - fi], [QUAGGA_INCLUDES]) + fi], [FRR_INCLUDES]) dnl ----------------------- dnl checking for IP_PKTINFO @@ -1408,7 +1413,7 @@ dnl -------------------------------------- AC_CHECK_DECL(CLOCK_MONOTONIC, [AC_CHECK_LIB(rt, clock_gettime, [LIBS="$LIBS -lrt"]) AC_DEFINE(HAVE_CLOCK_MONOTONIC,, Have monotonic clock) -], [AC_MSG_RESULT(no)], [QUAGGA_INCLUDES]) +], [AC_MSG_RESULT(no)], [FRR_INCLUDES]) dnl ------------------- dnl capabilities checks @@ -1418,17 +1423,17 @@ if test "${enable_capabilities}" != "no"; then AC_TRY_COMPILE([#include ],[prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);], [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_PR_SET_KEEPCAPS,,prctl) - quagga_ac_keepcaps="yes"], + frr_ac_keepcaps="yes"], AC_MSG_RESULT(no) ) - if test x"${quagga_ac_keepcaps}" = x"yes"; then + if test x"${frr_ac_keepcaps}" = x"yes"; then AC_CHECK_HEADERS(sys/capability.h) fi if test x"${ac_cv_header_sys_capability_h}" = x"yes"; then AC_CHECK_LIB(cap, cap_init, [AC_DEFINE(HAVE_LCAPS,1,Capabilities) LIBCAP="-lcap" - quagga_ac_lcaps="yes"] + frr_ac_lcaps="yes"] ) else AC_CHECK_HEADERS(priv.h, @@ -1436,14 +1441,14 @@ if test "${enable_capabilities}" != "no"; then AC_TRY_COMPILE([#include ],[getpflags(PRIV_AWARE);], [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SOLARIS_CAPABILITIES,1,getpflags) - quagga_ac_scaps="yes"], + frr_ac_scaps="yes"], AC_MSG_RESULT(no) ) ] ) fi - if test x"${quagga_ac_scaps}" = x"yes" \ - -o x"${quagga_ac_lcaps}" = x"yes"; then + if test x"${frr_ac_scaps}" = x"yes" \ + -o x"${frr_ac_lcaps}" = x"yes"; then AC_DEFINE(HAVE_CAPABILITIES,1,capabilities) fi fi @@ -1483,7 +1488,7 @@ AC_CHECK_HEADER([malloc.h], AC_DEFINE(HAVE_MALLINFO,,mallinfo)], AC_MSG_RESULT(no) ) - ], [], QUAGGA_INCLUDES) + ], [], FRR_INCLUDES) dnl ---------- dnl configure date @@ -1508,54 +1513,54 @@ dnl set paths for state directory dnl ------------------------------ AC_MSG_CHECKING(directory to use for state file) if test "${prefix}" = "NONE"; then - quagga_statedir_prefix=""; + frr_statedir_prefix=""; else - quagga_statedir_prefix=${prefix} + frr_statedir_prefix=${prefix} fi if test "${localstatedir}" = '${prefix}/var'; then - for QUAGGA_STATE_DIR in ${quagga_statedir_prefix}/var/run dnl - ${quagga_statedir_prefix}/var/adm dnl - ${quagga_statedir_prefix}/etc dnl + for FRR_STATE_DIR in ${frr_statedir_prefix}/var/run dnl + ${frr_statedir_prefix}/var/adm dnl + ${frr_statedir_prefix}/etc dnl /var/run dnl /var/adm dnl /etc dnl /dev/null; do - test -d $QUAGGA_STATE_DIR && break + test -d $FRR_STATE_DIR && break done - quagga_statedir=$QUAGGA_STATE_DIR + frr_statedir=$FRR_STATE_DIR else - quagga_statedir=${localstatedir} + frr_statedir=${localstatedir} fi -if test $quagga_statedir = "/dev/null"; then +if test $frr_statedir = "/dev/null"; then AC_MSG_ERROR('STATE DIRECTORY NOT FOUND! FIX OR SPECIFY --localstatedir!') fi -AC_MSG_RESULT(${quagga_statedir}) -AC_SUBST(quagga_statedir) - -AC_DEFINE_UNQUOTED(PATH_ZEBRA_PID, "$quagga_statedir/zebra.pid",zebra PID) -AC_DEFINE_UNQUOTED(PATH_RIPD_PID, "$quagga_statedir/ripd.pid",ripd PID) -AC_DEFINE_UNQUOTED(PATH_RIPNGD_PID, "$quagga_statedir/ripngd.pid",ripngd PID) -AC_DEFINE_UNQUOTED(PATH_BGPD_PID, "$quagga_statedir/bgpd.pid",bgpd PID) -AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$quagga_statedir/ospfd.pid",ospfd PID) -AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$quagga_statedir/ospf6d.pid",ospf6d PID) -AC_DEFINE_UNQUOTED(PATH_LDPD_PID, "$quagga_statedir/ldpd.pid",ldpd PID) -AC_DEFINE_UNQUOTED(LDPD_SOCKET, "$quagga_statedir/ldpd.sock",ldpd control socket) -AC_DEFINE_UNQUOTED(PATH_ISISD_PID, "$quagga_statedir/isisd.pid",isisd PID) -AC_DEFINE_UNQUOTED(PATH_PIMD_PID, "$quagga_statedir/pimd.pid",pimd PID) -AC_DEFINE_UNQUOTED(PATH_WATCHQUAGGA_PID, "$quagga_statedir/watchquagga.pid",watchquagga PID) -AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$quagga_statedir/zserv.api",zebra api socket) -AC_DEFINE_UNQUOTED(ZEBRA_VTYSH_PATH, "$quagga_statedir/zebra.vty",zebra vty socket) -AC_DEFINE_UNQUOTED(RIP_VTYSH_PATH, "$quagga_statedir/ripd.vty",rip vty socket) -AC_DEFINE_UNQUOTED(RIPNG_VTYSH_PATH, "$quagga_statedir/ripngd.vty",ripng vty socket) -AC_DEFINE_UNQUOTED(BGP_VTYSH_PATH, "$quagga_statedir/bgpd.vty",bgpd vty socket) -AC_DEFINE_UNQUOTED(OSPF_VTYSH_PATH, "$quagga_statedir/ospfd.vty",ospfd vty socket) -AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$quagga_statedir/ospf6d.vty",ospf6d vty socket) -AC_DEFINE_UNQUOTED(LDP_VTYSH_PATH, "$quagga_statedir/ldpd.vty",ldpd vty socket) -AC_DEFINE_UNQUOTED(ISIS_VTYSH_PATH, "$quagga_statedir/isisd.vty",isisd vty socket) -AC_DEFINE_UNQUOTED(PIM_VTYSH_PATH, "$quagga_statedir/pimd.vty",pimd vty socket) -AC_DEFINE_UNQUOTED(WATCHQUAGGA_VTYSH_PATH, "$quagga_statedir/watchquagga.vty",watchquagga vty socket) -AC_DEFINE_UNQUOTED(DAEMON_VTY_DIR, "$quagga_statedir",daemon vty directory) +AC_MSG_RESULT(${frr_statedir}) +AC_SUBST(frr_statedir) + +AC_DEFINE_UNQUOTED(PATH_ZEBRA_PID, "$frr_statedir/zebra.pid",zebra PID) +AC_DEFINE_UNQUOTED(PATH_RIPD_PID, "$frr_statedir/ripd.pid",ripd PID) +AC_DEFINE_UNQUOTED(PATH_RIPNGD_PID, "$frr_statedir/ripngd.pid",ripngd PID) +AC_DEFINE_UNQUOTED(PATH_BGPD_PID, "$frr_statedir/bgpd.pid",bgpd PID) +AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$frr_statedir/ospfd.pid",ospfd PID) +AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$frr_statedir/ospf6d.pid",ospf6d PID) +AC_DEFINE_UNQUOTED(PATH_LDPD_PID, "$frr_statedir/ldpd.pid",ldpd PID) +AC_DEFINE_UNQUOTED(LDPD_SOCKET, "$frr_statedir/ldpd.sock",ldpd control socket) +AC_DEFINE_UNQUOTED(PATH_ISISD_PID, "$frr_statedir/isisd.pid",isisd PID) +AC_DEFINE_UNQUOTED(PATH_PIMD_PID, "$frr_statedir/pimd.pid",pimd PID) +AC_DEFINE_UNQUOTED(PATH_WATCHQUAGGA_PID, "$frr_statedir/watchquagga.pid",watchquagga PID) +AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$frr_statedir/zserv.api",zebra api socket) +AC_DEFINE_UNQUOTED(ZEBRA_VTYSH_PATH, "$frr_statedir/zebra.vty",zebra vty socket) +AC_DEFINE_UNQUOTED(RIP_VTYSH_PATH, "$frr_statedir/ripd.vty",rip vty socket) +AC_DEFINE_UNQUOTED(RIPNG_VTYSH_PATH, "$frr_statedir/ripngd.vty",ripng vty socket) +AC_DEFINE_UNQUOTED(BGP_VTYSH_PATH, "$frr_statedir/bgpd.vty",bgpd vty socket) +AC_DEFINE_UNQUOTED(OSPF_VTYSH_PATH, "$frr_statedir/ospfd.vty",ospfd vty socket) +AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$frr_statedir/ospf6d.vty",ospf6d vty socket) +AC_DEFINE_UNQUOTED(LDP_VTYSH_PATH, "$frr_statedir/ldpd.vty",ldpd vty socket) +AC_DEFINE_UNQUOTED(ISIS_VTYSH_PATH, "$frr_statedir/isisd.vty",isisd vty socket) +AC_DEFINE_UNQUOTED(PIM_VTYSH_PATH, "$frr_statedir/pimd.vty",pimd vty socket) +AC_DEFINE_UNQUOTED(WATCHQUAGGA_VTYSH_PATH, "$frr_statedir/watchquagga.vty",watchquagga vty socket) +AC_DEFINE_UNQUOTED(DAEMON_VTY_DIR, "$frr_statedir",daemon vty directory) dnl autoconf does this, but it does it too late... test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -1568,6 +1573,18 @@ for I in 1 2 3 4 5 6 7 8 9 10; do done AC_DEFINE_UNQUOTED(VTYSH_BIN_PATH, "$vtysh_bin",path to vtysh binary) +CFG_SYSCONF="$sysconfdir" +CFG_SBIN="$sbindir" +CFG_STATE="$frr_statedir" +for I in 1 2 3 4 5 6 7 8 9 10; do + eval CFG_SYSCONF="\"$CFG_SYSCONF\"" + eval CFG_SBIN="\"$CFG_SBIN\"" + eval CFG_STATE="\"$CFG_STATE\"" +done +AC_SUBST(CFG_SYSCONF) +AC_SUBST(CFG_SBIN) +AC_SUBST(CFG_STATE) + dnl ------------------------------- dnl Quagga sources should always be dnl current wrt interfaces. Dont @@ -1581,7 +1598,7 @@ dnl Check htonl works correctly dnl --------------------------- AC_MSG_CHECKING(for working htonl) AC_CACHE_VAL(ac_cv_htonl_works, - [AC_LINK_IFELSE([AC_LANG_PROGRAM([QUAGGA_INCLUDES],[htonl (0);])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([FRR_INCLUDES],[htonl (0);])], [ac_cv_htonl_works=yes], [ac_cv_htonl_works=no]) ] ) @@ -1602,6 +1619,19 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile redhat/quagga.spec lib/version.h doc/defines.texi + doc/bgpd.8 + doc/isisd.8 + doc/ospf6d.8 + doc/ospfclient.8 + doc/ospfd.8 + doc/ldpd.8 + doc/ripd.8 + doc/ripngd.8 + doc/pimd.8 + doc/vtysh.1 + doc/watchquagga.8 + doc/zebra.8 + doc/quagga.1 pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh]) @@ -1622,21 +1652,21 @@ AC_CONFIG_FILES([vtysh/extract.pl],[chmod +x vtysh/extract.pl]) AC_OUTPUT echo " -Quagga configuration --------------------- -quagga version : ${PACKAGE_VERSION} +FreeRangeRouting configuration +------------------------------ +FRR version : ${PACKAGE_VERSION} host operating system : ${host_os} source code location : ${srcdir} compiler : ${CC} compiler flags : ${CFLAGS} make : ${MAKE-make} linker flags : ${LDFLAGS} ${LIBS} ${LIBCAP} ${LIBREADLINE} ${LIBM} -state file directory : ${quagga_statedir} +state file directory : ${frr_statedir} config file directory : `eval echo \`echo ${sysconfdir}\`` example directory : `eval echo \`echo ${exampledir}\`` -user to run as : ${enable_user} -group to run as : ${enable_group} -group for vty sockets : ${enable_vty_group} +user to run as : ${enable_user} +group to run as : ${enable_group} +group for vty sockets : ${enable_vty_group} config file mask : ${enable_configfile_mask} log file mask : ${enable_logfile_mask} zebra protobuf enabled : ${have_protobuf:-no} diff --git a/doc/Makefile.am b/doc/Makefile.am index d5db6cf49770..ab2657bba496 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -124,8 +124,21 @@ man_MANS += zebra.8 endif EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt \ - bgpd.8 isisd.8 ospf6d.8 ospfclient.8 ospfd.8 ldpd.8 ripd.8 \ - ripngd.8 pimd.8 vtysh.1 watchquagga.8 zebra.8 quagga.1 \ + \ + bgpd.8.in \ + isisd.8.in \ + ospf6d.8.in \ + ospfclient.8.in \ + ospfd.8.in \ + ldpd.8.in \ + ripd.8.in \ + ripngd.8.in \ + pimd.8.in \ + vtysh.1.in \ + watchquagga.8.in \ + zebra.8.in \ + quagga.1.in \ + \ mpls/ChangeLog.opaque.txt mpls/cli_summary.txt \ mpls/opaque_lsa.txt mpls/ospfd.conf \ $(figures_sources) $(figures_png) $(figures_txt) diff --git a/doc/bgpd.8 b/doc/bgpd.8.in similarity index 79% rename from doc/bgpd.8 rename to doc/bgpd.8.in index 7e90eaec5b30..7047744635ff 100644 --- a/doc/bgpd.8 +++ b/doc/bgpd.8.in @@ -1,7 +1,6 @@ -.TH BGPD 8 "25 November 2004" "Quagga BGPD daemon" "Version 0.97.3" +.TH BGPD 8 "25 November 2004" "@PACKAGE_FULLNAME@ BGPD daemon" "Version @PACKAGE_VERSION@" .SH NAME -bgpd \- a BGPv4, BGPv4\+, BGPv4\- routing engine for use with Quagga routing -software +bgpd \- a BGPv4, BGPv4\+, BGPv4\- routing engine for use with @PACKAGE_FULLNAME@. .SH SYNOPSIS .B bgpd @@ -32,7 +31,7 @@ software .SH DESCRIPTION .B bgpd is a routing component that works with the -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -44,10 +43,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/bgpd.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/bgpd.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -55,7 +54,7 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When bgpd starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart bgpd. The likely default is \fB\fI/var/run/bgpd.pid\fR. +restart bgpd. The default is \fB\fI@CFG_STATE@/bgpd.pid\fR. .TP \fB\-p\fR, \fB\-\-bgp_port \fR\fIbgp-port-number\fR Set the port that bgpd will listen to for bgp data. @@ -69,7 +68,7 @@ Specify the address that the bgpd VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-r\fR, \fB\-\-retain\fR When the program terminates, retain routes added by \fBbgpd\fR. @@ -81,12 +80,12 @@ Skip setting the process effective user and group. Print the version and exit. .SH FILES .TP -.BI /usr/lib/quagga/bgpd +.BI @CFG_SBIN@/bgpd The default location of the .B bgpd binary. .TP -.BI /etc/quagga/bgpd.conf +.BI @CFG_SYSCONF@/bgpd.conf The default location of the .B bgpd config file. @@ -98,7 +97,7 @@ process is config'd to output logs to a file, then you will find this file in the directory where you started \fBbgpd\fR. .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH DIAGNOSTICS The bgpd process may log to standard output, to a VTY, to a log file, or through syslog to the system logs. \fBbgpd\fR supports many @@ -114,11 +113,11 @@ debugging options, see the Info file, or the source for details. .SH BUGS .B bgpd eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See .BI http://www.zebra.org and -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/doc/defines.texi.in b/doc/defines.texi.in index 5436f20c3645..43d744293967 100644 --- a/doc/defines.texi.in +++ b/doc/defines.texi.in @@ -10,7 +10,9 @@ @set COPYRIGHT_STR Copyright @copyright{} @value{COPYRIGHT_YEAR} @value{AUTHORS} @c These may vary with installation environment. -@set INSTALL_PREFIX_ETC /etc/quagga -@set INSTALL_PREFIX_SBIN /usr/sbin -@set INSTALL_PREFIX_STATE /var/run/quagga +@set INSTALL_PREFIX_ETC @CFG_SYSCONF@ +@set INSTALL_PREFIX_SBIN @CFG_SBIN@ +@set INSTALL_PREFIX_STATE @CFG_STATE@ +@set INSTALL_USER @enable_user@ +@set INSTALL_GROUP @enable_group@ @set INSTALL_VTY_GROUP @enable_vty_group@ diff --git a/doc/isisd.8 b/doc/isisd.8.in similarity index 79% rename from doc/isisd.8 rename to doc/isisd.8.in index 83ac99d57a4e..9ffcbc618d95 100644 --- a/doc/isisd.8 +++ b/doc/isisd.8.in @@ -1,6 +1,6 @@ -.TH IS-IS 8 "25 November 2004" "Quagga IS-IS daemon" "Version 0.97.3" +.TH IS-IS 8 "25 November 2004" "@PACKAGE_FULLNAME@ IS-IS daemon" "Version @PACKAGE_VERSION@" .SH NAME -isisd \- an IS-IS routing engine for use with Quagga routing software. +isisd \- an IS-IS routing engine for use with @PACKAGE_FULLNAME@. .SH SYNOPSIS .B isisd [ @@ -27,7 +27,7 @@ isisd \- an IS-IS routing engine for use with Quagga routing software. .SH DESCRIPTION .B isisd is a routing component that works with the -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -39,10 +39,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/isisd.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/isisd.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -50,7 +50,7 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When isisd starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart isisd. The likely default is \fB\fI/var/run/isisd.pid\fR. +restart isisd. The default is \fB\fI@CFG_STATE@/isisd.pid\fR. .TP \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR Specify the port that the isisd VTY will listen on. This defaults to @@ -61,18 +61,18 @@ Specify the address that the isisd VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-v\fR, \fB\-\-version\fR Print the version and exit. .SH FILES .TP -.BI /usr/lib/quagga/isisd +.BI @CFG_SBIN@/isisd The default location of the .B isisd binary. .TP -.BI /etc/quagga/isisd.conf +.BI @CFG_SYSCONF@/isisd.conf The default location of the .B isisd config file. @@ -84,7 +84,7 @@ process is config'd to output logs to a file, then you will find this file in the directory where you started \fBisisd\fR. .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH DIAGNOSTICS The isisd process may log to standard output, to a VTY, to a log file, or through syslog to the system logs. \fBisisd\fR supports many @@ -103,7 +103,7 @@ production use. .B isisd eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See .BI http://isisd.sourceforge.net diff --git a/doc/ldpd.8 b/doc/ldpd.8.in similarity index 78% rename from doc/ldpd.8 rename to doc/ldpd.8.in index 092ff39d4953..1683de46ca39 100644 --- a/doc/ldpd.8 +++ b/doc/ldpd.8.in @@ -1,6 +1,6 @@ -.TH LDPD 8 "29 March 2016" "Quagga LDP daemon" "Version 1.0.20160309" +.TH LDPD 8 "29 March 2016" "@PACKAGE_FULLNAME@ LDP daemon" "Version @PACKAGE_VERSION@" .SH NAME -ldpd \- an LDP engine for use with Quagga routing software. +ldpd \- an LDP engine for use with @PACKAGE_FULLNAME@. .SH SYNOPSIS .B ldpd [ @@ -27,7 +27,7 @@ ldpd \- an LDP engine for use with Quagga routing software. .SH DESCRIPTION .B ldpd is a component that works with the -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -39,10 +39,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/ldpd.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/ldpd.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -50,7 +50,7 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When ldpd starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart ldpd. The likely default is \fB\fI/var/run/ldpd.pid\fR. +restart ldpd. The default is \fB\fI@CFG_STATE@/ldpd.pid\fR. .TP \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR Specify the port that the ldpd VTY will listen on. This defaults to @@ -61,18 +61,18 @@ Specify the address that the ldpd VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-v\fR, \fB\-\-version\fR Print the version and exit. .SH FILES .TP -.BI /usr/local/sbin/ldpd +.BI @CFG_SBIN@/ldpd The default location of the .B ldpd binary. .TP -.BI /usr/local/etc/ldpd.conf +.BI @CFG_SYSCONF@/ldpd.conf The default location of the .B ldpd config file. @@ -84,7 +84,7 @@ process is config'd to output logs to a file, then you will find this file in the directory where you started \fBldpd\fR. .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH DIAGNOSTICS The ldpd process may log to standard output, to a VTY, to a log file, or through syslog to the system logs. \fBldpd\fR supports many @@ -101,9 +101,9 @@ debugging options, see the Info file, or the source for details. .SH BUGS .B ldpd eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/doc/ospf6d.8 b/doc/ospf6d.8.in similarity index 77% rename from doc/ospf6d.8 rename to doc/ospf6d.8.in index 630b20afdd36..7f94782bea9e 100644 --- a/doc/ospf6d.8 +++ b/doc/ospf6d.8.in @@ -1,6 +1,6 @@ -.TH OSPF6D 8 "25 November 2004" "Quagga OSPFv3 daemon" "Version 0.97.3" +.TH OSPF6D 8 "25 November 2004" "@PACKAGE_FULLNAME@ OSPFv3 daemon" "Version @PACKAGE_VERSION@" .SH NAME -ospf6d \- an OSPFv3 routing engine for use with Quagga routing software. +ospf6d \- an OSPFv3 routing engine for use with @PACKAGE_FULLNAME@. .SH SYNOPSIS .B ospf6d [ @@ -27,7 +27,7 @@ ospf6d \- an OSPFv3 routing engine for use with Quagga routing software. .SH DESCRIPTION .B ospf6d is a routing component that works with the -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -40,10 +40,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/ospf6d.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/ospf6d.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -51,7 +51,7 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When ospf6d starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart ospf6d. The likely default is \fB\fI/var/run/ospf6d.pid\fR. +restart ospf6d. The default is \fB\fI@CFG_STATE@/ospf6d.pid\fR. .TP \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR Specify the port that the ospf6d VTY will listen on. This defaults to @@ -62,18 +62,18 @@ Specify the address that the ospf6d VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-v\fR, \fB\-\-version\fR Print the version and exit. .SH FILES .TP -.BI /usr/lib/quagga/ospf6d +.BI @CFG_SBIN@/ospf6d The default location of the .B ospf6d binary. .TP -.BI /etc/quagga/ospf6d.conf +.BI @CFG_SYSCONF@/ospf6d.conf The default location of the .B ospf6d config file. @@ -85,7 +85,7 @@ process is config'd to output logs to a file, then you will find this file in the directory where you started \fBospf6d\fR. .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH DIAGNOSTICS The ospf6d process may log to standard output, to a VTY, to a log file, or through syslog to the system logs. \fBospf6d\fR supports many @@ -101,11 +101,11 @@ debugging options, see the Info file, or the source for details. .SH BUGS .B ospf6d eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See .BI http://www.zebra.org and -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/doc/ospfclient.8 b/doc/ospfclient.8.in similarity index 94% rename from doc/ospfclient.8 rename to doc/ospfclient.8.in index ccfad1aad074..fb996a541fa8 100644 --- a/doc/ospfclient.8 +++ b/doc/ospfclient.8.in @@ -39,4 +39,4 @@ Area in the IP address format for type 10, otherwise it will be ignored. .SH "SEE ALSO" .BR ospfd (8). .SH AUTHORS -See the project homepage at . +See the project homepage at <@PACKAGE_URL@>. diff --git a/doc/ospfd.8 b/doc/ospfd.8.in similarity index 78% rename from doc/ospfd.8 rename to doc/ospfd.8.in index ba8848affa40..1b86551ca527 100644 --- a/doc/ospfd.8 +++ b/doc/ospfd.8.in @@ -1,6 +1,6 @@ -.TH OSPFD 8 "25 November 2004" "Quagga OSPFv2 daemon" "Version 0.97.3" +.TH OSPFD 8 "25 November 2004" "@PACKAGE_FULLNAME@ OSPFv2 daemon" "Version @PACKAGE_VERSION@" .SH NAME -ospfd \- an OSPFv2 routing engine for use with Quagga routing software. +ospfd \- an OSPFv2 routing engine for use with @PACKAGE_FULLNAME@. .SH SYNOPSIS .B ospfd [ @@ -27,7 +27,7 @@ ospfd \- an OSPFv2 routing engine for use with Quagga routing software. .SH DESCRIPTION .B ospfd is a routing component that works with the -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -39,10 +39,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/ospfd.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/ospfd.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -50,7 +50,7 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When ospfd starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart ospfd. The likely default is \fB\fI/var/run/ospfd.pid\fR. +restart ospfd. The default is \fB\fI@CFG_STATE@/ospfd.pid\fR. .TP \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR Specify the port that the ospfd VTY will listen on. This defaults to @@ -61,7 +61,7 @@ Specify the address that the ospfd VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-a\fR, \fB\-\-apiserver \fR Enable OSPF apiserver. Default is disabled. @@ -70,12 +70,12 @@ Enable OSPF apiserver. Default is disabled. Print the version and exit. .SH FILES .TP -.BI /usr/lib/quagga/ospfd +.BI @CFG_SBIN@/ospfd The default location of the .B ospfd binary. .TP -.BI /etc/quagga/ospfd.conf +.BI @CFG_SYSCONF@/ospfd.conf The default location of the .B ospfd config file. @@ -87,7 +87,7 @@ process is config'd to output logs to a file, then you will find this file in the directory where you started \fBospfd\fR. .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH DIAGNOSTICS The ospfd process may log to standard output, to a VTY, to a log file, or through syslog to the system logs. \fBospfd\fR supports many @@ -103,11 +103,11 @@ debugging options, see the Info file, or the source for details. .SH BUGS .B ospfd eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See .BI http://www.zebra.org and -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/doc/pimd.8 b/doc/pimd.8.in similarity index 81% rename from doc/pimd.8 rename to doc/pimd.8.in index 0dd170a2cd93..60b844b1e7db 100644 --- a/doc/pimd.8 +++ b/doc/pimd.8.in @@ -1,6 +1,6 @@ -.TH PIM 8 "10 December 2008" "Quagga PIM daemon" "Version 0.99.11" +.TH PIM 8 "10 December 2008" "@PACKAGE_FULLNAME@ PIM daemon" "Version @PACKAGE_VERSION@" .SH NAME -pimd \- a PIM routing for use with Quagga Routing Suite. +pimd \- a PIM routing for use with @PACKAGE_FULLNAME@. .SH SYNOPSIS .B pimd [ @@ -30,7 +30,7 @@ pimd \- a PIM routing for use with Quagga Routing Suite. .SH DESCRIPTION .B pimd is a protocol-independent multicast component that works with the -.B Quagga +.B @PACKAGE_FULLNAME@ Routing Suite. .SH OPTIONS Options available for the @@ -42,10 +42,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/pimd.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/pimd.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -53,11 +53,11 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When pimd starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart pimd. The likely default is \fB\fI/var/run/pimd.pid\fR. +restart pimd. The default is \fB\fI@CFG_STATE@/pimd.pid\fR. .TP \fB\-z\fR, \fB\-\-socket \fR\fIpath\fR Specify the socket path for contacting the zebra daemon. -The likely default is \fB\fI/var/run/zserv.api\fR. +The default is \fB\fI@CFG_STATE@/zserv.api\fR. .TP \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR Specify the port that the pimd VTY will listen on. This defaults to @@ -68,7 +68,7 @@ Specify the address that the pimd VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-v\fR, \fB\-\-version\fR Print the version and exit. @@ -77,22 +77,22 @@ Print the version and exit. Enable logging information for zclient debugging. .SH FILES .TP -.BI /usr/local/sbin/pimd +.BI @CFG_SBIN@/pimd The default location of the .B pimd binary. .TP -.BI /usr/local/etc/pimd.conf +.BI @CFG_SYSCONF@/pimd.conf The default location of the .B pimd config file. .TP -.BI /var/run/pimd.pid +.BI @CFG_STATE@/pimd.pid The default location of the .B pimd pid file. .TP -.BI /var/run/zserv.api +.BI @CFG_STATE@/zserv.api The default location of the .B zebra unix socket file. diff --git a/doc/quagga.1 b/doc/quagga.1.in similarity index 82% rename from doc/quagga.1 rename to doc/quagga.1.in index 35e8b30bf518..040187200fbb 100644 --- a/doc/quagga.1 +++ b/doc/quagga.1.in @@ -1,4 +1,4 @@ -.TH Quagga 1 "27 July 2006" "Quagga Systemd Script" "Version 0.99.23.1" +.TH Quagga 1 "27 July 2006" "@PACKAGE_FULLNAME@ Systemd Script" "Version @PACKAGE_VERSION@" .SH NAME quagga \- a systemd interaction script .SH SYNOPSIS @@ -28,9 +28,9 @@ quagga \- a systemd interaction script ] .br .SH DESCRIPTION -.B Quagga +.B @PACKAGE_NAME@ is a systemd interaction script for the -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -57,9 +57,9 @@ Status of all the daemons .SH BUGS .B quagga eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/doc/ripd.8 b/doc/ripd.8.in similarity index 79% rename from doc/ripd.8 rename to doc/ripd.8.in index f042af228b2a..6db5ac3649b1 100644 --- a/doc/ripd.8 +++ b/doc/ripd.8.in @@ -1,6 +1,6 @@ -.TH RIPD 8 "25 November 2004" "Quagga RIP daemon" "Version 0.97.3" +.TH RIPD 8 "25 November 2004" "@PACKAGE_FULLNAME@ RIP daemon" "Version @PACKAGE_VERSION@" .SH NAME -ripd \- a RIP routing engine for use with Quagga routing software. +ripd \- a RIP routing engine for use with @PACKAGE_FULLNAME@. .SH SYNOPSIS .B ripd [ @@ -27,7 +27,7 @@ ripd \- a RIP routing engine for use with Quagga routing software. .SH DESCRIPTION .B ripd is a routing component that works with the -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -40,10 +40,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/ripd.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/ripd.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -51,7 +51,7 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When ripd starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart ripd. The likely default is \fB\fI/var/run/ripd.pid\fR. +restart ripd. The default is \fB\fI@CFG_STATE@/ripd.pid\fR. .TP \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR Specify the port that the ripd VTY will listen on. This defaults to @@ -62,7 +62,7 @@ Specify the address that the ripd VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-r\fR, \fB\-\-retain\fR When the program terminates, retain routes added by \fBripd\fR. @@ -71,12 +71,12 @@ When the program terminates, retain routes added by \fBripd\fR. Print the version and exit. .SH FILES .TP -.BI /usr/lib/quagga/ripd +.BI @CFG_SBIN@/ripd The default location of the .B ripd binary. .TP -.BI /etc/quagga/ripd.conf +.BI @CFG_SYSCONF@/ripd.conf The default location of the .B ripd config file. @@ -88,7 +88,7 @@ process is config'd to output logs to a file, then you will find this file in the directory where you started \fBripd\fR. .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH DIAGNOSTICS The ripd process may log to standard output, to a VTY, to a log file, or through syslog to the system logs. \fBripd\fR supports many @@ -104,10 +104,10 @@ debugging options, see the Info file, or the source for details. .SH BUGS .B ripd eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See .BI http://www.zebra.org and -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/doc/ripngd.8 b/doc/ripngd.8.in similarity index 78% rename from doc/ripngd.8 rename to doc/ripngd.8.in index e4504fde46e5..4c5f2bb1149b 100644 --- a/doc/ripngd.8 +++ b/doc/ripngd.8.in @@ -1,6 +1,6 @@ -.TH RIPNGD 8 "25 November 2004" "Quagga RIPNG daemon" "Version 0.97.3" +.TH RIPNGD 8 "25 November 2004" "@PACKAGE_FULLNAME@ RIPNG daemon" "Version @PACKAGE_VERSION@" .SH NAME -ripngd \- a RIPNG routing engine for use with Quagga routing software. +ripngd \- a RIPNG routing engine for use with @PACKAGE_FULLNAME@. .SH SYNOPSIS .B ripngd [ @@ -27,7 +27,7 @@ ripngd \- a RIPNG routing engine for use with Quagga routing software. .SH DESCRIPTION .B ripngd is a routing component that works with the -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -40,10 +40,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/ripngd.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/ripngd.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -51,7 +51,7 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When ripngd starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart ripngd. The likely default is \fB\fI/var/run/ripngd.pid\fR. +restart ripngd. The default is \fB\fI@CFG_STATE@/ripngd.pid\fR. .TP \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR Specify the port that the ripngd VTY will listen on. This defaults to @@ -62,7 +62,7 @@ Specify the address that the ripngd VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-r\fR, \fB\-\-retain\fR When the program terminates, retain routes added by \fBripd\fR. @@ -71,12 +71,12 @@ When the program terminates, retain routes added by \fBripd\fR. Print the version and exit. .SH FILES .TP -.BI /usr/lib/quagga/ripngd +.BI @CFG_SBIN@/ripngd The default location of the .B ripngd binary. .TP -.BI /etc/quagga/ripngd.conf +.BI @CFG_SYSCONF@/ripngd.conf The default location of the .B ripngd config file. @@ -88,7 +88,7 @@ process is config'd to output logs to a file, then you will find this file in the directory where you started \fBripngd\fR. .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH DIAGNOSTICS The ripngd process may log to standard output, to a VTY, to a log file, or through syslog to the system logs. \fBripngd\fR supports many @@ -104,11 +104,11 @@ debugging options, see the Info file, or the source for details. .SH BUGS .B ripngd eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See .BI http://www.zebra.org and -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/doc/vtysh.1 b/doc/vtysh.1.in similarity index 76% rename from doc/vtysh.1 rename to doc/vtysh.1.in index d144cb642127..35a05709eb01 100644 --- a/doc/vtysh.1 +++ b/doc/vtysh.1.in @@ -1,6 +1,6 @@ -.TH VTYSH 1 "27 July 2006" "Quagga VTY shell" "Version 0.96.5" +.TH VTYSH 1 "27 July 2006" "@PACKAGE_FULLNAME@ VTY shell" "Version @PACKAGE_VERSION@" .SH NAME -vtysh \- a integrated shell for Quagga routing software +vtysh \- a integrated shell for @PACKAGE_FULLNAME@. .SH SYNOPSIS .B vtysh [ @@ -21,7 +21,7 @@ vtysh \- a integrated shell for Quagga routing software .SH DESCRIPTION .B vtysh is a integrated shell for -.B Quagga +.B @PACKAGE_FULLNAME@ routing engine. .SH OPTIONS Options available for the @@ -29,8 +29,8 @@ Options available for the command: .IP "\fB\-b, \-\-boot\fP" Execute boot startup configuration. It makes sense only if integrated config -file is in use (not default in Quagga). See Info file \fBQuagga\fR for more -info. +file is in use (not default in @PACKAGE_FULLNAME@). See Info file +\fB@PACKAGE_NAME@\fR for more info. .IP "\fB\-c, \-\-command \fIcommand\fP" Specify command to be executed under batch mode. It behaves like -c option in any other shell - @@ -39,7 +39,7 @@ is executed and .B vtysh exits. -It's useful for gathering info from Quagga routing software or reconfiguring +It's useful for gathering info from @PACKAGE_FULLNAME@ daemons or reconfiguring daemons from inside shell scripts, etc. Note that multiple commands may be executed by using more than one -c option and/or embedding linefeed characters inside the @@ -48,7 +48,7 @@ string. .IP "\fB\-d, \-\-daemon \fIdaemon_name\fP" Specify which daemon to connect to. By default, .B vtysh -attempts to connect to all Quagga daemons running on the system. With this +attempts to connect to all @PACKAGE_FULLNAME@ daemons running on the system. With this flag, one can specify a single daemon to connect to instead. For example, specifying '-d ospfd' will connect only to ospfd. This can be particularly useful inside scripts with -c where the command is targeted for a single daemon. @@ -68,20 +68,20 @@ Display a usage message on standard output and exit. This should be the name of the pager to use. Default is \fBmore\fR. .SH FILES .TP -.BI /etc/quagga/vtysh.conf +.BI @CFG_SYSCONF@/vtysh.conf The default location of the .B vtysh config file. .TP -.BI /etc/quagga/Quagga.conf -The default location of the integrated Quagga routing engine config file +.BI @CFG_SYSCONF@/Quagga.conf +The default location of the integrated @PACKAGE_FULLNAME@ routing engine config file if integrated config file is in use (not default). .TP .BI ${HOME}/.history_quagga Location of history of commands entered via cli .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH "SEE ALSO" .BR bgpd (8), .BR ripd (8), @@ -93,11 +93,11 @@ options. The definitive document is the Info file \fBQuagga\fR. .SH BUGS .B vtysh eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See .BI http://www.zebra.org and -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/doc/watchquagga.8 b/doc/watchquagga.8.in similarity index 99% rename from doc/watchquagga.8 rename to doc/watchquagga.8.in index ca9916461eff..a7249b837633 100644 --- a/doc/watchquagga.8 +++ b/doc/watchquagga.8.in @@ -226,6 +226,6 @@ Display the usage information and exit. .BR ripd (8), .BR ripngd (8) .PP -See the project homepage at . +See the project homepage at <@PACKAGE_URL@>. .SH AUTHORS Copyright 2004 Andrew J. Schorr diff --git a/doc/zebra.8 b/doc/zebra.8.in similarity index 84% rename from doc/zebra.8 rename to doc/zebra.8.in index cb431da0aadd..e7d00e10a3ef 100644 --- a/doc/zebra.8 +++ b/doc/zebra.8.in @@ -1,6 +1,6 @@ -.TH ZEBRA 8 "25 November 2004" "Zebra daemon" "Version 0.97.3" +.TH ZEBRA 8 "25 November 2004" "Zebra daemon" "Version @PACKAGE_VERSION@" .SH NAME -zebra \- a routing manager for use with associated Quagga components. +zebra \- a routing manager for use with associated @PACKAGE_FULLNAME@ components. .SH SYNOPSIS .B zebra [ @@ -44,10 +44,10 @@ Runs in daemon mode, forking and exiting from tty. .TP \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR Specifies the config file to use for startup. If not specified this -option will likely default to \fB\fI/usr/local/etc/zebra.conf\fR. +option will default to \fB\fI@CFG_SYSCONF@/zebra.conf\fR. .TP \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR -Specify the group to run as. Default is \fIquagga\fR. +Specify the group to run as. Default is \fI@enable_group@\fR. .TP \fB\-h\fR, \fB\-\-help\fR A brief message. @@ -55,7 +55,7 @@ A brief message. \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR When zebra starts its process identifier is written to \fB\fIpid-file\fR. The init system uses the recorded PID to stop or -restart zebra. The likely default is \fB\fI/var/run/zebra.pid\fR. +restart zebra. The default is \fB\fI@CFG_STATE@/zebra.pid\fR. .TP \fB\-k\fR, \fB\-\-keep_kernel\fR On startup, don't delete self inserted routes. @@ -69,7 +69,7 @@ Specify the address that the zebra VTY will listen on. Default is all interfaces. .TP \fB\-u\fR, \fB\-\-user \fR\fIuser\fR -Specify the user to run as. Default is \fIquagga\fR. +Specify the user to run as. Default is \fI@enable_user@\fR. .TP \fB\-r\fR, \fB\-\-retain\fR When the program terminates, retain routes added by \fBzebra\fR. @@ -90,12 +90,12 @@ Note that this affects Linux only. Print the version and exit. .SH FILES .TP -.BI /usr/lib/quagga/zebra +.BI @CFG_SBIN@/zebra The default location of the .B zebra binary. .TP -.BI /etc/quagga/zebra.conf +.BI @CFG_SYSCONF@/zebra.conf The default location of the .B zebra config file. @@ -107,7 +107,7 @@ process is config'd to output logs to a file, then you will find this file in the directory where you started \fBzebra\fR. .SH WARNING This man page is intended to be a quick reference for command line -options. The definitive document is the Info file \fBQuagga\fR. +options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR. .SH DIAGNOSTICS The zebra process may log to standard output, to a VTY, to a log file, or through syslog to the system logs. \fBzebra\fR supports many @@ -123,11 +123,11 @@ debugging options, see the Info file, or the source for details. .SH BUGS .B zebra eats bugs for breakfast. If you have food for the maintainers try -.BI http://bugzilla.quagga.net +.BI @PACKAGE_BUGREPORT@ .SH AUTHORS See .BI http://www.zebra.org and -.BI http://www.quagga.net +.BI @PACKAGE_URL@ or the Info file for an accurate list of authors. diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 84ebf8ceaa99..f34be99eca79 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -66,11 +66,11 @@ zebra_capabilities_t _caps_p[] = { }; struct zebra_privs_t isisd_privs = { -#if defined(QUAGGA_USER) - .user = QUAGGA_USER, +#if defined(FRR_USER) + .user = FRR_USER, #endif -#if defined QUAGGA_GROUP - .group = QUAGGA_GROUP, +#if defined FRR_GROUP + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, @@ -150,7 +150,7 @@ Daemon which manages IS-IS routing\n\n\ -C, --dryrun Check configuration for validity and exit\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit (status); @@ -382,7 +382,7 @@ main (int argc, char **argv, char **envp) vty_serv_sock (vty_addr, vty_port, ISIS_VTYSH_PATH); /* Print banner. */ - zlog_notice ("Quagga-ISISd %s starting: vty@%d", QUAGGA_VERSION, vty_port); + zlog_notice ("Quagga-ISISd %s starting: vty@%d", FRR_VERSION, vty_port); /* Start finite state machine. */ while (thread_fetch (master, &thread)) diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c index 21daaa7794dc..8282591a4946 100644 --- a/isisd/isis_redist.c +++ b/isisd/isis_redist.c @@ -540,12 +540,12 @@ isis_redist_area_finish(struct isis_area *area) DEFUN (isis_redistribute, isis_redistribute_cmd, - "redistribute (ipv4|ipv6) " QUAGGA_REDIST_STR_ISISD + "redistribute (ipv4|ipv6) " FRR_REDIST_STR_ISISD " (level-1|level-2) {metric <0-16777215>|route-map WORD}", REDIST_STR "Redistribute IPv4 routes\n" "Redistribute IPv6 routes\n" - QUAGGA_REDIST_HELP_STR_ISISD + FRR_REDIST_HELP_STR_ISISD "Redistribute into level-1\n" "Redistribute into level-2\n" "Metric for redistributed routes\n" @@ -609,13 +609,13 @@ DEFUN (isis_redistribute, DEFUN (no_isis_redistribute, no_isis_redistribute_cmd, - "no redistribute (ipv4|ipv6) " QUAGGA_REDIST_STR_ISISD + "no redistribute (ipv4|ipv6) " FRR_REDIST_STR_ISISD " (level-1|level-2)", NO_STR REDIST_STR "Redistribute IPv4 routes\n" "Redistribute IPv6 routes\n" - QUAGGA_REDIST_HELP_STR_ISISD + FRR_REDIST_HELP_STR_ISISD "Redistribute into level-1\n" "Redistribute into level-2\n") { diff --git a/ldpd/lde.c b/ldpd/lde.c index 904d0f8d9ac4..29c9590908d3 100644 --- a/ldpd/lde.c +++ b/ldpd/lde.c @@ -69,9 +69,9 @@ static zebra_capabilities_t _caps_p [] = static struct zebra_privs_t lde_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #if defined(VTY_GROUP) .vty_group = VTY_GROUP, diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index aa1dc57a7bfa..8a9847bdfd26 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -103,9 +103,9 @@ static zebra_capabilities_t _caps_p [] = struct zebra_privs_t ldpd_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #if defined(VTY_GROUP) .vty_group = VTY_GROUP, @@ -154,7 +154,7 @@ Daemon which manages LDP.\n\n\ -C, --dryrun Check configuration for validity and exit\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit(status); @@ -413,7 +413,7 @@ main(int argc, char *argv[]) vty_serv_sock(vty_addr, vty_port, LDP_VTYSH_PATH); /* Print banner. */ - log_notice("LDPd %s starting: vty@%d", QUAGGA_VERSION, vty_port); + log_notice("LDPd %s starting: vty@%d", FRR_VERSION, vty_port); /* Fetch next active thread. */ while (thread_fetch(master, &thread)) diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index aef33c8e373c..37a3d79a289a 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -66,9 +66,9 @@ static zebra_capabilities_t _caps_p [] = struct zebra_privs_t ldpe_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #if defined(VTY_GROUP) .vty_group = VTY_GROUP, diff --git a/lib/agentx.c b/lib/agentx.c index 5996b34a0fbe..4175e7ba927e 100644 --- a/lib/agentx.c +++ b/lib/agentx.c @@ -31,6 +31,7 @@ #include "smux.h" #include "memory.h" #include "linklist.h" +#include "version.h" static int agentx_enabled = 0; @@ -175,7 +176,7 @@ DEFUN (agentx_enable, { if (!agentx_enabled) { - init_snmp("quagga"); + init_snmp(FRR_SMUX_NAME); events = list_new(); agentx_events_update (); agentx_enabled = 1; @@ -209,7 +210,7 @@ smux_init (struct thread_master *tm) SNMP_CALLBACK_LOGGING, agentx_log_callback, NULL); - init_agent ("quagga"); + init_agent (FRR_SMUX_NAME); install_node (&agentx_node, config_write_agentx); install_element (CONFIG_NODE, &agentx_enable_cmd); diff --git a/lib/command.c b/lib/command.c index 0b0614b8060b..399252777f68 100644 --- a/lib/command.c +++ b/lib/command.c @@ -117,12 +117,7 @@ static struct cmd_node config_node = }; /* Default motd string. */ -static const char *default_motd = -"\r\n\ -Hello, this is " QUAGGA_PROGNAME " (version " QUAGGA_VERSION ").\r\n\ -" QUAGGA_COPYRIGHT "\r\n\ -" GIT_INFO "\r\n"; - +static const char *default_motd = FRR_DEFAULT_MOTD; static const struct facility_map { int facility; @@ -191,9 +186,9 @@ level_match(const char *s) void print_version (const char *progname) { - printf ("%s version %s\n", progname, QUAGGA_VERSION); - printf ("%s\n", QUAGGA_COPYRIGHT); - printf ("configured with:\n\t%s\n", QUAGGA_CONFIG_ARGS); + printf ("%s version %s\n", progname, FRR_VERSION); + printf ("%s\n", FRR_COPYRIGHT); + printf ("configured with:\n\t%s\n", FRR_CONFIG_ARGS); } @@ -3077,11 +3072,12 @@ DEFUN (show_version, SHOW_STR "Displays zebra version\n") { - vty_out (vty, "Quagga %s (%s).%s", QUAGGA_VERSION, host.name?host.name:"", + vty_out (vty, "%s %s (%s).%s", FRR_FULL_NAME, FRR_VERSION, + host.name ? host.name : "", VTY_NEWLINE); - vty_out (vty, "%s%s%s", QUAGGA_COPYRIGHT, GIT_INFO, VTY_NEWLINE); + vty_out (vty, "%s%s%s", FRR_COPYRIGHT, GIT_INFO, VTY_NEWLINE); vty_out (vty, "configured with:%s %s%s", VTY_NEWLINE, - QUAGGA_CONFIG_ARGS, VTY_NEWLINE); + FRR_CONFIG_ARGS, VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/lib/log.c b/lib/log.c index f9877300b44a..fb9d02a301b8 100644 --- a/lib/log.c +++ b/lib/log.c @@ -20,7 +20,7 @@ * 02111-1307, USA. */ -#define QUAGGA_DEFINE_DESC_TABLE +#define FRR_DEFINE_DESC_TABLE #include diff --git a/lib/route_types.pl b/lib/route_types.pl index d44cb12b2381..ffe9bec04b6d 100755 --- a/lib/route_types.pl +++ b/lib/route_types.pl @@ -86,8 +86,8 @@ /* Auto-generated from route_types.txt by %s. */ /* Do not edit! */ -#ifndef _QUAGGA_ROUTE_TYPES_H -#define _QUAGGA_ROUTE_TYPES_H +#ifndef _FRR_ROUTE_TYPES_H +#define _FRR_ROUTE_TYPES_H /* Zebra route's' types. */ EOF @@ -154,38 +154,38 @@ sub collect { printf "/* %s */\n", $daemon; if ($daemons{$daemon}->{"ipv4"} && $daemons{$daemon}->{"ipv6"}) { my ($names, $help) = collect($daemon, 1, 1, 0); - printf "#define QUAGGA_REDIST_STR_%s \\\n %s\n", uc $daemon, $names; - printf "#define QUAGGA_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help; + printf "#define FRR_REDIST_STR_%s \\\n %s\n", uc $daemon, $names; + printf "#define FRR_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help; ($names, $help) = collect($daemon, 1, 0, 0); - printf "#define QUAGGA_IP_REDIST_STR_%s \\\n %s\n", uc $daemon, $names; - printf "#define QUAGGA_IP_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help; + printf "#define FRR_IP_REDIST_STR_%s \\\n %s\n", uc $daemon, $names; + printf "#define FRR_IP_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help; ($names, $help) = collect($daemon, 0, 1, 0); - printf "#define QUAGGA_IP6_REDIST_STR_%s \\\n %s\n", uc $daemon, $names; - printf "#define QUAGGA_IP6_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help; + printf "#define FRR_IP6_REDIST_STR_%s \\\n %s\n", uc $daemon, $names; + printf "#define FRR_IP6_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help; if ($daemon eq "zebra") { ($names, $help) = collect($daemon, 1, 0, 1); - printf "#define QUAGGA_IP_PROTOCOL_MAP_STR_%s \\\n %s\n", uc $daemon, $names; - printf "#define QUAGGA_IP_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help; + printf "#define FRR_IP_PROTOCOL_MAP_STR_%s \\\n %s\n", uc $daemon, $names; + printf "#define FRR_IP_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help; ($names, $help) = collect($daemon, 0, 1, 1); - printf "#define QUAGGA_IP6_PROTOCOL_MAP_STR_%s \\\n %s\n", uc $daemon, $names; - printf "#define QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help; + printf "#define FRR_IP6_PROTOCOL_MAP_STR_%s \\\n %s\n", uc $daemon, $names; + printf "#define FRR_IP6_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help; } } else { my ($names, $help) = collect($daemon, $daemons{$daemon}->{"ipv4"}, $daemons{$daemon}->{"ipv6"}, 0); - printf "#define QUAGGA_REDIST_STR_%s \\\n %s\n", uc $daemon, $names; - printf "#define QUAGGA_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help; + printf "#define FRR_REDIST_STR_%s \\\n %s\n", uc $daemon, $names; + printf "#define FRR_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help; } print "\n"; } print <|metric-type (1|2)|route-map WORD}", REDIST_STR - QUAGGA_REDIST_HELP_STR_OSPFD + FRR_REDIST_HELP_STR_OSPFD "Metric for redistributed routes\n" "OSPF default metric\n" "OSPF exterior metric type for redistributed routes\n" @@ -8117,11 +8117,11 @@ DEFUN (ospf_redistribute_source, DEFUN (no_ospf_redistribute_source, no_ospf_redistribute_source_cmd, - "no redistribute " QUAGGA_REDIST_STR_OSPFD + "no redistribute " FRR_REDIST_STR_OSPFD " {metric <0-16777214>|metric-type (1|2)|route-map WORD}", NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_OSPFD + FRR_REDIST_HELP_STR_OSPFD "Metric for redistributed routes\n" "OSPF default metric\n" "OSPF exterior metric type for redistributed routes\n" @@ -8273,11 +8273,11 @@ DEFUN (no_ospf_redistribute_instance_source, DEFUN (ospf_distribute_list_out, ospf_distribute_list_out_cmd, - "distribute-list WORD out " QUAGGA_REDIST_STR_OSPFD, + "distribute-list WORD out " FRR_REDIST_STR_OSPFD, "Filter networks in routing updates\n" "Access-list name\n" OUT_STR - QUAGGA_REDIST_HELP_STR_OSPFD) + FRR_REDIST_HELP_STR_OSPFD) { struct ospf *ospf = vty->index; int source; @@ -8295,12 +8295,12 @@ DEFUN (ospf_distribute_list_out, DEFUN (no_ospf_distribute_list_out, no_ospf_distribute_list_out_cmd, - "no distribute-list WORD out " QUAGGA_REDIST_STR_OSPFD, + "no distribute-list WORD out " FRR_REDIST_STR_OSPFD, NO_STR "Filter networks in routing updates\n" "Access-list name\n" OUT_STR - QUAGGA_REDIST_HELP_STR_OSPFD) + FRR_REDIST_HELP_STR_OSPFD) { struct ospf *ospf = vty->index; int source; diff --git a/pimd/AUTHORS b/pimd/AUTHORS index f6135a410ed8..08869ff6fbcf 100644 --- a/pimd/AUTHORS +++ b/pimd/AUTHORS @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - # Everton da Silva Marques $ more ~/.gitconfig [user] diff --git a/pimd/CAVEATS b/pimd/CAVEATS index 9f07bda666c3..43dd823ae58c 100644 --- a/pimd/CAVEATS +++ b/pimd/CAVEATS @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - C1 IGMPv3 backward compatibility with IGMPv1 and IGMPv2 is not implemented. See RFC 3376, 7.3. Multicast Router Behavior. That's because only Source-Specific Multicast is currently targeted. diff --git a/pimd/COMMANDS b/pimd/COMMANDS index 425ac82297fb..c545eca56e45 100644 --- a/pimd/COMMANDS +++ b/pimd/COMMANDS @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - global configuration commands: pimd: ip multicast-routing Enable IP multicast forwarding diff --git a/pimd/DEBUG b/pimd/DEBUG index 72fb8264b94c..a6ad260e8224 100644 --- a/pimd/DEBUG +++ b/pimd/DEBUG @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - DEBUG HINTS - Check the source is issuing multicast packets with TTL high enough diff --git a/pimd/LINUX_KERNEL_MROUTE_MFC b/pimd/LINUX_KERNEL_MROUTE_MFC index e87e567f9dd6..3e482465f1eb 100644 --- a/pimd/LINUX_KERNEL_MROUTE_MFC +++ b/pimd/LINUX_KERNEL_MROUTE_MFC @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - # # The Linux Kernel MFC (Multicast Forwarding Cache) # diff --git a/pimd/Makefile.am b/pimd/Makefile.am index eba05076d5f7..bc28aa1e929a 100644 --- a/pimd/Makefile.am +++ b/pimd/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in. -## $QuaggaId: $Format:%an, %ai, %h$ $ # qpimd - pimd for quagga # Copyright (C) 2008 Everton da Silva Marques diff --git a/pimd/README b/pimd/README index 1e3f72c8385e..c8997808b65d 100644 --- a/pimd/README +++ b/pimd/README @@ -1,7 +1,3 @@ -# -# $QuaggaId: $Format:%an, %ai, %h$ $ -# - INTRODUCTION qpimd aims to implement a PIM (Protocol Independent Multicast) diff --git a/pimd/TODO b/pimd/TODO index 2308573b8749..4c0f18310048 100644 --- a/pimd/TODO +++ b/pimd/TODO @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - T1 DONE Implement debug command test pim receive join diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c index d3df6a110218..f09540ea00b9 100644 --- a/pimd/pim_assert.c +++ b/pimd/pim_assert.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_assert.h b/pimd/pim_assert.h index bd3fb3e25352..ec18cab85eb4 100644 --- a/pimd/pim_assert.h +++ b/pimd/pim_assert.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_ASSERT_H diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 430fc738d500..390199236161 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_cmd.h b/pimd/pim_cmd.h index 26191cd0b613..e6fbfa310c3d 100644 --- a/pimd/pim_cmd.h +++ b/pimd/pim_cmd.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_CMD_H diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c index 21d0e5b85ce2..1cd44f253921 100644 --- a/pimd/pim_hello.c +++ b/pimd/pim_hello.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_hello.h b/pimd/pim_hello.h index b5e272d5de5b..3a6d3361ba3b 100644 --- a/pimd/pim_hello.h +++ b/pimd/pim_hello.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_HELLO_H diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index a8a1d0880550..bac9692caa4c 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -15,8 +15,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h index 790afabea162..e56559ca462a 100644 --- a/pimd/pim_iface.h +++ b/pimd/pim_iface.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IFACE_H diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index abfa5cc2b7bf..7afb7a5bdfe3 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h index e6f1c2947c9f..ce753222ee0b 100644 --- a/pimd/pim_ifchannel.h +++ b/pimd/pim_ifchannel.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IFCHANNEL_H diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index 3b63b10e0d92..ef1b3cbac043 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h index c6685c2837ec..eb0377ce8c82 100644 --- a/pimd/pim_igmp.h +++ b/pimd/pim_igmp.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IGMP_H diff --git a/pimd/pim_igmp_join.h b/pimd/pim_igmp_join.h index 1700276de86a..ba80db0696c8 100644 --- a/pimd/pim_igmp_join.h +++ b/pimd/pim_igmp_join.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IGMP_JOIN_H diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c index 7300e6c6b4f2..bdaf2bb27010 100644 --- a/pimd/pim_igmpv3.c +++ b/pimd/pim_igmpv3.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_igmpv3.h b/pimd/pim_igmpv3.h index bb7e92672a87..db7895f9be8a 100644 --- a/pimd/pim_igmpv3.h +++ b/pimd/pim_igmpv3.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IGMPV3_H diff --git a/pimd/pim_int.c b/pimd/pim_int.c index 208075190f2d..44b8386a3d35 100644 --- a/pimd/pim_int.c +++ b/pimd/pim_int.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_int.h b/pimd/pim_int.h index d64b103277e2..a6349b5b3d04 100644 --- a/pimd/pim_int.h +++ b/pimd/pim_int.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_INT_H diff --git a/pimd/pim_join.c b/pimd/pim_join.c index 3852b423f024..6a5fb851d6ec 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_join.h b/pimd/pim_join.h index 37ec0f452560..dcdca00359b8 100644 --- a/pimd/pim_join.h +++ b/pimd/pim_join.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_JOIN_H diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c index 39098df526f7..622bef44393a 100644 --- a/pimd/pim_macro.c +++ b/pimd/pim_macro.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_macro.h b/pimd/pim_macro.h index 472fa9b4e79c..3079ca80cc0c 100644 --- a/pimd/pim_macro.h +++ b/pimd/pim_macro.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_MACRO_H diff --git a/pimd/pim_main.c b/pimd/pim_main.c index aa3db3d5b2e4..29432ea230a2 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include @@ -77,9 +75,9 @@ zebra_capabilities_t _caps_p [] = /* pimd privileges to run with */ struct zebra_privs_t pimd_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, @@ -176,7 +174,7 @@ int main(int argc, char** argv, char** envp) { break; case 'v': printf(PIMD_PROGNAME " version %s\n", PIMD_VERSION); - print_version(QUAGGA_PROGNAME); + print_version(progname); exit (0); break; #ifdef PIM_ZCLIENT_DEBUG @@ -196,7 +194,7 @@ int main(int argc, char** argv, char** envp) { master = thread_master_create(); zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting", - QUAGGA_VERSION, PIMD_VERSION); + FRR_VERSION, PIMD_VERSION); /* * Initializations @@ -243,7 +241,7 @@ int main(int argc, char** argv, char** envp) { vty_serv_sock(vty_addr, vty_port, PIM_VTYSH_PATH); zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d", - QUAGGA_VERSION, PIMD_VERSION, vty_port); + FRR_VERSION, PIMD_VERSION, vty_port); #ifdef PIM_DEBUG_BYDEFAULT zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands"); diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 56f49d62f578..3fbed88800ee 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_mroute.h b/pimd/pim_mroute.h index 176fb81cbc59..f385ce09f431 100644 --- a/pimd/pim_mroute.h +++ b/pimd/pim_mroute.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_MROUTE_H diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c index aa0433a2e2b0..9d0fc0ad8f6f 100644 --- a/pimd/pim_msg.c +++ b/pimd/pim_msg.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_msg.h b/pimd/pim_msg.h index a884fc84d9b9..96a89659e671 100644 --- a/pimd/pim_msg.h +++ b/pimd/pim_msg.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_MSG_H diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c index 7e7cbc0d116c..04792eb35e65 100644 --- a/pimd/pim_neighbor.c +++ b/pimd/pim_neighbor.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h index 5b2172dfc14f..e023a7f1ef78 100644 --- a/pimd/pim_neighbor.h +++ b/pimd/pim_neighbor.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_NEIGHBOR_H diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c index 96f9ef2b6260..ebbc6e19f96e 100644 --- a/pimd/pim_oil.c +++ b/pimd/pim_oil.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h index c63c026c0f29..540acce3a3d7 100644 --- a/pimd/pim_oil.h +++ b/pimd/pim_oil.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_OIL_H diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index 0dfd39cd16f1..0f41a433153d 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_pim.h b/pimd/pim_pim.h index 4b378fb2c311..5692a37938de 100644 --- a/pimd/pim_pim.h +++ b/pimd/pim_pim.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_PIM_H diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c index 11d846448689..8d6e7b70c105 100644 --- a/pimd/pim_rpf.c +++ b/pimd/pim_rpf.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_rpf.h b/pimd/pim_rpf.h index 72cc7ba2156c..4d55bd688136 100644 --- a/pimd/pim_rpf.h +++ b/pimd/pim_rpf.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_RPF_H diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c index 0344aa81d4c7..bd4d9e4857a9 100644 --- a/pimd/pim_signals.c +++ b/pimd/pim_signals.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_signals.h b/pimd/pim_signals.h index 62523c038b51..7b25608c105a 100644 --- a/pimd/pim_signals.h +++ b/pimd/pim_signals.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_SIGNALS_H diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c index 231efd0f223a..54816d126be7 100644 --- a/pimd/pim_sock.c +++ b/pimd/pim_sock.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_sock.h b/pimd/pim_sock.h index cd29543fa029..f905c661dd22 100644 --- a/pimd/pim_sock.h +++ b/pimd/pim_sock.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_SOCK_H diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c index fba563a6f86e..ece644a8615b 100644 --- a/pimd/pim_ssmpingd.c +++ b/pimd/pim_ssmpingd.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_ssmpingd.h b/pimd/pim_ssmpingd.h index 4bef20b20956..54f787e2a311 100644 --- a/pimd/pim_ssmpingd.h +++ b/pimd/pim_ssmpingd.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_SSMPINGD_H diff --git a/pimd/pim_static.c b/pimd/pim_static.c index 5882142b3213..565d6fe72892 100644 --- a/pimd/pim_static.c +++ b/pimd/pim_static.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_static.h b/pimd/pim_static.h index 07d31d59b75a..c288aa7ff489 100644 --- a/pimd/pim_static.h +++ b/pimd/pim_static.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_STATIC_H_ diff --git a/pimd/pim_str.c b/pimd/pim_str.c index 3a8353cd8cb7..c817045697c4 100644 --- a/pimd/pim_str.c +++ b/pimd/pim_str.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_str.h b/pimd/pim_str.h index 925f17f7325a..d2af0110a40a 100644 --- a/pimd/pim_str.h +++ b/pimd/pim_str.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_STR_H diff --git a/pimd/pim_time.c b/pimd/pim_time.c index 4e5832cc657b..75f767fef1e8 100644 --- a/pimd/pim_time.c +++ b/pimd/pim_time.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_time.h b/pimd/pim_time.h index 2984d9a8df8c..8ccc6a9207d0 100644 --- a/pimd/pim_time.h +++ b/pimd/pim_time.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_TIME_H diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c index 38f6de9feaa3..546ceb86e189 100644 --- a/pimd/pim_tlv.c +++ b/pimd/pim_tlv.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_tlv.h b/pimd/pim_tlv.h index 8556e931abe7..16c5aa4b97e2 100644 --- a/pimd/pim_tlv.h +++ b/pimd/pim_tlv.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_TLV_H diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 82678857565c..059de3b62e15 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h index ea44707c54f6..f10c8feb3ba3 100644 --- a/pimd/pim_upstream.h +++ b/pimd/pim_upstream.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_UPSTREAM_H diff --git a/pimd/pim_util.c b/pimd/pim_util.c index 57a8488ecab7..f5b6a8210abb 100644 --- a/pimd/pim_util.c +++ b/pimd/pim_util.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_util.h b/pimd/pim_util.h index a8613e2b97d0..d780bfbc2755 100644 --- a/pimd/pim_util.h +++ b/pimd/pim_util.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_UTIL_H diff --git a/pimd/pim_version.c b/pimd/pim_version.c index f3a5ee33595e..a43c27d5b533 100644 --- a/pimd/pim_version.c +++ b/pimd/pim_version.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_version.h b/pimd/pim_version.h index ef9f370c73b2..64e07862d6d1 100644 --- a/pimd/pim_version.h +++ b/pimd/pim_version.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_VERSION_H diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 037a00c4daa3..07c65e4e537c 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_vty.h b/pimd/pim_vty.h index 904ee55302ed..18a632e01627 100644 --- a/pimd/pim_vty.h +++ b/pimd/pim_vty.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_VTY_H diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index 1822de22997d..f2195960c4ee 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_zebra.h b/pimd/pim_zebra.h index 8e8f09551a84..257c9b896f58 100644 --- a/pimd/pim_zebra.h +++ b/pimd/pim_zebra.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_ZEBRA_H diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 86d7edbd01bb..af561a0b62b4 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_zlookup.h b/pimd/pim_zlookup.h index f2be6d4fa09c..dbce92647bb6 100644 --- a/pimd/pim_zlookup.h +++ b/pimd/pim_zlookup.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_ZLOOKUP_H diff --git a/pimd/pimd.c b/pimd/pimd.c index 91d8d56afc0d..15e52afc1dc2 100644 --- a/pimd/pimd.c +++ b/pimd/pimd.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pimd.conf.sample b/pimd/pimd.conf.sample index 67530856b678..de1da6b8387f 100644 --- a/pimd/pimd.conf.sample +++ b/pimd/pimd.conf.sample @@ -1,6 +1,5 @@ ! ! pimd sample configuration file -! $QuaggaId: $Format:%an, %ai, %h$ $ ! hostname quagga-pimd-router password zebra diff --git a/pimd/pimd.h b/pimd/pimd.h index 8855a2ab3ff0..2230a6ce9185 100644 --- a/pimd/pimd.h +++ b/pimd/pimd.h @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIMD_H diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c index 5c4574024b39..29143f362e08 100644 --- a/pimd/test_igmpv3_join.c +++ b/pimd/test_igmpv3_join.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/ripd/rip_main.c b/ripd/rip_main.c index 796647c3e5dd..cfcb60168a05 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -65,11 +65,11 @@ zebra_capabilities_t _caps_p [] = struct zebra_privs_t ripd_privs = { -#if defined(QUAGGA_USER) - .user = QUAGGA_USER, +#if defined(FRR_USER) + .user = FRR_USER, #endif -#if defined QUAGGA_GROUP - .group = QUAGGA_GROUP, +#if defined FRR_GROUP + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, @@ -123,7 +123,7 @@ Daemon which manages RIP version 1 and 2.\n\n\ -v, --version Print program version\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit (status); @@ -314,7 +314,7 @@ main (int argc, char **argv) vty_serv_sock (vty_addr, vty_port, RIP_VTYSH_PATH); /* Print banner. */ - zlog_notice ("RIPd %s starting: vty@%d", QUAGGA_VERSION, vty_port); + zlog_notice ("RIPd %s starting: vty@%d", FRR_VERSION, vty_port); /* Execute each thread. */ while (thread_fetch (master, &thread)) diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 3f7c7a3e4d1d..44fc1cd8f975 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -371,9 +371,9 @@ DEFUN (no_rip_redistribute_rip, DEFUN (rip_redistribute_type, rip_redistribute_type_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPD, + "redistribute " FRR_REDIST_STR_RIPD, REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD) + FRR_REDIST_HELP_STR_RIPD) { int i; @@ -396,10 +396,10 @@ DEFUN (rip_redistribute_type, DEFUN (no_rip_redistribute_type, no_rip_redistribute_type_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPD, + "no redistribute " FRR_REDIST_STR_RIPD, NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD) + FRR_REDIST_HELP_STR_RIPD) { int i; @@ -423,9 +423,9 @@ DEFUN (no_rip_redistribute_type, DEFUN (rip_redistribute_type_routemap, rip_redistribute_type_routemap_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPD " route-map WORD", + "redistribute " FRR_REDIST_STR_RIPD " route-map WORD", REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Route map reference\n" "Pointer to route-map entries\n") { @@ -450,10 +450,10 @@ DEFUN (rip_redistribute_type_routemap, DEFUN (no_rip_redistribute_type_routemap, no_rip_redistribute_type_routemap_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPD " route-map WORD", + "no redistribute " FRR_REDIST_STR_RIPD " route-map WORD", NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Route map reference\n" "Pointer to route-map entries\n") { @@ -479,9 +479,9 @@ DEFUN (no_rip_redistribute_type_routemap, DEFUN (rip_redistribute_type_metric, rip_redistribute_type_metric_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16>", + "redistribute " FRR_REDIST_STR_RIPD " metric <0-16>", REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Metric\n" "Metric value\n") { @@ -509,10 +509,10 @@ DEFUN (rip_redistribute_type_metric, DEFUN (no_rip_redistribute_type_metric, no_rip_redistribute_type_metric_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16>", + "no redistribute " FRR_REDIST_STR_RIPD " metric <0-16>", NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Metric\n" "Metric value\n") { @@ -538,9 +538,9 @@ DEFUN (no_rip_redistribute_type_metric, DEFUN (rip_redistribute_type_metric_routemap, rip_redistribute_type_metric_routemap_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16> route-map WORD", + "redistribute " FRR_REDIST_STR_RIPD " metric <0-16> route-map WORD", REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Metric\n" "Metric value\n" "Route map reference\n" @@ -572,11 +572,11 @@ DEFUN (rip_redistribute_type_metric_routemap, DEFUN (no_rip_redistribute_type_metric_routemap, no_rip_redistribute_type_metric_routemap_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPD + "no redistribute " FRR_REDIST_STR_RIPD " metric <0-16> route-map WORD", NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Metric\n" "Metric value\n" "Route map reference\n" diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c index e7ecbf969098..14711a1a65e5 100644 --- a/ripngd/ripng_main.c +++ b/ripngd/ripng_main.c @@ -70,11 +70,11 @@ zebra_capabilities_t _caps_p [] = struct zebra_privs_t ripngd_privs = { -#if defined(QUAGGA_USER) - .user = QUAGGA_USER, +#if defined(FRR_USER) + .user = FRR_USER, #endif -#if defined QUAGGA_GROUP - .group = QUAGGA_GROUP, +#if defined FRR_GROUP + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, @@ -125,7 +125,7 @@ Daemon which manages RIPng.\n\n\ -C, --dryrun Check configuration for validity and exit\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit (status); } @@ -309,7 +309,7 @@ main (int argc, char **argv) pid_output (pid_file); /* Print banner. */ - zlog_notice ("RIPNGd %s starting: vty@%d", QUAGGA_VERSION, vty_port); + zlog_notice ("RIPNGd %s starting: vty@%d", FRR_VERSION, vty_port); /* Fetch next active thread. */ while (thread_fetch (master, &thread)) diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index d05b5dbad8b2..67337caf288e 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -339,9 +339,9 @@ DEFUN (no_ripng_redistribute_ripng, DEFUN (ripng_redistribute_type, ripng_redistribute_type_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPNGD, + "redistribute " FRR_REDIST_STR_RIPNGD, "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD) + FRR_REDIST_HELP_STR_RIPNGD) { int type; @@ -359,10 +359,10 @@ DEFUN (ripng_redistribute_type, DEFUN (no_ripng_redistribute_type, no_ripng_redistribute_type_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPNGD, + "no redistribute " FRR_REDIST_STR_RIPNGD, NO_STR "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD) + FRR_REDIST_HELP_STR_RIPNGD) { int type; @@ -382,9 +382,9 @@ DEFUN (no_ripng_redistribute_type, DEFUN (ripng_redistribute_type_metric, ripng_redistribute_type_metric_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16>", + "redistribute " FRR_REDIST_STR_RIPNGD " metric <0-16>", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n") { @@ -408,18 +408,18 @@ DEFUN (ripng_redistribute_type_metric, ALIAS (no_ripng_redistribute_type, no_ripng_redistribute_type_metric_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16>", + "no redistribute " FRR_REDIST_STR_RIPNGD " metric <0-16>", NO_STR "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n") DEFUN (ripng_redistribute_type_routemap, ripng_redistribute_type_routemap_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPNGD " route-map WORD", + "redistribute " FRR_REDIST_STR_RIPNGD " route-map WORD", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Route map reference\n" "Pointer to route-map entries\n") { @@ -441,18 +441,18 @@ DEFUN (ripng_redistribute_type_routemap, ALIAS (no_ripng_redistribute_type, no_ripng_redistribute_type_routemap_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPNGD " route-map WORD", + "no redistribute " FRR_REDIST_STR_RIPNGD " route-map WORD", NO_STR "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Route map reference\n" "Pointer to route-map entries\n") DEFUN (ripng_redistribute_type_metric_routemap, ripng_redistribute_type_metric_routemap_cmd, - "redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16> route-map WORD", + "redistribute " FRR_REDIST_STR_RIPNGD " metric <0-16> route-map WORD", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n" "Route map reference\n" @@ -478,10 +478,10 @@ DEFUN (ripng_redistribute_type_metric_routemap, ALIAS (no_ripng_redistribute_type, no_ripng_redistribute_type_metric_routemap_cmd, - "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16> route-map WORD", + "no redistribute " FRR_REDIST_STR_RIPNGD " metric <0-16> route-map WORD", NO_STR "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Route map reference\n" "Pointer to route-map entries\n") diff --git a/tests/bgp_mpath_test.c b/tests/bgp_mpath_test.c index 723f2977d585..f9eb1534f3d4 100644 --- a/tests/bgp_mpath_test.c +++ b/tests/bgp_mpath_test.c @@ -1,5 +1,4 @@ -/* $QuaggaId: Format:%an, %ai, %h$ $ - * +/* * BGP Multipath Unit Test * Copyright (C) 2010 Google Inc. * diff --git a/tests/main.c b/tests/main.c index 885b8a2923ee..b3e6e706ff65 100644 --- a/tests/main.c +++ b/tests/main.c @@ -92,7 +92,7 @@ Daemon which does 'slow' things.\n\n\ -v, --version Print program version\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit (status); } diff --git a/tests/table_test.c b/tests/table_test.c index ee8192707388..4042e1aaa2a8 100644 --- a/tests/table_test.c +++ b/tests/table_test.c @@ -1,5 +1,4 @@ -/* $QuaggaId: Format:%an, %ai, %h$ $ - * +/* * Routing table test * Copyright (C) 2012 OSR. * diff --git a/tests/test-privs.c b/tests/test-privs.c index e0118a881c8d..c6ccc28e7a4d 100644 --- a/tests/test-privs.c +++ b/tests/test-privs.c @@ -37,9 +37,9 @@ zebra_capabilities_t _caps_p [] = struct zebra_privs_t test_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #if defined(VTY_GROUP) .vty_group = VTY_GROUP, @@ -71,7 +71,7 @@ Daemon which does 'slow' things.\n\n\ -g, --group Group to run as\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit (status); } diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index a90915e1ace1..a4f108e44725 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2509,21 +2509,21 @@ vtysh_write_config_integrated(void) err++; } - pwentry = getpwnam (QUAGGA_USER); + pwentry = getpwnam (FRR_USER); if (pwentry) uid = pwentry->pw_uid; else { - printf ("%% Warning: could not look up user \"%s\"\n", QUAGGA_USER); + printf ("%% Warning: could not look up user \"%s\"\n", FRR_USER); err++; } - grentry = getgrnam (QUAGGA_GROUP); + grentry = getgrnam (FRR_GROUP); if (grentry) gid = grentry->gr_gid; else { - printf ("%% Warning: could not look up group \"%s\"\n", QUAGGA_GROUP); + printf ("%% Warning: could not look up group \"%s\"\n", FRR_GROUP); err++; } @@ -2999,8 +2999,8 @@ vtysh_update_all_insances(struct vtysh_client * head_client) if (head_client->flag != VTYSH_OSPFD) return; - /* ls /var/run/quagga/ and look for all files ending in .vty */ - dir = opendir("/var/run/quagga/"); + /* ls DAEMON_VTY_DIR and look for all files ending in .vty */ + dir = opendir(DAEMON_VTY_DIR "/"); if (dir) { while ((file = readdir(dir)) != NULL) @@ -3010,7 +3010,8 @@ vtysh_update_all_insances(struct vtysh_client * head_client) if (n == MAXIMUM_INSTANCES) { fprintf(stderr, - "Parsing /var/run/quagga/, client limit(%d) reached!\n", n); + "Parsing %s/, client limit(%d) reached!\n", + DAEMON_VTY_DIR, n); break; } client = (struct vtysh_client *) malloc(sizeof(struct vtysh_client)); @@ -3018,7 +3019,7 @@ vtysh_update_all_insances(struct vtysh_client * head_client) client->name = "ospfd"; client->flag = VTYSH_OSPFD; ptr = (char *) malloc(100); - sprintf(ptr, "/var/run/quagga/%s", file->d_name); + sprintf(ptr, "%s/%s", DAEMON_VTY_DIR, file->d_name); client->path = (const char *)ptr; client->next = NULL; vtysh_client_sorted_insert(head_client, client); diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 999d90ab225d..6b33fca39b6a 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -150,7 +150,7 @@ usage (int status) "Note that multiple commands may be executed from the command\n" \ "line by passing multiple -c args, or by embedding linefeed\n" \ "characters in one or more of the commands.\n\n" \ - "Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); + "Report bugs to %s\n", progname, FRR_BUG_ADDRESS); exit (status); } diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c index da2ed1569e89..3a64ae0a966e 100644 --- a/vtysh/vtysh_user.c +++ b/vtysh/vtysh_user.c @@ -67,7 +67,7 @@ vtysh_pam (const char *user) pam_handle_t *pamh = NULL; /* Start PAM. */ - ret = pam_start(QUAGGA_PROGNAME, user, &conv, &pamh); + ret = pam_start(FRR_PAM_NAME, user, &conv, &pamh); /* printf ("ret %d\n", ret); */ /* Is user really user? */ diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c index 16b398030e1a..a70070bef701 100644 --- a/watchquagga/watchquagga.c +++ b/watchquagga/watchquagga.c @@ -706,7 +706,7 @@ daemon_send_ready (void) #if defined (HAVE_CUMULUS) FILE *fp; - fp = fopen("/var/run/quagga/watchquagga.started", "w"); + fp = fopen(DAEMON_VTY_DIR "/watchquagga.started", "w"); fclose(fp); #endif zlog_notice ("Watchquagga: Notifying Systemd we are up and running"); @@ -1266,7 +1266,7 @@ main(int argc, char **argv) gs.unresponsive_restart = 1; break; case 'v': - printf ("%s version %s\n", progname, QUAGGA_VERSION); + printf ("%s version %s\n", progname, FRR_VERSION); puts("Copyright 2004 Andrew J. Schorr"); return 0; case 'h': @@ -1422,7 +1422,7 @@ main(int argc, char **argv) p += strlen(p); } zlog_notice("%s %s watching [%s], mode [%s]", - progname, QUAGGA_VERSION, buf, mode_str[gs.mode]); + progname, FRR_VERSION, buf, mode_str[gs.mode]); } } diff --git a/zebra/client_main.c b/zebra/client_main.c index 24bfa56d021b..8290eafc4d98 100644 --- a/zebra/client_main.c +++ b/zebra/client_main.c @@ -1,6 +1,4 @@ /* - * $Quagga: $Format:%an, %ai, %h$ $ - * * GNU Zebra client test main routine. * Copyright (C) 1997 Kunihiro Ishiguro * diff --git a/zebra/main.c b/zebra/main.c index 4fea0104f51d..9abc8f87ffd4 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -111,9 +111,9 @@ zebra_capabilities_t _caps_p [] = /* zebra privileges to run with */ struct zebra_privs_t zserv_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, @@ -162,7 +162,7 @@ usage (char *progname, int status) printf ("-v, --version Print program version\n"\ "-h, --help Display this help and exit\n"\ "\n"\ - "Report bugs to %s\n", ZEBRA_BUG_ADDRESS); + "Report bugs to %s\n", FRR_BUG_ADDRESS); } exit (status); @@ -466,7 +466,7 @@ main (int argc, char **argv) vty_serv_sock (vty_addr, vty_port, ZEBRA_VTYSH_PATH); /* Print banner. */ - zlog_notice ("Zebra %s starting: vty@%d", QUAGGA_VERSION, vty_port); + zlog_notice ("Zebra %s starting: vty@%d", FRR_VERSION, vty_port); while (thread_fetch (zebrad.master, &thread)) thread_call (&thread); diff --git a/zebra/test_main.c b/zebra/test_main.c index 828b61af919a..76ce92c37088 100644 --- a/zebra/test_main.c +++ b/zebra/test_main.c @@ -108,7 +108,7 @@ usage (char *progname, int status) "-v, --version Print program version\n"\ "-h, --help Display this help and exit\n"\ "\n"\ - "Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); + "Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit (status); @@ -332,7 +332,7 @@ main (int argc, char **argv) vty_serv_sock (vty_addr, vty_port, "/tmp/test_zebra"); /* Print banner. */ - zlog_notice ("Zebra %s starting: vty@%d", QUAGGA_VERSION, vty_port); + zlog_notice ("Zebra %s starting: vty@%d", FRR_VERSION, vty_port); while (thread_fetch (zebrad.master, &thread)) thread_call (&thread); diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c index e6d13b5070e3..c5223199a4c5 100644 --- a/zebra/zebra_ptm.c +++ b/zebra/zebra_ptm.c @@ -38,6 +38,7 @@ #include "vrf.h" #include "rib.h" #include "zebra_vrf.h" +#include "version.h" #define ZEBRA_PTM_RECONNECT_TIME_INITIAL 1 /* initial reconnect is 1s */ #define ZEBRA_PTM_RECONNECT_TIME_MAX 300 @@ -119,7 +120,7 @@ zebra_ptm_init (void) ptm_cb.pid = getpid(); zebra_ptm_install_commands(); - sprintf(buf, "%s", "quagga"); + sprintf(buf, "%s", FRR_PTM_NAME); ptm_hdl = ptm_lib_register(buf, NULL, zebra_ptm_handle_msg_cb, zebra_ptm_handle_msg_cb); ptm_cb.wb = buffer_new(0); diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 3075a61c4a5b..041f67826b6e 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -730,10 +730,10 @@ ALIAS (no_zebra_route_map_timer, DEFUN (ip_protocol, ip_protocol_cmd, - "ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", + "ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP_STR "Filter routing info exchanged between zebra and protocol\n" - QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA "Route map name\n") { int i; @@ -767,11 +767,11 @@ DEFUN (ip_protocol, DEFUN (no_ip_protocol, no_ip_protocol_cmd, - "no ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA, + "no ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA, NO_STR IP_STR "Stop filtering routing info between zebra and protocol\n" - QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA "Protocol from which to stop filtering routes\n") { int i; @@ -805,11 +805,11 @@ DEFUN (no_ip_protocol, ALIAS (no_ip_protocol, no_ip_protocol_val_cmd, - "no ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", + "no ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", NO_STR IP_STR "Stop filtering routing info between zebra and protocol\n" - QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA "route map name") DEFUN (show_ip_protocol, @@ -843,10 +843,10 @@ DEFUN (show_ip_protocol, DEFUN (ipv6_protocol, ipv6_protocol_cmd, - "ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", + "ipv6 protocol " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP6_STR "Filter IPv6 routing info exchanged between zebra and protocol\n" - QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA "Route map name\n") { int i; @@ -880,11 +880,11 @@ DEFUN (ipv6_protocol, DEFUN (no_ipv6_protocol, no_ipv6_protocol_cmd, - "no ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA, + "no ipv6 protocol " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA, NO_STR IP6_STR "Stop filtering IPv6 routing info between zebra and protocol\n" - QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA "Protocol from which to stop filtering routes\n") { int i; @@ -919,11 +919,11 @@ DEFUN (no_ipv6_protocol, ALIAS (no_ipv6_protocol, no_ipv6_protocol_val_cmd, - "no ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", + "no ipv6 protocol " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", NO_STR IP6_STR "Stop filtering IPv6 routing info between zebra and protocol\n" - QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA "route map name") DEFUN (show_ipv6_protocol, @@ -957,10 +957,10 @@ DEFUN (show_ipv6_protocol, DEFUN (ip_protocol_nht_rmap, ip_protocol_nht_rmap_cmd, - "ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", + "ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP_STR "Filter Next Hop tracking route resolution\n" - QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA "Route map name\n") { int i; @@ -991,11 +991,11 @@ DEFUN (ip_protocol_nht_rmap, DEFUN (no_ip_protocol_nht_rmap, no_ip_protocol_nht_rmap_cmd, - "no ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA, + "no ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA, NO_STR IP_STR "Filter Next Hop tracking route resolution\n" - QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA) + FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA) { int i; @@ -1024,10 +1024,10 @@ DEFUN (no_ip_protocol_nht_rmap, ALIAS (no_ip_protocol_nht_rmap, no_ip_protocol_nht_rmap_val_cmd, - "no ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", + "no ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP_STR "Filter Next Hop tracking route resolution\n" - QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA "Route map name\n") DEFUN (show_ip_protocol_nht, @@ -1061,10 +1061,10 @@ DEFUN (show_ip_protocol_nht, DEFUN (ipv6_protocol_nht_rmap, ipv6_protocol_nht_rmap_cmd, - "ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", + "ipv6 nht " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP6_STR "Filter Next Hop tracking route resolution\n" - QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA "Route map name\n") { int i; @@ -1089,11 +1089,11 @@ DEFUN (ipv6_protocol_nht_rmap, DEFUN (no_ipv6_protocol_nht_rmap, no_ipv6_protocol_nht_rmap_cmd, - "no ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA, + "no ipv6 nht " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA, NO_STR IP6_STR "Filter Next Hop tracking route resolution\n" - QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA) + FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA) { int i; @@ -1127,11 +1127,11 @@ DEFUN (no_ipv6_protocol_nht_rmap, ALIAS (no_ipv6_protocol_nht_rmap, no_ipv6_protocol_nht_rmap_val_cmd, - "no ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", + "no ipv6 nht " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", NO_STR IP6_STR "Filter Next Hop tracking route resolution\n" - QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA + FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA "Route map name\n") DEFUN (show_ipv6_protocol_nht, diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 84106e7ff9fc..98c20270c3fd 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -2858,11 +2858,11 @@ ALIAS (show_ip_route_supernets, DEFUN (show_ip_route_protocol, show_ip_route_protocol_cmd, - "show ip route " QUAGGA_IP_REDIST_STR_ZEBRA, + "show ip route " FRR_IP_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" - QUAGGA_IP_REDIST_HELP_STR_ZEBRA) + FRR_IP_REDIST_HELP_STR_ZEBRA) { int type; struct route_table *table; @@ -2906,12 +2906,12 @@ DEFUN (show_ip_route_protocol, ALIAS (show_ip_route_protocol, show_ip_route_vrf_protocol_cmd, - "show ip route " VRF_CMD_STR " " QUAGGA_IP_REDIST_STR_ZEBRA, + "show ip route " VRF_CMD_STR " " FRR_IP_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" VRF_CMD_HELP_STR - QUAGGA_IP_REDIST_HELP_STR_ZEBRA) + FRR_IP_REDIST_HELP_STR_ZEBRA) DEFUN (show_ip_route_ospf_instance, show_ip_route_ospf_instance_cmd, @@ -3487,12 +3487,12 @@ DEFUN (show_ip_route_vrf_all_supernets, DEFUN (show_ip_route_vrf_all_protocol, show_ip_route_vrf_all_protocol_cmd, - "show ip route " VRF_ALL_CMD_STR " " QUAGGA_IP_REDIST_STR_ZEBRA, + "show ip route " VRF_ALL_CMD_STR " " FRR_IP_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" VRF_ALL_CMD_HELP_STR - QUAGGA_IP_REDIST_HELP_STR_ZEBRA"\n") + FRR_IP_REDIST_HELP_STR_ZEBRA"\n") { int type; struct route_table *table; @@ -5124,11 +5124,11 @@ ALIAS (show_ipv6_route_prefix_longer, DEFUN (show_ipv6_route_protocol, show_ipv6_route_protocol_cmd, - "show ipv6 route " QUAGGA_IP6_REDIST_STR_ZEBRA, + "show ipv6 route " FRR_IP6_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" - QUAGGA_IP6_REDIST_HELP_STR_ZEBRA) + FRR_IP6_REDIST_HELP_STR_ZEBRA) { int type; struct route_table *table; @@ -5172,12 +5172,12 @@ DEFUN (show_ipv6_route_protocol, ALIAS (show_ipv6_route_protocol, show_ipv6_route_vrf_protocol_cmd, - "show ipv6 route " VRF_CMD_STR " " QUAGGA_IP6_REDIST_STR_ZEBRA, + "show ipv6 route " VRF_CMD_STR " " FRR_IP6_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" VRF_CMD_HELP_STR - QUAGGA_IP6_REDIST_HELP_STR_ZEBRA) + FRR_IP6_REDIST_HELP_STR_ZEBRA) DEFUN (show_ipv6_route_addr, show_ipv6_route_addr_cmd, @@ -5562,12 +5562,12 @@ DEFUN (show_ipv6_route_vrf_all_prefix_longer, DEFUN (show_ipv6_route_vrf_all_protocol, show_ipv6_route_vrf_all_protocol_cmd, - "show ipv6 route " VRF_ALL_CMD_STR " " QUAGGA_IP6_REDIST_STR_ZEBRA, + "show ipv6 route " VRF_ALL_CMD_STR " " FRR_IP6_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" VRF_ALL_CMD_HELP_STR - QUAGGA_IP6_REDIST_HELP_STR_ZEBRA) + FRR_IP6_REDIST_HELP_STR_ZEBRA) { int type; struct route_table *table;