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

REORG: server: use flags for parse_server

Browse Source 
Modify the API of parse_server function. Use flags to describe the type
of the parsed server instead of discrete arguments. These flags can be
used to specify if a server/default-server/server-template is parsed.
Additional parameters are also specified (parsing of the address
required, resolve of a name must be done immediately).

It is now unneeded to use strcmp on args[0] in parse_server. Also, the
calls to parse_server are more explicit thanks to the flags.
This commit is contained in:
Amaury Denoyelle 2021-03-08 16:36:46 +01:00
parent cf58dd79e3
commit 30c0537f5a
7 changed files with 216 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/server-t.h
View File

@ -432,6 +432,12 @@ struct srv_kw_list {
struct srv_kw kw[VAR_ARRAY]; struct srv_kw kw[VAR_ARRAY];
}; };
#define SRV_PARSE_DEFAULT_SERVER 0x01 /* 'default-server' keyword */
#define SRV_PARSE_TEMPLATE 0x02 /* 'server-template' keyword */
#define SRV_PARSE_IN_PEER_SECTION 0x04 /* keyword in a peer section */
#define SRV_PARSE_PARSE_ADDR 0x08 /* required to parse the server address in the second argument */
#define SRV_PARSE_INITIAL_RESOLVE 0x10 /* resolve immediately the fqdn to an ip address */
#endif /* _HAPROXY_SERVER_T_H */ #endif /* _HAPROXY_SERVER_T_H */
/* /*

2
include/haproxy/server.h
View File

@ -45,7 +45,7 @@ extern struct dict server_key_dict;
int srv_downtime(const struct server *s); int srv_downtime(const struct server *s);
int srv_lastsession(const struct server *s); int srv_lastsession(const struct server *s);
int srv_getinter(const struct check *check); int srv_getinter(const struct check *check);
int parse_server(const char *file, int linenum, char **args, struct proxy *curproxy, const struct proxy *defproxy, int parse_addr, int in_peers_section, int initial_resolve); int parse_server(const char *file, int linenum, char **args, struct proxy *curproxy, const struct proxy *defproxy, int parse_flags);
int srv_update_addr(struct server *s, void *ip, int ip_sin_family, const char *updater); int srv_update_addr(struct server *s, void *ip, int ip_sin_family, const char *updater);
const char *srv_update_addr_port(struct server *s, const char *addr, const char *port, char *updater); const char *srv_update_addr_port(struct server *s, const char *addr, const char *port, char *updater);
const char *srv_update_check_addr_port(struct server *s, const char *addr, const char *port); const char *srv_update_check_addr_port(struct server *s, const char *addr, const char *port);

25
src/cfgparse-listen.c
View File

@ -342,10 +342,27 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
curproxy->conf.args.line = linenum; curproxy->conf.args.line = linenum;
/* Now let's parse the proxy-specific keywords */ /* Now let's parse the proxy-specific keywords */
if (strcmp(args[0], "server") == 0 || if ((strcmp(args[0], "server") == 0)) {
strcmp(args[0], "default-server") == 0 || err_code |= parse_server(file, linenum, args,
strcmp(args[0], "server-template") == 0) { curproxy, curr_defproxy,
err_code |= parse_server(file, linenum, args, curproxy, curr_defproxy, 1, 0, 0); SRV_PARSE_PARSE_ADDR);
if (err_code & ERR_FATAL)
goto out;
}
else if (strcmp(args[0], "default-server") == 0) {
err_code |= parse_server(file, linenum, args,
curproxy, curr_defproxy,
SRV_PARSE_DEFAULT_SERVER);
if (err_code & ERR_FATAL)
goto out;
}
else if (strcmp(args[0], "server-template") == 0) {
err_code |= parse_server(file, linenum, args,
curproxy, curr_defproxy,
SRV_PARSE_TEMPLATE|SRV_PARSE_PARSE_ADDR);
if (err_code & ERR_FATAL) if (err_code & ERR_FATAL)
goto out; goto out;
} }

8
src/cfgparse.c
View File

@ -706,7 +706,8 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
err_code |= ERR_ALERT | ERR_ABORT; err_code |= ERR_ALERT | ERR_ABORT;
goto out; goto out;
} }
err_code |= parse_server(file, linenum, args, curpeers->peers_fe, NULL, 0, 1, 1); err_code |= parse_server(file, linenum, args, curpeers->peers_fe, NULL,
SRV_PARSE_DEFAULT_SERVER|SRV_PARSE_IN_PEER_SECTION|SRV_PARSE_INITIAL_RESOLVE);
} }
else if (strcmp(args[0], "log") == 0) { else if (strcmp(args[0], "log") == 0) {
if (init_peers_frontend(file, linenum, NULL, curpeers) != 0) { if (init_peers_frontend(file, linenum, NULL, curpeers) != 0) {
@ -768,6 +769,7 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
else if (strcmp(args[0], "peer") == 0 || else if (strcmp(args[0], "peer") == 0 ||
strcmp(args[0], "server") == 0) { /* peer or server definition */ strcmp(args[0], "server") == 0) { /* peer or server definition */
int local_peer, peer; int local_peer, peer;
int parse_addr = 0;
peer = *args[0] == 'p'; peer = *args[0] == 'p';
local_peer = strcmp(args[1], localpeer) == 0; local_peer = strcmp(args[1], localpeer) == 0;
@ -815,7 +817,9 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
* The server address is parsed only if we are parsing a "peer" line, * The server address is parsed only if we are parsing a "peer" line,
* or if we are parsing a "server" line and the current peer is not the local one. * or if we are parsing a "server" line and the current peer is not the local one.
*/ */
err_code |= parse_server(file, linenum, args, curpeers->peers_fe, NULL, peer || !local_peer, 1, 1); parse_addr = (peer || !local_peer) ? SRV_PARSE_PARSE_ADDR : 0;
err_code |= parse_server(file, linenum, args, curpeers->peers_fe, NULL,
SRV_PARSE_IN_PEER_SECTION|parse_addr|SRV_PARSE_INITIAL_RESOLVE);
if (!curpeers->peers_fe->srv) { if (!curpeers->peers_fe->srv) {
/* Remove the newly allocated peer. */ /* Remove the newly allocated peer. */
if (newpeer != curpeers->local) { if (newpeer != curpeers->local) {

3
src/resolvers.c
View File

@ -2971,7 +2971,8 @@ int cfg_parse_resolvers(const char *file, int linenum, char **args, int kwm)
HA_SPIN_INIT(&curr_resolvers->lock); HA_SPIN_INIT(&curr_resolvers->lock);
} }
else if (strcmp(args[0],"server") == 0) { else if (strcmp(args[0],"server") == 0) {
err_code |= parse_server(file, linenum, args, curr_resolvers->px, NULL, 1, 0, 1); err_code |= parse_server(file, linenum, args, curr_resolvers->px, NULL,
SRV_PARSE_PARSE_ADDR|SRV_PARSE_INITIAL_RESOLVE);
} }
else if (strcmp(args[0], "nameserver") == 0) { /* nameserver definition */ else if (strcmp(args[0], "nameserver") == 0) { /* nameserver definition */
struct dns_nameserver *newnameserver = NULL; struct dns_nameserver *newnameserver = NULL;

110
src/server.c
View File

@ -2326,39 +2326,21 @@ static int _srv_parse_tmpl_init(struct server *srv, struct proxy *px)
* of memory exhaustion, ERR_ABORT is set. If the server cannot be allocated, * of memory exhaustion, ERR_ABORT is set. If the server cannot be allocated,
* <srv> will be set to NULL. * <srv> will be set to NULL.
*/ */
static int _srv_parse_init(struct server **srv, char **args, int *cur_arg, struct proxy *curproxy, static int _srv_parse_init(struct server **srv, char **args, int *cur_arg,
int parse_addr, int in_peers_section, int initial_resolve, struct proxy *curproxy,
char **errmsg) int parse_flags, char **errmsg)
{ {
struct server *newsrv = NULL; struct server *newsrv = NULL;
const char *err = NULL; const char *err = NULL;
int err_code = 0; int err_code = 0;
char *fqdn = NULL; char *fqdn = NULL;
int tmpl_range_low = 0, tmpl_range_high = 0;
*srv = NULL; *srv = NULL;
if (strcmp(args[0], "server") == 0 ||
strcmp(args[0], "peer") == 0 ||
strcmp(args[0], "default-server") == 0 ||
strcmp(args[0], "server-template") == 0) {
int defsrv = (*args[0] == 'd');
int srv_kw = !defsrv && (*args[0] == 'p' || strcmp(args[0], "server") == 0);
int srv_tmpl = !defsrv && !srv_kw;
int tmpl_range_low = 0, tmpl_range_high = 0;
/* There is no mandatory first arguments for default server. */ /* There is no mandatory first arguments for default server. */
if (srv_kw && parse_addr) { if (parse_flags & SRV_PARSE_PARSE_ADDR) {
if (!*args[2]) { if (parse_flags & SRV_PARSE_TEMPLATE) {
/* 'server' line number of argument check. */
memprintf(errmsg, "'%s' expects <name> and <addr>[:<port>] as arguments.",
args[0]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
err = invalid_char(args[1]);
}
else if (srv_tmpl) {
if (!*args[3]) { if (!*args[3]) {
/* 'server-template' line number of argument check. */ /* 'server-template' line number of argument check. */
memprintf(errmsg, "'%s' expects <prefix> <nb | range> <addr>[:<port>] as arguments.", memprintf(errmsg, "'%s' expects <prefix> <nb | range> <addr>[:<port>] as arguments.",
@ -2369,16 +2351,28 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg, struc
err = invalid_prefix_char(args[1]); err = invalid_prefix_char(args[1]);
} }
else {
if (err) { if (!*args[2]) {
memprintf(errmsg, "character '%c' is not permitted in %s %s '%s'.", /* 'server' line number of argument check. */
*err, args[0], srv_kw ? "name" : "prefix", args[1]); memprintf(errmsg, "'%s' expects <name> and <addr>[:<port>] as arguments.",
args[0]);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }
err = invalid_char(args[1]);
}
if (err) {
memprintf(errmsg, "character '%c' is not permitted in %s %s '%s'.",
*err, args[0], !(parse_flags & SRV_PARSE_TEMPLATE) ? "name" : "prefix", args[1]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
}
*cur_arg = 2; *cur_arg = 2;
if (srv_tmpl) { if (parse_flags & SRV_PARSE_TEMPLATE) {
/* Parse server-template <nb | range> arg. */ /* Parse server-template <nb | range> arg. */
if (_srv_parse_tmpl_range(newsrv, args[*cur_arg], &tmpl_range_low, &tmpl_range_high) < 0) { if (_srv_parse_tmpl_range(newsrv, args[*cur_arg], &tmpl_range_low, &tmpl_range_high) < 0) {
memprintf(errmsg, "Wrong %s number or range arg '%s'.", memprintf(errmsg, "Wrong %s number or range arg '%s'.",
@ -2389,7 +2383,7 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg, struc
(*cur_arg)++; (*cur_arg)++;
} }
if (!defsrv) { if (!(parse_flags & SRV_PARSE_DEFAULT_SERVER)) {
struct sockaddr_storage *sk; struct sockaddr_storage *sk;
int port1, port2, port; int port1, port2, port;
@ -2400,7 +2394,7 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg, struc
goto out; goto out;
} }
if (srv_tmpl) { if (parse_flags & SRV_PARSE_TEMPLATE) {
newsrv->tmpl_info.nb_low = tmpl_range_low; newsrv->tmpl_info.nb_low = tmpl_range_low;
newsrv->tmpl_info.nb_high = tmpl_range_high; newsrv->tmpl_info.nb_high = tmpl_range_high;
} }
@ -2409,7 +2403,7 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg, struc
* This is a temporary id which will be used for server allocations to come * This is a temporary id which will be used for server allocations to come
* after parsing. * after parsing.
*/ */
if (srv_kw) if (!(parse_flags & SRV_PARSE_TEMPLATE))
newsrv->id = strdup(args[1]); newsrv->id = strdup(args[1]);
else else
newsrv->tmpl_info.prefix = strdup(args[1]); newsrv->tmpl_info.prefix = strdup(args[1]);
@ -2421,12 +2415,12 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg, struc
* - IP:+N => port=+N, relative * - IP:+N => port=+N, relative
* - IP:-N => port=-N, relative * - IP:-N => port=-N, relative
*/ */
if (!parse_addr) if (!(parse_flags & SRV_PARSE_PARSE_ADDR))
goto skip_addr; goto skip_addr;
sk = str2sa_range(args[*cur_arg], &port, &port1, &port2, NULL, NULL, sk = str2sa_range(args[*cur_arg], &port, &port1, &port2, NULL, NULL,
errmsg, NULL, &fqdn, errmsg, NULL, &fqdn,
(initial_resolve ? PA_O_RESOLVE : 0) | PA_O_PORT_OK | PA_O_PORT_OFS | PA_O_STREAM | PA_O_XPRT | PA_O_CONNECT); (parse_flags & SRV_PARSE_INITIAL_RESOLVE ? PA_O_RESOLVE : 0) | PA_O_PORT_OK | PA_O_PORT_OFS | PA_O_STREAM | PA_O_XPRT | PA_O_CONNECT);
if (!sk) { if (!sk) {
memprintf(errmsg, "'%s %s' : %s", args[0], args[1], *errmsg); memprintf(errmsg, "'%s %s' : %s", args[0], args[1], *errmsg);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
@ -2475,13 +2469,13 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg, struc
/* Copy default server settings to new server settings. */ /* Copy default server settings to new server settings. */
srv_settings_cpy(newsrv, &curproxy->defsrv, 0); srv_settings_cpy(newsrv, &curproxy->defsrv, 0);
HA_SPIN_INIT(&newsrv->lock); HA_SPIN_INIT(&newsrv->lock);
} else { }
else {
*srv = newsrv = &curproxy->defsrv; *srv = newsrv = &curproxy->defsrv;
*cur_arg = 1; *cur_arg = 1;
newsrv->resolv_opts.family_prio = AF_INET6; newsrv->resolv_opts.family_prio = AF_INET6;
newsrv->resolv_opts.accept_duplicate_ip = 0; newsrv->resolv_opts.accept_duplicate_ip = 0;
} }
}
free(fqdn); free(fqdn);
return 0; return 0;
@ -2501,9 +2495,9 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg, struc
* A mask of errors is returned. ERR_FATAL is set if the parsing should be * A mask of errors is returned. ERR_FATAL is set if the parsing should be
* interrupted. * interrupted.
*/ */
static int _srv_parse_kw(struct server *srv, int defsrv, char **args, int *cur_arg, struct proxy *curproxy, static int _srv_parse_kw(struct server *srv, char **args, int *cur_arg,
int parse_addr, int in_peers_section, int initial_resolve, struct proxy *curproxy,
char **errmsg) int parse_flags, char **errmsg)
{ {
int err_code = 0; int err_code = 0;
struct srv_kw *kw; struct srv_kw *kw;
@ -2529,7 +2523,7 @@ static int _srv_parse_kw(struct server *srv, int defsrv, char **args, int *cur_a
goto out; goto out;
} }
if (defsrv && !kw->default_ok) { if ((parse_flags & SRV_PARSE_DEFAULT_SERVER) && !kw->default_ok) {
memprintf(errmsg, "'%s' option is not accepted in default-server sections", memprintf(errmsg, "'%s' option is not accepted in default-server sections",
args[*cur_arg]); args[*cur_arg]);
err_code = ERR_ALERT; err_code = ERR_ALERT;
@ -2606,23 +2600,17 @@ static int _srv_parse_finalize(char **args, int cur_arg,
return 0; return 0;
} }
int parse_server(const char *file, int linenum, char **args, struct proxy *curproxy, int parse_server(const char *file, int linenum, char **args,
const struct proxy *defproxy, int parse_addr, int in_peers_section, int initial_resolve) struct proxy *curproxy, const struct proxy *defproxy,
int parse_flags)
{ {
struct server *newsrv = NULL; struct server *newsrv = NULL;
char *errmsg = NULL; char *errmsg = NULL;
int err_code = 0; int err_code = 0;
if (strcmp(args[0], "server") == 0 ||
strcmp(args[0], "peer") == 0 ||
strcmp(args[0], "default-server") == 0 ||
strcmp(args[0], "server-template") == 0) {
int cur_arg; int cur_arg;
int defsrv = (*args[0] == 'd');
int srv = !defsrv && (*args[0] == 'p' || strcmp(args[0], "server") == 0);
int srv_tmpl = !defsrv && !srv;
if (!defsrv && curproxy == defproxy) { if (!(parse_flags & SRV_PARSE_DEFAULT_SERVER) && curproxy == defproxy) {
ha_alert("parsing [%s:%d] : '%s' not allowed in 'defaults' section.\n", file, linenum, args[0]); ha_alert("parsing [%s:%d] : '%s' not allowed in 'defaults' section.\n", file, linenum, args[0]);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
@ -2632,21 +2620,21 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
goto out; goto out;
} }
if (srv && parse_addr) { if ((parse_flags & (SRV_PARSE_IN_PEER_SECTION|SRV_PARSE_PARSE_ADDR)) ==
if (!*args[2]) { (SRV_PARSE_IN_PEER_SECTION|SRV_PARSE_PARSE_ADDR)) {
if (in_peers_section) if (!*args[2])
return 0; return 0;
} }
}
err_code = _srv_parse_init(&newsrv, args, &cur_arg, curproxy, err_code = _srv_parse_init(&newsrv, args, &cur_arg, curproxy,
parse_addr, in_peers_section, initial_resolve, &errmsg); parse_flags, &errmsg);
if (errmsg) { if (errmsg) {
ha_alert("parsing [%s:%d] : %s\n", file, linenum, errmsg); ha_alert("parsing [%s:%d] : %s\n", file, linenum, errmsg);
free(errmsg); free(errmsg);
} }
/* the servers are linked backwards first */ /* the servers are linked backwards first */
if (newsrv && !defsrv) { if (newsrv && !(parse_flags & SRV_PARSE_DEFAULT_SERVER)) {
newsrv->next = curproxy->srv; newsrv->next = curproxy->srv;
curproxy->srv = newsrv; curproxy->srv = newsrv;
} }
@ -2659,9 +2647,8 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
while (*args[cur_arg]) { while (*args[cur_arg]) {
errmsg = NULL; errmsg = NULL;
err_code |= _srv_parse_kw(newsrv, defsrv, args, &cur_arg, err_code = _srv_parse_kw(newsrv, args, &cur_arg, curproxy,
curproxy, parse_flags, &errmsg);
parse_addr, in_peers_section, initial_resolve, &errmsg);
if (err_code & ERR_ALERT) { if (err_code & ERR_ALERT) {
display_parser_err(file, linenum, args, cur_arg, err_code, &errmsg); display_parser_err(file, linenum, args, cur_arg, err_code, &errmsg);
@ -2672,7 +2659,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
goto out; goto out;
} }
if (!defsrv) { if (!(parse_flags & SRV_PARSE_DEFAULT_SERVER)) {
err_code |= _srv_parse_finalize(args, cur_arg, newsrv, curproxy, &errmsg); err_code |= _srv_parse_finalize(args, cur_arg, newsrv, curproxy, &errmsg);
if (err_code) { if (err_code) {
display_parser_err(file, linenum, args, cur_arg, err_code, &errmsg); display_parser_err(file, linenum, args, cur_arg, err_code, &errmsg);
@ -2683,9 +2670,8 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
goto out; goto out;
} }
if (srv_tmpl) if (parse_flags & SRV_PARSE_TEMPLATE)
_srv_parse_tmpl_init(newsrv, curproxy); _srv_parse_tmpl_init(newsrv, curproxy);
}
return 0; return 0;

3
src/sink.c
View File

@ -812,7 +812,8 @@ int cfg_parse_ring(const char *file, int linenum, char **args, int kwm)
} }
} }
else if (strcmp(args[0],"server") == 0) { else if (strcmp(args[0],"server") == 0) {
err_code |= parse_server(file, linenum, args, cfg_sink->forward_px, NULL, 1, 0, 1); err_code |= parse_server(file, linenum, args, cfg_sink->forward_px, NULL,
SRV_PARSE_PARSE_ADDR|SRV_PARSE_INITIAL_RESOLVE);
} }
else if (strcmp(args[0],"timeout") == 0) { else if (strcmp(args[0],"timeout") == 0) {
if (!cfg_sink || !cfg_sink->forward_px) { if (!cfg_sink || !cfg_sink->forward_px) {