diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2017-06-02 19:08:14 -0300 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2017-06-02 22:15:17 -0300 |
| commit | e4a82008c60e9508e53595eea2ff94051171b28c (patch) | |
| tree | 46d4865fdb5ff46a0086bcd7be7c966b3b3cfcf9 /ldpd/ldpd.h | |
| parent | ca70b756bf4c5b4aeb554fc1acd2c98aa696d6d7 (diff) | |
ldpd: further improvements in the configuration handling
This patch attempts to make the code easier to read by removing a
global variable and changing a few other things. Also, ldpd now calls
merge_config() only after reading the whole initial configuration at
startup, instead of doing that for every command in the configuration
file.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ldpd/ldpd.h')
| -rw-r--r-- | ldpd/ldpd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index 3acc4fbe2d..352a7b0d7e 100644 --- a/ldpd/ldpd.h +++ b/ldpd/ldpd.h @@ -29,6 +29,7 @@ #include "qobj.h" #include "prefix.h" #include "filter.h" +#include "vty.h" #include "ldp.h" @@ -516,7 +517,6 @@ struct ldpd_af_global { struct ldpd_global { int cmd_opts; - int sighup; struct in_addr rtr_id; struct ldpd_af_global ipv4; struct ldpd_af_global ipv6; @@ -719,7 +719,7 @@ struct ldpd_af_conf *ldp_af_conf_get(struct ldpd_conf *, int); struct ldpd_af_global *ldp_af_global_get(struct ldpd_global *, int); int ldp_is_dual_stack(struct ldpd_conf *); in_addr_t ldp_rtr_id_get(struct ldpd_conf *); -int ldp_reload(struct ldpd_conf *); +int ldp_config_apply(struct vty *, struct ldpd_conf *); void ldp_clear_config(struct ldpd_conf *); void merge_config(struct ldpd_conf *, struct ldpd_conf *); struct ldpd_conf *config_new_empty(void); |