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

[shonali at FreeBSD.org]

Author: shonali
Date: Wed Jun 11 17:00:42 2014
New Revision: 269407
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269407

Log:
  Modified BEGEMOT-SNMPD-MIB, tree.def, snmpd.config to add definitions for IPv6.
  

Modified:
  soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt
  soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config
  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 Jun 11 16:11:12 2014	(r269406)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt	Wed Jun 11 17:00:42 2014	(r269407)
@@ -40,6 +40,8 @@
 	FROM SNMPv2-TC
     MODULE-COMPLIANCE, OBJECT-GROUP
 	FROM SNMPv2-CONF
+    InetAddress, InetAddressType, InetPortNumber
+        FROM INET-ADDRESS-MIB
     begemot
 	FROM BEGEMOT-MIB;
 
@@ -216,23 +218,32 @@
     DESCRIPTION
 	    "An entry in the table with descriptions of UDP ports to
 	    listen on for SNMP messages."
-    INDEX	{ begemotSnmpdPortAddress, begemotSnmpdPortPort }
+    INDEX	{ begemotSnmpdPortAddress, begemotSnmpdPortAddressType, begemotSnmpdPortPort }
     ::= { begemotSnmpdPortTable 1 }
 
 BegemotSnmpdPortEntry ::= SEQUENCE {
-    begemotSnmpdPortAddress	IpAddress,
+    begemotSnmpdPortAddress     InetAddress,
+    begemotSnmpdPortAddressType InetAddressType,
     begemotSnmpdPortPort	INTEGER,
     begemotSnmpdPortStatus	INTEGER
 }
 
 begemotSnmpdPortAddress OBJECT-TYPE
-    SYNTAX	IpAddress
+    SYNTAX      InetAddress 
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION
 	    "The IP address to bind to."
     ::= { begemotSnmpdPortEntry 1 }
 
+begemotSnmpdPortAddressType OBJECT-TYPE
+    SYNTAX      InetAddressType
+    MAX-ACCESS  not-accessible 
+    STATUS      current
+    DESCRIPTION
+	"The address type of the given host."
+    ::= { begemotSnmpdPortEntry 4 }
+
 begemotSnmpdPortPort OBJECT-TYPE
     SYNTAX	INTEGER (1..65535)
     MAX-ACCESS	not-accessible
@@ -566,5 +577,6 @@
 --
 begemotSnmpdTransUdp	OBJECT IDENTIFIER ::= { begemotSnmpdTransportMappings 2 }
 begemotSnmpdTransLsock	OBJECT IDENTIFIER ::= { begemotSnmpdTransportMappings 3 }
+begemotSnmpdTransIpv6Udp    OBJECT IDENTIFIER ::= { begemotSnmpdTransportMappings 4 }
 
 END

Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config
==============================================================================
--- soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config	Wed Jun 11 16:11:12 2014	(r269406)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config	Wed Jun 11 17:00:42 2014	(r269407)
@@ -71,8 +71,8 @@
 begemotSnmpdCommunityDisable	= 1
 
 # open standard SNMP ports
-begemotSnmpdPortStatus.[$(host)].161 = 1
-begemotSnmpdPortStatus.127.0.0.1.161 = 1
+begemotSnmpdPortStatus.::.161.2 = 1
+begemotSnmpdPortStatus.::1.161.2 = 1
 
 # open a unix domain socket
 begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1

Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def
==============================================================================
--- soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def	Wed Jun 11 16:11:12 2014	(r269406)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def	Wed Jun 11 17:00:42 2014	(r269407)
@@ -121,8 +121,9 @@
 #	Port table
 #
               (4 begemotSnmpdPortTable
-                (1 begemotSnmpdPortEntry : IPADDRESS INTEGER op_snmp_port
-                  (1 begemotSnmpdPortAddress IPADDRESS)
+                (1 begemotSnmpdPortEntry : InetAddress InetAddressType INTEGER op_snmp_port
+                  (1 begemotSnmpdPortAddress InetAddress)
+                  (4 begemotSnmpdPortAddressType InetAddressType)
                   (2 begemotSnmpdPortPort UNSIGNED32)
                   (3 begemotSnmpdPortStatus INTEGER GET SET)
               ))
@@ -180,6 +181,7 @@
                 ))
                 (2 begemotSnmpdTransUdp OID op_transport_dummy)
                 (3 begemotSnmpdTransLsock OID op_transport_dummy)
+                (4 begemotSnmpdTransIpv6Udp OID op_transport_dummy)
               )
  	    )
             (2 begemotSnmpdDefs