proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-03 06:17:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: mgmtd: fix too early daemon detach of mgmtd

Browse Source 
Correct FRR startup counts on a daemon's vty socket to be open when the
parent process exits. The parent process waits for `frr_check_detach()`
to be called by the child before exiting. The problem is when the
`FRR_MANUAL_VTY_START` flag is set the vty socket was not opened but
`frr_check_detach()` was called anyway.

Instead add a bool option for `frr_check_detach()` to be called when the
socket is opened with `frr_vty_serv_start()`, and do so when "manually"
calling said function (i.e., when FRR_MANUAL_VTY_START is set).

The `FRR_MANUAL_VTY_START` flag is only set by mgmtd. The reason we
wait to open the vty socket is so that mgmtd can parse the various
daemon specific config files it has taken over, after the event loop has
started, but before we receive any possible new config from `vtysh`.

fixes #16362

Signed-off-by: Christian Hopps <chopps@labn.net>
(cherry picked from commit be9a6fc0ea)
This commit is contained in:
Christian Hopps 2024-07-23 17:42:07 -04:00 committed by Mergify
parent 066854e7da
commit 609a84f4fd
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/libfrr.c
View File

@ -1040,7 +1040,17 @@ void frr_config_fork(void)
zlog_tls_buffer_init();
}
void frr_vty_serv_start(void)
static void frr_check_detach(void)
{
if (nodetach_term || nodetach_daemon)
return;
if (daemon_ctl_sock != -1)
close(daemon_ctl_sock);
daemon_ctl_sock = -1;
}
void frr_vty_serv_start(bool check_detach)
{
/* allow explicit override of vty_path in the future
* (not currently set anywhere) */
@ -1063,6 +1073,9 @@ void frr_vty_serv_start(void)
}
vty_serv_start(di->vty_addr, di->vty_port, di->vty_path);
if (check_detach)
frr_check_detach();
}
void frr_vty_serv_stop(void)
@ -1073,16 +1086,6 @@ void frr_vty_serv_stop(void)
unlink(di->vty_path);
}
static void frr_check_detach(void)
{
if (nodetach_term || nodetach_daemon)
return;
if (daemon_ctl_sock != -1)
close(daemon_ctl_sock);
daemon_ctl_sock = -1;
}
static void frr_terminal_close(int isexit)
{
int nullfd;
@ -1168,7 +1171,7 @@ void frr_run(struct event_loop *master)
char instanceinfo[64] = "";
if (!(di->flags & FRR_MANUAL_VTY_START))
frr_vty_serv_start();
frr_vty_serv_start(false);
if (di->instance)
snprintf(instanceinfo, sizeof(instanceinfo), "instance %u ",
@ -1206,7 +1209,8 @@ void frr_run(struct event_loop *master)
close(nullfd);
}
frr_check_detach();
if (!(di->flags & FRR_MANUAL_VTY_START))
frr_check_detach();
}
/* end fixed stderr startup logging */

2
lib/libfrr.h
View File

@ -200,7 +200,7 @@ extern void frr_config_fork(void);
extern void frr_run(struct event_loop *master);
extern void frr_detach(void);
extern void frr_vty_serv_start(void);
extern void frr_vty_serv_start(bool check_detach);
extern void frr_vty_serv_stop(void);
extern bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,

2
lib/vty.c
View File

@ -3502,7 +3502,7 @@ static void vty_mgmt_server_connected(struct mgmt_fe_client *client,
/* Start or stop listening for vty connections */
if (connected)
frr_vty_serv_start();
frr_vty_serv_start(true);
else
frr_vty_serv_stop();
}