[master] f840c63 rename cache_priv.h to cache_varnishd.h which is more precise
Poul-Henning Kamp
phk at FreeBSD.org
Thu Sep 28 08:53:06 UTC 2017
commit f840c637d9044d2b8fabbfbd56e4d612235b7634
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Sep 28 08:25:20 2017 +0000
rename cache_priv.h to cache_varnishd.h which is more precise
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 598ada1..b0b0b05 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -117,8 +117,8 @@ noinst_HEADERS = \
cache/cache_esi.h \
cache/cache_obj.h \
cache/cache_pool.h \
- cache/cache_priv.h \
cache/cache_transport.h \
+ cache/cache_varnishd.h \
cache/cache_vgz.h \
common/heritage.h \
hash/hash_slinger.h \
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 3c34417..a0586c5 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -28,12 +28,6 @@
*
*/
-/*
- * This macro can be used in .h files to isolate bits that the manager
- * should not (need to) see, such as pthread mutexes etc.
- */
-#define VARNISH_CACHE_CHILD 1
-
#include <math.h>
#include <pthread.h>
#include <stdarg.h>
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 22b42ab..663e7c2 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -33,7 +33,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 20568b6..95f2ff2 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -34,7 +34,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "vrt.h"
#include "vtcp.h"
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 7d72e18..d7f126d 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -36,7 +36,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "vcli_serve.h"
#include "vrt.h"
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index 307513a..55f7e27 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -41,7 +41,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "binary_heap.h"
#include "vcli_serve.h"
diff --git a/bin/varnishd/cache/cache_backend_tcp.c b/bin/varnishd/cache/cache_backend_tcp.c
index dc10d5d..ce3f052 100644
--- a/bin/varnishd/cache/cache_backend_tcp.c
+++ b/bin/varnishd/cache/cache_backend_tcp.c
@@ -36,7 +36,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "vrt.h"
#include "vsa.h"
diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index 96254f2..8caac84 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -32,7 +32,7 @@
#include <pcre.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_ban.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/cache/cache_ban_build.c b/bin/varnishd/cache/cache_ban_build.c
index ab0f685..717f5c5 100644
--- a/bin/varnishd/cache/cache_ban_build.c
+++ b/bin/varnishd/cache/cache_ban_build.c
@@ -32,7 +32,7 @@
#include <pcre.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_ban.h"
#include "vend.h"
diff --git a/bin/varnishd/cache/cache_ban_lurker.c b/bin/varnishd/cache/cache_ban_lurker.c
index dfc9981..f721394 100644
--- a/bin/varnishd/cache/cache_ban_lurker.c
+++ b/bin/varnishd/cache/cache_ban_lurker.c
@@ -30,7 +30,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_ban.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index 043aca7..bb13378 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -35,7 +35,7 @@
#include <stddef.h>
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index b9d82da..066398b 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -36,7 +36,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "common/heritage.h"
#include "vcli_serve.h"
diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
index e0d9496..342696f 100644
--- a/bin/varnishd/cache/cache_deliver_proc.c
+++ b/bin/varnishd/cache/cache_deliver_proc.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_filter.h"
/* VDP_bytes
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 6f9a6a2..d9bd52a 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -35,7 +35,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_director.h"
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 6818fa2..4076985 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -30,7 +30,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <stdlib.h>
diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index a6799b6..071fb79 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -33,7 +33,7 @@
#include <errno.h>
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_filter.h"
#include "cache_vgz.h"
diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index 771bf80..5ce78bd 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -30,7 +30,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_vgz.h"
#include "cache_esi.h"
diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index 19324f7..2648c06 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -34,7 +34,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "binary_heap.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 2898a9d..7efc8b0 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_director.h"
#include "cache_filter.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/cache/cache_fetch_proc.c b/bin/varnishd/cache/cache_fetch_proc.c
index 4773b97..dd36a4a 100644
--- a/bin/varnishd/cache/cache_fetch_proc.c
+++ b/bin/varnishd/cache/cache_fetch_proc.c
@@ -31,7 +31,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_filter.h"
#include "vcli_serve.h"
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index a933101..f2b638a 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -40,7 +40,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_filter.h"
#include "cache_vgz.h"
#include "vend.h"
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 3d83bee..8f1c79b 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -52,7 +52,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 70b7c1a..9c4dac8 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -32,7 +32,7 @@
#include "config.h"
#include <stddef.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <stdio.h>
#include "vend.h"
diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index 5837957..05086d9 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -35,7 +35,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index e3edb72..778790b 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index 6f60d72..f2cc1c8 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -31,7 +31,7 @@
#include "config.h"
#include <stddef.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache/cache_obj.c b/bin/varnishd/cache/cache_obj.c
index b5c30c0..a3f2d18 100644
--- a/bin/varnishd/cache/cache_obj.c
+++ b/bin/varnishd/cache/cache_obj.c
@@ -83,7 +83,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_obj.h"
#include "vend.h"
#include "storage/storage.h"
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 44b84a2..c20fa63 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -38,7 +38,7 @@
#include "vtim.h"
#include "vcs.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_transport.h"
#include "cache_filter.h"
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index aa47190..3e7a670 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -37,7 +37,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_pool.h"
static pthread_t thr_pool_herder;
diff --git a/bin/varnishd/cache/cache_priv.h b/bin/varnishd/cache/cache_priv.h
deleted file mode 100644
index 5af6041..0000000
--- a/bin/varnishd/cache/cache_priv.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2015 Varnish Software AS
- * All rights reserved.
- *
- * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Stuff that should *never* be exposed to a VMOD
- */
-
-#include "cache.h"
-
-#include "vsb.h"
-
-#include <sys/socket.h>
-
-#include <string.h>
-#include <limits.h>
-#include <unistd.h>
-
-#include "common/common_param.h"
-
-#include "VSC_main.h"
-
-struct vfp;
-
-/* Prototypes etc ----------------------------------------------------*/
-
-/* cache_acceptor.c */
-void VCA_Init(void);
-void VCA_Shutdown(void);
-
-/* cache_backend_cfg.c */
-void VBE_InitCfg(void);
-void VBE_Poll(void);
-
-/* cache_backend_tcp.c */
-void VBT_Init(void);
-
-/* cache_backend_poll.c */
-void VBP_Init(void);
-
-/* cache_director.c */
-int VDI_GetHdr(struct worker *, struct busyobj *);
-int VDI_GetBody(struct worker *, struct busyobj *);
-const struct suckaddr *VDI_GetIP(struct worker *, struct busyobj *);
-void VDI_Finish(struct worker *wrk, struct busyobj *bo);
-enum sess_close VDI_Http1Pipe(struct req *, struct busyobj *);
-void VDI_Panic(const struct director *, struct vsb *, const char *nm);
-
-/* cache_exp.c */
-double EXP_Ttl(const struct req *, const struct objcore *);
-void EXP_Insert(struct worker *wrk, struct objcore *oc);
-void EXP_Remove(struct objcore *);
-
-#define EXP_Dttl(req, oc) (oc->ttl - (req->t_req - oc->t_origin))
-
-/* From cache_main.c */
-void BAN_Init(void);
-void BAN_Compile(void);
-void BAN_Shutdown(void);
-
-/* From cache_hash.c */
-void BAN_NewObjCore(struct objcore *oc);
-void BAN_DestroyObj(struct objcore *oc);
-int BAN_CheckObject(struct worker *, struct objcore *, struct req *);
-
-/* cache_busyobj.c */
-void VBO_Init(void);
-
-/* cache_cli.c [CLI] */
-void CLI_Init(void);
-void CLI_Run(void);
-void CLI_AddFuncs(struct cli_proto *p);
-
-/* cache_deliver_proc.c */
-void VDP_close(struct req *req);
-int VDP_DeliverObj(struct req *req);
-
-extern const struct vdp VDP_gunzip;
-extern const struct vdp VDP_esi;
-
-/* cache_expire.c */
-void EXP_Init(void);
-
-/* cache_fetch_proc.c */
-void VFP_Init(void);
-enum vfp_status VFP_GetStorage(struct vfp_ctx *, ssize_t *sz, uint8_t **ptr);
-void VFP_Extend(const struct vfp_ctx *, ssize_t sz);
-struct vfp_entry *VFP_Push(struct vfp_ctx *, const struct vfp *);
-void VFP_Setup(struct vfp_ctx *vc);
-int VFP_Open(struct vfp_ctx *bo);
-void VFP_Close(struct vfp_ctx *bo);
-
-extern const struct vfp VFP_gunzip;
-extern const struct vfp VFP_gzip;
-extern const struct vfp VFP_testgunzip;
-extern const struct vfp VFP_esi;
-extern const struct vfp VFP_esi_gzip;
-
-/* cache_http.c */
-void HTTP_Init(void);
-
-/* cache_main.c */
-void THR_SetName(const char *name);
-const char* THR_GetName(void);
-void THR_SetBusyobj(const struct busyobj *);
-struct busyobj * THR_GetBusyobj(void);
-void THR_SetRequest(const struct req *);
-struct req * THR_GetRequest(void);
-void THR_Init(void);
-
-/* cache_lck.c */
-void LCK_Init(void);
-
-/* cache_obj.c */
-void ObjInit(void);
-
-/* cache_panic.c */
-void PAN_Init(void);
-int PAN_already(struct vsb *, const void *);
-
-/* cache_pool.c */
-void Pool_Init(void);
-int Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio prio);
-int Pool_Task_Arg(struct worker *, enum task_prio, task_func_t *,
- const void *arg, size_t arg_len);
-void Pool_Sumstat(const struct worker *w);
-int Pool_TrySumstat(const struct worker *wrk);
-void Pool_PurgeStat(unsigned nobj);
-int Pool_Task_Any(struct pool_task *task, enum task_prio prio);
-
-/* cache_range.c [VRG] */
-void VRG_dorange(struct req *req, const char *r);
-
-/* cache_session.c */
-void SES_NewPool(struct pool *, unsigned pool_no);
-void SES_DestroyPool(struct pool *);
-
-/* cache_shmlog.c */
-extern struct VSC_main *VSC_C_main;
-void VSM_Init(void);
-void VSL_Setup(struct vsl_log *vsl, void *ptr, size_t len);
-void VSL_ChgId(struct vsl_log *vsl, const char *typ, const char *why,
- uint32_t vxid);
-void VSL_End(struct vsl_log *vsl);
-
-/* cache_vary.c */
-int VRY_Create(struct busyobj *bo, struct vsb **psb);
-int VRY_Match(struct req *, const uint8_t *vary);
-void VRY_Prep(struct req *);
-void VRY_Clear(struct req *);
-enum vry_finish_flag { KEEP, DISCARD };
-void VRY_Finish(struct req *req, enum vry_finish_flag);
-
-/* cache_vcl.c */
-struct director *VCL_DefaultDirector(const struct vcl *);
-const struct vrt_backend_probe *VCL_DefaultProbe(const struct vcl *);
-void VCL_Init(void);
-void VCL_Panic(struct vsb *, const struct vcl *);
-void VCL_Poll(void);
-void VCL_Ref(struct vcl *);
-void VCL_Refresh(struct vcl **);
-void VCL_Rel(struct vcl **);
-const char *VCL_Return_Name(unsigned);
-
-
-/* cache_vrt.c */
-void VRTPRIV_init(struct vrt_privs *privs);
-void VRTPRIV_dynamic_kill(struct vrt_privs *privs, uintptr_t id);
-void pan_privs(struct vsb *, const struct vrt_privs *);
-
-/* cache_vrt_vmod.c */
-void VMOD_Init(void);
-void VMOD_Panic(struct vsb *);
-
-/* http1/cache_http1_pipe.c */
-void V1P_Init(void);
-
-/* cache_http2_deliver.c */
-void V2D_Init(void);
-
-/* stevedore.c */
-void STV_open(void);
-void STV_close(void);
-const struct stevedore *STV_find(const char *);
-const struct stevedore *STV_next(void);
-int STV_BanInfoDrop(const uint8_t *ban, unsigned len);
-int STV_BanInfoNew(const uint8_t *ban, unsigned len);
-void STV_BanExport(const uint8_t *banlist, unsigned len);
-
-/* storage_persistent.c */
-void SMP_Ready(void);
-
diff --git a/bin/varnishd/cache/cache_range.c b/bin/varnishd/cache/cache_range.c
index e4f8433..7ee0b11 100644
--- a/bin/varnishd/cache/cache_range.c
+++ b/bin/varnishd/cache/cache_range.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_filter.h"
#include "vct.h"
diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index 65c2830..66fdbd3 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -32,7 +32,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c
index 83b1006..0ddac6b 100644
--- a/bin/varnishd/cache/cache_req_body.c
+++ b/bin/varnishd/cache/cache_req_body.c
@@ -32,7 +32,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_filter.h"
#include "vtim.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 4823871..8625d69 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -38,7 +38,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_director.h"
#include "cache_filter.h"
#include "cache_transport.h"
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index f1171c2..cef9b39 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -31,7 +31,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "vtim.h"
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 28f1ce2..bd0716e 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -36,7 +36,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <errno.h>
#include <stdio.h>
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 9b28b25..c129fa3 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <errno.h>
#include <stdio.h>
diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
new file mode 100644
index 0000000..c85a452
--- /dev/null
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -0,0 +1,224 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2015 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Stuff that should *never* be exposed to a VMOD
+ */
+
+#include "cache.h"
+
+#include "vsb.h"
+
+#include <sys/socket.h>
+
+#include <string.h>
+#include <limits.h>
+#include <unistd.h>
+
+#include "common/common_param.h"
+
+#include "VSC_main.h"
+
+/* -------------------------------------------------------------------*/
+/*
+ * This macro can be used in .h files to isolate bits that the manager
+ * should not (need to) see, such as pthread mutexes etc.
+ */
+#define VARNISH_CACHE_CHILD 1
+
+/* -------------------------------------------------------------------*/
+
+struct vfp;
+
+/* Prototypes etc ----------------------------------------------------*/
+
+/* cache_acceptor.c */
+void VCA_Init(void);
+void VCA_Shutdown(void);
+
+/* cache_backend_cfg.c */
+void VBE_InitCfg(void);
+void VBE_Poll(void);
+
+/* cache_backend_tcp.c */
+void VBT_Init(void);
+
+/* cache_backend_poll.c */
+void VBP_Init(void);
+
+/* cache_director.c */
+int VDI_GetHdr(struct worker *, struct busyobj *);
+int VDI_GetBody(struct worker *, struct busyobj *);
+const struct suckaddr *VDI_GetIP(struct worker *, struct busyobj *);
+void VDI_Finish(struct worker *wrk, struct busyobj *bo);
+enum sess_close VDI_Http1Pipe(struct req *, struct busyobj *);
+void VDI_Panic(const struct director *, struct vsb *, const char *nm);
+
+/* cache_exp.c */
+double EXP_Ttl(const struct req *, const struct objcore *);
+void EXP_Insert(struct worker *wrk, struct objcore *oc);
+void EXP_Remove(struct objcore *);
+
+#define EXP_Dttl(req, oc) (oc->ttl - (req->t_req - oc->t_origin))
+
+/* From cache_main.c */
+void BAN_Init(void);
+void BAN_Compile(void);
+void BAN_Shutdown(void);
+
+/* From cache_hash.c */
+void BAN_NewObjCore(struct objcore *oc);
+void BAN_DestroyObj(struct objcore *oc);
+int BAN_CheckObject(struct worker *, struct objcore *, struct req *);
+
+/* cache_busyobj.c */
+void VBO_Init(void);
+
+/* cache_cli.c [CLI] */
+void CLI_Init(void);
+void CLI_Run(void);
+void CLI_AddFuncs(struct cli_proto *p);
+
+/* cache_deliver_proc.c */
+void VDP_close(struct req *req);
+int VDP_DeliverObj(struct req *req);
+
+extern const struct vdp VDP_gunzip;
+extern const struct vdp VDP_esi;
+
+/* cache_expire.c */
+void EXP_Init(void);
+
+/* cache_fetch_proc.c */
+void VFP_Init(void);
+enum vfp_status VFP_GetStorage(struct vfp_ctx *, ssize_t *sz, uint8_t **ptr);
+void VFP_Extend(const struct vfp_ctx *, ssize_t sz);
+struct vfp_entry *VFP_Push(struct vfp_ctx *, const struct vfp *);
+void VFP_Setup(struct vfp_ctx *vc);
+int VFP_Open(struct vfp_ctx *bo);
+void VFP_Close(struct vfp_ctx *bo);
+
+extern const struct vfp VFP_gunzip;
+extern const struct vfp VFP_gzip;
+extern const struct vfp VFP_testgunzip;
+extern const struct vfp VFP_esi;
+extern const struct vfp VFP_esi_gzip;
+
+/* cache_http.c */
+void HTTP_Init(void);
+
+/* cache_main.c */
+void THR_SetName(const char *name);
+const char* THR_GetName(void);
+void THR_SetBusyobj(const struct busyobj *);
+struct busyobj * THR_GetBusyobj(void);
+void THR_SetRequest(const struct req *);
+struct req * THR_GetRequest(void);
+void THR_Init(void);
+
+/* cache_lck.c */
+void LCK_Init(void);
+
+/* cache_obj.c */
+void ObjInit(void);
+
+/* cache_panic.c */
+void PAN_Init(void);
+int PAN_already(struct vsb *, const void *);
+
+/* cache_pool.c */
+void Pool_Init(void);
+int Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio prio);
+int Pool_Task_Arg(struct worker *, enum task_prio, task_func_t *,
+ const void *arg, size_t arg_len);
+void Pool_Sumstat(const struct worker *w);
+int Pool_TrySumstat(const struct worker *wrk);
+void Pool_PurgeStat(unsigned nobj);
+int Pool_Task_Any(struct pool_task *task, enum task_prio prio);
+
+/* cache_range.c [VRG] */
+void VRG_dorange(struct req *req, const char *r);
+
+/* cache_session.c */
+void SES_NewPool(struct pool *, unsigned pool_no);
+void SES_DestroyPool(struct pool *);
+
+/* cache_shmlog.c */
+extern struct VSC_main *VSC_C_main;
+void VSM_Init(void);
+void VSL_Setup(struct vsl_log *vsl, void *ptr, size_t len);
+void VSL_ChgId(struct vsl_log *vsl, const char *typ, const char *why,
+ uint32_t vxid);
+void VSL_End(struct vsl_log *vsl);
+
+/* cache_vary.c */
+int VRY_Create(struct busyobj *bo, struct vsb **psb);
+int VRY_Match(struct req *, const uint8_t *vary);
+void VRY_Prep(struct req *);
+void VRY_Clear(struct req *);
+enum vry_finish_flag { KEEP, DISCARD };
+void VRY_Finish(struct req *req, enum vry_finish_flag);
+
+/* cache_vcl.c */
+struct director *VCL_DefaultDirector(const struct vcl *);
+const struct vrt_backend_probe *VCL_DefaultProbe(const struct vcl *);
+void VCL_Init(void);
+void VCL_Panic(struct vsb *, const struct vcl *);
+void VCL_Poll(void);
+void VCL_Ref(struct vcl *);
+void VCL_Refresh(struct vcl **);
+void VCL_Rel(struct vcl **);
+const char *VCL_Return_Name(unsigned);
+
+
+/* cache_vrt.c */
+void VRTPRIV_init(struct vrt_privs *privs);
+void VRTPRIV_dynamic_kill(struct vrt_privs *privs, uintptr_t id);
+void pan_privs(struct vsb *, const struct vrt_privs *);
+
+/* cache_vrt_vmod.c */
+void VMOD_Init(void);
+void VMOD_Panic(struct vsb *);
+
+/* http1/cache_http1_pipe.c */
+void V1P_Init(void);
+
+/* cache_http2_deliver.c */
+void V2D_Init(void);
+
+/* stevedore.c */
+void STV_open(void);
+void STV_close(void);
+const struct stevedore *STV_find(const char *);
+const struct stevedore *STV_next(void);
+int STV_BanInfoDrop(const uint8_t *ban, unsigned len);
+int STV_BanInfoNew(const uint8_t *ban, unsigned len);
+void STV_BanExport(const uint8_t *banlist, unsigned len);
+
+/* storage_persistent.c */
+void SMP_Ready(void);
+
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index 04ab24c..379f7b3 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -58,7 +58,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "vct.h"
#include "vend.h"
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index a667309..6ef4221 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "common/heritage.h"
#include "vrt.h"
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 8b16942..79fd1ba 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -31,7 +31,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_director.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/cache/cache_vrt_priv.c b/bin/varnishd/cache/cache_vrt_priv.c
index b85367b..b344756 100644
--- a/bin/varnishd/cache/cache_vrt_priv.c
+++ b/bin/varnishd/cache/cache_vrt_priv.c
@@ -34,7 +34,7 @@
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "vrt.h"
diff --git a/bin/varnishd/cache/cache_vrt_re.c b/bin/varnishd/cache/cache_vrt_re.c
index 6f58480..ed9d4fa 100644
--- a/bin/varnishd/cache/cache_vrt_re.c
+++ b/bin/varnishd/cache/cache_vrt_re.c
@@ -33,7 +33,7 @@
#include <ctype.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "vrt.h"
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 3fd5eb4..9d4db8e 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -32,7 +32,7 @@
#include <stdio.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "common/heritage.h"
#include "cache_director.h"
diff --git a/bin/varnishd/cache/cache_vrt_vmod.c b/bin/varnishd/cache/cache_vrt_vmod.c
index d325b9d..04502db 100644
--- a/bin/varnishd/cache/cache_vrt_vmod.c
+++ b/bin/varnishd/cache/cache_vrt_vmod.c
@@ -31,7 +31,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <dlfcn.h>
#include <stdio.h>
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 6c391ea..167481f 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -34,7 +34,7 @@
#include <errno.h>
#include <stdlib.h>
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include "cache_pool.h"
#include "vtim.h"
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index 5167247..a58f657 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -30,7 +30,7 @@
#include "config.h"
-#include "cache_priv.h"
+#include "cache_varnishd.h"
#include <stdio.h>
diff --git a/bin/varnishd/hash/hash_classic.c b/bin/varnishd/hash/hash_classic.c
index 23e4ef9..781dce7 100644
--- a/bin/varnishd/hash/hash_classic.c
+++ b/bin/varnishd/hash/hash_classic.c
@@ -31,7 +31,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "common/heritage.h"
#include <stdio.h>
diff --git a/bin/varnishd/hash/hash_critbit.c b/bin/varnishd/hash/hash_critbit.c
index d48e3e7..e548965 100644
--- a/bin/varnishd/hash/hash_critbit.c
+++ b/bin/varnishd/hash/hash_critbit.c
@@ -34,7 +34,7 @@
#include <stdlib.h>
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "hash/hash_slinger.h"
#include "vmb.h"
diff --git a/bin/varnishd/hash/hash_simple_list.c b/bin/varnishd/hash/hash_simple_list.c
index d68ae8a..16b3e70 100644
--- a/bin/varnishd/hash/hash_simple_list.c
+++ b/bin/varnishd/hash/hash_simple_list.c
@@ -31,7 +31,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index b3f6cf1..7ed54a6 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "cache/cache_filter.h"
#include "cache_http1.h"
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index d1b5bf0..3304664 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <errno.h>
#include <stdio.h>
diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index 06df250..b694623 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -33,7 +33,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <errno.h>
#include <stdio.h>
diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index 46f583a..476c8e3 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -35,7 +35,7 @@
#include "config.h"
#include <sys/uio.h>
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <errno.h>
#include <stdio.h>
diff --git a/bin/varnishd/http1/cache_http1_pipe.c b/bin/varnishd/http1/cache_http1_pipe.c
index 37032e4..cb7de49 100644
--- a/bin/varnishd/http1/cache_http1_pipe.c
+++ b/bin/varnishd/http1/cache_http1_pipe.c
@@ -31,7 +31,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <poll.h>
#include <stdio.h>
diff --git a/bin/varnishd/http1/cache_http1_proto.c b/bin/varnishd/http1/cache_http1_proto.c
index 0bc6df9..4cc8b4d 100644
--- a/bin/varnishd/http1/cache_http1_proto.c
+++ b/bin/varnishd/http1/cache_http1_proto.c
@@ -45,7 +45,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "cache/cache_transport.h"
#include "cache_http1.h"
diff --git a/bin/varnishd/http1/cache_http1_vfp.c b/bin/varnishd/http1/cache_http1_vfp.c
index fd770ea..38cfde8 100644
--- a/bin/varnishd/http1/cache_http1_vfp.c
+++ b/bin/varnishd/http1/cache_http1_vfp.c
@@ -38,7 +38,7 @@
#include <errno.h>
#include <inttypes.h>
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "cache/cache_filter.h"
#include "cache_http1.h"
diff --git a/bin/varnishd/http2/cache_http2_deliver.c b/bin/varnishd/http2/cache_http2_deliver.c
index 0277b21..f01a120 100644
--- a/bin/varnishd/http2/cache_http2_deliver.c
+++ b/bin/varnishd/http2/cache_http2_deliver.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <netinet/in.h>
diff --git a/bin/varnishd/http2/cache_http2_hpack.c b/bin/varnishd/http2/cache_http2_hpack.c
index 973827d..7689838 100644
--- a/bin/varnishd/http2/cache_http2_hpack.c
+++ b/bin/varnishd/http2/cache_http2_hpack.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <ctype.h>
#include <stdio.h>
@@ -92,7 +92,7 @@ h2h_checkhdr(const struct http *hp, const char *b, size_t namelen, size_t len)
static h2_error
h2h_addhdr(struct http *hp, char *b, size_t namelen, size_t len)
{
- /* XXX: This might belong in cache/cache_priv.http.c */
+ /* XXX: This might belong in cache/cache_varnishd.http.c */
unsigned n;
CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
diff --git a/bin/varnishd/http2/cache_http2_panic.c b/bin/varnishd/http2/cache_http2_panic.c
index b160343..da8c5eb 100644
--- a/bin/varnishd/http2/cache_http2_panic.c
+++ b/bin/varnishd/http2/cache_http2_panic.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "cache/cache_transport.h"
#include "http2/cache_http2.h"
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 13ee528..8828593 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/http2/cache_http2_send.c b/bin/varnishd/http2/cache_http2_send.c
index b17b4f2..ecbda33 100644
--- a/bin/varnishd/http2/cache_http2_send.c
+++ b/bin/varnishd/http2/cache_http2_send.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "cache/cache_transport.h"
#include "http2/cache_http2.h"
diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index 8785e47..f679a3a 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <stdio.h>
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index f381641..b3aaf1d 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <netinet/in.h>
diff --git a/bin/varnishd/storage/mgt_storage_persistent.c b/bin/varnishd/storage/mgt_storage_persistent.c
index 9e6255e..b15be3f 100644
--- a/bin/varnishd/storage/mgt_storage_persistent.c
+++ b/bin/varnishd/storage/mgt_storage_persistent.c
@@ -35,7 +35,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "common/heritage.h"
#include <sys/mman.h>
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 084c82d..cab8ac1 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -33,7 +33,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/storage/storage_file.c b/bin/varnishd/storage/storage_file.c
index 287d05b..c3fbd9f 100644
--- a/bin/varnishd/storage/storage_file.c
+++ b/bin/varnishd/storage/storage_file.c
@@ -31,7 +31,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "common/heritage.h"
#include <sys/mman.h>
diff --git a/bin/varnishd/storage/storage_lru.c b/bin/varnishd/storage/storage_lru.c
index 33dca6b..4374c58 100644
--- a/bin/varnishd/storage/storage_lru.c
+++ b/bin/varnishd/storage/storage_lru.c
@@ -32,7 +32,7 @@
#include <stdlib.h>
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "hash/hash_slinger.h"
#include "storage/storage.h"
diff --git a/bin/varnishd/storage/storage_malloc.c b/bin/varnishd/storage/storage_malloc.c
index 60cd988..0468835 100644
--- a/bin/varnishd/storage/storage_malloc.c
+++ b/bin/varnishd/storage/storage_malloc.c
@@ -31,7 +31,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "common/heritage.h"
#include <stdio.h>
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index af22649..72dd6de 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -35,7 +35,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <sys/mman.h>
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index e0115c0..bacf18e 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -34,7 +34,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/storage/storage_persistent_subr.c b/bin/varnishd/storage/storage_persistent_subr.c
index fc75ddb..aedb02b 100644
--- a/bin/varnishd/storage/storage_persistent_subr.c
+++ b/bin/varnishd/storage/storage_persistent_subr.c
@@ -36,7 +36,7 @@
#include "config.h"
#include <stddef.h>
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "common/heritage.h"
#include <sys/mman.h>
diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index d07166d..2716159 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -29,7 +29,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "cache/cache_obj.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index b7afaf3..f4ec53b 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -30,7 +30,7 @@
#include "config.h"
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <stdlib.h>
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index fa381e9..cede609 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -39,7 +39,7 @@
#include <errno.h>
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "waiter/waiter.h"
#include "waiter/waiter_priv.h"
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 546e1df..00b1e3b 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -33,7 +33,7 @@
#if defined(HAVE_KQUEUE)
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include <sys/event.h>
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 6c953c6..363db64 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -34,7 +34,7 @@
#include <poll.h>
#include <stdlib.h>
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "waiter/waiter.h"
#include "waiter/waiter_priv.h"
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 50f8b1d..428e8e4 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -73,7 +73,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache_priv.h"
+#include "cache/cache_varnishd.h"
#include "waiter/waiter.h"
#include "waiter/waiter_priv.h"
More information about the varnish-commit
mailing list