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
f217f3eb
Commit
f217f3eb
authored
Sep 10, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be more consistent about using the VCL typedefs
parent
507d14a1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
cache_vrt.c
bin/varnishd/cache/cache_vrt.c
+9
-7
vrt.h
include/vrt.h
+6
-6
No files found.
bin/varnishd/cache/cache_vrt.c
View file @
f217f3eb
...
...
@@ -297,24 +297,26 @@ VRT_r_now(const struct vrt_ctx *ctx)
/*--------------------------------------------------------------------*/
char
*
VRT_IP_string
(
const
struct
vrt_ctx
*
ctx
,
const
struct
sockaddr_storage
*
sa
)
VRT_IP_string
(
const
struct
vrt_ctx
*
ctx
,
const
VCL_IP
ip
)
{
char
*
p
;
const
struct
sockaddr
*
sa
;
const
struct
sockaddr_in
*
si4
;
const
struct
sockaddr_in6
*
si6
;
const
void
*
addr
;
int
len
;
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
switch
(
sa
->
ss_family
)
{
sa
=
ip
;
switch
(
sa
->
sa_family
)
{
case
AF_INET
:
len
=
INET_ADDRSTRLEN
;
si4
=
(
const
void
*
)
sa
;
si4
=
ip
;
addr
=
&
(
si4
->
sin_addr
);
break
;
case
AF_INET6
:
len
=
INET6_ADDRSTRLEN
;
si6
=
(
const
void
*
)
sa
;
si6
=
ip
;
addr
=
&
(
si6
->
sin6_addr
);
break
;
default:
...
...
@@ -322,7 +324,7 @@ VRT_IP_string(const struct vrt_ctx *ctx, const struct sockaddr_storage *sa)
}
XXXAN
(
len
);
AN
(
p
=
WS_Alloc
(
ctx
->
ws
,
len
));
AN
(
inet_ntop
(
sa
->
s
s
_family
,
addr
,
p
,
len
));
AN
(
inet_ntop
(
sa
->
s
a
_family
,
addr
,
p
,
len
));
return
(
p
);
}
...
...
@@ -364,8 +366,8 @@ VRT_TIME_string(const struct vrt_ctx *ctx, double t)
return
(
p
);
}
const
char
*
VRT_BACKEND_string
(
const
struct
director
*
d
)
const
char
*
__match_proto__
()
VRT_BACKEND_string
(
VCL_BACKEND
d
)
{
if
(
d
==
NULL
)
return
(
NULL
);
...
...
include/vrt.h
View file @
f217f3eb
...
...
@@ -252,10 +252,10 @@ int VRT_Stv(const char *nm);
/* Convert things to string */
char
*
VRT_IP_string
(
const
struct
vrt_ctx
*
,
const
struct
sockaddr_storage
*
sa
);
char
*
VRT_INT_string
(
const
struct
vrt_ctx
*
,
long
);
char
*
VRT_REAL_string
(
const
struct
vrt_ctx
*
,
double
);
char
*
VRT_TIME_string
(
const
struct
vrt_ctx
*
,
double
);
const
char
*
VRT_BOOL_string
(
unsigned
);
const
char
*
VRT_BACKEND_string
(
const
struct
director
*
d
);
char
*
VRT_IP_string
(
const
struct
vrt_ctx
*
,
VCL_IP
);
char
*
VRT_INT_string
(
const
struct
vrt_ctx
*
,
VCL_INT
);
char
*
VRT_REAL_string
(
const
struct
vrt_ctx
*
,
VCL_REAL
);
char
*
VRT_TIME_string
(
const
struct
vrt_ctx
*
,
VCL_TIME
);
const
char
*
VRT_BOOL_string
(
VCL_BOOL
);
const
char
*
VRT_BACKEND_string
(
VCL_BACKEND
);
const
char
*
VRT_CollectString
(
const
struct
vrt_ctx
*
,
const
char
*
p
,
...);
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