Merge pull request #1 from daghf/varn-4.0

Migrate to Varnish 4.0

Author: drwilco

configure.ac

@@ -39,31 +39,13 @@ AC_CHECK_HEADERS([sys/stdlib.h])
 # Check for python
 AC_CHECK_PROGS(PYTHON, [python3 python3.1 python3.2 python2.7 python2.6 python2.5 python2 python], [AC_MSG_ERROR([Python is needed to build this vmod, please install python.])])
 
-# Varnish source tree
-AC_ARG_VAR([VARNISHSRC], [path to Varnish source tree (mandatory)])
-if test "x$VARNISHSRC" = x; then
-	AC_MSG_ERROR([No Varnish source tree specified])
-fi
-VARNISHSRC=`cd $VARNISHSRC && pwd`
-AC_CHECK_FILE([$VARNISHSRC/include/varnishapi.h],
-	[],
-	[AC_MSG_FAILURE(["$VARNISHSRC" is not a Varnish source directory])]
-)
-
-# Check that varnishtest is built in the varnish source directory
-AC_CHECK_FILE([$VARNISHSRC/bin/varnishtest/varnishtest],
-	[],
-	[AC_MSG_FAILURE([Can't find "$VARNISHSRC/bin/varnishtest/varnishtest". Please build your varnish source directory])]
-)
+# Varnish include files tree
+VARNISH_VMOD_INCLUDES
+VARNISH_VMOD_DIR
+VARNISH_VMODTOOL
 
-# vmod installation dir
-AC_ARG_VAR([VMODDIR], [vmod installation directory @<:@LIBDIR/varnish/vmods@:>@])
-if test "x$VMODDIR" = x; then
-	VMODDIR=`pkg-config --variable=vmoddir varnishapi`
-	if test "x$VMODDIR" = x; then
-		AC_MSG_FAILURE([Can't determine vmod installation directory])
-	fi
-fi
+AC_PATH_PROG([VARNISHTEST], [varnishtest])
+AC_PATH_PROG([VARNISHD], [varnishd])
 
 AC_CONFIG_FILES([
 	Makefile

src/Makefile.am

@@ -1,6 +1,6 @@
-INCLUDES = -I$(VARNISHSRC)/include -I$(VARNISHSRC)
+AM_CPPFLAGS = @VMOD_INCLUDES@
 
-vmoddir = $(VMODDIR)
+vmoddir = @VMOD_DIR@
 vmod_LTLIBRARIES = libvmod_urlcode.la
 
 libvmod_urlcode_la_LDFLAGS = -module -export-dynamic -avoid-version
@@ -10,14 +10,14 @@ libvmod_urlcode_la_SOURCES = \
 	vcc_if.h \
 	vmod_urlcode.c
 
-vcc_if.c vcc_if.h: $(VARNISHSRC)/lib/libvmod_std/vmod.py $(top_srcdir)/src/vmod_urlcode.vcc
-	@PYTHON@ $(VARNISHSRC)/lib/libvmod_std/vmod.py $(top_srcdir)/src/vmod_urlcode.vcc
+vcc_if.c vcc_if.h: @VMODTOOL@ $(top_srcdir)/src/vmod_urlcode.vcc
+	@VMODTOOL@ $(top_srcdir)/src/vmod_urlcode.vcc
 
 VMOD_TESTS = tests/*.vtc
 .PHONY: $(VMOD_TESTS)
 
 tests/*.vtc:
-	$(VARNISHSRC)/bin/varnishtest/varnishtest -Dvarnishd=$(VARNISHSRC)/bin/varnishd/varnishd -Dvmod_topbuild=$(abs_top_builddir) $@
+	@VARNISHTEST@ -Dvarnishd=@VARNISHD@ -Dvmod_topbuild=$(abs_top_builddir) $@
 
 check: $(VMOD_TESTS)
 

src/tests/urlcode01.vtc

@@ -17,7 +17,7 @@ server s1 {
 varnish v1 -vcl+backend {
 	import urlcode from "${vmod_topbuild}/src/.libs/libvmod_urlcode.so";
 
-	sub vcl_fetch {
+	sub vcl_backend_response {
 		set beresp.http.Bar1 = urlcode.encode(beresp.http.Foo1);
 		set beresp.http.Baz1 = urlcode.decode(beresp.http.Bar1);
 		set beresp.http.Bar2 = urlcode.encode(beresp.http.Foo2);

src/vmod_urlcode.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 #include "vrt.h"
-#include "bin/varnishd/cache.h"
+#include "cache/cache.h"
 
 #include "vcc_if.h"
 
@@ -12,17 +12,16 @@ static char hexchars[] = "0123456789ABCDEF";
 	((c >= '0' && c <= '9') || visalpha(c))
 
 const char *
-vmod_encode(struct sess *sp, const char *str, ...)
+vmod_encode(const struct vrt_ctx *ctx, const char *str, ...)
 {
 	char *b, *e;
 	unsigned u;
 	va_list ap;
 
-	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->http->ws, WS_MAGIC);
-	u = WS_Reserve(sp->http->ws, 0);
-	e = b = sp->http->ws->f;
+	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+	CHECK_OBJ_NOTNULL(ctx->ws, WS_MAGIC);
+	u = WS_Reserve(ctx->ws, 0);
+	e = b = ctx->ws->f;
 	e += u;
 	va_start(ap, str);
 	while (b < e && str != vrt_magic_string_end) {
@@ -46,12 +45,12 @@ vmod_encode(struct sess *sp, const char *str, ...)
 		*b = '\0';
 	b++;
 	if (b > e) {
-		WS_Release(sp->http->ws, 0);
+		WS_Release(ctx->ws, 0);
 		return (NULL);
 	} else {
 		e = b;
-		b = sp->http->ws->f;
-		WS_Release(sp->http->ws, e - b);
+		b = ctx->ws->f;
+		WS_Release(ctx->ws, e - b);
 		return (b);
 	}
 }
@@ -69,19 +68,18 @@ vmod_hex_to_int(char c)
 }
 
 const char *
-vmod_decode(struct sess *sp, const char *str, ...)
+vmod_decode(const struct vrt_ctx *ctx, const char *str, ...)
 {
 	char *b, *e;
 	int h, l;
 	unsigned u;
 	va_list ap;
 	int percent = 0;
 
-	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->http->ws, WS_MAGIC);
-	u = WS_Reserve(sp->http->ws, 0);
-	e = b = sp->http->ws->f;
+	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+	CHECK_OBJ_NOTNULL(ctx->ws, WS_MAGIC);
+	u = WS_Reserve(ctx->ws, 0);
+	e = b = ctx->ws->f;
 	e += u;
 	va_start(ap, str);
 	while (b < e && str != vrt_magic_string_end) {
@@ -118,12 +116,12 @@ vmod_decode(struct sess *sp, const char *str, ...)
 		*b = '\0';
 	b++;
 	if (b > e) {
-		WS_Release(sp->http->ws, 0);
+		WS_Release(ctx->ws, 0);
 		return (NULL);
 	} else {
 		e = b;
-		b = sp->http->ws->f;
-		WS_Release(sp->http->ws, e - b);
+		b = ctx->ws->f;
+		WS_Release(ctx->ws, e - b);
 		return (b);
 	}
 }

src/vmod_urlcode.vcc

@@ -1,3 +1,3 @@
-Module urlcode
-Function STRING encode(STRING_LIST)
-Function STRING decode(STRING_LIST)
+$Module urlcode 3 urlencode/urldecode functions vmod
+$Function STRING encode(STRING_LIST)
+$Function STRING decode(STRING_LIST)