socsvn commit: r272473 - soc2014/shonali/head/contrib/bsnmp/snmpd
shonali at FreeBSD.org
shonali at FreeBSD.org
Fri Aug 15 17:51:28 UTC 2014
Author: shonali
Date: Fri Aug 15 17:51:26 2014
New Revision: 272473
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272473
Log:
Switched back to the single begemotTrapSinkTable approach
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 16:08:52 2014 (r272472)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt Fri Aug 15 17:51:26 2014 (r272473)
@@ -155,7 +155,7 @@
::= { begemotSnmpdConfig 6 }
--
--- IPv4 Trap destinations
+-- Trap destinations
--
begemotTrapSinkTable OBJECT-TYPE
SYNTAX SEQUENCE OF BegemotTrapSinkEntry
@@ -163,7 +163,7 @@
STATUS current
DESCRIPTION
"A table with destinations for standard traps."
- INDEX { begemotTrapSinkAddr, begemotTrapSinkPort }
+ INDEX { begemotTrapSinkAddrType begemotTrapSinkAddr, begemotTrapSinkPort }
::= { begemotSnmpdObjects 2 }
begemotTrapSinkEntry OBJECT-TYPE
@@ -172,24 +172,33 @@
STATUS current
DESCRIPTION
"Entry describes one trap destination."
- INDEX { begemotTrapSinkAddr, begemotTrapSinkPort }
+ INDEX { begemotTrapSinkAddrType begemotTrapSinkAddr, begemotTrapSinkPort }
::= { begemotTrapSinkTable 1 }
BegemotTrapSinkEntry ::= SEQUENCE {
- begemotTrapSinkAddr InetAddressIPv4,
+ begemotTrapSinkAddr InetAddress,
+ begemotTrapSinkAddrType InetAddressType
begemotTrapSinkPort INTEGER,
begemotTrapSinkStatus RowStatus
}
begemotTrapSinkAddr OBJECT-TYPE
- SYNTAX InetAddressIPv4
+ SYNTAX InetAddress
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
- "Destination IPv4 address of the manager station where to send
+ "Destination IP address of the manager station where to send
traps."
::= { begemotTrapSinkEntry 1 }
+begemotTrapSinkAddrType OBJECT-TYPE
+ SYNTAX InetAddressType
+ MAX-ACCESS not-accessible
+ STATUS current
+ DESCRIPTION
+ "The address type of the manager station where to send traps."
+ ::= { begemotTrapSinkEntry 4 }
+
begemotTrapSinkPort OBJECT-TYPE
SYNTAX INTEGER (1..65535)
MAX-ACCESS not-accessible
@@ -630,57 +639,4 @@
"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 16:08:52 2014 (r272472)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config Fri Aug 15 17:51:26 2014 (r272473)
@@ -84,9 +84,7 @@
begemotTrapSinkStatus.[$(traphost)].$(trapport) = 4
begemotTrapSinkVersion.[$(traphost)].$(trapport) = 2
begemotTrapSinkComm.[$(traphost)].$(trapport) = $(trap)
-begemotTrapSinkv6Status.[$(traphost)].$(trapport) = 4
-begemotTrapSinkv6Version.[$(traphost)].$(trapport) = 2
-begemotTrapSinkv6Comm.[$(traphost)].$(trapport) = $(trap)
+begemotTrapSinkAddrType.[$(traphost)].$(trapport) = 2
sysContact = $(contact)
sysLocation = $(location)
Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def
==============================================================================
--- soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Fri Aug 15 16:08:52 2014 (r272472)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Fri Aug 15 17:51:26 2014 (r272473)
@@ -119,12 +119,13 @@
(6 begemotSnmpdTrap1Addr6 OCTETSTRING | InetAddressIPv6 op_snmpd_config GET SET)
)
(2 begemotTrapSinkTable
- (1 begemotTrapSinkEntry : OCTETSTRING | InetAddressIPv4 INTEGER op_trapsink
- (1 begemotTrapSinkAddr OCTETSTRING | InetAddressIPv4)
+ (1 begemotTrapSinkEntry : InetAddressType OCTETSTRING | InetAddress INTEGER op_trapsink
+ (1 begemotTrapSinkAddr OCTETSTRING | InetAddress)
(2 begemotTrapSinkPort INTEGER)
(3 begemotTrapSinkStatus INTEGER GET SET)
(4 begemotTrapSinkComm OCTETSTRING GET SET)
(5 begemotTrapSinkVersion INTEGER GET SET)
+ (6 begemotTrapSinkAddrType InetAddressType GET SET)
)
)
#
@@ -199,15 +200,6 @@
(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