proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-16 18:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12671 from vfreex/babel-fix-terminal

Browse Source 
babeld: Fix --terminal option
This commit is contained in:
Donatas Abraitis 2023-01-22 00:02:05 +02:00 committed by GitHub
commit a0adee8232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
babeld/babel_main.c
View File

@ -50,7 +50,6 @@ THE SOFTWARE.
static void babel_fail(void); static void babel_fail(void);
static void babel_init_random(void); static void babel_init_random(void);
static void babel_replace_by_null(int fd);
static void babel_exit_properly(void); static void babel_exit_properly(void);
static void babel_save_state_file(void); static void babel_save_state_file(void);
@ -199,8 +198,6 @@ main(int argc, char **argv)
resend_delay = BABEL_DEFAULT_RESEND_DELAY; resend_delay = BABEL_DEFAULT_RESEND_DELAY;
change_smoothing_half_life(BABEL_DEFAULT_SMOOTHING_HALF_LIFE); change_smoothing_half_life(BABEL_DEFAULT_SMOOTHING_HALF_LIFE);
babel_replace_by_null(STDIN_FILENO);
/* init some quagga's dependencies, and babeld's commands */ /* init some quagga's dependencies, and babeld's commands */
if_zapi_callbacks(babel_ifp_create, babel_ifp_up, if_zapi_callbacks(babel_ifp_create, babel_ifp_up,
babel_ifp_down, babel_ifp_destroy); babel_ifp_down, babel_ifp_destroy);
@ -247,32 +244,6 @@ babel_init_random(void)
srandom(seed); srandom(seed);
} }
/*
close fd, and replace it by "/dev/null"
exit if error
*/
static void
babel_replace_by_null(int fd)
{
int fd_null;
int rc;
fd_null = open("/dev/null", O_RDONLY);
if(fd_null < 0) {
flog_err_sys(EC_LIB_SYSTEM_CALL, "open(null): %s", safe_strerror(errno));
exit(1);
}
rc = dup2(fd_null, fd);
if(rc < 0) {
flog_err_sys(EC_LIB_SYSTEM_CALL, "dup2(null, 0): %s",
safe_strerror(errno));
exit(1);
}
close(fd_null);
}
/* /*
Load the state file: check last babeld's running state, usefull in case of Load the state file: check last babeld's running state, usefull in case of
"/etc/init.d/babeld restart" "/etc/init.d/babeld restart"