mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-11 12:41:00 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: cfgparse: move maxsslconn parsing to ssl_sock

Browse Source 
This one simply reuses the existing integer parser. It implicitly
adds a control against negative numbers.
This commit is contained in:
Willy Tarreau 2016-12-21 23:17:25 +01:00
parent 9ceda384e9
commit 0bea58d641
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cfgparse.c
View File

@ -1104,22 +1104,6 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
err_code |= ERR_ALERT; err_code |= ERR_ALERT;
} }
#endif /* SYSTEM_MAXCONN */ #endif /* SYSTEM_MAXCONN */
}
else if (!strcmp(args[0], "maxsslconn")) {
#ifdef USE_OPENSSL
if (alertif_too_many_args(1, file, linenum, args, &err_code))
goto out;
if (*(args[1]) == 0) {
Alert("parsing [%s:%d] : '%s' expects an integer argument.\n", file, linenum, args[0]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
global.maxsslconn = atol(args[1]);
#else
Alert("parsing [%s:%d] : '%s' is not implemented.\n", file, linenum, args[0]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
#endif
} }
else if (!strcmp(args[0], "ssl-default-bind-ciphers")) { else if (!strcmp(args[0], "ssl-default-bind-ciphers")) {
#ifdef USE_OPENSSL #ifdef USE_OPENSSL

3
src/ssl_sock.c
View File

@ -6025,6 +6025,8 @@ static int ssl_parse_global_int(char **args, int section_type, struct proxy *cur
target = (int *)&global.tune.ssl_max_record; target = (int *)&global.tune.ssl_max_record;
else if (strcmp(args[0], "tune.ssl.ssl-ctx-cache-size") == 0) else if (strcmp(args[0], "tune.ssl.ssl-ctx-cache-size") == 0)
target = &global.tune.ssl_ctx_cache; target = &global.tune.ssl_ctx_cache;
else if (strcmp(args[0], "maxsslconn") == 0)
target = &global.maxsslconn;
else { else {
memprintf(err, "'%s' keyword not unhandled (please report this bug).", args[0]); memprintf(err, "'%s' keyword not unhandled (please report this bug).", args[0]);
return -1; return -1;
@ -6510,6 +6512,7 @@ static struct srv_kw_list srv_kws = { "SSL", { }, {
static struct cfg_kw_list cfg_kws = {ILH, { static struct cfg_kw_list cfg_kws = {ILH, {
{ CFG_GLOBAL, "ca-base", ssl_parse_global_ca_crt_base }, { CFG_GLOBAL, "ca-base", ssl_parse_global_ca_crt_base },
{ CFG_GLOBAL, "crt-base", ssl_parse_global_ca_crt_base }, { CFG_GLOBAL, "crt-base", ssl_parse_global_ca_crt_base },
{ CFG_GLOBAL, "maxsslconn", ssl_parse_global_int },
{ CFG_GLOBAL, "ssl-default-bind-options", ssl_parse_default_bind_options }, { CFG_GLOBAL, "ssl-default-bind-options", ssl_parse_default_bind_options },
{ CFG_GLOBAL, "ssl-default-server-options", ssl_parse_default_server_options }, { CFG_GLOBAL, "ssl-default-server-options", ssl_parse_default_server_options },
{ CFG_GLOBAL, "tune.ssl.cachesize", ssl_parse_global_int }, { CFG_GLOBAL, "tune.ssl.cachesize", ssl_parse_global_int },