Bugfixes

Use consistend debug token names. Make sure configuration settings are
honored by opening VSM and doing initial loading after the configuration
has been read and processed. Avoid inifinite recursion in dict_load.

* src/modconf.c: New file.
* src/modconf.h: New file.
* src/vclient.h: New file.
* src/Makefile.am: Add new files.
* src/VARNISH-MIB.txt: Minor changes in descriptions.
* src/backend.h (backend_collect_addr): Change prototype.
* src/ban.c: Remove configuration management functions.
* src/betab.c: Likewise.
* src/statdict.c (dict_lookup): Remove debugging kludge.
(dict_load): Don't call backend_collect_addr. It is responsibility
of the caller.
* src/varnish_mib.mib2c: Rearrange includes. Open VSM after
parsing configuration.
(init_$modulename): Allow loading of one instance only.
* src/vcli.c: Rewrite socket support.

1 files changed, 10 insertions, 6 deletions

diff --git a/src/VARNISH-MIB.txt b/src/VARNISH-MIB.txt
index 8d60477..6b03f21 100644
--- a/src/VARNISH-MIB.txt
+++ b/src/VARNISH-MIB.txt
@@ -20,14 +20,14 @@ IMPORTS
                 FROM SNMPv2-CONF;
 
 varnishMIB MODULE-IDENTITY
-        LAST-UPDATED "201802012132Z"
+        LAST-UPDATED "201802020845Z"
         ORGANIZATION "Shared Autonomous sYstems"
         CONTACT-INFO "Morten Hermanrud <mhe@say.no>
                       Sergey Poznyakoff <gray@gnu.org>
                      "
         DESCRIPTION 
                 "This MIB module defines objects for Varnish reverse web proxy."
-        REVISION "201802012132Z"
+        REVISION "201802020845Z"
         DESCRIPTION 
                 "Second revision."
         ::= { varnish 0 }
@@ -112,7 +112,8 @@ clientRequests411 OBJECT-TYPE
         MAX-ACCESS read-only
         STATUS  current
         DESCRIPTION
-                "Client requests received, subject to 411 errors."
+                "Client requests received, subject to 411 errors.
+                 This OID is not available in Varnish version 5 and above."
         ::= { client 8 }
 
 clientRequests413 OBJECT-TYPE
@@ -120,7 +121,8 @@ clientRequests413 OBJECT-TYPE
         MAX-ACCESS read-only
         STATUS  current
         DESCRIPTION
-                "Client requests received, subject to 413 errors."
+                "Client requests received, subject to 413 errors.
+                 This OID is not available in Varnish version 5 and above."
         ::= { client 9 }
 
 clientRequests417 OBJECT-TYPE
@@ -186,7 +188,8 @@ backendConnUnused OBJECT-TYPE
         MAX-ACCESS read-only
         STATUS  current
         DESCRIPTION
-                "Backend connections unused."
+                "Backend connections unused.
+                 This OID is not available in Varnish version 5 and above."
         ::= { connections 7 }
 
 backendConnRetry OBJECT-TYPE
@@ -912,7 +915,8 @@ vclFail OBJECT-TYPE
         MAX-ACCESS read-only
         STATUS  current
         DESCRIPTION
-                "Number of VCL failures"
+                "Number of VCL failures.
+                 This OID is not available in Varnish 4 and below."
         ::= { vcl 4 }
         
 --