Implement table of bans

* src/varnish_mib.h: Removed; from now on it is generated
from varnish_mib.mib2c in pair with varnish_mib.c
* src/.gitignore: Add varnish_mib.h
* src/Makefile.am: Change rules accordingly.
* src/VARNISH-MIB.txt: Define table of bans.
* src/ban.c: Implement table of bans.
* src/varnish_mib.mib2c: Implement table support.

1 files changed, 75 insertions, 8 deletions

diff --git a/src/VARNISH-MIB.txt b/src/VARNISH-MIB.txt
index cde935a..47e39c8 100644
--- a/src/VARNISH-MIB.txt
+++ b/src/VARNISH-MIB.txt
@@ -8,22 +8,24 @@ VARNISH-MIB DEFINITIONS ::= BEGIN
 --
 -- *************************************************************
 
 IMPORTS
 	MODULE-IDENTITY, OBJECT-TYPE, enterprises, Counter64, TimeTicks
 		FROM SNMPv2-SMI
+	DateAndTime
+		FROM SNMPv2-TC
 	OBJECT-GROUP, MODULE-COMPLIANCE
 		FROM SNMPv2-CONF;
 
 varnishMIB MODULE-IDENTITY
-	LAST-UPDATED "201411241848Z"
+	LAST-UPDATED "201411260759Z"
 	ORGANIZATION "Shared Autonomous sYstems"
 	CONTACT-INFO "mhe@say.no"
 	DESCRIPTION 
 		"This MIB module defines objects for Varnish reverse web proxy."
-	REVISION "201411241848Z"
+	REVISION "201411260759Z"
 	DESCRIPTION 
 		"Initial version."
 	::= { varnish 0 }
 
 varnish OBJECT IDENTIFIER	::= { enterprises 33043 6 1 }
 client  OBJECT IDENTIFIER	::= { varnish 1 }
@@ -71,14 +73,20 @@ clientCacheMisses OBJECT-TYPE
 	MAX-ACCESS read-only
 	STATUS  current
 	DESCRIPTION
 		"Cache misses"
 	::= { client 5 }
 
+VarnishBanString ::= TEXTUAL-CONVENTION
+    DISPLAY-HINT "1024t"
+    STATUS       current
+    DESCRIPTION ""
+    SYNTAX       OCTET STRING (SIZE (0..1024))
+       	
 clientBan OBJECT-TYPE
-	SYNTAX	OCTET STRING (SIZE(0..1024))
+	SYNTAX	VarnishBanString
 	MAX-ACCESS  read-write
 	STATUS      current
 	DESCRIPTION
 		"When set, invalidates the cache using the supplied value as
 		 argument to ban.  When read, returns an empty string."
 	::= { client 6 }
@@ -524,14 +532,69 @@ bansPersistedFragmentation OBJECT-TYPE
 	SYNTAX  Counter64
 	MAX-ACCESS read-only
 	STATUS  current
 	DESCRIPTION
 		"Extra bytes in persisted ban lists due to fragmentation"
 	::= { bans 17 }
-	
 
+banTable OBJECT-TYPE
+       SYNTAX     SEQUENCE OF VarnishBanEntry
+       MAX-ACCESS not-accessible
+       STATUS     current
+       DESCRIPTION
+             "The (conceptual) table listing available bans"
+       ::= { bans 18 }
+
+varnishBanEntry OBJECT-TYPE
+       SYNTAX     VarnishBanEntry
+       MAX-ACCESS not-accessible
+       STATUS     current
+       DESCRIPTION
+             "An entry (conceptual row) representing a ban"
+       INDEX      { banIndex }
+       ::= { banTable 1 }
+
+VarnishBanEntry ::= SEQUENCE {
+       banIndex                           Integer32,
+       banTime				  DateAndTime,
+       banRefCount                        Counter64,
+       banExpression			  VarnishBanString
+}
+
+banIndex OBJECT-TYPE
+	SYNTAX  Integer32
+	MAX-ACCESS not-accessible
+	STATUS  current
+	DESCRIPTION
+		"A number uniquely identifying each ban"
+	::= { varnishBanEntry 1 }
+
+banTime OBJECT-TYPE
+	SYNTAX  DateAndTime
+	MAX-ACCESS read-only
+	STATUS  current
+	DESCRIPTION
+		"Time when the ban was created"
+	::= { varnishBanEntry 2 }
+
+banRefCount OBJECT-TYPE
+	SYNTAX  Counter32
+	MAX-ACCESS read-only
+	STATUS  current
+	DESCRIPTION
+		"Number of references to this ban"
+	::= { varnishBanEntry 3 }
+	
+banExpression OBJECT-TYPE
+	SYNTAX  VarnishBanString
+	MAX-ACCESS read-only
+	STATUS  current
+	DESCRIPTION
+		"VCL expression of the ban"
+	::= { varnishBanEntry 4 }
+	
 --
 -- Groups and Compliance
 --
 varnishConfs  OBJECT IDENTIFIER	::= { varnish 100 }
 varnishGroups OBJECT IDENTIFIER	::= { varnishConfs 1 }
 varnishCompl  OBJECT IDENTIFIER ::= { varnishConfs 2 }
@@ -582,14 +645,19 @@ varnishGroup OBJECT-GROUP
 		threadsPools,
 		threadsTotal,
 		threadsLimitHits,
 		threadsCreated,
 		threadsDestroyed,
 		threadsFailed,
-		threadsQueueLength
-
+		threadsQueueLength,
+	        banTable,
+		varnishBanEntry,
+		banIndex,
+		banTime,
+		banRefCount,
+		banExpression
 		}
 
 	STATUS  current
 	DESCRIPTION "Group of Varnish objects"
 	::= { varnishGroups 1 }
 
@@ -599,14 +667,13 @@ varnishGroup OBJECT-GROUP
 varnishStandardComplianceV1 MODULE-COMPLIANCE
 	STATUS  current
 	DESCRIPTION
 		"Compliance for an Varnish agent"
 
 	MODULE 
-	MANDATORY-GROUPS {
-		varnishGroup}
+	MANDATORY-GROUPS { varnishGroup }
 
 	::= { varnishCompl 1 }
 
 END
 
 -- Local variables: