socsvn commit: r272456 - soc2014/shonali/head/contrib/bsnmp/snmpd
shonali at FreeBSD.org
shonali at FreeBSD.org
Fri Aug 15 06:21:17 UTC 2014
Author: shonali
Date: Fri Aug 15 06:21:15 2014
New Revision: 272456
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272456
Log:
Added separate begemotTrapSinkv6Table to BEGEMOT-SNMPD.txt, snmpd.config & tree.def
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 Fri Aug 15 06:03:46 2014 (r272455)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt Fri Aug 15 06:21:15 2014 (r272456)
@@ -125,11 +125,11 @@
::= { begemotSnmpdConfig 3 }
begemotSnmpdTrap1Addr OBJECT-TYPE
- SYNTAX IpAddress
+ SYNTAX InetAddressIPv4
MAX-ACCESS read-write
STATUS current
DESCRIPTION
- "The trap sink for v1 traps."
+ "The IPv4 trap sink for v1 traps."
::= { begemotSnmpdConfig 4 }
begemotSnmpdVersionEnable OBJECT-TYPE
@@ -146,8 +146,16 @@
DEFVAL { 3 }
::= { begemotSnmpdConfig 5 }
+begemotSnmpdTrap1Addr6 OBJECT-TYPE
+ SYNTAX InetAddressIPv6
+ MAX-ACCESS read-write
+ STATUS current
+ DESCRIPTION
+ "The IPv6 trap sink for v1 traps."
+ ::= { begemotSnmpdConfig 6 }
+
--
--- Trap destinations
+-- IPv4 Trap destinations
--
begemotTrapSinkTable OBJECT-TYPE
SYNTAX SEQUENCE OF BegemotTrapSinkEntry
@@ -168,17 +176,17 @@
::= { begemotTrapSinkTable 1 }
BegemotTrapSinkEntry ::= SEQUENCE {
- begemotTrapSinkAddr IpAddress,
+ begemotTrapSinkAddr InetAddressIPv4,
begemotTrapSinkPort INTEGER,
begemotTrapSinkStatus RowStatus
}
begemotTrapSinkAddr OBJECT-TYPE
- SYNTAX IpAddress
+ SYNTAX InetAddressIPv4
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
- "Destination IP address of the manager station where to send
+ "Destination IPv4 address of the manager station where to send
traps."
::= { begemotTrapSinkEntry 1 }
@@ -622,4 +630,57 @@
"Set status to 1 to create entry, set it to 2 to delete it."
::= { begemotSnmpdPortv6Entry 3 }
+--
+-- IPv6 Trap destinations
+--
+begemotTrapSinkv6Table OBJECT-TYPE
+ SYNTAX SEQUENCE OF BegemotTrapSinkv6Entry
+ MAX-ACCESS not-accessible
+ STATUS current
+ DESCRIPTION
+ "A table with destinations for standard traps."
+ INDEX { begemotTrapSinkv6Addr, begemotTrapSinkv6Port }
+ ::= { begemotSnmpdObjects 12 }
+
+begemotTrapSinkv6Entry OBJECT-TYPE
+ SYNTAX BegemotTrapSinkv6Entry
+ MAX-ACCESS not-accessible
+ STATUS current
+ DESCRIPTION
+ "Entry describes one trap destination."
+ INDEX { begemotTrapSinkv6Addr, begemotTrapSinkv6Port }
+ ::= { begemotTrapSinkv6Table 1 }
+
+BegemotTrapSinkv6Entry ::= SEQUENCE {
+ begemotTrapSinkv6Addr InetAddressIPv6,
+ begemotTrapSinkv6Port INTEGER,
+ begemotTrapSinkv6Status RowStatus
+}
+
+begemotTrapSinkv6Addr OBJECT-TYPE
+ SYNTAX InetAddressIPv6
+ MAX-ACCESS not-accessible
+ STATUS current
+ DESCRIPTION
+ "Destination IPv6 address of the manager station where to send
+ traps."
+ ::= { begemotTrapSinkv6Entry 1 }
+
+begemotTrapSinkv6Port OBJECT-TYPE
+ SYNTAX INTEGER (1..65535)
+ MAX-ACCESS not-accessible
+ STATUS current
+ DESCRIPTION
+ "Destination UDP port of the manager station where to send
+ traps."
+ ::= { begemotTrapSinkv6Entry 2 }
+
+begemotTrapSinkv6Status OBJECT-TYPE
+ SYNTAX RowStatus
+ MAX-ACCESS read-create
+ STATUS current
+ DESCRIPTION
+ "Used to create/activate/destroy the entry."
+ ::= { begemotTrapSinkv6Entry 3 }
+
END
Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config
==============================================================================
--- soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config Fri Aug 15 06:03:46 2014 (r272455)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config Fri Aug 15 06:21:15 2014 (r272456)
@@ -84,6 +84,9 @@
begemotTrapSinkStatus.[$(traphost)].$(trapport) = 4
begemotTrapSinkVersion.[$(traphost)].$(trapport) = 2
begemotTrapSinkComm.[$(traphost)].$(trapport) = $(trap)
+begemotTrapSinkv6Status.[$(traphost)].$(trapport) = 4
+begemotTrapSinkv6Version.[$(traphost)].$(trapport) = 2
+begemotTrapSinkv6Comm.[$(traphost)].$(trapport) = $(trap)
sysContact = $(contact)
sysLocation = $(location)
Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def
==============================================================================
--- soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Fri Aug 15 06:03:46 2014 (r272455)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Fri Aug 15 06:21:15 2014 (r272456)
@@ -114,12 +114,13 @@
(1 begemotSnmpdTransmitBuffer INTEGER op_snmpd_config GET SET)
(2 begemotSnmpdReceiveBuffer INTEGER op_snmpd_config GET SET)
(3 begemotSnmpdCommunityDisable INTEGER op_snmpd_config GET SET)
- (4 begemotSnmpdTrap1Addr IPADDRESS op_snmpd_config GET SET)
+ (4 begemotSnmpdTrap1Addr OCTETSTRING | InetAddressIPv4 op_snmpd_config GET SET)
(5 begemotSnmpdVersionEnable UNSIGNED32 op_snmpd_config GET SET)
+ (6 begemotSnmpdTrap1Addr6 OCTETSTRING | InetAddressIPv6 op_snmpd_config GET SET)
)
(2 begemotTrapSinkTable
- (1 begemotTrapSinkEntry : IPADDRESS INTEGER op_trapsink
- (1 begemotTrapSinkAddr IPADDRESS)
+ (1 begemotTrapSinkEntry : OCTETSTRING | InetAddressIPv4 INTEGER op_trapsink
+ (1 begemotTrapSinkAddr OCTETSTRING | InetAddressIPv4)
(2 begemotTrapSinkPort INTEGER)
(3 begemotTrapSinkStatus INTEGER GET SET)
(4 begemotTrapSinkComm OCTETSTRING GET SET)
@@ -198,6 +199,15 @@
(2 begemotSnmpdPortv6Port UNSIGNED32)
(3 begemotSnmpdPortv6Status INTEGER GET SET)
))
+
+ (12 begemotTrapSinkv6Table
+ (1 begemotTrapSinkv6Entry : OCTETSTRING | InetAddressIPv6 INTEGER op_trapsink
+ (1 begemotTrapSinkv6Addr OCTETSTRING | InetAddressIPv6)
+ (2 begemotTrapSinkv6Port INTEGER)
+ (3 begemotTrapSinkv6Status INTEGER GET SET)
+ (4 begemotTrapSinkv6Comm OCTETSTRING GET SET)
+ (5 begemotTrapSinkv6Version INTEGER GET SET)
+ ))
)
(2 begemotSnmpdDefs
(1 begemotSnmpdAgent
More information about the svn-soc-all
mailing list