summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore24
-rwxr-xr-xREADME.NetBSD6
-rw-r--r--REPORTING-BUGS2
-rwxr-xr-xbuildtest.sh2
-rwxr-xr-xconfigure.ac38
-rw-r--r--doc/appendix.texi2
-rw-r--r--doc/babeld.texi6
-rw-r--r--lib/module.c2
-rw-r--r--lib/vty.c2
-rw-r--r--snapcraft/.gitignore2
-rw-r--r--solaris/.gitignore2
-rwxr-xr-xtools/frr-reload.py6
-rw-r--r--tools/multiple-bgpd.sh4
-rw-r--r--tools/vty_index.cocci2
-rw-r--r--watchfrr/watchfrr.c2
-rw-r--r--zebra/Makefile.am2
16 files changed, 52 insertions, 52 deletions
diff --git a/.gitignore b/.gitignore
index 62aa48e22f..3ad6b1de1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,18 +48,18 @@ m4/*.m4
debian/autoreconf.after
debian/autoreconf.before
debian/files
-debian/quagga-dbg.debhelper.log
-debian/quagga-dbg.substvars
-debian/quagga-dbg/
-debian/quagga-doc.debhelper.log
-debian/quagga-doc.substvars
-debian/quagga-doc/
-debian/quagga.debhelper.log
-debian/quagga.postinst.debhelper
-debian/quagga.postrm.debhelper
-debian/quagga.prerm.debhelper
-debian/quagga.substvars
-debian/quagga/
+debian/frr-dbg.debhelper.log
+debian/frr-dbg.substvars
+debian/frr-dbg/
+debian/frr-doc.debhelper.log
+debian/frr-doc.substvars
+debian/frr-doc/
+debian/frr.debhelper.log
+debian/frr.postinst.debhelper
+debian/frr.postrm.debhelper
+debian/frr.prerm.debhelper
+debian/frr.substvars
+debian/frr/
debian/tmp/
*.pyc
*.swp
diff --git a/README.NetBSD b/README.NetBSD
index 6e454533e5..c97e3bcb38 100755
--- a/README.NetBSD
+++ b/README.NetBSD
@@ -1,18 +1,18 @@
#!/bin/sh
-# This file is helpful for building quagga from cvs on NetBSD, and
+# This file is helpful for building FRR from cvs on NetBSD, and
# probably on any system using pkgsrc.
# One should have readline installed already (pkgsrc/devel/readline).
MAKE=make
-# Quagga is currently documented not to require GNU make, but sometimes
+# FRR is currently documented not to require GNU make, but sometimes
# BSD make fails. Enable this if statement as a workaround.
if false; then
MAKE=gmake
echo "WARNING: using gmake to work around nonportable makefiles"
fi
-# Use /usr/quagga to be independent, and /usr/pkg to overwrite pkgsrc.
+# Use /usr/frr to be independent, and /usr/pkg to overwrite pkgsrc.
PREFIX=/usr/pkg
case $1 in
diff --git a/REPORTING-BUGS b/REPORTING-BUGS
index 01f25a2051..339ebc24d5 100644
--- a/REPORTING-BUGS
+++ b/REPORTING-BUGS
@@ -16,7 +16,7 @@ Please supply the following information:
1. Your FRRouting version or if it is from git then the commit reference.
Please try to report bugs against git master or the latest release.
2. FRR daemons you run e.g. bgpd or ripd and full name of your OS. Any
- specific options you compiled Quagga with.
+ specific options you compiled FRR with.
3. Problem description. Copy and paste relative commands and their output to
describe your network setup e.g. "zebra>show ip route".
Please, also give your simple network layout and output of relative OS
diff --git a/buildtest.sh b/buildtest.sh
index cbe6962a43..b4b02d10bf 100755
--- a/buildtest.sh
+++ b/buildtest.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# written 2012-2013 by David Lamparter, placed in Public Domain.
#
-# builds some git commit of Quagga in some different configurations
+# builds some git commit of FRR in some different configurations
# usage: buildtest.sh [commit [configurations...]]
basecfg="--prefix=/usr --enable-user=frr --enable-group=frr --enable-vty-group=frr --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/frr --enable-exampledir=/etc/frr/samples --localstatedir=/var/run/frr --libdir=/usr/lib64/frr --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror"
diff --git a/configure.ac b/configure.ac
index 4cfa829f2a..cbda2fc84f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,7 @@ dnl autoconf 2.59 appears not to support AC_PROG_SED
dnl AC_PROG_SED
AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])
-dnl try and enable CFLAGS that are useful for Quagga
+dnl try and enable CFLAGS that are useful for FRR
dnl - specifically, options to control warnings
AC_USE_SYSTEM_EXTENSIONS
@@ -249,7 +249,7 @@ AX_PTHREAD([
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
LIBS="$PTHREAD_LIBS $LIBS"
], [
- AC_MSG_FAILURE([This Quagga version needs pthreads])
+ AC_MSG_FAILURE([This FRR version needs pthreads])
])
dnl --------------
@@ -283,7 +283,7 @@ AC_ARG_WITH(vtysh_pager,
AS_HELP_STRING([--with-vtysh-pager=PAGER], [control what pager is compiled in as default]),
VTYSH_PAGER=$withval, VTYSH_PAGER="more")
AC_ARG_ENABLE(vtysh,
- AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for Quagga]))
+ AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for FRR]))
AC_ARG_ENABLE(doc,
AS_HELP_STRING([--disable-doc], [do not build docs]))
AC_ARG_ENABLE(zebra,
@@ -939,7 +939,7 @@ AM_CONDITIONAL(VTYSH, test "x$VTYSH" = "xvtysh")
dnl ----------
dnl PAM module
dnl
-dnl Quagga detects the PAM library it is built against by checking for a
+dnl FRR detects the PAM library it is built against by checking for a
dnl functional pam_misc.h (Linux-PAM) or openpam.h (OpenPAM) header. pam_misc.h
dnl is known to #include pam_appl.h, the standard header of a PAM library, and
dnl openpam.h doesn't do that, although depends on the header too. Hence a
@@ -1759,10 +1759,10 @@ dnl --------------------------------------
AM_PROG_LEX
AC_MSG_CHECKING(version of flex)
-quagga_ac_flex_version="$(eval $LEX -V | grep flex | head -n 1)"
-quagga_ac_flex_version="${quagga_ac_flex_version##* }"
-AC_MSG_RESULT([$quagga_ac_flex_version])
-AX_COMPARE_VERSION([$quagga_ac_flex_version], [lt], [2.5.20], [
+frr_ac_flex_version="$(eval $LEX -V | grep flex | head -n 1)"
+frr_ac_flex_version="${frr_ac_flex_version##* }"
+AC_MSG_RESULT([$frr_ac_flex_version])
+AX_COMPARE_VERSION([$frr_ac_flex_version], [lt], [2.5.20], [
LEX="$SHELL $missing_dir/missing flex"
if test -f "${srcdir}/lib/command_lex.c" -a -f "${srcdir}/lib/command_lex.h"; then
AC_MSG_WARN([using pregenerated flex output files])
@@ -1776,38 +1776,38 @@ AX_COMPARE_VERSION([$quagga_ac_flex_version], [lt], [2.5.20], [
AC_PROG_YACC
dnl thanks GNU bison for this b*llshit...
AC_MSG_CHECKING(version of bison)
-quagga_ac_bison_version="$(eval $YACC -V | grep bison | head -n 1)"
-quagga_ac_bison_version="${quagga_ac_bison_version##* }"
-quagga_ac_bison_missing="false"
-case "x${quagga_ac_bison_version}" in
+frr_ac_bison_version="$(eval $YACC -V | grep bison | head -n 1)"
+frr_ac_bison_version="${frr_ac_bison_version##* }"
+frr_ac_bison_missing="false"
+case "x${frr_ac_bison_version}" in
x2.7*)
BISON_OPENBRACE='"'
BISON_CLOSEBRACE='"'
BISON_VERBOSE=''
- AC_MSG_RESULT([$quagga_ac_bison_version - 2.7 or older])
+ AC_MSG_RESULT([$frr_ac_bison_version - 2.7 or older])
;;
x2.*|x1.*)
- AC_MSG_RESULT([$quagga_ac_bison_version])
+ AC_MSG_RESULT([$frr_ac_bison_version])
AC_MSG_WARN([installed bison is too old. Please install GNU bison 2.7.x or newer.])
- quagga_ac_bison_missing="true"
+ frr_ac_bison_missing="true"
;;
x)
AC_MSG_RESULT([none])
AC_MSG_WARN([could not determine bison version. Please install GNU bison 2.7.x or newer.])
- quagga_ac_bison_missing="true"
+ frr_ac_bison_missing="true"
;;
*)
BISON_OPENBRACE='{'
BISON_CLOSEBRACE='}'
BISON_VERBOSE='-Dparse.error=verbose'
- AC_MSG_RESULT([$quagga_ac_bison_version - 3.0 or newer])
+ AC_MSG_RESULT([$frr_ac_bison_version - 3.0 or newer])
;;
esac
AC_SUBST(BISON_OPENBRACE)
AC_SUBST(BISON_CLOSEBRACE)
AC_SUBST(BISON_VERBOSE)
-if $quagga_ac_bison_missing; then
+if $frr_ac_bison_missing; then
YACC="$SHELL $missing_dir/missing bison -y"
if test -f "${srcdir}/lib/command_parse.c" -a -f "${srcdir}/lib/command_parse.h"; then
AC_MSG_WARN([using pregenerated bison output files])
@@ -2013,7 +2013,7 @@ AC_CONFIG_FILES([solaris/Makefile])
AC_CONFIG_FILES([vtysh/extract.pl],[chmod +x vtysh/extract.pl])
-## Hack, but working solution to avoid rebuilding of quagga.info.
+## Hack, but working solution to avoid rebuilding of frr.info.
## It's already in CVS until texinfo 4.7 is more common.
AC_OUTPUT
diff --git a/doc/appendix.texi b/doc/appendix.texi
index 3904c5f0cd..2e1c9deb1b 100644
--- a/doc/appendix.texi
+++ b/doc/appendix.texi
@@ -1,7 +1,7 @@
@node Packet Binary Dump Format
@appendix Packet Binary Dump Format
- Quagga can dump routing protocol packet into file with a binary format
+ FRR can dump routing protocol packet into file with a binary format
(@pxref{Dump BGP packets and table}).
It seems to be better that we share the MRT's header format for
diff --git a/doc/babeld.texi b/doc/babeld.texi
index 6b4cca1e1f..2dfb5f8c0a 100644
--- a/doc/babeld.texi
+++ b/doc/babeld.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
-@c This is part of the Quagga Manual.
+@c This is part of the FRR Manual.
@c @value{COPYRIGHT_STR}
-@c See file quagga.texi for copying conditions.
+@c See file frr.texi for copying conditions.
@node Babel
@chapter Babel
@@ -14,7 +14,7 @@ perform reliable link quality estimation on wireless links. Babel is
a double-stack routing protocol, meaning that a single Babel instance
is able to perform routing for both IPv4 and IPv6.
-Quagga implements Babel as described in RFC6126.
+FRR implements Babel as described in RFC6126.
@menu
* Configuring babeld::
diff --git a/lib/module.c b/lib/module.c
index c7dd5538cd..140fd87b99 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -110,7 +110,7 @@ struct frrmod_runtime *frrmod_load(const char *spec,
dlclose(handle);
if (err)
snprintf(err, err_len,
- "\"%s\" is not a Quagga module: %s",
+ "\"%s\" is not an FRR module: %s",
name, dlerror());
return NULL;
}
diff --git a/lib/vty.c b/lib/vty.c
index e6497b3100..62c48f0fa3 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2221,7 +2221,7 @@ vtysh_read (struct thread *thread)
if (ret == CMD_SUSPEND)
break;
- /* warning: watchquagga hardcodes this result write */
+ /* warning: watchfrr hardcodes this result write */
header[3] = ret;
buffer_put(vty->obuf, header, 4);
diff --git a/snapcraft/.gitignore b/snapcraft/.gitignore
index e050ff0c8d..ac7860290b 100644
--- a/snapcraft/.gitignore
+++ b/snapcraft/.gitignore
@@ -2,5 +2,5 @@ snapcraft.yaml
parts
prime
stage
-quagga*.snap
+frr*.snap
!*/Makefile
diff --git a/solaris/.gitignore b/solaris/.gitignore
index 63afe3fdbb..a2c7946e71 100644
--- a/solaris/.gitignore
+++ b/solaris/.gitignore
@@ -14,7 +14,7 @@ depend.dev
depend.doc
depend.libs
depend.smf
-quagga.init
+frr.init
*.pkg
*.pkg.gz
*~
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index a7a04be639..bfdc08ab4c 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -812,7 +812,7 @@ def compare_context_objects(newconf, running):
delete_bgpd = True
lines_to_del.append((running_ctx_keys, None))
- # We cannot do 'no interface' in quagga, and so deal with it
+ # We cannot do 'no interface' in FRR, and so deal with it
elif running_ctx_keys[0].startswith('interface'):
for line in running_ctx.lines:
lines_to_del.append((running_ctx_keys, line))
@@ -1010,7 +1010,7 @@ if __name__ == '__main__':
# the "neighbor 1.1.1.1 route-map FOO out" line...so we compare the
# configs again to put this line back.
- # There are many keywords in quagga that can only appear one time under
+ # There are many keywords in FRR that can only appear one time under
# a context, take "bgp router-id" for example. If the config that we are
# reloading against has the following:
#
@@ -1038,7 +1038,7 @@ if __name__ == '__main__':
lines_to_add.extend(lines_to_add_first_pass)
# Only do deletes on the first pass. The reason being if we
- # configure a bgp neighbor via "neighbor swp1 interface" quagga
+ # configure a bgp neighbor via "neighbor swp1 interface" FRR
# will automatically add:
#
# interface swp1
diff --git a/tools/multiple-bgpd.sh b/tools/multiple-bgpd.sh
index 20a92a9160..6dee1bafc3 100644
--- a/tools/multiple-bgpd.sh
+++ b/tools/multiple-bgpd.sh
@@ -10,8 +10,8 @@ PREFIX=192.168.145.
#PREFIX=3ffe:123:456::
ADDRPLEN=32
CONFBASE=/tmp
-PIDBASE=/var/run/quagga
-CHOWNSTR=quagga:quagga
+PIDBASE=/var/run/frr
+CHOWNSTR=frr:frr
for H in `seq 1 ${NUM}` ; do
CONF="${CONFBASE}"/bgpd${H}.conf
diff --git a/tools/vty_index.cocci b/tools/vty_index.cocci
index 8290e80b91..eabbaa1aa5 100644
--- a/tools/vty_index.cocci
+++ b/tools/vty_index.cocci
@@ -141,7 +141,7 @@ fn << rule11.fn;
@@
print "R11 removing vty-index argument on %s(...)" % (fn)
-#/* find type of the argument - note args are mostly unnamed in Quagga :( */
+#/* find type of the argument - note args are mostly unnamed in FRR :( */
@ rule12 @
identifier rule11.fn;
identifier T, argname;
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index 3ff4a40965..53d58668d0 100644
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -1294,7 +1294,7 @@ int main(int argc, char **argv)
if (watchfrr_di.daemon_mode) {
zlog_set_level(ZLOG_DEST_SYSLOG, MIN(gs.loglevel, LOG_DEBUG));
if (daemon (0, 0) < 0) {
- fprintf(stderr, "Watchquagga daemon failed: %s",
+ fprintf(stderr, "Watchfrr daemon failed: %s",
strerror(errno));
exit (1);
}
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 541496174a..f70d603d3d 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -85,7 +85,7 @@ EXTRA_DIST = if_ioctl.c if_ioctl_solaris.c if_netlink.c \
client : client_main.o ../lib/libfrr.la
$(CC) -g -o client client_main.o ../liblzebra.la $(LIBS) $(LIB_IPV6)
-quaggaconfdir = $(sysconfdir)
+frrconfdir = $(sysconfdir)
examplesdir = $(exampledir)
dist_examples_DATA = zebra.conf.sample