Support for VCL 4.0

* NEWS: Update.
* configure.ac: Version 1.0.90
Detect Varnish version, set up the C defines and automake conditionals
to indicate it.
* src/.gitignore: Update.
* src/Makefile.am: Don't distribute vcc_if.c and vcc_if.h,
build them for the current Varnish version.
* src/tbf.h: New file.
* src/getla.c: Include tbf.h, rewrite to compile with both 3.0
and 4.0
* src/sleep.c: Likewise.
* src/tbf.c: Likewise.
* src/time.c: Likewise.
* src/vmod_tbf.vcc: Rewrite using v4.0 format.
* tests/.gitignore: New file.
* tests/Makefile.am: Build test00.vtc and test02.vtc
* tests/test00.vtc: Rename to tests/test00.vti, add conditional
compilation directives.
* tests/test02.vtc: Rename to tests/test02.vti, add conditional
compilation directives.

14 files changed, 183 insertions, 76 deletions

diff --git a/NEWS b/NEWS
index 9c771b3..f5bcc13 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,3 @@
-vmod-tbf -- history of user-visible changes. 2013-10-19
-Copyright (C) 2013 Sergey Poznyakoff
+vmod-tbf -- history of user-visible changes. 2014-10-31
+Copyright (C) 2013-2014 Sergey Poznyakoff
 See the end of file for copying conditions.
@@ -7,2 +7,7 @@ Please send vmod-tbf bug reports to <gray@gnu.org>
 
+Version 1.0.90 (git)
+
+Support for VCL 4.0
+
+
 Version 1.0, 2013-10-19
@@ -14,3 +19,3 @@ Copyright information:
 
-Copyright (C) 2013 Sergey Poznyakoff
+Copyright (C) 2013-2014 Sergey Poznyakoff
 
diff --git a/configure.ac b/configure.ac
index 6af8fd6..70fd78d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,3 +16,3 @@
 AC_PREREQ(2.69)
-AC_INIT([vmod-tbf], 1.0, [gray@gnu.org])
+AC_INIT([vmod-tbf], 1.0.90, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -69,5 +69,13 @@ esac
 VARNISHSRC=`cd $VARNISHSRC && pwd`
+VARNISHVERSION=
 AC_CHECK_FILE([$VARNISHSRC/include/varnishapi.h],
-  [],
-  [AC_MSG_FAILURE(["$VARNISHSRC" is not a Varnish source directory])])
+  [VARNISHVERSION=3],
+  [AC_CHECK_FILE([$VARNISHSRC/include/vapi/vsm.h],
+     [VARNISHVERSION=4],
+     [AC_MSG_FAILURE(["$VARNISHSRC" is not a Varnish source directory])]) ])
+AC_SUBST([VARNISHVERSION],$VARNISHVERSION)
+
+AC_DEFINE_UNQUOTED([VARNISHVERSION],$VARNISHVERSION,[Varnish major version number])
+AM_CONDITIONAL([VARNISH3],[test $VARNISHVERSION -eq 3])
+AM_CONDITIONAL([VARNISH4],[test $VARNISHVERSION -eq 4])
 
diff --git a/src/.gitignore b/src/.gitignore
index 7f6e438..ce7aef0 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2 +2,2 @@ vcc_if.c
 vcc_if.h
+*.rst
diff --git a/src/Makefile.am b/src/Makefile.am
index 727d33b..f4e3bec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,2 +18,3 @@ AM_CPPFLAGS=\
  -I$(VARNISHSRC)/include\
+ -I$(VARNISHSRC)/bin/varnishd\
  -I$(VARNISHSRC)\
@@ -30,12 +31,31 @@ libvmod_tbf_la_LIBADD=
 libvmod_tbf_la_SOURCES = \
+        tbf.c\
+        tbf.h\
         getla.c\
         sleep.c\
-        time.c\
-        tbf.c\
+        time.c
+nodist_libvmod_tbf_la_SOURCES = \
         vcc_if.c vcc_if.h
 
-BUILT_SOURCES = vcc_if.c vcc_if.h
+tbf.lo: vcc_if.h
+
+CLEANFILES = vcc_if.c vcc_if.h *.rst
+
+if VARNISH4
+  vmodtool = $(VARNISHSRC)/lib/libvcc/vmodtool.py
+  vmodtoolargs = --strict
+  vccfile = $(top_srcdir)/src/vmod_tbf.vcc
+else
+  vmodtool = $(VARNISHSRC)/lib/libvmod_std/vmod.py
+  vmodtoolargs =
+  vccfile = vmod_tbf.vcc3
+
+vmod_tbf.vcc3: $(top_srcdir)/src/vmod_tbf.vcc
+  CLEANFILES += vmod_tbf.vcc3
+endif
 
-vcc_if.c vcc_if.h: $(VARNISHSRC)/lib/libvmod_std/vmod.py $(top_srcdir)/src/vmod_tbf.vcc
-        @PYTHON@ $(VARNISHSRC)/lib/libvmod_std/vmod.py $(top_srcdir)/src/vmod_tbf.vcc
+.vcc.vcc3:
+        sed -n '/^\$$/{s///;s/\(Module  *[^ ][^ ]*\).*/\1/;p}' $< > $@
+vcc_if.c vcc_if.h: $(vmodtool) $(vccfile)
+        @PYTHON@ $(vmodtool) $(vmodtoolargs) $(vccfile)
 
@@ -44,3 +64,2 @@ EXTRA_DIST = \
 
-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h
 
diff --git a/src/getla.c b/src/getla.c
index c735956..51791c4 100644
--- a/src/getla.c
+++ b/src/getla.c
@@ -17,6 +17,3 @@
 #define _BSD_SOURCE
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <syslog.h>
+#include "tbf.h"
 #if defined(HAVE_SYSINFO) && defined(HAVE_SYS_SYSINFO_H)
@@ -24,4 +21,2 @@
 #endif
-#include "vrt.h"
-#include "vcc_if.h"
 
@@ -52,4 +47,4 @@ sys_getla(int what)
 
-double
-vmod_getla(struct sess *sp, int what)
+VCL_REAL
+vmod_getla(MOD_CTX ctx, VCL_INT what)
 {
diff --git a/src/sleep.c b/src/sleep.c
index 70c4337..9242475 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -16,10 +16,8 @@
 */
-#include <config.h>
+#include "tbf.h"
 #include <errno.h>
 #include <time.h>
-#include "vrt.h"
-#include "vcc_if.h"
 
-void
-vmod_sleep(struct sess *sp, double t)
+VCL_VOID
+vmod_sleep(MOD_CTX ctx, VCL_REAL t)
 {
diff --git a/src/tbf.c b/src/tbf.c
index 7050fc7..56a4ad1 100644
--- a/src/tbf.c
+++ b/src/tbf.c
@@ -16,6 +16,3 @@
 */
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
+#include "tbf.h"
 #include <syslog.h>
@@ -23,6 +20,4 @@
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <db.h>
-#include "vrt.h"
-#include "vcc_if.h"
-#include "bin/varnishd/cache.h"
 
@@ -353,3 +348,3 @@ tbf_init(struct vmod_priv *priv, const struct VCL_conf *vclconf)
 void
-vmod_open(struct sess *sp, const char *dir, const char *params)
+vmod_open(MOD_CTX ctx, const char *dir, const char *params)
 {
@@ -364,3 +359,3 @@ vmod_open(struct sess *sp, const char *dir, const char *params)
 void
-vmod_close(struct sess *sp)
+vmod_close(MOD_CTX ctx)
 {
@@ -379,3 +374,3 @@ vmod_close(struct sess *sp)
 void
-vmod_sync(struct sess *sp)
+vmod_sync(MOD_CTX ctx)
 {
@@ -412,3 +407,3 @@ struct tbf_bucket {
 int
-tbf_proc(struct sess *sp, DB *db, const char *key, int cost,
+tbf_proc(MOD_CTX ctx, DB *db, const char *key, int cost,
          unsigned long interval, int burst_size)
@@ -501,4 +496,5 @@ tbf_proc(struct sess *sp, DB *db, const char *key, int cost,
 
-unsigned
-vmod_rate(struct sess *sp, const char *key, int cost, double t, int burst_size)
+VCL_BOOL
+vmod_rate(MOD_CTX ctx, VCL_STRING key, VCL_INT cost, VCL_REAL t,
+          VCL_INT burst_size)
 {
@@ -529,3 +525,3 @@ vmod_rate(struct sess *sp, const char *key, int cost, double t, int burst_size)
                 AZ(pthread_mutex_lock(&kp->mutex));
-                rc = tbf_proc(sp, db, key, cost, interval, burst_size);
+                rc = tbf_proc(ctx, db, key, cost, interval, burst_size);
                 if (--kp->refcnt == 0)
@@ -541,4 +537,4 @@ vmod_rate(struct sess *sp, const char *key, int cost, double t, int burst_size)
 
-unsigned
-vmod_check(struct sess *sp, const char *key, const char *spec)
+VCL_BOOL
+vmod_check(MOD_CTX ctx, VCL_STRING key, VCL_STRING spec)
 {
@@ -603,3 +599,3 @@ vmod_check(struct sess *sp, const char *key, const char *spec)
 
-        return vmod_rate(sp, key, 1, n/v, v/n+1);
+        return vmod_rate(ctx, key, 1, n/v, v/n+1);
 }
diff --git a/src/tbf.h b/src/tbf.h
new file mode 100644
index 0000000..3c7a118
--- /dev/null
+++ b/src/tbf.h
@@ -0,0 +1,38 @@
+/* This file is part of vmod-tbf
+   Copyright (C) 2013-2014 Sergey Poznyakoff
+  
+   Vmod-tbf is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+  
+   Vmod-tbf is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+  
+   You should have received a copy of the GNU General Public License
+   along with vmod-tbf.  If not, see <http://www.gnu.org/licenses/>.