socsvn commit: r271988 - soc2014/shonali/head/contrib/bsnmp/snmpd

[shonali at FreeBSD.org]

Author: shonali
Date: Wed Aug  6 16:30:45 2014
New Revision: 271988
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271988

Log:
  Made changes to BEGEMOT-SNMPD.txt & tree.def
  

Modified:
  soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt
  soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def

Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt
==============================================================================
--- soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt	Wed Aug  6 14:38:09 2014	(r271987)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt	Wed Aug  6 16:30:45 2014	(r271988)
@@ -218,7 +218,7 @@
     DESCRIPTION
 	    "An entry in the table with descriptions of UDP ports to
 	    listen on for SNMP messages."
-    INDEX	{ begemotSnmpdPortAddress, begemotSnmpdPortAddressType, begemotSnmpdPortPort }
+    INDEX     { begemotSnmpdPortAddressType, begemotSnmpdPortAddress, begemotSnmpdPortPort }
     ::= { begemotSnmpdPortTable 1 }
 
 BegemotSnmpdPortEntry ::= SEQUENCE {

Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def
==============================================================================
--- soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def	Wed Aug  6 14:38:09 2014	(r271987)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def	Wed Aug  6 16:30:45 2014	(r271988)
@@ -33,8 +33,15 @@
 
 #include "tc.def"
 
-typedef InetAddress { type binary { length "0..255"; } }
-typedef InetAddressType { type enumeration { enum unknown { value 0; } enum ipv4 { value 1; } enum ipv6 { value 2; } enum ipv4z { value 3; } enum ipv6z { value 4; } enum dns { value 16; } } } 
+typedef InetAddressType ENUM (
+        0 unknown
+        1 ipv4
+        2 ipv6
+        3 ipv4z
+        4 ipv6z
+        16 dns
+)
+
 typedef RowStatus ENUM (
 	1 active
 	2 notInService
@@ -123,8 +130,8 @@
 #	Port table
 #
               (4 begemotSnmpdPortTable
-                (1 begemotSnmpdPortEntry : InetAddress INTEGER op_snmp_port InetAddressType 
-                  (1 begemotSnmpdPortAddress InetAddress)
+                (1 begemotSnmpdPortEntry : InetAddressType OCTETSTRING | InetAddress INTEGER op_snmp_port
+                  (1 begemotSnmpdPortAddress OCTETSTRING | InetAddress) 
                   (2 begemotSnmpdPortPort UNSIGNED32)
                   (3 begemotSnmpdPortStatus INTEGER GET SET)
                   (4 begemotSnmpdPortAddressType InetAddressType)