Rewrite for varnishapi 4.1varnish-4.1

* NEWS: Update.
* configure.ac: Raise version number to 2.0.90
* src/tbf.c (tbf_init): Replaced with tbf_event
* src/vmod_tbf.vcc: Likewise.
* src/tbf.h: Include errno.h and vcl.h.

5 files changed, 17 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index b87dafa..f324433 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,18 @@
-vmod-tbf -- history of user-visible changes. 2014-11-13
+vmod-tbf -- history of user-visible changes. 2016-01-20
 Copyright (C) 2013-2014 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send vmod-tbf bug reports to <gray@gnu.org>
 
 
+Version 2.1, (git)
+
+Support for Varnishapi 4.1
+
+
 Version 2.0, 2014-11-13
 
 Support for VCL 4.0
 
 
 Version 1.0, 2013-10-19
diff --git a/configure.ac b/configure.ac
index 8041a57..58f7633 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,13 +11,13 @@
 # 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/>.
 AC_PREREQ(2.69)
-AC_INIT([vmod-tbf], 2.0, [gray@gnu.org])
+AC_INIT([vmod-tbf], 2.0.90, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod_tbf.vcc)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_SYSTEM
diff --git a/src/tbf.c b/src/tbf.c
index dadb9cc..3790a01 100644
--- a/src/tbf.c
+++ b/src/tbf.c
@@ -332,16 +332,19 @@ tbf_open_safe(const char *params)
                 tbf_open(params ? params : DEFOPENPARAMS);
         pthread_mutex_unlock(&mutex);
         return db;
 }
 
 int
-tbf_init(struct vmod_priv *priv, const struct VCL_conf *vclconf)
+tbf_event(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
 {
-        VTAILQ_INIT(&keylock_head);
-        VTAILQ_INIT(&keylock_avail);
+        if (e == VCL_EVENT_LOAD) {
+                VTAILQ_INIT(&keylock_head);
+                VTAILQ_INIT(&keylock_avail);
+        }
+        return 0;
 }
 
 void
 vmod_open(MOD_CTX ctx, const char *dir, const char *params)
 {
         if (db) {
diff --git a/src/tbf.h b/src/tbf.h
index 7ee9f7e..ea0aa6e 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -19,13 +19,15 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <syslog.h>
 #include <inttypes.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include "vrt.h"
+#include <errno.h>
+#include <vcl.h>
+#include <vrt.h>
 #include "vcc_if.h"
 #include "pthread.h"
 
 #include "bin/varnishd/cache/cache.h"
 #define MOD_CTX const struct vrt_ctx *
 #define WSPTR(s) ((s)->ws)
diff --git a/src/vmod_tbf.vcc b/src/vmod_tbf.vcc
index bb03d44..28d1af0 100644
--- a/src/vmod_tbf.vcc
+++ b/src/vmod_tbf.vcc
@@ -21,13 +21,13 @@ COLOPHON
 This document provides a short description of the **vmod-tbf** module.
 For a detailed documentation, please see vmod-tbf(3) manual page.
 
 DESCRIPTION
 ===========
 
-$Init tbf_init
+$Event tbf_event
 $Function VOID open(STRING, STRING)
 $Function VOID close()
 $Function VOID sync()
 $Function BOOL rate(STRING, INT, DURATION, INT)
 $Function BOOL check(STRING, STRING)
 $Function REAL getla(INT)