diff options
| author | Yuxiang Zhu <vfreex@gmail.com> | 2023-01-18 19:16:22 +0000 |
|---|---|---|
| committer | Yuxiang Zhu <vfreex@gmail.com> | 2023-01-21 00:04:06 +0800 |
| commit | c268bd31155875b9d1309d14ca57a6c05b1eb5ca (patch) | |
| tree | 012f7471fdd65a6ac000f45eb88e99946ea7dbef /babeld | |
| parent | 329dc2070440672c215bdf385f353deb35ef8442 (diff) | |
babeld: Fix --terminal option
babeld's `--terminal` option doesn't work because it replaces `stdin`
with `/dev/null`. It seems to me this function can be removed as `frr_run`
handles that in daemon mode.
Signed-off-by: Yuxiang Zhu <vfreex@gmail.com>
Diffstat (limited to 'babeld')
| -rw-r--r-- | babeld/babel_main.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c index b29374fee3..9aa5ce3a01 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -50,7 +50,6 @@ THE SOFTWARE. static void babel_fail(void); static void babel_init_random(void); -static void babel_replace_by_null(int fd); static void babel_exit_properly(void); static void babel_save_state_file(void); @@ -199,8 +198,6 @@ main(int argc, char **argv) resend_delay = BABEL_DEFAULT_RESEND_DELAY; change_smoothing_half_life(BABEL_DEFAULT_SMOOTHING_HALF_LIFE); - babel_replace_by_null(STDIN_FILENO); - /* init some quagga's dependencies, and babeld's commands */ if_zapi_callbacks(babel_ifp_create, babel_ifp_up, babel_ifp_down, babel_ifp_destroy); @@ -248,32 +245,6 @@ babel_init_random(void) } /* - 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 "/etc/init.d/babeld restart" */ |
