MINOR: cfgparse: Parse scope lines and save the last one parsed

A scope is a section name between square bracket, alone on its line, ie:

  [scope-name]
  ...

The spaces at the beginning and at the end of the line are skipped. Comments at
the end of the line are also skipped.

When a scope is parsed, its name is saved in the global variable
cfg_scope. Initially, cfg_scope is NULL and it remains NULL until a valid scope
line is parsed.

This feature remains unused in the HAProxy configuration file and
undocumented. However, it will be used during SPOE configuration parsing.

diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h
index 9f432ad3992f8affce22766596d66586f688af87..9e75a6576215d286c857e06deb334fcbe7a8fcca 100644 (file)
--- a/include/common/cfgparse.h
+++ b/include/common/cfgparse.h
@@ -62,6 +62,7 @@ struct cfg_kw_list {
 
 extern int cfg_maxpconn;
 extern int cfg_maxconn;
+extern char *cfg_scope;
 
 int cfg_parse_global(const char *file, int linenum, char **args, int inv);
 int cfg_parse_listen(const char *file, int linenum, char **args, int inv);

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 5e849699b5ea45afa5fecc8b7010edd9065e5d07..acd570d3154534aae83c6bdd3a4c3ff44f99bc8e 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -205,6 +205,7 @@ static char *cursection = NULL;
 static struct proxy defproxy;          /* fake proxy used to assign default values on all instances */
 int cfg_maxpconn = DEFAULT_MAXCONN;    /* # of simultaneous connections per proxy (-N) */
 int cfg_maxconn = 0;                   /* # of simultaneous connections, (-n) */
+char *cfg_scope = NULL;                 /* the current scope during the configuration parsing */
 
 /* List head of all known configuration keywords */
 static struct cfg_kw_list cfg_keywords = {
@@ -7006,6 +7007,55 @@ out:
        return err_code;
 }
 
+int
+cfg_parse_scope(const char *file, int linenum, char *line)
+{
+       char *beg, *end, *scope = NULL;
+       int err_code = 0;
+       const char *err;
+
+       beg = line + 1;
+       end = strchr(beg, ']');
+
+       /* Detect end of scope declaration */
+       if (!end || end == beg) {
+               Alert("parsing [%s:%d] : empty scope name is forbidden.\n",
+                     file, linenum);
+               err_code |= ERR_ALERT | ERR_FATAL;
+               goto out;
+       }
+
+       /* Get scope name and check its validity */
+       scope = my_strndup(beg, end-beg);
+       err = invalid_char(scope);
+       if (err) {
+               Alert("parsing [%s:%d] : character '%c' is not permitted in a scope name.\n",
+                     file, linenum, *err);
+               err_code |= ERR_ALERT | ERR_ABORT;
+               goto out;
+       }
+
+       /* Be sure to have a scope declaration alone on its line */
+       line = end+1;
+       while (isspace((unsigned char)*line))
+               line++;
+       if (*line && *line != '#' && *line != '\n' && *line != '\r') {
+               Alert("parsing [%s:%d] : character '%c' is not permitted after scope declaration.\n",
+                     file, linenum, *line);
+               err_code |= ERR_ALERT | ERR_ABORT;
+               goto out;
+       }
+
+       /* We have a valid scope declaration, save it */
+       free(cfg_scope);
+       cfg_scope = scope;
+       scope = NULL;
+
+  out:
+       free(scope);
+       return err_code;
+}
+
 /*
  * This function reads and parses the configuration file given in the argument.
  * Returns the error code, 0 if OK, or any combination of :
@@ -7077,6 +7127,12 @@ next_line:
                while (isspace((unsigned char)*line))
                        line++;
 
+
+               if (*line == '[') {/* This is the begining if a scope */
+                       err_code |= cfg_parse_scope(file, linenum, line);
+                       goto next_line;
+               }
+
                arg = 0;
                args[arg] = line;
 
@@ -7328,6 +7384,8 @@ next_line:
                if (err_code & ERR_ABORT)
                        break;
        }
+       free(cfg_scope);
+       cfg_scope = NULL;
        cursection = NULL;
        free(thisline);
        fclose(f);