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

isisd: remove reload-by-reexec

Browse Source 
This is a quite horrible mechanism...

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

39
isisd/isis_main.c
View File

@ -89,35 +89,15 @@ struct option longopts[] = {
/* Master of threads. */ /* Master of threads. */
struct thread_master *master; struct thread_master *master;
/* for reload */
char _cwd[MAXPATHLEN];
char _progpath[MAXPATHLEN];
int _argc;
char **_argv;
char **_envp;
/* /*
* Prototypes. * Prototypes.
*/ */
void reload(void);
void sighup(void); void sighup(void);
void sigint(void); void sigint(void);
void sigterm(void); void sigterm(void);
void sigusr1(void); void sigusr1(void);
void
reload ()
{
zlog_debug ("Reload");
/* FIXME: Clean up func call here */
vty_reset ();
(void) isisd_privs.change (ZPRIVS_RAISE);
execve (_progpath, _argv, _envp);
zlog_err ("Reload failed: cannot exec %s: %s", _progpath,
safe_strerror (errno));
}
static __attribute__((__noreturn__)) void static __attribute__((__noreturn__)) void
terminate (int i) terminate (int i)
{ {
@ -131,9 +111,7 @@ terminate (int i)
void void
sighup (void) sighup (void)
{ {
zlog_debug ("SIGHUP received"); zlog_err ("SIGHUP/reload is not implemented for isisd");
reload ();
return; return;
} }
@ -199,21 +177,6 @@ main (int argc, char **argv, char **envp)
{ {
int opt; int opt;
/* for reload */
_argc = argc;
_argv = argv;
_envp = envp;
if (getcwd (_cwd, sizeof (_cwd)) == NULL)
{
zlog_err ("ISISd: Unable to determine CWD: %d", errno);
exit (1);
}
if (*argv[0] == '.')
snprintf (_progpath, sizeof (_progpath), "%s/%s", _cwd, _argv[0]);
else
snprintf (_progpath, sizeof (_progpath), "%s", argv[0]);
frr_preinit (&isisd_di, argc, argv); frr_preinit (&isisd_di, argc, argv);
frr_opt_add ("", longopts, ""); frr_opt_add ("", longopts, "");