mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: startup: adapt list_append_word to use cfgfile

Browse Source 
list_append_word() helper was used before only to chain configuration file names
in a list. As now we start to use cfgfile structure which represents entire file
in memory and its metadata, let's adapt this helper to use this structure and
let's rename it to list_append_cfgfile().

Adapt functions, which process configuration files and directories to use
cfgfile structure and list_append_cfgfile() instead of wordlist.
This commit is contained in:
Valentine Krasnobaeva 2024-08-07 18:20:43 +02:00 committed by Willy Tarreau
parent 39f2a19620
commit bafb0ce272
3 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/cfgparse.h
View File

@ -140,7 +140,7 @@ const char *cfg_find_best_match(const char *word, const struct list *list, int s
int warnifnotcap(struct proxy *proxy, int cap, const char *file, int line, const char *arg, const char *hint);
int failifnotcap(struct proxy *proxy, int cap, const char *file, int line, const char *arg, const char *hint);
void cfg_dump_registered_keywords();
int list_append_word(struct list *li, const char *str, char **err);
int list_append_cfgfile(struct list *li, const char *filename, char **err);
/* simplified way to define a section parser */
#define REGISTER_CONFIG_SECTION(name, parse, post) \

33
src/cfgparse.c
View File

@ -1717,35 +1717,36 @@ static int cfg_parse_global_def_path(char **args, int section_type, struct proxy
return ret;
}
/* append a copy of string <str> (in a wordlist) at the end of the list <li>
/* append a copy of string <filename>, ptr to some allocated memory at the at
* the end of the list <li>.
* On failure : return 0 and <err> filled with an error message.
* The caller is responsible for freeing the <err> and <str> copy
* memory area using free()
* The caller is responsible for freeing the <err> and <filename> copy
* memory area using free().
*/
int list_append_word(struct list *li, const char *str, char **err)
int list_append_cfgfile(struct list *li, const char *filename, char **err)
{
struct wordlist *wl;
struct cfgfile *entry = NULL;
wl = calloc(1, sizeof(*wl));
if (!wl) {
entry = calloc(1, sizeof(*entry));
if (!entry) {
memprintf(err, "out of memory");
goto fail_wl;
goto fail_entry;
}
wl->s = strdup(str);
if (!wl->s) {
entry->filename = strdup(filename);
if (!entry->filename) {
memprintf(err, "out of memory");
goto fail_wl_s;
goto fail_entry_name;
}
LIST_APPEND(li, &wl->list);
LIST_APPEND(li, &entry->list);
return 1;
fail_wl_s:
free(wl->s);
fail_wl:
free(wl);
fail_entry_name:
free(entry->filename);
fail_entry:
free(entry);
return 0;
}

57
src/haproxy.c
View File

@ -1082,18 +1082,18 @@ static void stdio_quiet(int fd)
*/
static void cfgfiles_expand_directories(void)
{
struct wordlist *wl, *wlb;
struct cfgfile *cfg, *cfg_tmp;
char *err = NULL;
list_for_each_entry_safe(wl, wlb, &cfg_cfgfiles, list) {
list_for_each_entry_safe(cfg, cfg_tmp, &cfg_cfgfiles, list) {
struct stat file_stat;
struct dirent **dir_entries = NULL;
int dir_entries_nb;
int dir_entries_it;
if (stat(wl->s, &file_stat)) {
if (stat(cfg->filename, &file_stat)) {
ha_alert("Cannot open configuration file/directory %s : %s\n",
wl->s,
cfg->filename,
strerror(errno));
exit(1);
}
@ -1101,17 +1101,17 @@ static void cfgfiles_expand_directories(void)
if (!S_ISDIR(file_stat.st_mode))
continue;
/* from this point wl->s is a directory */
/* from this point cfg->name is a directory */
dir_entries_nb = scandir(wl->s, &dir_entries, NULL, alphasort);
dir_entries_nb = scandir(cfg->filename, &dir_entries, NULL, alphasort);
if (dir_entries_nb < 0) {
ha_alert("Cannot open configuration directory %s : %s\n",
wl->s,
cfg->filename,
strerror(errno));
exit(1);
}
/* for each element in the directory wl->s */
/* for each element in the directory cfg->name */
for (dir_entries_it = 0; dir_entries_it < dir_entries_nb; dir_entries_it++) {
struct dirent *dir_entry = dir_entries[dir_entries_it];
char *filename = NULL;
@ -1124,7 +1124,7 @@ static void cfgfiles_expand_directories(void)
!(d_name_cfgext && d_name_cfgext[4] == '\0'))
goto next_dir_entry;
if (!memprintf(&filename, "%s/%s", wl->s, dir_entry->d_name)) {
if (!memprintf(&filename, "%s/%s", cfg->filename, dir_entry->d_name)) {
ha_alert("Cannot load configuration files %s : out of memory.\n",
filename);
exit(1);
@ -1132,7 +1132,7 @@ static void cfgfiles_expand_directories(void)
if (stat(filename, &file_stat)) {
ha_alert("Cannot open configuration file %s : %s\n",
wl->s,
cfg->filename,
strerror(errno));
exit(1);
}
@ -1143,7 +1143,7 @@ static void cfgfiles_expand_directories(void)
if (!S_ISREG(file_stat.st_mode))
goto next_dir_entry;
if (!list_append_word(&wl->list, filename, &err)) {
if (!list_append_cfgfile(&cfg->list, filename, &err)) {
ha_alert("Cannot load configuration files %s : %s\n",
filename,
err);
@ -1157,10 +1157,10 @@ static void cfgfiles_expand_directories(void)
free(dir_entries);
/* remove the current directory (wl) from cfg_cfgfiles */
free(wl->s);
LIST_DELETE(&wl->list);
free(wl);
/* remove the current directory (cfg) from cfgfiles */
free(cfg->filename);
LIST_DELETE(&cfg->list);
free(cfg);
}
free(err);
@ -1175,7 +1175,7 @@ static int read_cfg(char *progname)
{
char *env_cfgfiles = NULL;
int env_err = 0;
struct wordlist *wl;
struct cfgfile *cfg;
int err_code = 0;
/* handle cfgfiles that are actually directories */
@ -1192,25 +1192,25 @@ static int read_cfg(char *progname)
setenv("HAPROXY_HTTPS_LOG_FMT", default_https_log_format, 1);
setenv("HAPROXY_TCP_LOG_FMT", default_tcp_log_format, 1);
setenv("HAPROXY_BRANCH", PRODUCT_BRANCH, 1);
list_for_each_entry(wl, &cfg_cfgfiles, list) {
list_for_each_entry(cfg, &cfg_cfgfiles, list) {
int ret;
if (env_err == 0) {
if (!memprintf(&env_cfgfiles, "%s%s%s",
(env_cfgfiles ? env_cfgfiles : ""),
(env_cfgfiles ? ";" : ""), wl->s))
(env_cfgfiles ? ";" : ""), cfg->filename))
env_err = 1;
}
ret = readcfgfile(wl->s);
ret = readcfgfile(cfg->filename);
if (ret == -1) {
ha_alert("Could not open configuration file %s : %s\n",
wl->s, strerror(errno));
cfg->filename, strerror(errno));
free(env_cfgfiles);
exit(1);
}
if (ret & (ERR_ABORT|ERR_FATAL))
ha_alert("Error(s) found in configuration file : %s\n", wl->s);
ha_alert("Error(s) found in configuration file : %s\n", cfg->filename);
err_code |= ret;
if (err_code & ERR_ABORT) {
free(env_cfgfiles);
@ -1831,7 +1831,7 @@ static void init_args(int argc, char **argv)
/* now that's a cfgfile list */
argv++; argc--;
while (argc > 0) {
if (!list_append_word(&cfg_cfgfiles, *argv, &err_msg)) {
if (!list_append_cfgfile(&cfg_cfgfiles, *argv, &err_msg)) {
ha_alert("Cannot load configuration file/directory %s : %s\n",
*argv,
err_msg);
@ -1861,7 +1861,7 @@ static void init_args(int argc, char **argv)
global.localpeer_cmdline = 1;
break;
case 'f' :
if (!list_append_word(&cfg_cfgfiles, *argv, &err_msg)) {
if (!list_append_cfgfile(&cfg_cfgfiles, *argv, &err_msg)) {
ha_alert("Cannot load configuration file/directory %s : %s\n",
*argv,
err_msg);
@ -2629,7 +2629,7 @@ static void init(int argc, char **argv)
void deinit(void)
{
struct proxy *p = proxies_list, *p0;
struct wordlist *wl, *wlb;
struct cfgfile *cfg, *cfg_tmp;
struct uri_auth *uap, *ua = NULL;
struct logger *log, *logb;
struct build_opts_str *bol, *bolb;
@ -2766,10 +2766,11 @@ void deinit(void)
free_logger(log);
}
list_for_each_entry_safe(wl, wlb, &cfg_cfgfiles, list) {
free(wl->s);
LIST_DELETE(&wl->list);
free(wl);
list_for_each_entry_safe(cfg, cfg_tmp, &cfg_cfgfiles, list) {
ha_free(&cfg->content);
ha_free(&cfg->filename);
LIST_DELETE(&cfg->list);
ha_free(&cfg);
}
list_for_each_entry_safe(bol, bolb, &build_opts_list, list) {