On Fri, Jan 13, 2012 at 2:53 PM, Joel Knight <knight.j...@gmail.com> wrote:
> Hi,
>
> This diff integrates my existing snmp MIB for carp(4) into the base
> snmpd. I brought the MIB straight across with no changes. The only
> limitation I'm aware of is that it doesn't support the multiple
> carpnodes style loadbalancing; it only reports status on the main
> carpnode.
>
> http://www.packetmischief.ca/files/openbsd/patches/snmpd.carp.diff
Updated diff based on feedback from camield@
- relayd(8) already uses .30155.3 as its based OID for sending traps
so move carp to .30155.6
- fix file descriptor leak
.joel
Index: src/share/snmp/Makefile
===================================================================
RCS file: /cvs/src/share/snmp/Makefile,v
retrieving revision 1.1
diff -p -u -r1.1 Makefile
--- src/share/snmp/Makefile 23 Dec 2008 18:32:10 -0000 1.1
+++ src/share/snmp/Makefile 29 Jan 2012 13:29:42 -0000
@@ -2,6 +2,7 @@
FILES= OPENBSD-SNMPD-CONF.txt OPENBSD-BASE-MIB.txt
FILES+= OPENBSD-MEM-MIB.txt OPENBSD-SENSORS-MIB.txt
+FILES+= OPENBSD-CARP-MIB.txt
all clean cleandir depend lint obj tags: _SUBDIRUSE
Index: src/share/snmp/OPENBSD-CARP-MIB.txt
===================================================================
RCS file: src/share/snmp/OPENBSD-CARP-MIB.txt
diff -N src/share/snmp/OPENBSD-CARP-MIB.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/share/snmp/OPENBSD-CARP-MIB.txt 29 Jan 2012 13:29:42 -0000
@@ -0,0 +1,312 @@
+--
+-- $OpenBSD$
+--
+--
+-- Copyright (c) 2006-2011 Joel Knight <knight.j...@gmail.com>
+--
+-- Permission to use, copy, modify, and distribute this document for any
+-- purpose with or without fee is hereby granted, provided that the above
+-- copyright notice and this permission notice appear in all copies.
+--
+-- THE DOCUMENT IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+-- WITH REGARD TO THIS DOCUMENT INCLUDING ALL IMPLIED WARRANTIES OF
+-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+-- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+-- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+-- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS DOCUMENT.
+
+
+OPENBSD-CARP-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+ MODULE-IDENTITY, NOTIFICATION-TYPE, OBJECT-TYPE,
+ Counter64, Integer32, enterprises
+ FROM SNMPv2-SMI
+
+ TruthValue
+ FROM SNMPv2-TC
+
+ openBSD
+ FROM OPENBSD-BASE-MIB
+
+ MODULE-COMPLIANCE, OBJECT-GROUP
+ FROM SNMPv2-CONF;
+
+carpMIBObjects MODULE-IDENTITY
+ LAST-UPDATED "201105130000Z"
+ ORGANIZATION "OpenBSD"
+ CONTACT-INFO "
+ Author: Joel Knight
+ email: knight.j...@gmail.com
+ www: www.packetmischief.ca/openbsd-snmp-mibs/
+ "
+ DESCRIPTION "The MIB module for gathering information about
+ Common Address Redundancy Protocol (CARP) interfaces.
+ "
+ ::= { openBSD 6 }
+
+
+-- define the sections of the MIB
+
+carpSysctl OBJECT IDENTIFIER ::= { carpMIBObjects 1 }
+carpIf OBJECT IDENTIFIER ::= { carpMIBObjects 2 }
+carpStats OBJECT IDENTIFIER ::= { carpMIBObjects 3 }
+
+
+-- carpSysctl
+carpAllow OBJECT-TYPE
+ SYNTAX TruthValue
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Indicates whether the node will respond to CARP packets."
+ ::= { carpSysctl 1 }
+
+carpPreempt OBJECT-TYPE
+ SYNTAX TruthValue
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Indicates whether preemption is enabled."
+ ::= { carpSysctl 2 }
+
+carpLog OBJECT-TYPE
+ SYNTAX TruthValue
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Indicates whether logging of invalud CARP packets is enabled."
+ ::= { carpSysctl 3 }
+
+
+-- carpIf
+
+carpIfNumber OBJECT-TYPE
+ SYNTAX Integer32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The number of CARP interfaces present on this system."
+ ::= { carpIf 1 }
+
+carpIfTable OBJECT-TYPE
+ SYNTAX SEQUENCE OF CarpIfEntry
+ MAX-ACCESS not-accessible
+ STATUS current
+ DESCRIPTION
+ "A list of individual CARP interfaces. The number of entries is
+ given by the value of carpIfNumber."
+ ::= { carpIf 2 }
+
+carpIfEntry OBJECT-TYPE
+ SYNTAX CarpIfEntry
+ MAX-ACCESS not-accessible
+ STATUS current
+ DESCRIPTION
+ "An entry containing management information applicable to a
+ particular CARP interface."
+ INDEX { carpIfIndex }
+ ::= { carpIfTable 1 }
+
+CarpIfEntry ::=
+ SEQUENCE {
+ carpIfIndex Integer32,
+ carpIfDescr OCTET STRING,
+ carpIfVhid Integer32,
+ carpIfDev OCTET STRING,
+ carpIfAdvbase Integer32,
+ carpIfAdvskew Integer32,
+ carpIfState Integer32
+ }
+
+carpIfIndex OBJECT-TYPE
+ SYNTAX Integer32 (1..2147483647)
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "A unique value, greater than zero, for each CARP interface."
+ ::= { carpIfEntry 1 }
+
+carpIfDescr OBJECT-TYPE
+ SYNTAX OCTET STRING
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The name of the CARP interface."
+ ::= { carpIfEntry 2 }
+
+carpIfVhid OBJECT-TYPE
+ SYNTAX Integer32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The Virtual HostID of the CARP interface."
+ ::= { carpIfEntry 3 }
+
+carpIfDev OBJECT-TYPE
+ SYNTAX OCTET STRING
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The parent interface that the CARP interface is bound to."
+ ::= { carpIfEntry 4 }
+
+carpIfAdvbase OBJECT-TYPE
+ SYNTAX Integer32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The advbase value of the CARP interface."
+ ::= { carpIfEntry 5 }
+
+carpIfAdvskew OBJECT-TYPE
+ SYNTAX Integer32
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The advskew value of the CARP interface."
+ ::= { carpIfEntry 6 }
+
+carpIfState OBJECT-TYPE
+ SYNTAX INTEGER { init(0), backup(1), master(2) }
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Indicates the operational state of the CARP interface."
+ ::= { carpIfEntry 7 }
+
+
+-- carpStats
+
+carpIpPktsRecv OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of IPv4 CARP packets received on all interfaces."
+ ::= { carpStats 1 }
+
+carpIp6PktsRecv OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of IPv6 CARP packets received on all interfaces."
+ ::= { carpStats 2 }
+
+carpPktDiscardsForBadInterface OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets discarded due to being received on a
+ non-CARP interface."
+ ::= { carpStats 3 }
+
+carpPktDiscardsForWrongTtl OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets discarded due to having a TTL less
+ than 255."
+ ::= { carpStats 4 }
+
+carpPktShorterThanHeader OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets received on any interface that is
+ shorter than the size of the CARP packet header."
+ ::= { carpStats 5 }
+
+carpPktDiscardsForBadChecksum OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets discarded due to bad checksum."
+ ::= { carpStats 6 }
+
+carpPktDiscardsForBadVersion OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets discarded due to bad version in
+ the packet header."
+ ::= { carpStats 7 }
+
+carpPktDiscardsForTooShort OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets discarded due to being too short."
+ ::= { carpStats 8 }
+
+carpPktDiscardsForBadAuth OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets discarded because they failed the
+ HMAC authentication check."
+ ::= { carpStats 9 }
+
+carpPktDiscardsForBadVhid OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets discarded due to incorrect VHID in
+ the packet header."
+ ::= { carpStats 10 }
+
+carpPktDiscardsForBadAddressList OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of packets discarded due to bad addresses in
+ the CARP packet."
+ ::= { carpStats 11 }
+
+carpIpPktsSent OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of IPv4 CARP packets sent on all interfaces."
+ ::= { carpStats 12 }
+
+carpIp6PktsSent OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of IPv6 CARP packets sent on all interfaces."
+ ::= { carpStats 13 }
+
+carpNoMemory OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of CARP advertisements that failed because memory
+ could not be allocated."
+ ::= { carpStats 14 }
+
+carpTransitionsToMaster OBJECT-TYPE
+ SYNTAX Counter64
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Number of times the host has transitioned to MASTER state
+ for any CARP group."
+ ::= { carpStats 15 }
+
+END
+
Index: src/share/snmp/OPENBSD-SNMPD-CONF.txt
===================================================================
RCS file: /cvs/src/share/snmp/OPENBSD-SNMPD-CONF.txt,v
retrieving revision 1.2
diff -p -u -r1.2 OPENBSD-SNMPD-CONF.txt
--- src/share/snmp/OPENBSD-SNMPD-CONF.txt 11 Jun 2010 10:45:37 -0000
1.2
+++ src/share/snmp/OPENBSD-SNMPD-CONF.txt 29 Jan 2012 13:29:42 -0000
@@ -74,4 +74,8 @@ IMPORTS
memMIBObjects
FROM OPENBSD-MEM-MIB;
+ -- CARP interface & statistics MIB, OPENBSD-CARP-MIB.txt
+ carpMIBObjects
+ FROM OPENBSD-CARP-MIB;
+
END
Index: src/usr.sbin/snmpd/mib.c
===================================================================
RCS file: /cvs/src/usr.sbin/snmpd/mib.c,v
retrieving revision 1.45
diff -p -u -r1.45 mib.c
--- src/usr.sbin/snmpd/mib.c 4 Jul 2011 04:34:14 -0000 1.45
+++ src/usr.sbin/snmpd/mib.c 29 Jan 2012 13:29:42 -0000
@@ -27,13 +27,16 @@
#include <sys/sysctl.h>
#include <sys/sensors.h>
#include <sys/sched.h>
+#include <sys/socket.h>
#include <sys/mount.h>
+#include <sys/ioctl.h>
#include <net/if.h>
#include <net/if_types.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
+#include <netinet/ip_carp.h>
#include <netinet/ip_var.h>
#include <arpa/inet.h>
@@ -1210,14 +1213,27 @@ mib_ifrcvtable(struct oid *oid, struct b
}
/*
- * Defined in OPENBSD-SENSORS-MIB.txt
- * (http://packetmischief.ca/openbsd/snmp/)
- */
+ * Defined in
+ * - OPENBSD-SENSORS-MIB.txt
+ * - OPENBSD-CARP-MIB.txt
+ * (http://www.packetmischief.ca/openbsd-snmp-mibs/)
+ */
+
+struct carpif {
+ struct carpreq carpr;
+ struct kif kif;
+};
int mib_sensornum(struct oid *, struct ber_oid *, struct ber_element **);
int mib_sensors(struct oid *, struct ber_oid *, struct ber_element **);
const char *mib_sensorunit(struct sensor *);
char *mib_sensorvalue(struct sensor *);
+int mib_carpsysctl(struct oid *, struct ber_oid *, struct ber_element **);
+int mib_carpstats(struct oid *, struct ber_oid *, struct ber_element **);
+int mib_carpiftable(struct oid *, struct ber_oid *, struct ber_element **);
+int mib_carpifnum(struct oid *, struct ber_oid *, struct ber_element **);
+struct carpif
+ *mib_carpifget(struct carpif *, u_int);
int mib_memiftable(struct oid *, struct ber_oid *, struct ber_element **);
static struct oid openbsd_mib[] = {
@@ -1230,6 +1246,33 @@ static struct oid openbsd_mib[] = {
{ MIB(sensorValue), OID_TRD, mib_sensors },
{ MIB(sensorUnits), OID_TRD, mib_sensors },
{ MIB(sensorStatus), OID_TRD, mib_sensors },
+ { MIB(carpMIBObjects), OID_MIB },
+ { MIB(carpAllow), OID_RD, mib_carpsysctl },
+ { MIB(carpPreempt), OID_RD, mib_carpsysctl },
+ { MIB(carpLog), OID_RD, mib_carpsysctl },
+ { MIB(carpIpPktsRecv), OID_RD, mib_carpstats },
+ { MIB(carpIp6PktsRecv), OID_RD, mib_carpstats },
+ { MIB(carpPktDiscardsBadIface), OID_RD, mib_carpstats },
+ { MIB(carpPktDiscardsBadTtl), OID_RD, mib_carpstats },
+ { MIB(carpPktShorterThanHdr), OID_RD, mib_carpstats },
+ { MIB(carpDiscardsBadCksum), OID_RD, mib_carpstats },
+ { MIB(carpDiscardsBadVersion), OID_RD, mib_carpstats },
+ { MIB(carpDiscardsTooShort), OID_RD, mib_carpstats },
+ { MIB(carpDiscardsBadAuth), OID_RD, mib_carpstats },
+ { MIB(carpDiscardsBadVhid), OID_RD, mib_carpstats },
+ { MIB(carpDiscardsBadAddrList), OID_RD, mib_carpstats },
+ { MIB(carpIpPktsSent), OID_RD, mib_carpstats },
+ { MIB(carpIp6PktsSent), OID_RD, mib_carpstats },
+ { MIB(carpNoMemory), OID_RD, mib_carpstats },
+ { MIB(carpTransitionsToMaster), OID_RD, mib_carpstats },
+ { MIB(carpIfNumber), OID_RD, mib_carpifnum },
+ { MIB(carpIfIndex), OID_TRD, mib_carpiftable },
+ { MIB(carpIfDescr), OID_TRD, mib_carpiftable },
+ { MIB(carpIfVhid), OID_TRD, mib_carpiftable },
+ { MIB(carpIfDev ), OID_TRD, mib_carpiftable },
+ { MIB(carpIfAdvbase), OID_TRD, mib_carpiftable },
+ { MIB(carpIfAdvskew), OID_TRD, mib_carpiftable },
+ { MIB(carpIfState), OID_TRD, mib_carpiftable },
{ MIB(memMIBObjects), OID_MIB },
{ MIB(memMIBVersion), OID_RD, mps_getint, NULL, NULL,
OIDVER_OPENBSD_MEM },
@@ -1407,6 +1450,192 @@ mib_sensorvalue(struct sensor *s)
if (ret == -1)
return (NULL);
return (v);
+}
+
+int
+mib_carpsysctl(struct oid *oid, struct ber_oid *o, struct ber_element **elm)
+{
+ size_t len;
+ int mib[] = { CTL_NET, PF_INET, IPPROTO_CARP, 0 };
+ int v;
+
+ mib[3] = oid->o_oid[OIDIDX_carpsysctl];
+ len = sizeof(v);
+
+ if (sysctl(mib, 4, &v, &len, NULL, 0) == -1)
+ return (1);
+
+ *elm = ber_add_integer(*elm, v);
+ return (0);
+}
+
+int
+mib_carpstats(struct oid *oid, struct ber_oid *o, struct ber_element **elm)
+{
+ int mib[] = { CTL_NET, PF_INET, IPPROTO_CARP,
+ CARPCTL_STATS };
+ size_t len;
+ struct carpstats stats;
+ int i;
+ struct statsmap {
+ u_int8_t m_id;
+ u_int64_t *m_ptr;
+ } mapping[] = {
+ { 1, &stats.carps_ipackets },
+ { 2, &stats.carps_ipackets6 },
+ { 3, &stats.carps_badif },
+ { 4, &stats.carps_badttl },
+ { 5, &stats.carps_hdrops },
+ { 6, &stats.carps_badsum },
+ { 7, &stats.carps_badver },
+ { 8, &stats.carps_badlen },
+ { 9, &stats.carps_badauth },
+ { 10, &stats.carps_badvhid },
+ { 11, &stats.carps_badaddrs },
+ { 12, &stats.carps_opackets },
+ { 13, &stats.carps_opackets6 },
+ { 14, &stats.carps_onomem },
+ { 15, &stats.carps_preempt }
+ };
+
+ len = sizeof(stats);
+
+ if (sysctl(mib, 4, &stats, &len, NULL, 0) == -1)
+ return (1);
+
+ for (i = 0;
+ (u_int)i < (sizeof(mapping) / sizeof(mapping[0])); i++) {
+ if (oid->o_oid[OIDIDX_carpstats] == mapping[i].m_id) {
+ *elm = ber_add_integer(*elm, *mapping[i].m_ptr);
+ ber_set_header(*elm, BER_CLASS_APPLICATION,
+ SNMP_T_COUNTER64);
+ return (0);
+ }
+ }
+
+ return (-1);
+}
+
+int
+mib_carpifnum(struct oid *oid, struct ber_oid *o, struct ber_element **elm)
+{
+ struct kif *kif;
+ int c = 0;
+
+ for (kif = kr_getif(0); kif != NULL;
+ kif = kr_getnextif(kif->if_index))
+ if (kif->if_type == IFT_CARP)
+ c++;
+
+ *elm = ber_add_integer(*elm, c);
+ return (0);
+}
+
+struct carpif *
+mib_carpifget(struct carpif *cif, u_int idx)
+{
+ struct kif *kif;
+ int s;
+ struct ifreq ifr;
+ struct carpreq carpr;
+
+ if ((kif = kr_getif(idx)) == NULL || kif->if_type != IFT_CARP) {
+ /*
+ * It may happen that an interface with a specific index
+ * does not exist, has been removed, or is not a carp(4)
+ * interface. Jump to the next available carp(4) interface
+ * index.
+ */
+ for (kif = kr_getif(0); kif != NULL;
+ kif = kr_getnextif(kif->if_index)) {
+ if (kif->if_type != IFT_CARP)
+ continue;
+ if (kif->if_index > idx)
+ break;
+
+ }
+ if (kif == NULL)
+ return (NULL);
+ }
+ idx = kif->if_index;
+
+ /* Update interface information */
+ kr_updateif(idx);
+ if ((kif = kr_getif(idx)) == NULL) {
+ log_debug("mib_carpifget: interface %d disappeared?", idx);
+ return (NULL);
+ }
+
+ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+ return (NULL);
+
+ memset(&ifr, 0, sizeof(ifr));
+ strlcpy(ifr.ifr_name, kif->if_name, sizeof(ifr.ifr_name));
+ memset((char *)&carpr, 0, sizeof(carpr));
+ ifr.ifr_data = (caddr_t)&carpr;
+
+ if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1)
+ return (NULL);
+
+ memset(cif, 0, sizeof(struct carpif));
+ memcpy(&cif->carpr, &carpr, sizeof(struct carpreq));
+ memcpy(&cif->kif, kif, sizeof(struct kif));
+
+ close(s);
+
+ return (cif);
+}
+
+int
+mib_carpiftable(struct oid *oid, struct ber_oid *o, struct ber_element **elm)
+{
+ u_int32_t idx;
+ struct carpif *cif;
+
+ if ((cif = malloc(sizeof(struct carpif))) == NULL)
+ return (1);
+
+ /* Get and verify the current row index */
+ idx = o->bo_id[OIDIDX_carpIfEntry];
+
+ if ((cif = mib_carpifget(cif, idx)) == NULL) {
+ free(cif);
+ return (1);
+ }
+
+ /* Tables need to prepend the OID on their own */
+ o->bo_id[OIDIDX_carpIfEntry] = cif->kif.if_index;
+ *elm = ber_add_oid(*elm, o);
+
+ switch (o->bo_id[OIDIDX_carpIf]) {
+ case 1:
+ *elm = ber_add_integer(*elm, cif->kif.if_index);
+ break;
+ case 2:
+ *elm = ber_add_string(*elm, cif->kif.if_name);
+ break;
+ case 3:
+ *elm = ber_add_integer(*elm, cif->carpr.carpr_vhids[0]);
+ break;
+ case 4:
+ *elm = ber_add_string(*elm, cif->carpr.carpr_carpdev);
+ break;
+ case 5:
+ *elm = ber_add_integer(*elm, cif->carpr.carpr_advbase);
+ break;
+ case 6:
+ *elm = ber_add_integer(*elm, cif->carpr.carpr_advskews[0]);
+ break;
+ case 7:
+ *elm = ber_add_integer(*elm, cif->carpr.carpr_states[0]);
+ break;
+ default:
+ free(cif);
+ return (1);
+ }
+
+ free(cif);
+ return (0);
}
int
Index: src/usr.sbin/snmpd/mib.h
===================================================================
RCS file: /cvs/src/usr.sbin/snmpd/mib.h,v
retrieving revision 1.21
diff -p -u -r1.21 mib.h
--- src/usr.sbin/snmpd/mib.h 20 Sep 2010 16:29:51 -0000 1.21
+++ src/usr.sbin/snmpd/mib.h 29 Jan 2012 13:29:42 -0000
@@ -412,7 +412,6 @@
#define MIB_sensorValue MIB_sensorEntry, 5
#define MIB_sensorUnits MIB_sensorEntry, 6
#define MIB_sensorStatus MIB_sensorEntry, 7
-#define MIB_carpMIBObjects MIB_openBSD, 3
#define MIB_ipsecMIBObjects MIB_openBSD, 4
#define MIB_memMIBObjects MIB_openBSD, 5
#define MIB_memMIBVersion MIB_memMIBObjects, 1
@@ -423,6 +422,42 @@
#define OIDIDX_memIfEntry 11
#define MIB_memIfName MIB_memIfEntry, 1
#define MIB_memIfLiveLocks MIB_memIfEntry, 2
+#define MIB_carpMIBObjects MIB_openBSD, 6
+#define MIB_carpSysctl MIB_carpMIBObjects, 1
+#define MIB_carpAllow MIB_carpSysctl, 1
+#define MIB_carpPreempt MIB_carpSysctl, 2
+#define MIB_carpLog MIB_carpSysctl, 3
+#define OIDIDX_carpsysctl 9
+#define MIB_carpIf MIB_carpMIBObjects, 2
+#define MIB_carpIfNumber MIB_carpIf, 1
+#define MIB_carpIfTable MIB_carpIf, 2
+#define MIB_carpIfEntry MIB_carpIfTable, 1
+#define OIDIDX_carpIf 11
+#define OIDIDX_carpIfEntry 12
+#define MIB_carpIfIndex MIB_carpIfEntry, 1
+#define MIB_carpIfDescr MIB_carpIfEntry, 2
+#define MIB_carpIfVhid MIB_carpIfEntry, 3
+#define MIB_carpIfDev MIB_carpIfEntry, 4
+#define MIB_carpIfAdvbase MIB_carpIfEntry, 5
+#define MIB_carpIfAdvskew MIB_carpIfEntry, 6
+#define MIB_carpIfState MIB_carpIfEntry, 7
+#define OIDIDX_carpstats 9
+#define MIB_carpStats MIB_carpMIBObjects, 3
+#define MIB_carpIpPktsRecv MIB_carpStats, 1
+#define MIB_carpIp6PktsRecv MIB_carpStats, 2
+#define MIB_carpPktDiscardsBadIface MIB_carpStats, 3
+#define MIB_carpPktDiscardsBadTtl MIB_carpStats, 4
+#define MIB_carpPktShorterThanHdr MIB_carpStats, 5
+#define MIB_carpDiscardsBadCksum MIB_carpStats, 6
+#define MIB_carpDiscardsBadVersion MIB_carpStats, 7
+#define MIB_carpDiscardsTooShort MIB_carpStats, 8
+#define MIB_carpDiscardsBadAuth MIB_carpStats, 9
+#define MIB_carpDiscardsBadVhid MIB_carpStats, 10
+#define MIB_carpDiscardsBadAddrList MIB_carpStats, 11
+#define MIB_carpIpPktsSent MIB_carpStats, 12
+#define MIB_carpIp6PktsSent MIB_carpStats, 13
+#define MIB_carpNoMemory MIB_carpStats, 14
+#define MIB_carpTransitionsToMaster MIB_carpStats, 15
#define MIB_localSystem MIB_openBSD, 23
#define MIB_SYSOID_DEFAULT MIB_openBSD, 23, 1
#define MIB_localTest MIB_openBSD, 42
@@ -701,6 +736,38 @@
{ MIBDECL(memIfEntry) }, \
{ MIBDECL(memIfName) }, \
{ MIBDECL(memIfLiveLocks) }, \
+ { MIBDECL(carpMIBObjects) }, \
+ { MIBDECL(carpSysctl) }, \
+ { MIBDECL(carpAllow) }, \
+ { MIBDECL(carpPreempt) }, \
+ { MIBDECL(carpLog) }, \
+ { MIBDECL(carpIf) }, \
+ { MIBDECL(carpIfNumber) }, \
+ { MIBDECL(carpIfTable) }, \
+ { MIBDECL(carpIfEntry) }, \
+ { MIBDECL(carpIfIndex) }, \
+ { MIBDECL(carpIfDescr) }, \
+ { MIBDECL(carpIfVhid) }, \
+ { MIBDECL(carpIfDev) }, \
+ { MIBDECL(carpIfAdvbase) }, \
+ { MIBDECL(carpIfAdvskew) }, \
+ { MIBDECL(carpIfState) }, \
+ { MIBDECL(carpStats) }, \
+ { MIBDECL(carpIpPktsRecv) }, \
+ { MIBDECL(carpIp6PktsRecv) }, \
+ { MIBDECL(carpPktDiscardsBadIface) }, \
+ { MIBDECL(carpPktDiscardsBadTtl) }, \
+ { MIBDECL(carpPktShorterThanHdr) }, \
+ { MIBDECL(carpDiscardsBadCksum) }, \
+ { MIBDECL(carpDiscardsBadVersion) }, \
+ { MIBDECL(carpDiscardsTooShort) }, \
+ { MIBDECL(carpDiscardsBadAuth) }, \
+ { MIBDECL(carpDiscardsBadVhid) }, \
+ { MIBDECL(carpDiscardsBadAddrList) }, \
+ { MIBDECL(carpIpPktsSent) }, \
+ { MIBDECL(carpIp6PktsSent) }, \
+ { MIBDECL(carpNoMemory) }, \
+ { MIBDECL(carpTransitionsToMaster) }, \
{ MIBDECL(localSystem) }, \
{ MIBDECL(localTest) }, \
\
