Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to new functions for Varnish 5.2 #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to new functions for Varnish 5.2 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 46 additions & 8 deletions check_varnish.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <locale.h>
#include <assert.h>

#if defined(HAVE_VARNISHAPI_4) || defined(HAVE_VARNISHAPI_4_1)
#if defined(HAVE_VARNISHAPI_4) || defined(HAVE_VARNISHAPI_4_1) || defined(HAVE_VARNISHAPI_5)
#include <vapi/vsc.h>
#include <vapi/vsm.h>
#elif defined(HAVE_VARNISHAPI_3)
Expand Down Expand Up @@ -185,7 +185,11 @@ check_stats_cb(void *priv, const struct VSC_point * const pt)
if (pt == NULL)
return(0);

#if defined(HAVE_VARNISHAPI_4_1) || defined(HAVE_VARNISHAPI_4)
#if defined(HAVE_VARNISHAPI_5)
assert(sizeof(tmp) > (strlen(pt->name) + 1));
snprintf(tmp, sizeof(tmp), "%s", pt->name);
p = priv;
#elif defined(HAVE_VARNISHAPI_4_1) || defined(HAVE_VARNISHAPI_4)
assert(sizeof(tmp) > (strlen(pt->section->fantom->type) + 1 +
strlen(pt->section->fantom->ident) + 1 +
strlen(pt->desc->name) + 1));
Expand All @@ -197,7 +201,9 @@ check_stats_cb(void *priv, const struct VSC_point * const pt)
pt->desc->name);
p = priv;
#endif
#if defined(HAVE_VARNISHAPI_4_1)
#if defined(HAVE_VARNISHAPI_5)
assert(!strcmp(pt->ctype, "uint64_t"));
#elif defined(HAVE_VARNISHAPI_4_1)
assert(!strcmp(pt->desc->ctype, "uint64_t"));
#elif defined(HAVE_VARNISHAPI_4)
assert(!strcmp(pt->desc->fmt, "uint64_t"));
Expand All @@ -216,7 +222,9 @@ check_stats_cb(void *priv, const struct VSC_point * const pt)
#endif
if (strcmp(tmp, p->param) == 0) {
p->found = 1;
#if defined(HAVE_VARNISHAPI_4) || defined(HAVE_VARNISHAPI_4_1)
#if defined(HAVE_VARNISHAPI_5)
p->info = pt->sdesc;
#elif defined(HAVE_VARNISHAPI_4) || defined(HAVE_VARNISHAPI_4_1)
p->info = pt->desc->sdesc;
#elif defined(HAVE_VARNISHAPI_3)
p->info = pt->desc;
Expand All @@ -237,15 +245,21 @@ check_stats_cb(void *priv, const struct VSC_point * const pt)
* Check the statistics for the requested parameter.
*/
static void
#if defined(HAVE_VARNISHAPI_5)
check_stats(struct vsc *vsc, struct vsm *vsm, char *param)
#else
check_stats(struct VSM_data *vd, char *param)
#endif
{
int status;
struct stat_priv priv;

priv.found = 0;
priv.param = param;

#if defined(HAVE_VARNISHAPI_4) || defined(HAVE_VARNISHAPI_4_1)
#if defined(HAVE_VARNISHAPI_5)
(void)VSC_Iter(vsc, vsm, check_stats_cb, &priv);
#elif defined(HAVE_VARNISHAPI_4) || defined(HAVE_VARNISHAPI_4_1)
(void)VSC_Iter(vd, NULL, check_stats_cb, &priv);
#elif defined(HAVE_VARNISHAPI_3)
(void)VSC_Iter(vd, check_stats_cb, &priv);
Expand Down Expand Up @@ -315,18 +329,25 @@ usage(void)
int
main(int argc, char **argv)
{
#if defined(HAVE_VARNISHAPI_5)
struct vsm *vd;
struct vsc *vsc;
#else
struct VSM_data *vd;
#endif
char *param = NULL;
int opt;

setlocale(LC_ALL, "");

vd = VSM_New();
#if defined(HAVE_VARNISHAPI_3)
#if defined(HAVE_VARNISHAPI_5)
vsc = VSC_New();
#elif defined(HAVE_VARNISHAPI_3)
VSC_Setup(vd);
#endif

while ((opt = getopt(argc, argv, VSC_ARGS "c:hn:p:vw:")) != -1) {
while ((opt = getopt(argc, argv, "c:hn:p:vw:")) != -1) {
switch (opt) {
case 'c':
if (parse_range(optarg, &critical) != 0)
Expand All @@ -336,7 +357,11 @@ main(int argc, char **argv)
help();
break;
case 'n':
#if defined(HAVE_VARNISHAPI_5)
VSC_Arg(vsc, opt, optarg);
#else
VSC_Arg(vd, opt, optarg);
#endif
break;
case 'p':
param = strdup(optarg);
Expand All @@ -349,13 +374,22 @@ main(int argc, char **argv)
usage();
break;
default:
#if defined(HAVE_VARNISHAPI_5)
if (VSC_Arg(vsc, opt, optarg) > 0)
#else
if (VSC_Arg(vd, opt, optarg) > 0)
#endif
break;
usage();
}
}

#if defined(HAVE_VARNISHAPI_4) || defined(HAVE_VARNISHAPI_4_1)
#if defined(HAVE_VARNISHAPI_5)
if (VSM_Attach(vd, -1) < 0) {
printf("varnish plugin: Cannot attach to varnish. %s", VSM_Error(vd));
exit(1);
}
#elif defined(HAVE_VARNISHAPI_4) || defined(HAVE_VARNISHAPI_4_1)
if (VSM_Open(vd))
exit(1);
#elif defined(HAVE_VARNISHAPI_3)
Expand All @@ -377,7 +411,11 @@ main(int argc, char **argv)
if (!param)
usage();

#if defined(HAVE_VARNISHAPI_5)
check_stats(vsc, vd, param);
#else
check_stats(vd, param);
#endif

exit(0);
}
18 changes: 11 additions & 7 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@ AC_PROG_LIBTOOL
AC_PROG_MAKE_SET

# Checks for libraries.
PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 4.1],
[AC_DEFINE([HAVE_VARNISHAPI_4_1], [1], [Use VARNISHAPI v4.1])],
[PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 4],
[AC_DEFINE([HAVE_VARNISHAPI_4], [1], [Use VARNISHAPI v4])],
[PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 3],
[AC_DEFINE([HAVE_VARNISHAPI_3], [1], [Use VARNISHAPI v3])],
[AC_MSG_ERROR([Could not find neither varnishapi v4 nor v3.])])
PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 5.2],
[AC_DEFINE([HAVE_VARNISHAPI_5], [1], [Use VARNISHAPI v5])],
[PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 4.1],
[AC_DEFINE([HAVE_VARNISHAPI_4_1], [1], [Use VARNISHAPI v4.1])],
[PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 4],
[AC_DEFINE([HAVE_VARNISHAPI_4], [1], [Use VARNISHAPI v4])],
[PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 3],
[AC_DEFINE([HAVE_VARNISHAPI_3], [1], [Use VARNISHAPI v3])],
[AC_MSG_ERROR([Could not find neither varnishapi v4 nor v3.])])
]
)
]
)
]
Expand Down