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

[MEDIUM] add the 'acl' keyword to the config language

Browse Source 
The 'acl' keyword allows one to declare a new ACL. It is an important part
of the ACL framework.
This commit is contained in:
Willy Tarreau 2007-05-07 00:53:22 +02:00
parent a84d374367
commit eb0c614f0e
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types/proxy.h
View File

@ -34,6 +34,7 @@
#include <common/regex.h> #include <common/regex.h>
#include <common/tools.h> #include <common/tools.h>
#include <types/acl.h>
#include <types/buffers.h> #include <types/buffers.h>
#include <types/httperr.h> #include <types/httperr.h>
#include <types/session.h> #include <types/session.h>
@ -82,6 +83,7 @@ struct proxy {
struct proxy *be; /* default backend, or NULL if none set */ struct proxy *be; /* default backend, or NULL if none set */
char *name; /* default backend name during config parse */ char *name; /* default backend name during config parse */
} defbe; } defbe;
struct list acl; /* ACL declared on this proxy */
struct server *srv; /* known servers */ struct server *srv; /* known servers */
int srv_act, srv_bck; /* # of running servers */ int srv_act, srv_bck; /* # of running servers */
int tot_wact, tot_wbck; /* total weights of active and backup servers */ int tot_wact, tot_wbck; /* total weights of active and backup servers */

9
src/cfgparse.c
View File

@ -33,6 +33,7 @@
#include <types/proxy.h> #include <types/proxy.h>
#include <types/queue.h> #include <types/queue.h>
#include <proto/acl.h>
#include <proto/backend.h> #include <proto/backend.h>
#include <proto/buffers.h> #include <proto/buffers.h>
#include <proto/checks.h> #include <proto/checks.h>
@ -492,6 +493,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args)
curproxy->next = proxy; curproxy->next = proxy;
proxy = curproxy; proxy = curproxy;
LIST_INIT(&curproxy->pendconns); LIST_INIT(&curproxy->pendconns);
LIST_INIT(&curproxy->acl);
curproxy->id = strdup(args[1]); curproxy->id = strdup(args[1]);
curproxy->cap = rc; curproxy->cap = rc;
@ -667,6 +669,13 @@ int cfg_parse_listen(const char *file, int linenum, char **args)
else if (!strcmp(args[0], "enabled")) { /* enables this proxy (used to revert a disabled default) */ else if (!strcmp(args[0], "enabled")) { /* enables this proxy (used to revert a disabled default) */
curproxy->state = PR_STNEW; curproxy->state = PR_STNEW;
} }
else if (!strcmp(args[0], "acl")) { /* add an ACL */
if (parse_acl((const char **)args + 1, &curproxy->acl) == NULL) {
Alert("parsing [%s:%d] : error detected while parsing ACL '%s'.\n",
file, linenum, args[1]);
return -1;
}
}
else if (!strcmp(args[0], "cookie")) { /* cookie name */ else if (!strcmp(args[0], "cookie")) { /* cookie name */
int cur_arg; int cur_arg;
// if (curproxy == &defproxy) { // if (curproxy == &defproxy) {