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
1b4695eb
Commit
1b4695eb
authored
Jun 17, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename VRT_init_vbe() to VRT_new_backend()
parent
02f1654d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
7 deletions
+9
-7
cache_backend.c
bin/varnishd/cache/cache_backend.c
+3
-5
cache_backend.h
bin/varnishd/cache/cache_backend.h
+1
-0
cache_backend_cfg.c
bin/varnishd/cache/cache_backend_cfg.c
+3
-0
vrt.h
include/vrt.h
+1
-1
vcc_backend.c
lib/libvcc/vcc_backend.c
+1
-1
No files found.
bin/varnishd/cache/cache_backend.c
View file @
1b4695eb
...
...
@@ -297,16 +297,14 @@ vbe_dir_http1pipe(const struct director *d, struct req *req, struct busyobj *bo)
/*--------------------------------------------------------------------*/
void
VRT_
init_vbe
(
VRT_CTX
,
struct
director
**
dp
,
const
struct
vrt_backend
*
vrt
)
struct
director
*
VRT_
new_backend
(
VRT_CTX
,
const
struct
vrt_backend
*
vrt
)
{
struct
director
*
d
;
struct
backend
*
be
;
ASSERT_CLI
();
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
AN
(
dp
);
AZ
(
*
dp
);
CHECK_OBJ_NOTNULL
(
vrt
,
VRT_BACKEND_MAGIC
);
AN
(
ctx
->
vcl
);
...
...
@@ -328,7 +326,7 @@ VRT_init_vbe(VRT_CTX, struct director **dp, const struct vrt_backend *vrt)
if
(
vrt
->
probe
!=
NULL
)
VBP_Insert
(
be
,
vrt
->
probe
,
vrt
->
hosthdr
);
*
dp
=
d
;
return
(
d
)
;
}
void
...
...
bin/varnishd/cache/cache_backend.h
View file @
1b4695eb
...
...
@@ -62,6 +62,7 @@ struct backend {
int
refcount
;
struct
lock
mtx
;
const
struct
vcl
*
vcl
;
const
char
*
vcl_name
;
char
*
display_name
;
const
char
*
ipv4_addr
;
...
...
bin/varnishd/cache/cache_backend_cfg.c
View file @
1b4695eb
...
...
@@ -82,7 +82,9 @@ VBE_AddBackend(const struct vrt_ctx *ctx, const struct vrt_backend *vb)
char
buf
[
128
];
struct
vcl
*
vcl
;
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
vcl
=
ctx
->
vcl
;
AN
(
vcl
);
AN
(
vb
->
vcl_name
);
assert
(
vb
->
ipv4_suckaddr
!=
NULL
||
vb
->
ipv6_suckaddr
!=
NULL
);
...
...
@@ -94,6 +96,7 @@ VBE_AddBackend(const struct vrt_ctx *ctx, const struct vrt_backend *vb)
bprintf
(
buf
,
"%s.%s"
,
VCL_Name
(
vcl
),
vb
->
vcl_name
);
REPLACE
(
b
->
display_name
,
buf
);
b
->
vcl
=
vcl
;
b
->
vcl_name
=
vb
->
vcl_name
;
b
->
ipv4_addr
=
vb
->
ipv4_addr
;
b
->
ipv6_addr
=
vb
->
ipv6_addr
;
...
...
include/vrt.h
View file @
1b4695eb
...
...
@@ -242,7 +242,7 @@ void VRT_Rollback(VRT_CTX, const struct http *);
void
VRT_synth_page
(
VRT_CTX
,
const
char
*
,
...);
/* Backend related */
void
VRT_init_vbe
(
VRT_CTX
,
struct
director
**
,
const
struct
vrt_backend
*
);
struct
director
*
VRT_new_backend
(
VRT_CTX
,
const
struct
vrt_backend
*
);
#ifdef VCL_RET_MAX
void
VRT_event_vbe
(
VRT_CTX
,
enum
vcl_event_e
,
const
struct
director
*
,
const
struct
vrt_backend
*
);
...
...
lib/libvcc/vcc_backend.c
View file @
1b4695eb
...
...
@@ -410,7 +410,7 @@ vcc_ParseHostDef(struct vcc *tl, const struct token *t_be, const char *vgcname)
ifp
=
New_IniFin
(
tl
);
VSB_printf
(
ifp
->
ini
,
"
\t
VRT_init_vbe(ctx, &%s,
\n\t
&vgc_dir_priv_%s);"
,
"
\t
%s =
\n\t
VRT_new_backend(ctx,
&vgc_dir_priv_%s);"
,
vgcname
,
vgcname
);
VSB_printf
(
ifp
->
fin
,
"
\t\t
VRT_fini_vbe(ctx, &%s,
\n\t\t
&vgc_dir_priv_%s);"
,
...
...
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