proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-24 19:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3378 from opensourcerouting/remove-config-lock

Browse Source 
*: remove the configuration lock from all daemons
This commit is contained in:
Donald Sharp 2018-11-30 18:50:49 -05:00 committed by GitHub
commit 0ee78eafbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 38 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_rpki.c
View File

@ -1282,7 +1282,7 @@ DEFUN_NOSH (rpki_end,
{
int ret = reset(false);
vty_config_unlock(vty);
vty_config_exit(vty);
vty->node = ENABLE_NODE;
return ret == SUCCESS ? CMD_SUCCESS : CMD_WARNING;
}

1
isisd/isis_main.c
View File

@ -203,7 +203,6 @@ int main(int argc, char **argv, char **envp)
}
}
vty_config_lockless();
/* thread master */
master = frr_init();

1
ldpd/ldpd.c
View File

@ -335,7 +335,6 @@ main(int argc, char *argv[])
master = frr_init();
vty_config_lockless();
vrf_init(NULL, NULL, NULL, NULL, NULL);
access_list_init();
ldp_vty_init();

18
lib/command.c
View File

@ -1391,19 +1391,7 @@ DEFUN (config_terminal,
"Configuration from vty interface\n"
"Configuration terminal\n")
{
if (vty_config_lock(vty))
vty->node = CONFIG_NODE;
else {
vty_out(vty, "VTY configuration is locked by other VTY\n");
return CMD_WARNING_CONFIG_FAILED;
}
vty->private_config = false;
vty->candidate_config = vty_shared_candidate_config;
if (frr_get_cli_mode() == FRR_CLI_TRANSACTIONAL)
vty->candidate_config_base = nb_config_dup(running_config);
return CMD_SUCCESS;
return vty_config_enter(vty, false, false);
}
/* Enable command */
@ -1455,7 +1443,7 @@ void cmd_exit(struct vty *vty)
break;
case CONFIG_NODE:
vty->node = ENABLE_NODE;
vty_config_unlock(vty);
vty_config_exit(vty);
break;
case INTERFACE_NODE:
case PW_NODE:
@ -1599,7 +1587,7 @@ DEFUN (config_end,
case LINK_PARAMS_NODE:
case BFD_NODE:
case BFD_PEER_NODE:
vty_config_unlock(vty);
vty_config_exit(vty);
vty->node = ENABLE_NODE;
break;
default:

30
lib/northbound_cli.c
View File

@ -519,20 +519,7 @@ DEFUN (config_exclusive,
"Configuration from vty interface\n"
"Configure exclusively from this terminal\n")
{
if (vty_config_exclusive_lock(vty))
vty->node = CONFIG_NODE;
else {
vty_out(vty, "VTY configuration is locked by other VTY\n");
return CMD_WARNING_CONFIG_FAILED;
}
vty->private_config = true;
vty->candidate_config = nb_config_dup(running_config);
vty->candidate_config_base = nb_config_dup(running_config);
vty_out(vty,
"Warning: uncommitted changes will be discarded on exit.\n\n");
return CMD_SUCCESS;
return vty_config_enter(vty, true, true);
}
/* Configure using a private candidate configuration. */
@ -542,20 +529,7 @@ DEFUN (config_private,
"Configuration from vty interface\n"
"Configure using a private candidate configuration\n")
{
if (vty_config_lock(vty))
vty->node = CONFIG_NODE;
else {
vty_out(vty, "VTY configuration is locked by other VTY\n");
return CMD_WARNING_CONFIG_FAILED;
}
vty->private_config = true;
vty->candidate_config = nb_config_dup(running_config);
vty->candidate_config_base = nb_config_dup(running_config);
vty_out(vty,
"Warning: uncommitted changes will be discarded on exit.\n\n");
return CMD_SUCCESS;
return vty_config_enter(vty, true, false);
}
DEFPY (config_commit,

54
lib/vty.c
View File

@ -86,10 +86,6 @@ static vector Vvty_serv_thread;
/* Current directory. */
char *vty_cwd = NULL;
/* Configure lock. */
static int vty_config;
static int vty_config_is_lockless = 0;
/* Exclusive configuration lock. */
struct vty *vty_exclusive_lock;
@ -824,7 +820,7 @@ static void vty_end_config(struct vty *vty)
case BGP_EVPN_VNI_NODE:
case BFD_NODE:
case BFD_PEER_NODE:
vty_config_unlock(vty);
vty_config_exit(vty);
vty->node = ENABLE_NODE;
break;
default:
@ -1225,7 +1221,7 @@ static void vty_stop_input(struct vty *vty)
case VTY_NODE:
case BFD_NODE:
case BFD_PEER_NODE:
vty_config_unlock(vty);
vty_config_exit(vty);
vty->node = ENABLE_NODE;
break;
default:
@ -2351,7 +2347,7 @@ void vty_close(struct vty *vty)
}
/* Check configure. */
vty_config_unlock(vty);
vty_config_exit(vty);
/* OK free vty. */
XFREE(MTYPE_VTY, vty);
@ -2690,18 +2686,33 @@ void vty_log_fixed(char *buf, size_t len)
}
}
int vty_config_lock(struct vty *vty)
int vty_config_enter(struct vty *vty, bool private_config, bool exclusive)
{
if (vty_config_is_lockless)
return 1;
if (vty_config == 0) {
vty->config = 1;
vty_config = 1;
if (exclusive && !vty_config_exclusive_lock(vty)) {
vty_out(vty, "VTY configuration is locked by other VTY\n");
return CMD_WARNING;
}
return vty->config;
vty->node = CONFIG_NODE;
vty->config = true;
vty->private_config = private_config;
if (private_config) {
vty->candidate_config = nb_config_dup(running_config);
vty->candidate_config_base = nb_config_dup(running_config);
vty_out(vty,
"Warning: uncommitted changes will be discarded on exit.\n\n");
} else {
vty->candidate_config = vty_shared_candidate_config;
if (frr_get_cli_mode() == FRR_CLI_TRANSACTIONAL)
vty->candidate_config_base =
nb_config_dup(running_config);
}
return CMD_SUCCESS;
}
int vty_config_unlock(struct vty *vty)
void vty_config_exit(struct vty *vty)
{
vty_config_exclusive_unlock(vty);
@ -2714,19 +2725,6 @@ int vty_config_unlock(struct vty *vty)
nb_config_free(vty->candidate_config_base);
vty->candidate_config_base = NULL;
}
if (vty_config_is_lockless)
return 0;
if (vty_config == 1 && vty->config == 1) {
vty->config = 0;
vty_config = 0;
}
return vty->config;
}
void vty_config_lockless(void)
{
vty_config_is_lockless = 1;
}
int vty_config_exclusive_lock(struct vty *vty)

12
lib/vty.h
View File

@ -114,6 +114,9 @@ struct vty {
int xpath_index;
char xpath[VTY_MAXDEPTH][XPATH_MAXLEN];
/* In configure mode. */
bool config;
/* Private candidate configuration mode. */
bool private_config;
@ -161,9 +164,6 @@ struct vty {
/* Terminal monitor. */
int monitor;
/* In configure mode. */
int config;
/* Read and write thread. */
struct thread *t_read;
struct thread *t_write;
@ -311,9 +311,9 @@ extern void vty_close(struct vty *);
extern char *vty_get_cwd(void);
extern void vty_log(const char *level, const char *proto, const char *fmt,
struct timestamp_control *, va_list);
extern int vty_config_lock(struct vty *);
extern int vty_config_unlock(struct vty *);
extern void vty_config_lockless(void);
extern int vty_config_enter(struct vty *vty, bool private_config,
bool exclusive);
extern void vty_config_exit(struct vty *);
extern int vty_config_exclusive_lock(struct vty *vty);
extern void vty_config_exclusive_unlock(struct vty *vty);
extern int vty_shell(struct vty *);

2
ripd/rip_main.c
View File

@ -165,8 +165,6 @@ int main(int argc, char **argv)
}
}
vty_config_lockless();
/* Prepare master thread. */
master = frr_init();

1
zebra/main.c
View File

@ -390,7 +390,6 @@ int main(int argc, char **argv)
}
}
vty_config_lockless();
zebrad.master = frr_init();
/* Initialize pthread library */