summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--doc/REGEX-MIB.txt32
-rw-r--r--doc/bsnmp-regex.814
-rw-r--r--module/Makefile.am2
-rw-r--r--module/bsnmp-regex.c2
-rw-r--r--module/regex-tree.def2
6 files changed, 34 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 80eaff9..1f327c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
0.2:
* Better configure.in checks.
+ * Cleanup the MIB a bit
0.1:
* Initial Release.
diff --git a/doc/REGEX-MIB.txt b/doc/REGEX-MIB.txt
index d3ec986..7e8c4e9 100644
--- a/doc/REGEX-MIB.txt
+++ b/doc/REGEX-MIB.txt
@@ -31,7 +31,7 @@ IMPORTS
begemot
FROM BEGEMOT-MIB;
-regexData MODULE-IDENTITY
+regex MODULE-IDENTITY
LAST-UPDATED "200603290000Z"
ORGANIZATION "Nate Nielsen"
CONTACT-INFO "nielsen@memberwebs.com"
@@ -46,28 +46,42 @@ regexCount OBJECT-TYPE
MAX-ACCESS read-only
STATUS current
DESCRIPTION "Number of regexEntry objects."
- ::= { regexData 0 }
-
-regexEntry OBJECT IDENTIFIER
- ::= { regexData 1 }
+ ::= { regex 0 }
--
-- entry information
--
+regexEntry OBJECT-TYPE
+ SYNTAX RegexEntry
+ MAX-ACCESS not-accessible
+ STATUS current
+ DESCRIPTION
+ "A set of information about one regex counter"
+ INDEX { regexIndex }
+ ::= { regex 1 }
+
+RegexEntry ::= SEQUENCE {
+ regexIndex Integer32,
+ regexDescr OCTET STRING,
+ regexLast TimeTicks,
+ regexInteger Integer32,
+ regexString OCTET STRING,
+}
+
regexIndex OBJECT-TYPE
SYNTAX Integer32
MAX-ACCESS read-only
STATUS current
DESCRIPTION "Index of this regexEntry object."
- :: { regexEntry 1 }
+ ::= { regexEntry 1 }
regexDescr OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-only
STATUS current
DESCRIPTION "Description of the regexEntry object."
- :: { regexEntry 2 }
+ ::= { regexEntry 2 }
regexLast OBJECT-TYPE
SYNTAX TimeTicks
@@ -82,13 +96,13 @@ regexInteger OBJECT-TYPE
MAX-ACCESS read-only
STATUS current
DESCRIPTION "Integer value of this regexEntry object."
- :: { regexEntry 4 }
+ ::= { regexEntry 4 }
regexString OBJECT-TYPE
SYNTAX OCTET STRING
MAX-ACCESS read-only
STATUS current
DESCRIPTION "String value of this regexEntry object."
- :: { regexEntry 5 }
+ ::= { regexEntry 5 }
END
diff --git a/doc/bsnmp-regex.8 b/doc/bsnmp-regex.8
index 7acf116..340cd55 100644
--- a/doc/bsnmp-regex.8
+++ b/doc/bsnmp-regex.8
@@ -68,22 +68,22 @@ The counters will be available as a table under the following MIB:
.Pp
Or if the appropriate MIB.txt files have been installed:
.Bd -literal -offset indent
- enterprises.fokus.begemot.regexData
+ enterprises.fokus.begemot.regex
.Ed
.Pp
The following SNMP MIBs are available for use (where X is the counter index):
.Bl -tag -width Fl
-.It Ar regexData.regexCount.0
+.It Ar regex.regexCount.0
The number of counters available.
-.It Ar regexData.regexEntry.regexIndex.X
+.It Ar regex.regexEntry.regexIndex.X
The index of the counter.
-.It Ar regexData.regexEntry.regexDescr.X
+.It Ar regex.regexEntry.regexDescr.X
The description of the counter.
-.It Ar regexData.regexEntry.regexLast.X
+.It Ar regex.regexEntry.regexLast.X
How long ago the counter was last updated.
-.It Ar regexData.regexEntry.regexInteger.X
+.It Ar regex.regexEntry.regexInteger.X
The current counter value as a integer.
-.It Ar regexData.regexEntry.regexString.X
+.It Ar regex.regexEntry.regexString.X
The current counter value as a string.
.El
.Sh OPTIONS
diff --git a/module/Makefile.am b/module/Makefile.am
index 0874973..e77f249 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -10,7 +10,7 @@ snmp_regex_la_SOURCES = regex_tree.c regex_tree.h regex_oid.h \
regex_tree.c: $(srcdir)/regex-tree.def
gensnmptree -p regex_ < $(srcdir)/regex-tree.def
- gensnmptree -e regexData > regex_oid.h < $(srcdir)/regex-tree.def
+ gensnmptree -e regex > regex_oid.h < $(srcdir)/regex-tree.def
CLEANFILES = regex_tree.* \
regex_oid.h
diff --git a/module/bsnmp-regex.c b/module/bsnmp-regex.c
index 2955681..cfa8163 100644
--- a/module/bsnmp-regex.c
+++ b/module/bsnmp-regex.c
@@ -69,7 +69,7 @@
static struct lmodule *module;
/* OIDs */
-static const struct asn_oid oid_regex = OIDX_regexData;
+static const struct asn_oid oid_regex = OIDX_regex;
/* the Object Resource registration index */
static u_int reg_index = 0;
diff --git a/module/regex-tree.def b/module/regex-tree.def
index 1d58819..234357c 100644
--- a/module/regex-tree.def
+++ b/module/regex-tree.def
@@ -40,7 +40,7 @@
(1 enterprises
(12325 fokus
(1 begemot
- (203 regexData
+ (203 regex
(0 regexCount INTEGER op_regex GET)
(1 regexEntry : INTEGER op_regexentry