From 7110b40d0686441f6212af65b3a046623eb6fb49 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Wed, 26 Oct 2016 11:09:44 +0200 Subject: [PATCH] MINOR: cfgparse: Add functions to backup and restore registered sections This feature will be used by the stream processing offload engine (SPOE) to parse dedicated configuration files without mixing HAProxy sections with SPOE sections. So, here we can back up all sections known by HAProxy, unregister all of them and add new ones, dedicted to the SPOE. Once the SPOE configuration file parsed, we can roll back all changes by restoring HAProxy sections. --- include/common/cfgparse.h | 2 ++ src/cfgparse.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h index 39e8a4c5b..9f432ad39 100644 --- a/include/common/cfgparse.h +++ b/include/common/cfgparse.h @@ -74,6 +74,8 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf, int cfg_register_section(char *section_name, int (*section_parser)(const char *, int, char **, int)); void cfg_unregister_sections(void); +void cfg_backup_sections(struct list *backup_sections); +void cfg_restore_sections(struct list *backup_sections); int warnif_misplaced_tcp_conn(struct proxy *proxy, const char *file, int line, const char *arg); int warnif_misplaced_tcp_sess(struct proxy *proxy, const char *file, int line, const char *arg); int warnif_misplaced_tcp_cont(struct proxy *proxy, const char *file, int line, const char *arg); diff --git a/src/cfgparse.c b/src/cfgparse.c index 83accbeb9..5e849699b 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -9258,6 +9258,26 @@ void cfg_unregister_sections(void) } } +void cfg_backup_sections(struct list *backup_sections) +{ + struct cfg_section *cs, *ics; + + list_for_each_entry_safe(cs, ics, §ions, list) { + LIST_DEL(&cs->list); + LIST_ADDQ(backup_sections, &cs->list); + } +} + +void cfg_restore_sections(struct list *backup_sections) +{ + struct cfg_section *cs, *ics; + + list_for_each_entry_safe(cs, ics, backup_sections, list) { + LIST_DEL(&cs->list); + LIST_ADDQ(§ions, &cs->list); + } +} + __attribute__((constructor)) static void cfgparse_init(void) {