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

Revert "lib: Ensure FRR detects running of the second instance of a FRR daemon, doesnot allow it to run."

Browse Source 
This reverts commit 6e23e5e9e1.
This commit is contained in:
Donald Sharp 2018-09-22 14:14:52 -04:00
parent 7c12afcf80
commit 42a75fec9d
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/libfrr.c
View File

@ -262,34 +262,6 @@ bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
static struct frr_daemon_info *di = NULL; static struct frr_daemon_info *di = NULL;
static void frr_guard_daemon(void)
{
int fd;
struct flock lock;
const char *path = di->pid_file;
fd = open(path, O_RDWR);
if (fd != -1) {
memset(&lock, 0, sizeof(lock));
lock.l_type = F_WRLCK;
lock.l_whence = SEEK_SET;
if (fcntl(fd, F_GETLK, &lock) < 0) {
flog_err_sys(
EC_LIB_SYSTEM_CALL,
"Could not do F_GETLK pid_file %s (%s), exiting",
path, safe_strerror(errno));
exit(1);
} else if (lock.l_type == F_WRLCK) {
flog_err_sys(
EC_LIB_SYSTEM_CALL,
"Process %d has a write lock on file %s already! Error: (%s)",
lock.l_pid, path, safe_strerror(errno));
exit(1);
}
close(fd);
}
}
void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv) void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv)
{ {
di = daemon; di = daemon;
@ -619,9 +591,6 @@ struct thread_master *frr_init(void)
zprivs_init(di->privs); zprivs_init(di->privs);
/* Guard to prevent a second instance of this daemon */
frr_guard_daemon();
master = thread_master_create(NULL); master = thread_master_create(NULL);
signal_init(master, di->n_signals, di->signals); signal_init(master, di->n_signals, di->signals);