Hi again,
here is the patch now for real.
cheers,
Peter
---------------------------------------------------------------------
Peter Hirdina Frauenstrasse 128
[EMAIL PROTECTED] 89073 Ulm / Germany
---------------------------------------------------------------------
diff -ruN net-snmp-5.2.3-7.orig/agent/mibgroup/ucd-snmp/lmSensors.c net-snmp-5.2.3-7/agent/mibgroup/ucd-snmp/lmSensors.c
--- net-snmp-5.2.3-7.orig/agent/mibgroup/ucd-snmp/lmSensors.c 2007-05-25 20:27:14.622412038 +0200
+++ net-snmp-5.2.3-7/agent/mibgroup/ucd-snmp/lmSensors.c 2007-05-25 21:42:30.244294461 +0200
@@ -131,42 +131,54 @@
/*
* magic number , variable type , ro/rw , callback fn , L, oidsuffix
*/
-#define LMTEMPSENSORSINDEX 3
- {LMTEMPSENSORSINDEX, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
+#define LMTEMPSENSORSINDEX 3
+ {LMTEMPSENSORSINDEX, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
{2, 1, 1}},
-#define LMTEMPSENSORSDEVICE 4
- {LMTEMPSENSORSDEVICE, ASN_OCTET_STR, RONLY, var_lmSensorsTable, 3,
+#define LMTEMPSENSORSDEVICE 4
+ {LMTEMPSENSORSDEVICE, ASN_OCTET_STR, RONLY, var_lmSensorsTable, 3,
{2, 1, 2}},
-#define LMTEMPSENSORSVALUE 5
- {LMTEMPSENSORSVALUE, ASN_GAUGE, RONLY, var_lmSensorsTable, 3,
+#define LMTEMPSENSORSVALUE 5
+ {LMTEMPSENSORSVALUE, ASN_GAUGE, RONLY, var_lmSensorsTable, 3,
{2, 1, 3}},
-#define LMFANSENSORSINDEX 8
- {LMFANSENSORSINDEX, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
+#define LMTEMPSENSORSVALUESIGNED 6
+ {LMTEMPSENSORSVALUESIGNED, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
+ {2, 1, 4}},
+#define LMFANSENSORSINDEX 9
+ {LMFANSENSORSINDEX, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
{3, 1, 1}},
-#define LMFANSENSORSDEVICE 9
- {LMFANSENSORSDEVICE, ASN_OCTET_STR, RONLY, var_lmSensorsTable, 3,
+#define LMFANSENSORSDEVICE 10
+ {LMFANSENSORSDEVICE, ASN_OCTET_STR, RONLY, var_lmSensorsTable, 3,
{3, 1, 2}},
-#define LMFANSENSORSVALUE 10
- {LMFANSENSORSVALUE, ASN_GAUGE, RONLY, var_lmSensorsTable, 3,
+#define LMFANSENSORSVALUE 11
+ {LMFANSENSORSVALUE, ASN_GAUGE, RONLY, var_lmSensorsTable, 3,
{3, 1, 3}},
-#define LMVOLTSENSORSINDEX 13
- {LMVOLTSENSORSINDEX, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
+#define LMFANSENSORSVALUESIGNED 12
+ {LMFANSENSORSVALUESIGNED, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
+ {3, 1, 4}},
+#define LMVOLTSENSORSINDEX 15
+ {LMVOLTSENSORSINDEX, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
{4, 1, 1}},
-#define LMVOLTSENSORSDEVICE 14
- {LMVOLTSENSORSDEVICE, ASN_OCTET_STR, RONLY, var_lmSensorsTable, 3,
+#define LMVOLTSENSORSDEVICE 16
+ {LMVOLTSENSORSDEVICE, ASN_OCTET_STR, RONLY, var_lmSensorsTable, 3,
{4, 1, 2}},
-#define LMVOLTSENSORSVALUE 15
- {LMVOLTSENSORSVALUE, ASN_GAUGE, RONLY, var_lmSensorsTable, 3,
+#define LMVOLTSENSORSVALUE 17
+ {LMVOLTSENSORSVALUE, ASN_GAUGE, RONLY, var_lmSensorsTable, 3,
{4, 1, 3}},
-#define LMMISCSENSORSINDEX 18
- {LMMISCSENSORSINDEX, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
+#define LMVOLTSENSORSVALUESIGNED 18
+ {LMVOLTSENSORSVALUESIGNED, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
+ {4, 1, 4}},
+#define LMMISCSENSORSINDEX 21
+ {LMMISCSENSORSINDEX, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
{5, 1, 1}},
-#define LMMISCSENSORSDEVICE 19
- {LMMISCSENSORSDEVICE, ASN_OCTET_STR, RONLY, var_lmSensorsTable, 3,
+#define LMMISCSENSORSDEVICE 22
+ {LMMISCSENSORSDEVICE, ASN_OCTET_STR, RONLY, var_lmSensorsTable, 3,
{5, 1, 2}},
-#define LMMISCSENSORSVALUE 20
- {LMMISCSENSORSVALUE, ASN_GAUGE, RONLY, var_lmSensorsTable, 3,
+#define LMMISCSENSORSVALUE 23
+ {LMMISCSENSORSVALUE, ASN_GAUGE, RONLY, var_lmSensorsTable, 3,
{5, 1, 3}},
+#define LMMISCSENSORSVALUESIGNED 24
+ {LMMISCSENSORSVALUESIGNED, ASN_INTEGER, RONLY, var_lmSensorsTable, 3,
+ {5, 1, 4}},
};
typedef struct {
@@ -241,6 +253,7 @@
case LMTEMPSENSORSINDEX:
case LMTEMPSENSORSDEVICE:
case LMTEMPSENSORSVALUE:
+ case LMTEMPSENSORSVALUESIGNED:
s_type = 0;
n_sensors = sensor_array[0].n;
break;
@@ -248,6 +261,7 @@
case LMFANSENSORSINDEX:
case LMFANSENSORSDEVICE:
case LMFANSENSORSVALUE:
+ case LMFANSENSORSVALUESIGNED:
s_type = 1;
n_sensors = sensor_array[1].n;
break;
@@ -255,6 +269,7 @@
case LMVOLTSENSORSINDEX:
case LMVOLTSENSORSDEVICE:
case LMVOLTSENSORSVALUE:
+ case LMVOLTSENSORSVALUESIGNED:
s_type = 2;
n_sensors = sensor_array[2].n;
break;
@@ -262,6 +277,7 @@
case LMMISCSENSORSINDEX:
case LMMISCSENSORSDEVICE:
case LMMISCSENSORSVALUE:
+ case LMMISCSENSORSVALUESIGNED:
s_type = 3;
n_sensors = sensor_array[3].n;
break;
@@ -305,6 +321,13 @@
long_ret = s.value;
return (unsigned char *) &long_ret;
+ case LMTEMPSENSORSVALUESIGNED:
+ case LMFANSENSORSVALUESIGNED:
+ case LMVOLTSENSORSVALUESIGNED:
+ case LMMISCSENSORSVALUESIGNED:
+ long_ret = s.value;
+ return (unsigned char *) &long_ret;
+
default:
ERROR_MSG("Unable to handle table request");
}
diff -ruN net-snmp-5.2.3-7.orig/mibs/LM-SENSORS-MIB.txt net-snmp-5.2.3-7/mibs/LM-SENSORS-MIB.txt
--- net-snmp-5.2.3-7.orig/mibs/LM-SENSORS-MIB.txt 2007-05-25 20:27:11.129729556 +0200
+++ net-snmp-5.2.3-7/mibs/LM-SENSORS-MIB.txt 2007-05-25 21:32:03.373476550 +0200
@@ -51,9 +51,10 @@
::= { lmTempSensorsTable 1 }
LMTempSensorsEntry ::= SEQUENCE {
- lmTempSensorsIndex Integer32,
- lmTempSensorsDevice DisplayString,
- lmTempSensorsValue Gauge32
+ lmTempSensorsIndex Integer32,
+ lmTempSensorsDevice DisplayString,
+ lmTempSensorsValue Gauge32,
+ lmTempSensorsValueSigned Integer32
}
lmTempSensorsIndex OBJECT-TYPE
@@ -79,6 +80,15 @@
DESCRIPTION
"The temperature of this sensor in mC."
::= { lmTempSensorsEntry 3 }
+
+lmTempSensorsValueSigned OBJECT-TYPE
+ SYNTAX Integer32 (-2147483648..2147483647)
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The signed temperature of this sensor in mC."
+ ::= { lmTempSensorsEntry 4 }
+
--
lmFanSensorsTable OBJECT-TYPE
@@ -99,9 +109,10 @@
::= { lmFanSensorsTable 1 }
LMFanSensorsEntry ::= SEQUENCE {
- lmFanSensorsIndex Integer32,
- lmFanSensorsDevice DisplayString,
- lmFanSensorsValue Gauge32
+ lmFanSensorsIndex Integer32,
+ lmFanSensorsDevice DisplayString,
+ lmFanSensorsValue Gauge32,
+ lmFanSensorsValueSigned Integer32
}
lmFanSensorsIndex OBJECT-TYPE
@@ -128,6 +139,14 @@
"The rotation speed of the fan in RPM."
::= { lmFanSensorsEntry 3 }
+lmFanSensorsValueSigned OBJECT-TYPE
+ SYNTAX Integer32 (-2147483648..2147483647)
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The signed rotation speed of the fan in RPM."
+ ::= { lmFanSensorsEntry 4 }
+
--
lmVoltSensorsTable OBJECT-TYPE
@@ -148,9 +167,10 @@
::= { lmVoltSensorsTable 1 }
LMVoltSensorsEntry ::= SEQUENCE {
- lmVoltSensorsIndex Integer32,
- lmVoltSensorsDevice DisplayString,
- lmVoltSensorsValue Gauge32
+ lmVoltSensorsIndex Integer32,
+ lmVoltSensorsDevice DisplayString,
+ lmVoltSensorsValue Gauge32,
+ lmVoltSensorsValueSigned Integer32
}
lmVoltSensorsIndex OBJECT-TYPE
@@ -177,6 +197,14 @@
"The voltage in mV."
::= { lmVoltSensorsEntry 3 }
+lmVoltSensorsValueSigned OBJECT-TYPE
+ SYNTAX Integer32 (-2147483648..2147483647)
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The signed voltage in mV."
+ ::= { lmVoltSensorsEntry 4 }
+
--
lmMiscSensorsTable OBJECT-TYPE
@@ -197,9 +225,10 @@
::= { lmMiscSensorsTable 1 }
LMMiscSensorsEntry ::= SEQUENCE {
- lmMiscSensorsIndex Integer32,
- lmMiscSensorsDevice DisplayString,
- lmMiscSensorsValue Gauge32
+ lmMiscSensorsIndex Integer32,
+ lmMiscSensorsDevice DisplayString,
+ lmMiscSensorsValue Gauge32,
+ lmMiscSensorsValueSigned Integer32
}
lmMiscSensorsIndex OBJECT-TYPE
@@ -226,5 +255,12 @@
"The value of this sensor."
::= { lmMiscSensorsEntry 3 }
+lmMiscSensorsValueSigned OBJECT-TYPE
+ SYNTAX Integer32 (-2147483648..2147483647)
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The signed value of this sensor."
+ ::= { lmMiscSensorsEntry 4 }
END
