diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-12-15 06:27:00 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-12-15 06:27:00 +0000 |
| commit | d1ee5eeaf97b7bf7cbcfc98b9cdecffc12bdca64 (patch) | |
| tree | fecf0813c6e2832ca26d9a49902796cf4c4f41a6 /usr.sbin | |
| parent | 8c8b74467d5d61a3480f1dbef0ccb3cf6b983b26 (diff) | |
fix the sensors mib to match the new OpenBSD PEN
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/snmpd/mib.c | 14 | ||||
| -rw-r--r-- | usr.sbin/snmpd/mib.h | 6 |
2 files changed, 9 insertions, 11 deletions
diff --git a/usr.sbin/snmpd/mib.c b/usr.sbin/snmpd/mib.c index 2b3392bb34d..d2e2f533d41 100644 --- a/usr.sbin/snmpd/mib.c +++ b/usr.sbin/snmpd/mib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mib.c,v 1.11 2007/12/15 04:15:12 reyk Exp $ */ +/* $OpenBSD: mib.c,v 1.12 2007/12/15 06:26:59 reyk Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net> @@ -867,11 +867,12 @@ mib_sensornum(struct oid *oid, struct ber_oid *o, struct ber_element **elm) struct sensordev sensordev; size_t len = sizeof(sensordev); int mib[] = { CTL_HW, HW_SENSORS, 0 }; + size_t miblen = sizeof(mib) / sizeof(mib[0]); int i, c; for (i = c = 0; i < MAXSENSORDEVICES; i++) { mib[2] = i; - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), + if (sysctl(mib, miblen, &sensordev, &len, NULL, 0) == -1) { if (errno != ENOENT) return (-1); @@ -899,23 +900,20 @@ mib_sensors(struct oid *oid, struct ber_oid *o, struct ber_element **elm) /* Get and verify the current row index */ idx = o->bo_id[OIDIDX_SENSORENTRY]; - - mib[0] = CTL_HW; - mib[1] = HW_SENSORS; for (i = c = 0, n = 1; i < MAXSENSORDEVICES; i++) { mib[2] = i; - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), + if (sysctl(mib, 3, &sensordev, &len, NULL, 0) == -1) { if (errno != ENOENT) - return(-1); + return (-1); continue; } for (j = 0; j < SENSOR_MAX_TYPES; j++) { mib[3] = j; for (k = 0; k < sensordev.maxnumt[j]; k++, n++) { mib[4] = k; - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), + if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) { if (errno != ENOENT) return (-1); diff --git a/usr.sbin/snmpd/mib.h b/usr.sbin/snmpd/mib.h index ea21b56e107..fad60b39578 100644 --- a/usr.sbin/snmpd/mib.h +++ b/usr.sbin/snmpd/mib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mib.h,v 1.6 2007/12/15 04:15:12 reyk Exp $ */ +/* $OpenBSD: mib.h,v 1.7 2007/12/15 06:26:59 reyk Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net> @@ -247,8 +247,8 @@ #define MIB_SENSORNUMBER MIB_SENSORS, 1 #define MIB_SENSORTABLE MIB_SENSORS, 2 #define MIB_SENSORENTRY MIB_SENSORTABLE, 1 -#define OIDIDX_SENSOR 12 -#define OIDIDX_SENSORENTRY 13 +#define OIDIDX_SENSOR 11 +#define OIDIDX_SENSORENTRY 12 #define MIB_SENSORINDEX MIB_SENSORENTRY, 1 #define MIB_SENSORDESCR MIB_SENSORENTRY, 2 #define MIB_SENSORTYPE MIB_SENSORENTRY, 3 |