mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: listener: add a scope field in the bind keyword lists

Browse Source 
This scope is used to report what the keywords are used for (eg: TCP,
UNIX, ...). It is now reported by bind_dump_kws().
This commit is contained in:
Willy Tarreau 2012-09-18 18:24:39 +02:00
parent 8638f4850f
commit 51fb7651c4
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/types/listener.h
View File

@ -173,9 +173,10 @@ struct bind_kw {
* A keyword list. It is a NULL-terminated array of keywords. It embeds a * A keyword list. It is a NULL-terminated array of keywords. It embeds a
* struct list in order to be linked to other lists, allowing it to easily * struct list in order to be linked to other lists, allowing it to easily
* be declared where it is needed, and linked without duplicating data nor * be declared where it is needed, and linked without duplicating data nor
* allocating memory. * allocating memory. It is also possible to indicate a scope for the keywords.
*/ */
struct bind_kw_list { struct bind_kw_list {
const char *scope;
struct list list; struct list list;
struct bind_kw kw[VAR_ARRAY]; struct bind_kw kw[VAR_ARRAY];
}; };

8
src/listener.c
View File

@ -469,9 +469,11 @@ void bind_dump_kws(char **out)
for (index = 0; kwl->kw[index].kw != NULL; index++) { for (index = 0; kwl->kw[index].kw != NULL; index++) {
if (kwl->kw[index].parse || if (kwl->kw[index].parse ||
bind_find_kw(kwl->kw[index].kw) == &kwl->kw[index]) { bind_find_kw(kwl->kw[index].kw) == &kwl->kw[index]) {
memprintf(out, "%s%s %s\n", *out ? *out : "", memprintf(out, "%s[%4s] %s%s%s\n", *out ? *out : "",
kwl->scope,
kwl->kw[index].kw, kwl->kw[index].kw,
kwl->kw[index].parse ? "" : "(not supported)"); kwl->kw[index].skip ? " <arg>" : "",
kwl->kw[index].parse ? "" : " (not supported)");
} }
} }
} }
@ -662,7 +664,7 @@ static struct acl_kw_list acl_kws = {{ },{
* the config parser can report an appropriate error when a known keyword was * the config parser can report an appropriate error when a known keyword was
* not enabled. * not enabled.
*/ */
static struct bind_kw_list bind_kws = {{ },{ static struct bind_kw_list bind_kws = { "ALL", { }, {
{ "accept-proxy", bind_parse_accept_proxy, 0 }, /* enable PROXY protocol */ { "accept-proxy", bind_parse_accept_proxy, 0 }, /* enable PROXY protocol */
{ "backlog", bind_parse_backlog, 1 }, /* set backlog of listening socket */ { "backlog", bind_parse_backlog, 1 }, /* set backlog of listening socket */
{ "id", bind_parse_id, 1 }, /* set id of listening socket */ { "id", bind_parse_id, 1 }, /* set id of listening socket */

2
src/proto_tcp.c
View File

@ -1842,7 +1842,7 @@ static struct sample_fetch_kw_list sample_fetch_keywords = {{ },{
* the config parser can report an appropriate error when a known keyword was * the config parser can report an appropriate error when a known keyword was
* not enabled. * not enabled.
*/ */
static struct bind_kw_list bind_kws = {{ },{ static struct bind_kw_list bind_kws = { "TCP", { }, {
#ifdef TCP_DEFER_ACCEPT #ifdef TCP_DEFER_ACCEPT
{ "defer-accept", bind_parse_defer_accept, 0 }, /* wait for some data for 1 second max before doing accept */ { "defer-accept", bind_parse_defer_accept, 0 }, /* wait for some data for 1 second max before doing accept */
#endif #endif

2
src/proto_uxst.c
View File

@ -493,7 +493,7 @@ static int bind_parse_user(char **args, int cur_arg, struct proxy *px, struct li
* the config parser can report an appropriate error when a known keyword was * the config parser can report an appropriate error when a known keyword was
* not enabled. * not enabled.
*/ */
static struct bind_kw_list bind_kws = {{ },{ static struct bind_kw_list bind_kws = { "UNIX", { }, {
{ "gid", bind_parse_gid, 1 }, /* set the socket's gid */ { "gid", bind_parse_gid, 1 }, /* set the socket's gid */
{ "group", bind_parse_group, 1 }, /* set the socket's gid from the group name */ { "group", bind_parse_group, 1 }, /* set the socket's gid from the group name */
{ "mode", bind_parse_mode, 1 }, /* set the socket's mode (eg: 0644)*/ { "mode", bind_parse_mode, 1 }, /* set the socket's mode (eg: 0644)*/

2
src/ssl_sock.c
View File

@ -903,7 +903,7 @@ static struct acl_kw_list acl_kws = {{ },{
* the config parser can report an appropriate error when a known keyword was * the config parser can report an appropriate error when a known keyword was
* not enabled. * not enabled.
*/ */
static struct bind_kw_list bind_kws = {{ },{ static struct bind_kw_list bind_kws = { "SSL", { }, {
{ "ciphers", bind_parse_ciphers, 1 }, /* set SSL cipher suite */ { "ciphers", bind_parse_ciphers, 1 }, /* set SSL cipher suite */
{ "crt", bind_parse_crt, 1 }, /* load SSL certificates from this location */ { "crt", bind_parse_crt, 1 }, /* load SSL certificates from this location */
{ "nosslv3", bind_parse_nosslv3, 0 }, /* disable SSLv3 */ { "nosslv3", bind_parse_nosslv3, 0 }, /* disable SSLv3 */