DisplayString seems a better type for pfIfDescr and some of the other
objects; this improves the display format in Prometheus snmp_exporter
which uses hex values for OCTET STRING.

OK?


Index: OPENBSD-PF-MIB.txt
===================================================================
RCS file: /cvs/src/share/snmp/OPENBSD-PF-MIB.txt,v
retrieving revision 1.6
diff -u -p -r1.6 OPENBSD-PF-MIB.txt
--- OPENBSD-PF-MIB.txt  19 Jun 2018 10:08:45 -0000      1.6
+++ OPENBSD-PF-MIB.txt  20 Mar 2021 14:24:11 -0000
@@ -23,7 +23,7 @@ IMPORTS
        TimeTicks, enterprises
                FROM SNMPv2-SMI
 
-       TruthValue
+       TruthValue, DisplayString
                FROM SNMPv2-TC
                
        openBSD
@@ -33,7 +33,7 @@ IMPORTS
                FROM SNMPv2-CONF;
 
 pfMIBObjects MODULE-IDENTITY
-    LAST-UPDATED "201506091728Z"
+    LAST-UPDATED "202103201421Z"
     ORGANIZATION "OpenBSD"
     CONTACT-INFO "
                   Author:     Joel Knight
@@ -43,6 +43,8 @@ pfMIBObjects MODULE-IDENTITY
     DESCRIPTION "The MIB module for gathering information from
                OpenBSD's packet filter.
                 "
+    REVISION "202103201421Z"
+    DESCRIPTION "Use DisplayString not OCTET STRING where appropriate"
     REVISION "201506091728Z"
     DESCRIPTION "Add separate counter for failed 'route-to' applications"
     REVISION "201308310446Z"
@@ -300,7 +302,7 @@ pfStateRemovals OBJECT-TYPE
 -- pfLogInterface
 
 pfLogIfName OBJECT-TYPE
-    SYNTAX      OCTET STRING
+    SYNTAX      DisplayString
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -683,7 +685,7 @@ pfIfEntry OBJECT-TYPE
 PfIfEntry ::=
        SEQUENCE {
                pfIfIndex               Integer32,
-               pfIfDescr               OCTET STRING,
+               pfIfDescr               DisplayString,
                pfIfType                INTEGER,
                pfIfRefs                Unsigned32,
                pfIfRules               Unsigned32,
@@ -719,7 +721,7 @@ pfIfIndex OBJECT-TYPE
        ::= { pfIfEntry 1 }
 
 pfIfDescr OBJECT-TYPE
-       SYNTAX          OCTET STRING
+       SYNTAX          DisplayString
        MAX-ACCESS      read-only
        STATUS          current
        DESCRIPTION
@@ -913,7 +915,7 @@ pfTblEntry OBJECT-TYPE
 TblEntry ::=
        SEQUENCE {
                pfTblIndex              Integer32,
-               pfTblName               OCTET STRING,
+               pfTblName               DisplayString,
                pfTblAddresses          Integer32,
                pfTblAnchorRefs         Integer32,
                pfTblRuleRefs           Integer32,
@@ -947,7 +949,7 @@ pfTblIndex OBJECT-TYPE
        ::= { pfTblEntry 1 }
 
 pfTblName OBJECT-TYPE
-       SYNTAX          OCTET STRING
+       SYNTAX          DisplayString
        MAX-ACCESS      read-only
        STATUS          current
        DESCRIPTION
@@ -1363,7 +1365,7 @@ pfLabelEntry OBJECT-TYPE
 PfLabelEntry ::=
        SEQUENCE {
                pfLabelIndex            Integer32,
-               pfLabelName             OCTET STRING,
+               pfLabelName             DisplayString,
                pfLabelEvals            Counter64,
                pfLabelPkts             Counter64,
                pfLabelBytes            Counter64,
@@ -1383,7 +1385,7 @@ pfLabelIndex OBJECT-TYPE
        ::= { pfLabelEntry 1 }
 
 pfLabelName OBJECT-TYPE
-       SYNTAX          OCTET STRING
+       SYNTAX          DisplayString
        MAX-ACCESS      read-only
        STATUS          current
        DESCRIPTION

Reply via email to