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
4580b7de
Commit
4580b7de
authored
Aug 19, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hmm, as always git cheats me when I add files.
parent
0e507635
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
v00038.vtc
bin/varnishtest/tests/v00038.vtc
+2
-2
vss.h
include/vss.h
+1
-1
vss.c
lib/libvarnish/vss.c
+4
-5
vcc_backend.c
lib/libvcl/vcc_backend.c
+5
-4
No files found.
bin/varnishtest/tests/v00038.vtc
View file @
4580b7de
varnishtest "VCL compiler coverage test: vcc_backend.c
varnishtest "VCL compiler coverage test: vcc_backend.c
"
varnish v1 -errvcl "IPv6 address [] wrong" {
backend b1 {
...
...
@@ -59,7 +59,7 @@ varnish v1 -errvcl "NB: Backend Syntax has changed:" {
}
}
varnish v1 -errvcl "Expected '{' or name of probe
.
" {
varnish v1 -errvcl "Expected '{' or name of probe
, got
" {
backend b1 {
.host = "127.0.0.1";
.probe = "NONE";
...
...
include/vss.h
View file @
4580b7de
...
...
@@ -29,7 +29,7 @@
/* vss.c */
struct
vss_addr
;
int
VSS_parse
(
const
char
*
str
,
char
**
addr
,
char
**
port
);
const
char
*
VSS_parse
(
const
char
*
str
,
char
**
addr
,
char
**
port
);
int
VSS_resolve
(
const
char
*
addr
,
const
char
*
port
,
struct
vss_addr
***
ta
);
int
VSS_bind
(
const
struct
vss_addr
*
addr
);
int
VSS_listen
(
const
struct
vss_addr
*
addr
,
int
depth
);
...
...
lib/libvarnish/vss.c
View file @
4580b7de
...
...
@@ -71,7 +71,7 @@ struct vss_addr {
* See also RFC5952
*/
int
const
char
*
VSS_parse
(
const
char
*
str
,
char
**
addr
,
char
**
port
)
{
const
char
*
p
;
...
...
@@ -83,7 +83,7 @@ VSS_parse(const char *str, char **addr, char **port)
if
((
p
=
strchr
(
str
,
']'
))
==
NULL
||
p
==
str
+
1
||
(
p
[
1
]
!=
'\0'
&&
p
[
1
]
!=
':'
))
return
(
-
1
);
return
(
"IPv6 address [] wrong."
);
*
addr
=
strdup
(
str
+
1
);
XXXAN
(
*
addr
);
(
*
addr
)[
p
-
(
str
+
1
)]
=
'\0'
;
...
...
@@ -109,7 +109,7 @@ VSS_parse(const char *str, char **addr, char **port)
XXXAN
(
*
port
);
}
}
return
(
0
);
return
(
NULL
);
}
/*
...
...
@@ -143,8 +143,7 @@ VSS_resolve(const char *addr, const char *port, struct vss_addr ***vap)
hints
.
ai_socktype
=
SOCK_STREAM
;
hints
.
ai_flags
=
AI_PASSIVE
;
ret
=
VSS_parse
(
addr
,
&
hop
,
&
adp
);
if
(
ret
)
if
(
VSS_parse
(
addr
,
&
hop
,
&
adp
)
!=
NULL
)
return
(
0
);
if
(
adp
==
NULL
)
...
...
lib/libvcl/vcc_backend.c
View file @
4580b7de
...
...
@@ -75,14 +75,15 @@ static void
Emit_Sockaddr
(
struct
vcc
*
tl
,
const
struct
token
*
t_host
,
const
char
*
port
)
{
const
char
*
ipv4
,
*
ipv4a
,
*
ipv6
,
*
ipv6a
,
*
pa
;
const
char
*
err
;
char
*
hop
,
*
pop
;
AN
(
t_host
->
dec
);
if
(
VSS_parse
(
t_host
->
dec
,
&
hop
,
&
pop
))
{
err
=
VSS_parse
(
t_host
->
dec
,
&
hop
,
&
pop
);
if
(
err
!=
NULL
)
{
VSB_printf
(
tl
->
sb
,
"Backend host '%.*s': wrong syntax (unbalanced [...] ?)
\n
"
,
PF
(
t_host
)
);
"Backend host '%.*s': %s
\n
"
,
PF
(
t_host
),
err
);
vcc_ErrWhere
(
tl
,
t_host
);
return
;
}
...
...
@@ -416,7 +417,7 @@ vcc_ParseHostDef(struct vcc *tl, int serial, const char *vgcname)
SkipToken
(
tl
,
';'
);
}
else
if
(
vcc_IdIs
(
t_field
,
"probe"
))
{
VSB_printf
(
tl
->
sb
,
"Expected '{' or name of probe
.
"
);
"Expected '{' or name of probe
, got
"
);
vcc_ErrToken
(
tl
,
tl
->
t
);
VSB_printf
(
tl
->
sb
,
" at
\n
"
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
...
...
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