Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
a1c936c8
Commit
a1c936c8
authored
Apr 13, 2021
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Generalize the VCL flag stuff a little bit.
parent
c8174af6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
10 deletions
+31
-10
v00017.vtc
bin/varnishtest/tests/v00017.vtc
+1
-1
vcc_acl.c
lib/libvcc/vcc_acl.c
+10
-9
vcc_compile.h
lib/libvcc/vcc_compile.h
+1
-0
vcc_utils.c
lib/libvcc/vcc_utils.c
+19
-0
No files found.
bin/varnishtest/tests/v00017.vtc
View file @
a1c936c8
...
...
@@ -101,7 +101,7 @@ varnish v1 -errvcl {/mask only allowed once} {
sub vcl_recv { if (client.ip ~ a) { return(pass); } }
}
varnish v1 -errvcl {Expected
ACL flag after
:} {
varnish v1 -errvcl {Expected
a flag at
:} {
backend b { .host = "${localhost}"; }
acl a + foobar {
"10.0.1.0/22" / 22;
...
...
lib/libvcc/vcc_acl.c
View file @
a1c936c8
...
...
@@ -692,7 +692,7 @@ void
vcc_ParseAcl
(
struct
vcc
*
tl
)
{
struct
symbol
*
sym
;
struct
token
*
sign
;
int
sign
;
struct
acl
acl
[
1
];
INIT_OBJ
(
acl
,
VCC_ACL_MAGIC
);
...
...
@@ -706,19 +706,20 @@ vcc_ParseAcl(struct vcc *tl)
ERRCHK
(
tl
);
AN
(
sym
);
while
(
tl
->
t
->
tok
==
'-'
||
tl
->
t
->
tok
==
'+'
)
{
sign
=
tl
->
t
;
vcc_NextToken
(
tl
);
if
(
tl
->
t
->
b
!=
sign
->
e
)
{
VSB_cat
(
tl
->
sb
,
"Expected ACL flag after:
\n
"
);
vcc_ErrWhere
(
tl
,
sign
);
while
(
1
)
{
sign
=
vcc_IsFlag
(
tl
);
if
(
tl
->
err
)
{
VSB_cat
(
tl
->
sb
,
"Valid ACL flags are `log` and `table`:
\n
"
);
return
;
}
if
(
sign
<
0
)
break
;
if
(
vcc_IdIs
(
tl
->
t
,
"log"
))
{
acl
->
flag_log
=
sign
->
tok
==
'+'
;
acl
->
flag_log
=
sign
;
vcc_NextToken
(
tl
);
}
else
if
(
vcc_IdIs
(
tl
->
t
,
"table"
))
{
acl
->
flag_table
=
sign
->
tok
==
'+'
;
acl
->
flag_table
=
sign
;
vcc_NextToken
(
tl
);
}
else
{
VSB_cat
(
tl
->
sb
,
"Unknown ACL flag:
\n
"
);
...
...
lib/libvcc/vcc_compile.h
View file @
a1c936c8
...
...
@@ -431,6 +431,7 @@ double vcc_DurationUnit(struct vcc *);
void
vcc_ByteVal
(
struct
vcc
*
,
double
*
);
void
vcc_Duration
(
struct
vcc
*
tl
,
double
*
);
unsigned
vcc_UintVal
(
struct
vcc
*
tl
);
int
vcc_IsFlag
(
struct
vcc
*
tl
);
/* vcc_var.c */
sym_wildcard_t
vcc_Var_Wildcard
;
...
...
lib/libvcc/vcc_utils.c
View file @
a1c936c8
...
...
@@ -357,3 +357,22 @@ vcc_ByteVal(struct vcc *tl, double *d)
vcc_NextToken
(
tl
);
*
d
=
v
*
sc
;
}
/*--------------------------------------------------------------------*/
int
vcc_IsFlag
(
struct
vcc
*
tl
)
{
struct
token
*
sign
;
if
(
tl
->
t
->
tok
!=
'-'
&&
tl
->
t
->
tok
!=
'+'
)
return
(
-
1
);
sign
=
tl
->
t
;
vcc_NextToken
(
tl
);
if
(
tl
->
t
->
b
!=
sign
->
e
)
{
VSB_cat
(
tl
->
sb
,
"Expected a flag at:
\n
"
);
vcc_ErrWhere
(
tl
,
sign
);
return
(
-
1
);
}
return
(
sign
->
tok
==
'+'
?
1
:
0
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment