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

2003-08-12 Paul Jakma <paul@dishone.st>

Browse source 
2003-08-12 Paul Jakma <paul@dishone.st>

        * Makefile.am: redhat/zebra.* -> redhat/quagga.*
        * configure.ac: Bump autoconf prerequisite to 2.53.
          dist name zebra -> quagga.
          general Zebra -> Quagga where appropriate (ie not zebra daemon).
          User and group zebra->quagga.
          s/ZEBRA\(_VERSION\)/QUAGGA\1/.
        * bgpd/bgp_main.c: s/ZEBRA\(_VERSION\)/QUAGGA\1/
        * lib/command.c: Update banners and s/ZEBRA\(_VERSION\)/QUAGGA\1/
        * lib/print_version.c: ditto
        * lib/version.h: s/ZEBRA\(_VERSION\)/QUAGGA\1/ and bump version.
          Change ZEBRA_URL.
        * lib/smux.c: s/ZEBRA\(_VERSION\)/QUAGGA\1/
        * lib/vty.h: Change Zebra.conf to Quagga.conf (integrated file)
        * ospf6d/ospf6{,_main}.c: s/ZEBRA\(_VERSION\)/QUAGGA\1/
        * ospfd/ospf_main.c: s/ZEBRA\(_VERSION\)/QUAGGA\1/
This commit is contained in:
paul 2003-08-12 13:08:31 +00:00
parent 5f5eab7833
commit e8f2984c00
12 changed files with 59 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.cvsignore
View file

@ -13,3 +13,4 @@ config.h.in
aclocal.m4 aclocal.m4
Makefile.in Makefile.in
zebra-[0-9.][0-9.][0-9.]*.tar.gz zebra-[0-9.][0-9.][0-9.]*.tar.gz
quagga-[0-9.][0-9.][0-9.]*.tar.gz

2
Makefile.am
View file

@ -15,5 +15,5 @@ dist-hook:
cp -p $(srcdir)/tools/*.el $(distdir)/tools cp -p $(srcdir)/tools/*.el $(distdir)/tools
cp -p $(srcdir)/tools/*.cgi $(distdir)/tools cp -p $(srcdir)/tools/*.cgi $(distdir)/tools
cp -p $(srcdir)/redhat/*.init $(distdir)/redhat cp -p $(srcdir)/redhat/*.init $(distdir)/redhat
cp -p $(srcdir)/redhat/zebra.* $(distdir)/redhat cp -p $(srcdir)/redhat/quagga.* $(distdir)/redhat
rm -rf `find $(distdir)/doc -type d -name CVS` rm -rf `find $(distdir)/doc -type d -name CVS`

2
bgpd/bgp_main.c
View file

@ -305,7 +305,7 @@ main (int argc, char **argv)
vty_serv_sock (vty_addr, vty_port, BGP_VTYSH_PATH); vty_serv_sock (vty_addr, vty_port, BGP_VTYSH_PATH);
/* Print banner. */ /* Print banner. */
zlog_info ("BGPd %s starting: vty@%d, bgp@%d", ZEBRA_VERSION, zlog_info ("BGPd %s starting: vty@%d, bgp@%d", QUAGGA_VERSION,
vty_port, bm->port); vty_port, bm->port);
/* Start finite state machine, here we go! */ /* Start finite state machine, here we go! */

87
configure.ac
View file

@ -1,13 +1,14 @@
## ##
## Configure template file for Zebra. ## Configure template file for Quagga.
## autoconf will generate configure script. ## autoconf will generate configure script.
## ##
## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org> ## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
## Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
## ##
AC_PREREQ(2.13) AC_PREREQ(2.53)
AC_INIT(lib/zebra.h) AC_INIT(lib/zebra.h)
AM_INIT_AUTOMAKE(zebra, 0.94) AM_INIT_AUTOMAKE(quagga, 0.96)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
dnl ----------------------------------- dnl -----------------------------------
@ -56,7 +57,7 @@ dnl ----------------------
dnl Packages configuration dnl Packages configuration
dnl ---------------------- dnl ----------------------
AC_ARG_ENABLE(vtysh, AC_ARG_ENABLE(vtysh,
[ --enable-vtysh, Make integrated VTY version of zebra]) [ --enable-vtysh, Make integrated vty shell for Quagga])
AC_ARG_ENABLE(ipv6, AC_ARG_ENABLE(ipv6,
[ --disable-ipv6 turn off IPv6 related features and daemons]) [ --disable-ipv6 turn off IPv6 related features and daemons])
AC_ARG_ENABLE(zebra, AC_ARG_ENABLE(zebra,
@ -98,10 +99,10 @@ AC_ARG_ENABLE(ospf-te,
[ --enable-ospf-te enable Traffic Engineering Extension to OSPF]) [ --enable-ospf-te enable Traffic Engineering Extension to OSPF])
AC_ARG_ENABLE(multipath, AC_ARG_ENABLE(multipath,
[ --enable-multipath=ARG enable multipath function, ARG must be digit]) [ --enable-multipath=ARG enable multipath function, ARG must be digit])
AC_ARG_ENABLE(zebra_user, AC_ARG_ENABLE(quagga_user,
[ --enable-user=ARG user to run zebra suite as (default zebra)]) [ --enable-user=ARG user to run Quagga suite as (default quagga)])
AC_ARG_ENABLE(zebra_group, AC_ARG_ENABLE(quagga_group,
[ --enable-group=ARG group to run zebra suite as (default zebra)]) [ --enable-group=ARG group to run Quagga suite as (default quagga)])
AC_ARG_ENABLE(vty_group, AC_ARG_ENABLE(vty_group,
[ --enable-vty-group=ARG set vty sockets to have specified group as owner]) [ --enable-vty-group=ARG set vty sockets to have specified group as owner])
@ -135,27 +136,27 @@ if test "${enable_ospf_te}" = "yes"; then
AC_DEFINE(HAVE_OSPF_TE,,OSPF TE) AC_DEFINE(HAVE_OSPF_TE,,OSPF TE)
fi fi
AC_MSG_CHECKING(Should Zebra's RTADV be used) AC_MSG_CHECKING(Should zebra's RTADV be used)
if test "${enable_rtadv}" = "yes"; then if test "${enable_rtadv}" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_RTADV,,Enable Zebra IPv6 Routing Advertisements) AC_DEFINE(HAVE_RTADV,,Enable zebra IPv6 Routing Advertisements)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
if test "${enable_user}" = "yes" || test x"${enable_user}" = x""; then if test "${enable_user}" = "yes" || test x"${enable_user}" = x""; then
enable_user="zebra" enable_user="quagga"
elif test "${enable_user}" = "no"; then elif test "${enable_user}" = "no"; then
enable_user="root" enable_user="root"
fi fi
AC_DEFINE_UNQUOTED(ZEBRA_USER, "${enable_user}", Zebra User) AC_DEFINE_UNQUOTED(QUAGGA_USER, "${enable_user}", Quagga User)
if test "${enable_group}" = "yes" || test x"${enable_group}" = x""; then if test "${enable_group}" = "yes" || test x"${enable_group}" = x""; then
enable_group="zebra" enable_group="quagga"
elif test "${enable_group}" = "no"; then elif test "${enable_group}" = "no"; then
enable_group="root" enable_group="root"
fi fi
AC_DEFINE_UNQUOTED(ZEBRA_GROUP, "${enable_group}", Zebra Group) AC_DEFINE_UNQUOTED(QUAGGA_GROUP, "${enable_group}", Quagga Group)
if test x"${enable_vty_group}" = x"yes" ; then if test x"${enable_vty_group}" = x"yes" ; then
AC_MSG_ERROR([--enable-vty-group requires a group as argument, not yes]) AC_MSG_ERROR([--enable-vty-group requires a group as argument, not yes])
@ -907,10 +908,10 @@ AC_MSG_CHECKING(whether prctl PR_SET_KEEPCAPS is available)
AC_TRY_COMPILE([#include <sys/prctl.h>],[prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);], AC_TRY_COMPILE([#include <sys/prctl.h>],[prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PR_SET_KEEPCAPS,,prctl) AC_DEFINE(HAVE_PR_SET_KEEPCAPS,,prctl)
zebra_ac_keepcaps="yes"], quagga_ac_keepcaps="yes"],
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) )
if test x"${zebra_ac_keepcaps}" = x"yes"; then if test x"${quagga_ac_keepcaps}" = x"yes"; then
AC_CHECK_HEADERS(sys/capability.h) AC_CHECK_HEADERS(sys/capability.h)
fi fi
if test x"${ac_cv_header_sys_capability_h}" = x"yes"; then if test x"${ac_cv_header_sys_capability_h}" = x"yes"; then
@ -938,7 +939,7 @@ dnl -------------
dnl check version dnl check version
dnl ------------- dnl -------------
file="${srcdir}/lib/version.h" file="${srcdir}/lib/version.h"
VERSION=`sed -ne 's/^#.*ZEBRA_VERSION.*\"\([^\"]*\)\"$/\1/p' $file` VERSION=`sed -ne 's/^#.*QUAGGA_VERSION.*\"\([^\"]*\)\"$/\1/p' $file`
AC_SUBST(VERSION) AC_SUBST(VERSION)
dnl ---------- dnl ----------
@ -951,45 +952,45 @@ dnl ------------------------------
dnl set paths for state directory dnl set paths for state directory
dnl ------------------------------ dnl ------------------------------
if test "${prefix}" = "NONE"; then if test "${prefix}" = "NONE"; then
zebra_statedir_prefix=""; quagga_statedir_prefix="";
else else
zebra_statedir_prefix=${prefix} quagga_statedir_prefix=${prefix}
fi fi
if test "${localstatedir}" = '${prefix}/var'; then if test "${localstatedir}" = '${prefix}/var'; then
AC_CACHE_CHECK(state directory,ac_statedir, AC_CACHE_CHECK(state directory,ac_statedir,
[for ZEBRA_STATE_DIR in ${zebra_statedir_prefix}/var/run dnl [for QUAGGA_STATE_DIR in ${quagga_statedir_prefix}/var/run dnl
${zebra_statedir_prefix}/var/adm dnl ${quagga_statedir_prefix}/var/adm dnl
${zebra_statedir_prefix}/etc dnl ${quagga_statedir_prefix}/etc dnl
/var/run dnl /var/run dnl
/var/adm dnl /var/adm dnl
/etc dnl /etc dnl
/dev/null; /dev/null;
do do
test -d $ZEBRA_STATE_DIR && break test -d $QUAGGA_STATE_DIR && break
done done
zebra_statedir=$ZEBRA_STATE_DIR]) quagga_statedir=$QUAGGA_STATE_DIR])
else else
zebra_statedir=${localstatedir} quagga_statedir=${localstatedir}
AC_MSG_CHECKING(directory to use for state file) AC_MSG_CHECKING(directory to use for state file)
AC_MSG_RESULT(${zebra_statedir}) AC_MSG_RESULT(${quagga_statedir})
fi fi
if test $zebra_statedir = "/dev/null"; then if test $quagga_statedir = "/dev/null"; then
AC_MSG_ERROR('STATE DIRECTORY NOT FOUND! FIX OR SPECIFY --localstatedir!') AC_MSG_ERROR('STATE DIRECTORY NOT FOUND! FIX OR SPECIFY --localstatedir!')
fi fi
AC_DEFINE_UNQUOTED(PATH_ZEBRA_PID, "$zebra_statedir/zebra.pid",zebra PID) AC_DEFINE_UNQUOTED(PATH_ZEBRA_PID, "$quagga_statedir/zebra.pid",zebra PID)
AC_DEFINE_UNQUOTED(PATH_RIPD_PID, "$zebra_statedir/ripd.pid",ripd PID) AC_DEFINE_UNQUOTED(PATH_RIPD_PID, "$quagga_statedir/ripd.pid",ripd PID)
AC_DEFINE_UNQUOTED(PATH_RIPNGD_PID, "$zebra_statedir/ripngd.pid",ripngd PID) AC_DEFINE_UNQUOTED(PATH_RIPNGD_PID, "$quagga_statedir/ripngd.pid",ripngd PID)
AC_DEFINE_UNQUOTED(PATH_BGPD_PID, "$zebra_statedir/bgpd.pid",bgpd PID) AC_DEFINE_UNQUOTED(PATH_BGPD_PID, "$quagga_statedir/bgpd.pid",bgpd PID)
AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$zebra_statedir/ospfd.pid",ospfd PID) AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$quagga_statedir/ospfd.pid",ospfd PID)
AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$zebra_statedir/ospf6d.pid",ospf6d PID) AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$quagga_statedir/ospf6d.pid",ospf6d PID)
AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$zebra_statedir/zserv.api",zebra api socket) AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$quagga_statedir/zserv.api",zebra api socket)
AC_DEFINE_UNQUOTED(ZEBRA_VTYSH_PATH, "$zebra_statedir/zebra.vty",zebra vty socket) AC_DEFINE_UNQUOTED(ZEBRA_VTYSH_PATH, "$quagga_statedir/zebra.vty",zebra vty socket)
AC_DEFINE_UNQUOTED(RIP_VTYSH_PATH, "$zebra_statedir/ripd.vty",rip vty socket) AC_DEFINE_UNQUOTED(RIP_VTYSH_PATH, "$quagga_statedir/ripd.vty",rip vty socket)
AC_DEFINE_UNQUOTED(RIPNG_VTYSH_PATH, "$zebra_statedir/ripngd.vty",ripng vty socket) AC_DEFINE_UNQUOTED(RIPNG_VTYSH_PATH, "$quagga_statedir/ripngd.vty",ripng vty socket)
AC_DEFINE_UNQUOTED(BGP_VTYSH_PATH, "$zebra_statedir/bgpd.vty",bgpd vty socket) AC_DEFINE_UNQUOTED(BGP_VTYSH_PATH, "$quagga_statedir/bgpd.vty",bgpd vty socket)
AC_DEFINE_UNQUOTED(OSPF_VTYSH_PATH, "$zebra_statedir/ospfd.vty",ospfd vty socket) AC_DEFINE_UNQUOTED(OSPF_VTYSH_PATH, "$quagga_statedir/ospfd.vty",ospfd vty socket)
AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$zebra_statedir/ospf6d.vty",ospf6d vty socket) AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$quagga_statedir/ospf6d.vty",ospf6d vty socket)
dnl --------------------------- dnl ---------------------------
dnl Check htonl works correctly dnl Check htonl works correctly
@ -1014,18 +1015,18 @@ AC_OUTPUT(Makefile lib/Makefile zebra/Makefile ripd/Makefile
ripngd/Makefile bgpd/Makefile ospfd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile
ospf6d/Makefile vtysh/Makefile doc/Makefile ospf6d/Makefile vtysh/Makefile doc/Makefile
ospfclient/Makefile ospfclient/Makefile
redhat/zebra.spec) redhat/quagga.spec)
echo " echo "
zebra configuration zebra configuration
------------------- -------------------
zebra version : ${VERSION} quagga version : ${VERSION}
host operationg system : ${host_os} host operationg system : ${host_os}
source code location : ${srcdir} source code location : ${srcdir}
compiler : ${CC} compiler : ${CC}
compiler flags : ${CFLAGS} compiler flags : ${CFLAGS}
linker flags : ${LDFLAGS} ${LIBS} linker flags : ${LDFLAGS} ${LIBS}
state file directory : ${zebra_statedir} state file directory : ${quagga_statedir}
user to run as : ${enable_user} user to run as : ${enable_user}
group to run as : ${enable_group} group to run as : ${enable_group}
group for vty sockets : ${enable_vty_group} group for vty sockets : ${enable_vty_group}

4
lib/command.c
View file

@ -39,7 +39,7 @@ struct host host;
/* Default motd string. */ /* Default motd string. */
char *default_motd = char *default_motd =
"\r\n\ "\r\n\
Hello, this is zebra (version " ZEBRA_VERSION ").\r\n\ Hello, this is quagga (version " QUAGGA_VERSION ").\r\n\
Copyright 1996-2002 Kunihiro Ishiguro.\r\n\ Copyright 1996-2002 Kunihiro Ishiguro.\r\n\
\r\n"; \r\n";
@ -2393,7 +2393,7 @@ DEFUN (show_version,
SHOW_STR SHOW_STR
"Displays zebra version\n") "Displays zebra version\n")
{ {
vty_out (vty, "Zebra %s (%s).%s", ZEBRA_VERSION, vty_out (vty, "Quagga %s (%s).%s", QUAGGA_VERSION,
host_name, host_name,
VTY_NEWLINE); VTY_NEWLINE);
vty_out (vty, "Copyright 1996-2002, Kunihiro Ishiguro.%s", VTY_NEWLINE); vty_out (vty, "Copyright 1996-2002, Kunihiro Ishiguro.%s", VTY_NEWLINE);

2
lib/print_version.c
View file

@ -26,6 +26,6 @@
void void
print_version (char *progname) print_version (char *progname)
{ {
printf ("%s version %s (%s)\n", progname, ZEBRA_VERSION, host_name); printf ("%s version %s (%s)\n", progname, QUAGGA_VERSION, host_name);
printf ("Copyright 1996-2001, Kunihiro Ishiguro\n"); printf ("Copyright 1996-2001, Kunihiro Ishiguro\n");
} }

2
lib/smux.c
View file

@ -952,7 +952,7 @@ smux_open (int sock)
u_char *ptr; u_char *ptr;
int len; int len;
u_long version; u_long version;
u_char progname[] = "zebra-" ZEBRA_VERSION; u_char progname[] = "zebra-" QUAGGA_VERSION;
if (debug_smux) if (debug_smux)
{ {

4
lib/version.h
View file

@ -22,11 +22,11 @@
#ifndef _ZEBRA_VERSION_H #ifndef _ZEBRA_VERSION_H
#define _ZEBRA_VERSION_H #define _ZEBRA_VERSION_H
#define ZEBRA_VERSION "0.94" #define QUAGGA_VERSION "0.96"
#define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org" #define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org"
#define ZEBRA_URL "http://zebra.dishone.st" #define ZEBRA_URL "http://www.quagga.net"
extern char *host_name; extern char *host_name;

2
lib/vty.h
View file

@ -131,7 +131,7 @@ struct vty
}; };
/* Integrated configuration file. */ /* Integrated configuration file. */
#define INTEGRATE_DEFAULT_CONFIG "Zebra.conf" #define INTEGRATE_DEFAULT_CONFIG "Quagga.conf"
/* Small macro to determine newline is newline only or linefeed needed. */ /* Small macro to determine newline is newline only or linefeed needed. */
#define VTY_NEWLINE ((vty->type == VTY_TERM) ? "\r\n" : "\n") #define VTY_NEWLINE ((vty->type == VTY_TERM) ? "\r\n" : "\n")

6
ospf6d/ospf6_main.c
View file

@ -130,7 +130,7 @@ void
_reload () _reload ()
{ {
zlog_notice ("OSPF6d (Zebra-%s ospf6d-%s) reloaded", zlog_notice ("OSPF6d (Zebra-%s ospf6d-%s) reloaded",
ZEBRA_VERSION, OSPF6_DAEMON_VERSION); QUAGGA_VERSION, OSPF6_DAEMON_VERSION);
ospf6_zebra_finish (); ospf6_zebra_finish ();
vty_finish (); vty_finish ();
execve (_progpath, _argv, _envp); execve (_progpath, _argv, _envp);
@ -142,7 +142,7 @@ terminate (int i)
ospf6_delete (ospf6); ospf6_delete (ospf6);
unlink (PATH_OSPF6D_PID); unlink (PATH_OSPF6D_PID);
zlog_notice ("OSPF6d (Zebra-%s ospf6d-%s) terminated", zlog_notice ("OSPF6d (Zebra-%s ospf6d-%s) terminated",
ZEBRA_VERSION, OSPF6_DAEMON_VERSION); QUAGGA_VERSION, OSPF6_DAEMON_VERSION);
exit (i); exit (i);
} }
@ -345,7 +345,7 @@ main (int argc, char *argv[], char *envp[])
#ifdef DEBUG #ifdef DEBUG
/* Print start message */ /* Print start message */
zlog_notice ("OSPF6d (Zebra-%s ospf6d-%s) starts", zlog_notice ("OSPF6d (Zebra-%s ospf6d-%s) starts",
ZEBRA_VERSION, OSPF6_DAEMON_VERSION); QUAGGA_VERSION, OSPF6_DAEMON_VERSION);
#endif #endif
/* Start finite state machine, here we go! */ /* Start finite state machine, here we go! */

2
ospf6d/ospf6d.c
View file

@ -637,7 +637,7 @@ DEFUN (set_proctitle,
if (strncmp (argv[0], "v", 1) == 0) if (strncmp (argv[0], "v", 1) == 0)
{ {
proctitle_mode = 1; proctitle_mode = 1;
setproctitle ("%s Zebra: %s", OSPF6_DAEMON_VERSION, ZEBRA_VERSION); setproctitle ("%s Zebra: %s", OSPF6_DAEMON_VERSION, QUAGGA_VERSION);
} }
else if (strncmp (argv[0], "nor", 3) == 0) else if (strncmp (argv[0], "nor", 3) == 0)
{ {

2
ospfd/ospf_main.c
View file

@ -328,7 +328,7 @@ main (int argc, char **argv)
#ifdef DEBUG #ifdef DEBUG
/* Print banner. */ /* Print banner. */
zlog (NULL, LOG_INFO, "OSPFd (%s) starts", ZEBRA_VERSION); zlog (NULL, LOG_INFO, "OSPFd (%s) starts", QUAGGA_VERSION);
#endif #endif
/* Fetch next active thread. */ /* Fetch next active thread. */