proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-02 16:57:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: fix some user-visible Quagga remnants

Browse Source 
(Note: the allow_delete thing is called "zebra" on the commandline
because that's the clearest context there, while it is called "FRR" in
the CLI because that's considerably less confusing in a vtysh env.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-03-08 16:13:12 +01:00
parent 6dd7b12a05
commit 4487fc74e8
5 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/log.h
View File

@ -153,8 +153,6 @@ struct timestamp_control {
char buf[QUAGGA_TIMESTAMP_LEN]; /* will contain the rendered timestamp */
};
#define LOG_DEFAULT_FILENAME "/var/log/quagga/Quagga.log"
/* Defines for use in command construction: */
#define LOG_LEVEL_DESC \

3
pimd/pim_main.c
View File

@ -113,9 +113,6 @@ int main(int argc, char** argv, char** envp) {
master = frr_init();
zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting",
FRR_VERSION, PIMD_VERSION);
/*
* Initializations
*/

2
zebra/main.c
View File

@ -229,7 +229,7 @@ main (int argc, char **argv)
#endif
, longopts,
" -b, --batch Runs in batch mode\n"
" -a, --allow_delete Allow other processes to delete Quagga Routes\n"
" -a, --allow_delete Allow other processes to delete zebra routes\n"
" -F, --fpm_format Set fpm format to 'netlink' or 'protobuf'\n"
" -z, --socket Set path of zebra socket\n"
" -e, --ecmp Specify ECMP to use.\n"

2
zebra/test_main.c
View File

@ -100,7 +100,7 @@ usage (char *progname, int status)
"redistribution between different routing protocols.\n\n"\
"-b, --batch Runs in batch mode\n"\
"-d, --daemon Runs in daemon mode\n"\
"-a, --allow_delete Allow other processes to delete Quagga Routes\n" \
"-a, --allow_delete Allow other processes to delete zebra routes\n" \
"-f, --config_file Set configuration file name\n"\
"-A, --vty_addr Set vty's bind address\n"\
"-P, --vty_port Set vty's port number\n"\

4
zebra/zebra_vty.c
View File

@ -3825,7 +3825,7 @@ static_config_ipv6 (struct vty *vty)
DEFUN (allow_external_route_update,
allow_external_route_update_cmd,
"allow-external-route-update",
"Allow Quagga routes to be overwritten by external processes")
"Allow FRR routes to be overwritten by external processes")
{
allow_delete = 1;
@ -3835,7 +3835,7 @@ DEFUN (allow_external_route_update,
DEFUN (no_allow_external_route_update,
no_allow_external_route_update_cmd,
"no allow-external-route-update",
"Allow Quagga routes to be overwritten by external processes")
"Allow FRR routes to be overwritten by external processes")
{
allow_delete = 0;