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

*: remove the configuration lock from all daemons

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/vty.h b/lib/vty.h
index 5cc077523..ae6c4bae9 100644
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -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 *);