diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2023-06-13 22:50:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-13 22:50:39 +0300 |
| commit | 2b21ec2c4983a3219881c3dd16b61ae9560e9b26 (patch) | |
| tree | e99a60f4d80922fb323b3ce336f10af79d68e93b /lib/vty.h | |
| parent | ea4c53412ef2957775b7739b46057aa3d2873352 (diff) | |
| parent | c9d153e5e9dc29459ec7d24640a817d3c6fcd222 (diff) | |
Merge pull request #13766 from LabNConsulting/chopps/mgmtd-cleanup
mgmtd cleanup/simplify some code
Diffstat (limited to 'lib/vty.h')
| -rw-r--r-- | lib/vty.h | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -147,7 +147,6 @@ struct vty { /* Dynamic transaction information. */ bool pending_allowed; bool pending_commit; - bool no_implicit_commit; char *pending_cmds_buf; size_t pending_cmds_buflen; size_t pending_cmds_bufpos; @@ -408,7 +407,7 @@ extern bool vty_mgmt_fe_enabled(void); extern bool vty_mgmt_should_process_cli_apply_changes(struct vty *vty); extern bool mgmt_vty_read_configs(void); -extern int vty_mgmt_send_config_data(struct vty *vty); +extern int vty_mgmt_send_config_data(struct vty *vty, bool implicit_commit); extern int vty_mgmt_send_commit_config(struct vty *vty, bool validate_only, bool abort); extern int vty_mgmt_send_get_config(struct vty *vty, @@ -422,11 +421,7 @@ extern void vty_mgmt_resume_response(struct vty *vty, bool success); static inline bool vty_needs_implicit_commit(struct vty *vty) { - return (frr_get_cli_mode() == FRR_CLI_CLASSIC - ? ((vty->pending_allowed || vty->no_implicit_commit) - ? false - : true) - : false); + return frr_get_cli_mode() == FRR_CLI_CLASSIC && !vty->pending_allowed; } #ifdef __cplusplus |