matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

build: rename (1 of ?): configure.ac + preproc

Browse source 
This replaces Quagga -> FRR in most configure.ac settings as well as
a handful of preprocessor macros in the source code.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2016-12-14 19:30:44 +01:00
parent a07169b1f6
commit b2f361571b
24 changed files with 167 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -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

6
bgpd/bgp_btoa.c
View file

@ -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,

10
bgpd/bgp_main.c
View file

@ -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 : "<all>"),
bm->port);

140
configure.ac
View file

@ -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 <kunihiro@zebra.org>
@ -7,9 +7,9 @@
##
AC_PREREQ(2.60)
AC_INIT(Quagga, 2.0-rc0, [https://bugzilla.quagga.net])
PACKAGE_URL="http://www.quagga.net"
PACKAGE_FULLNAME="Quagga"
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"
@ -239,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,
@ -427,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
@ -887,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 -----------------------------
@ -1035,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 ----------------------------------------------------------------------------
@ -1513,14 +1513,14 @@ 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 QUAGGA_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
@ -1528,39 +1528,39 @@ if test "${localstatedir}" = '${prefix}/var'; then
do
test -d $QUAGGA_STATE_DIR && break
done
quagga_statedir=$QUAGGA_STATE_DIR
frr_statedir=$QUAGGA_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_MSG_RESULT(${frr_statedir})
AC_SUBST(frr_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_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
@ -1652,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}

12
isisd/isis_main.c
View file

@ -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))

6
ldpd/lde.c
View file

@ -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,

10
ldpd/ldpd.c
View file

@ -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))

6
ldpd/ldpe.c
View file

@ -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,

20
lib/command.c
View file

@ -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;
}

2
lib/smux.c
View file

@ -922,7 +922,7 @@ smux_open (int sock)
u_char *ptr;
size_t len;
long version;
const char progname[] = QUAGGA_PROGNAME "-" QUAGGA_VERSION;
const char progname[] = FRR_SMUX_NAME "-" FRR_VERSION;
if (debug_smux)
{

21
lib/version.h.in
View file

@ -35,17 +35,20 @@
#define GIT_INFO ""
#endif
#define QUAGGA_PROGNAME "@PACKAGE_NAME@"
#define FRR_PAM_NAME "@PACKAGE_NAME@"
#define FRR_SMUX_NAME "@PACKAGE_NAME@"
#define QUAGGA_VERSION "@PACKAGE_VERSION@" GIT_SUFFIX
#define FRR_FULL_NAME "FreeRangeRouting"
#define FRR_VERSION "@PACKAGE_VERSION@" GIT_SUFFIX
#define FRR_BUG_ADDRESS "@PACKAGE_BUGREPORT@"
#define FRR_COPYRIGHT "Copyright 1996-2005 Kunihiro Ishiguro, et al."
#define FRR_CONFIG_ARGS "@CONFIG_ARGS@"
#define ZEBRA_BUG_ADDRESS "@PACKAGE_BUGREPORT@"
#define QUAGGA_URL "http://www.quagga.net"
#define QUAGGA_COPYRIGHT "Copyright 1996-2005 Kunihiro Ishiguro, et al."
#define QUAGGA_CONFIG_ARGS "@CONFIG_ARGS@"
#define FRR_DEFAULT_MOTD \
"\r\n" \
"Hello, this is " FRR_FULL_NAME " (version " FRR_VERSION ").\r\n" \
FRR_COPYRIGHT "\r\n" \
GIT_INFO "\r\n"
pid_t pid_output (const char *);

12
ospf6d/ospf6_main.c
View file

@ -63,11 +63,11 @@ zebra_capabilities_t _caps_p [] =
struct zebra_privs_t ospf6d_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,
@ -131,7 +131,7 @@ Daemon which manages OSPF version 3.\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);
@ -361,7 +361,7 @@ main (int argc, char *argv[], char *envp[])
/* Print start message */
zlog_notice ("OSPF6d (Quagga-%s ospf6d-%s) starts: vty@%d",
QUAGGA_VERSION, OSPF6_DAEMON_VERSION,vty_port);
FRR_VERSION, OSPF6_DAEMON_VERSION,vty_port);
/* Start finite state machine, here we go! */
while (thread_fetch (master, &thread))

10
ospfd/ospf_main.c
View file

@ -63,9 +63,9 @@ zebra_capabilities_t _caps_p [] =
struct zebra_privs_t ospfd_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,
@ -133,7 +133,7 @@ Daemon which manages OSPF.\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);
}
@ -373,7 +373,7 @@ main (int argc, char **argv)
vty_serv_sock (vty_addr, vty_port, vty_path);
/* Print banner. */
zlog_notice ("OSPFd %s starting: vty@%d, %s", QUAGGA_VERSION, vty_port, vty_path);
zlog_notice ("OSPFd %s starting: vty@%d, %s", FRR_VERSION, vty_port, vty_path);
/* Fetch next active thread. */
while (thread_fetch (master, &thread))

12
pimd/pim_main.c
View file

@ -75,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,
@ -174,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
@ -194,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
@ -241,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");

12
ripd/rip_main.c
View file

@ -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))

12
ripngd/ripng_main.c
View file

@ -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))

2
tests/main.c
View file

@ -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);
}

8
tests/test-privs.c
View file

@ -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);
}

8
vtysh/vtysh.c
View file

@ -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++;
}

2
vtysh/vtysh_main.c
View file

@ -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);
}

2
vtysh/vtysh_user.c
View file

@ -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? */

4
watchquagga/watchquagga.c
View file

@ -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]);
}
}

10
zebra/main.c
View file

@ -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);

4
zebra/test_main.c
View file

@ -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);