Remove banTableTimeout oid.

4 files changed, 6 insertions, 43 deletions

diff --git a/src/VARNISH-MIB.txt b/src/VARNISH-MIB.txt
index bb6075d..71556c4 100644
--- a/src/VARNISH-MIB.txt
+++ b/src/VARNISH-MIB.txt
@@ -17,20 +17,20 @@ IMPORTS
         InetAddressIPv4, InetAddressIPv6, InetPortNumber,
                 FROM INET-ADDRESS-MIB
         OBJECT-GROUP, MODULE-COMPLIANCE
                 FROM SNMPv2-CONF;
 
 varnishMIB MODULE-IDENTITY
-        LAST-UPDATED "201411280136Z"
+        LAST-UPDATED "201411280837Z"
         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 "201411280136Z"
+        REVISION "201411280837Z"
         DESCRIPTION 
                 "Second revision."
         ::= { varnish 0 }
 
 varnish OBJECT IDENTIFIER       ::= { enterprises 33043 6 1 }
 client  OBJECT IDENTIFIER       ::= { varnish 1 }
@@ -780,21 +780,12 @@ banExpression OBJECT-TYPE
         MAX-ACCESS read-only
         STATUS  current
         DESCRIPTION
                 "VCL expression of the ban."
         ::= { varnishBanEntry 4 }
 
-banTableTimeout OBJECT-TYPE
-        SYNTAX  Unsigned32
-        MAX-ACCESS read-write
-        STATUS  current
-        DESCRIPTION
-                "If banTable content is cached, this variable keeps
-                 the time in seconds after which the table is reloaded.
-                 Setting it changes that value."
-        ::= { agent 1 }
 --
 -- Groups and Compliance
 --
 varnishConfs  OBJECT IDENTIFIER ::= { varnish 100 }
 varnishGroups OBJECT IDENTIFIER ::= { varnishConfs 1 }
 varnishCompl  OBJECT IDENTIFIER ::= { varnishConfs 2 }
diff --git a/src/ban.c b/src/ban.c
index 72aa506..8d48db2 100644
--- a/src/ban.c
+++ b/src/ban.c
@@ -96,26 +96,12 @@ varnish_mib_timeout_parser(const char *token, char *line, unsigned *retval)
 void
 varnish_ban_table_timeout_parser(const char *token, char *line)
 {
         varnish_mib_timeout_parser(token, line, &banTable_timeout);
 }
 
-int
-varnish_ban_table_timeout_set(netsnmp_agent_request_info   *reqinfo,
-                              netsnmp_request_info         *requests,
-                              struct VSM_data *vd)
-{
-        if (*requests->requestvb->val.integer < 0 ||
-            *requests->requestvb->val.integer > UINT_MAX)
-                return SNMP_ERR_BADVALUE;
-        DEBUGMSGTL(("varnish_ban", "setting banTable timeout %ld\n",
-                    *requests->requestvb->val.integer));
-        banTable_timeout = *requests->requestvb->val.integer;
-        return SNMP_ERR_NOERROR;
-}
-
 /*
  * create a new row in the table 
  */
 static struct banTable_entry *
 create_entry(netsnmp_tdata *table_data, long idx, struct banTable_entry *ent)
 {
diff --git a/src/varnish-mib.8 b/src/varnish-mib.8
index c2d37cd..05fa177 100644
--- a/src/varnish-mib.8
+++ b/src/varnish-mib.8
@@ -51,15 +51,12 @@ The following configuration statements are available:
 To create \fBbanTable\fR (see below), \fBvarnish_mib\fR connects to
 \fBvarnish\fR administration port and issues the \fBban.list\fR
 command.  To minimize the performance impact, the information obtained
 is cached for a predefined amount of time (60 seconds by default).
 This amount (in seconds) is configured by \fBvarnishBanTableTimeout\fR
 statement.
-
-It can also be set remotely by assigning new value to the
-\fBbanTableTimeout\fR oid.
 .TP
 \fBvarnishCLIPortTimeout\fR \fINUMBER\fR
 Sets timeout for I/O operations with Varnish administrative port.
 Default is 5 seconds.
 .TP
 \fBvarnishBackendTableTimeout\fR \fINUMBER\fR
@@ -332,20 +329,17 @@ in the varnish cache affected by that ban.
 VCL expression of the ban.
 .RE
 
 Notice that for performance reasons, the ban table is cached, so the
 total number of rows in the \fBbanTable\fR may diverge from the value
 of \fBbansTotal\fR variable.  The default update interval is 60
-seconds.  It can be configured either in the \fBsnmpd.conf\fR file
-(see the \fBvarnishBanTableTimeout\fR statement above), or via
-the \fBbanTableTimeout\fR variable.
+seconds.  It can be configured in the \fBsnmpd.conf\fR file
+(see the \fBvarnishBanTableTimeout\fR statement above).
 .SS Branch \(dqagent\(dq
-.TP
-.B banTableTimeout
-Update interval for the \fBbanTable\fR cache.  If set, it takes effect
-immediately.
+The \fBagent\fR branch is reserved for OIDs for
+implementation-specific management.  It is not used currently.
 .SH "SEE ALSO"
 .BR snmpd.conf (5),
 .BR snmpd (8),
 .BR varnish (7),
 .BR varnishstat (1).
 .SH AUTHORS
diff --git a/src/varnish_mib.mib2c b/src/varnish_mib.mib2c
index c120b0e..5d9cc6b 100644
--- a/src/varnish_mib.mib2c
+++ b/src/varnish_mib.mib2c
@@ -98,16 +98,12 @@ $vars{'varnish_translate'} = sub {
         bansLurkerTestTested      => [ 'MAIN', 'bans_lurker_tests_tested' ],
         bansLurkerObjKilled       => [ 'MAIN', 'bans_lurker_obj_killed' ],
         bansDups                  => [ 'MAIN', 'bans_dups' ],
         bansLurkerContention      => [ 'MAIN', 'bans_lurker_contention' ],
         bansPersistedBytes        => [ 'MAIN', 'bans_persisted_bytes' ],
         bansPersistedFragmentation => [ 'MAIN', 'bans_persisted_fragmentation' ],
-
-        banTableTimeout           => [ 'VAR', 'banTable_timeout',
-                       { varnish_set_action => 'varnish_ban_table_timeout_set'
-                       }  ],
                                        
         );
 
     my $r = $trans{$name};
     if (!defined($r)) {
         print STDERR "no translation for $name!\n";
@@ -185,16 +181,12 @@ int varnish_ban(netsnmp_agent_request_info   *reqinfo,
 int varnish_mib_timeout_parser(const char *token, char *line,
                                unsigned *retval);
 
 void varnish_ban_table_timeout_parser(const char *token, char *line);
 void varnish_vcli_timeout_parser(const char *token, char *line);
 
-int varnish_ban_table_timeout_set(netsnmp_agent_request_info   *reqinfo,
-                                  netsnmp_request_info         *requests,
-                                  struct VSM_data *vd);
-
 void varnish_backend_table_timeout_parser(const char *token, char *line);
 
 @open ${name}@
 /* THIS FILE IS GENERATED AUTOMATICALLY.  PLEASE DO NOT EDIT. */
 
 #include "varnish_mib.h"