[master] 3e5d51575 Also use the VCL_PROBE type where it makes sense
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Wed Oct 17 14:35:13 UTC 2018
commit 3e5d5157550f84c7ecb22e8afe80d862af678c20
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Wed Oct 17 16:07:01 2018 +0200
Also use the VCL_PROBE type where it makes sense
Refs c9d3b3ff5ff3fc400fe72f1e7d66693f88e1b04f
diff --git a/bin/varnishd/cache/cache_vrt_vcl.c b/bin/varnishd/cache/cache_vrt_vcl.c
index 7b9d7fed8..62f42ff45 100644
--- a/bin/varnishd/cache/cache_vrt_vcl.c
+++ b/bin/varnishd/cache/cache_vrt_vcl.c
@@ -262,7 +262,7 @@ VCL_Name(const struct vcl *vcl)
return (vcl->loaded_name);
}
-const struct vrt_backend_probe *
+VCL_PROBE
VCL_DefaultProbe(const struct vcl *vcl)
{
diff --git a/include/vrt.h b/include/vrt.h
index f7508446e..c04274a4a 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -303,7 +303,7 @@ struct vrt_backend {
VRT_BACKEND_FIELDS(const)
const struct suckaddr *ipv4_suckaddr;
const struct suckaddr *ipv6_suckaddr;
- const struct vrt_backend_probe *probe;
+ VCL_PROBE probe;
};
#define VRT_BACKEND_PROBE_FIELDS(rigid) \
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index 5dba1a37a..763bad5ea 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -652,7 +652,7 @@ struct VCL_conf {
unsigned syntax;
VCL_BACKEND *default_director;
- const struct vrt_backend_probe *default_probe;
+ VCL_PROBE default_probe;
unsigned nref;
const struct vrt_ref *ref;
More information about the varnish-commit
mailing list