Author: arekm Date: Sat Jun 5 18:27:00 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 1; add two fixes from fc and updates lm sensors patch
---- Files affected: packages/net-snmp: net-snmp-defaultconfig.patch (1.1 -> 1.2) , net-snmp-lm_sensors_3.patch (1.2 -> 1.3) , net-snmp.spec (1.161 -> 1.162) , net-snmp-5.5-missing-bcast.patch (NONE -> 1.1) (NEW), net-snmp-5.5-tcp-pid.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/net-snmp/net-snmp-defaultconfig.patch diff -u packages/net-snmp/net-snmp-defaultconfig.patch:1.1 packages/net-snmp/net-snmp-defaultconfig.patch:1.2 --- packages/net-snmp/net-snmp-defaultconfig.patch:1.1 Thu Feb 7 01:27:35 2008 +++ packages/net-snmp/net-snmp-defaultconfig.patch Sat Jun 5 20:26:55 2010 @@ -1,142 +1,61 @@ ---- net-snmp-5.1.2.orig/EXAMPLE.conf.def -+++ net-snmp-5.1.2/EXAMPLE.conf.def -@@ -6,7 +6,7 @@ - ############################################################################### +--- net-snmp-5.5/EXAMPLE.conf.def.org 2009-06-01 15:11:07.000000000 +0200 ++++ net-snmp-5.5/EXAMPLE.conf.def 2010-06-05 20:02:19.658299931 +0200 +@@ -74,8 +74,8 @@ + + # Note that setting these values here, results in the corresponding MIB objects being 'read-only' + # See snmpd.conf(5) for more details +-sysLocation Sitting on the Dock of the Bay +-sysContact Me <[email protected]> ++sysLocation Unknown (configure /etc/snmp/snmpd.local.conf) ++sysContact Root <r...@localhost> (configure /etc/snmp/snmpd.local.conf) + # Application + End-to-End layers + sysServices 72 + +@@ -84,11 +84,11 @@ + # Process Monitoring # - # This file is intended to only be an example. If, however, you want --# to use it, it should be placed in SYSCONFDIR/snmp/snmpd.conf. -+# to use it, it should be placed in /etc/snmp/snmpd.conf. - # When the snmpd agent starts up, this is where it will look for it. + # At least one 'mountd' process +-proc mountd ++#proc mountd + # No more than 4 'ntalkd' processes - 0 is OK +-proc ntalkd 4 ++#proc ntalkd 4 + # At least one 'sendmail' process, but no more than 10 +-proc sendmail 10 1 ++#proc sendmail 10 1 + + # Walk the UCD-SNMP-MIB::prTable to see the resulting output + # Note that this table will be empty if there are no "proc" entries in the snmpd.conf file +@@ -98,9 +98,9 @@ + # Disk Monitoring # - # You might be interested in generating your own snmpd.conf file using -@@ -58,31 +58,37 @@ - # from): - - # sec.name source community --com2sec local localhost COMMUNITY --com2sec mynetwork NETWORK/24 COMMUNITY -+com2sec paranoid default public -+#com2sec readonly default public -+#com2sec readwrite default private - - #### - # Second, map the security names into group names: - - # sec.model sec.name --group MyRWGroup v1 local --group MyRWGroup v2c local --group MyRWGroup usm local --group MyROGroup v1 mynetwork --group MyROGroup v2c mynetwork --group MyROGroup usm mynetwork -+group MyROSystem v1 paranoid -+group MyROSystem v2c paranoid -+group MyROSystem usm paranoid -+group MyROGroup v1 readonly -+group MyROGroup v2c readonly -+group MyROGroup usm readonly -+group MyRWGroup v1 readwrite -+group MyRWGroup v2c readwrite -+group MyRWGroup usm readwrite - - #### - # Third, create a view for us to let the groups have rights to: - - # incl/excl subtree mask - view all included .1 80 -+view system included .iso.org.dod.internet.mgmt.mib-2.system - - #### - # Finally, grant the 2 groups access to the 1 view with different - # write permissions: - - # context sec.model sec.level match read write notif -+access MyROSystem "" any noauth exact system none none - access MyROGroup "" any noauth exact all none none - access MyRWGroup "" any noauth exact all all none - -@@ -100,8 +106,8 @@ - # value of an object whose value is given here will fail with an error - # status of notWritable. - --syslocation Right here, right now. --syscontact Me <[email protected]> -+syslocation Unknown (configure /etc/snmp/snmpd.local.conf) -+syscontact Root <r...@localhost> (configure /etc/snmp/snmpd.local.conf) - - # Example output of snmpwalk: - # % snmpwalk -v 1 -c public localhost system -@@ -135,13 +141,13 @@ + # 10MBs required on root disk, 5% free on /var, 10% free on all other disks +-disk / 10000 +-disk /var 5% +-includeAllDisks 10% ++#disk / 10000 ++#disk /var 5% ++#includeAllDisks 10% + + # Walk the UCD-SNMP-MIB::dskTable to see the resulting output + # Note that this table will be empty if there are no "disk" entries in the snmpd.conf file +@@ -110,7 +110,7 @@ + # System Load # - - # Make sure mountd is running --proc mountd -+#proc mountd - - # Make sure there are no more than 4 ntalkds running, but 0 is ok too. --proc ntalkd 4 -+#proc ntalkd 4 - - # Make sure at least one sendmail, but less than or equal to 10 are running. --proc sendmail 10 1 -+#proc sendmail 10 1 - - # A snmpwalk of the prTable would look something like this: - # -@@ -199,7 +205,7 @@ - # ARGS: optional arguments to be passed to the program - - # a simple hello world --exec echotest /bin/echo hello world -+#exec echotest /bin/echo hello world - - # Run a shell script containing: + # Unacceptable 1-, 5-, and 15-minute load averages +-load 12 10 5 ++#load 12 10 5 + + # Walk the UCD-SNMP-MIB::laTable to see the resulting output + # Note that this table *will* be populated, even without a "load" entry in the snmpd.conf file +@@ -154,8 +154,8 @@ # -@@ -250,7 +256,7 @@ - - # Check the / partition and make sure it contains at least 10 megs. - --disk / 10000 -+#disk / 10000 + # Arbitrary extension commands + # +- extend test1 /bin/echo Hello, world! +- extend-sh test2 echo Hello, world! ; echo Hi there ; exit 35 ++#extend test1 /bin/echo Hello, world! ++#extend-sh test2 echo Hello, world! ; echo Hi there ; exit 35 + #extend-sh test3 /bin/sh /tmp/shtest - # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.DISKMIBNUM - # enterprises.ucdavis.diskTable.dskEntry.diskIndex.1 = 0 -@@ -279,7 +285,7 @@ - # 15MAX: Similar, but for 15 min average. - - # Check for loads: --load 12 14 14 -+#load 12 14 14 - - # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.LOADAVEMIBNUM - # enterprises.ucdavis.loadTable.laEntry.loadaveIndex.1 = 1 -@@ -365,7 +371,7 @@ - # (commented out here since it requires that you place the - # script in the right location. (its not installed by default)) - --# pass .EXTENSIBLEDOTMIB.255 /bin/sh PREFIX/local/passtest -+# pass .EXTENSIBLEDOTMIB.255 /bin/sh /usr/local/passtest - - # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.255 - # enterprises.ucdavis.255.1 = "life the universe and everything" ---- net-snmp-5.1.2.orig/EXAMPLE-trap.conf -+++ net-snmp-5.1.2/EXAMPLE-trap.conf -@@ -0,0 +1,18 @@ -+############################################################################### -+# -+# EXAMPLE-trap.conf: -+# An example configuration file for configuring the Net-SNMP snmptrapd agent. -+# -+############################################################################### -+# -+# This file is intended to only be an example. If, however, you want -+# to use it, it should be placed in /etc/snmp/snmptrapd.conf. -+# When the snmptrapd agent starts up, this is where it will look for it. -+# -+# All lines beginning with a '#' are comments and are intended for you -+# to read. All other lines are configuration commands for the agent. -+ -+# -+# PLEASE: read the snmptrapd.conf(5) manual page as well! -+# -+ + # Note that this last entry requires the script '/tmp/shtest' to be created first, ================================================================ Index: packages/net-snmp/net-snmp-lm_sensors_3.patch diff -u packages/net-snmp/net-snmp-lm_sensors_3.patch:1.2 packages/net-snmp/net-snmp-lm_sensors_3.patch:1.3 --- packages/net-snmp/net-snmp-lm_sensors_3.patch:1.2 Wed May 12 14:48:37 2010 +++ packages/net-snmp/net-snmp-lm_sensors_3.patch Sat Jun 5 20:26:55 2010 @@ -1,1300 +1,14 @@ -351991: Port net-snmp to lm_sensors-3.x.x -Source: upstream, svn diff -r 16736:16739 -Reviewed-By: Jan Safranek <[email protected]> +Compile with lm_sensors3. -Index: include/net-snmp/agent/hardware/sensors.h -=================================================================== ---- include/net-snmp/agent/hardware/sensors.h (revision 0) -+++ include/net-snmp/agent/hardware/sensors.h (revision 16739) -@@ -0,0 +1,48 @@ -+/* -+ * Hardware Abstraction Layer - Sensors module -+ * -+ * Public interface -+ */ -+ -+#define NETSNMP_SENSOR_TYPE_OTHER 1 -+#define NETSNMP_SENSOR_TYPE_VOLTAGE_AC 3 -+#define NETSNMP_SENSOR_TYPE_VOLTAGE_DC 4 -+#define NETSNMP_SENSOR_TYPE_CURRENT 5 -+#define NETSNMP_SENSOR_TYPE_POWER 6 -+#define NETSNMP_SENSOR_TYPE_FREQUENCY 7 -+#define NETSNMP_SENSOR_TYPE_TEMPERATURE 8 -+#define NETSNMP_SENSOR_TYPE_HUMIDITY 9 -+#define NETSNMP_SENSOR_TYPE_RPM 10 -+#define NETSNMP_SENSOR_TYPE_VOLUME 11 -+#define NETSNMP_SENSOR_TYPE_BOOLEAN 12 -+ -+ -+#define NETSNMP_SENSOR_FLAG_ACTIVE 0x01 -+#define NETSNMP_SENSOR_FLAG_NAVAIL 0x02 -+#define NETSNMP_SENSOR_FLAG_BROKEN 0x04 -+#define NETSNMP_SENSOR_FLAG_DISABLE 0x08 -+ -+#define NETSNMP_SENSOR_MASK_STATUS 0x06 /* NAVAIL|BROKEN */ -+ -+ -+#define NETSNMP_SENSOR_FIND_CREATE 1 /* or use one of the sensor type values */ -+#define NETSNMP_SENSOR_FIND_EXIST 0 -+ -+typedef struct netsnmp_sensor_info_s netsnmp_sensor_info; -+struct netsnmp_sensor_info_s { -+ -+ netsnmp_index idx; -+ /* int idx; */ -+ char name[256]; -+ -+ int type; -+ float value; -+ char descr[256]; -+ long flags; -+}; -+ -+netsnmp_container *get_sensor_container( void ); -+netsnmp_cache *get_sensor_cache( void ); -+netsnmp_sensor_info *sensor_by_name( char *, int ); -+NetsnmpCacheLoad netsnmp_sensor_load; -+NetsnmpCacheFree netsnmp_sensor_free; -Index: agent/mibgroup/ucd-snmp/lmsensorsMib.c -=================================================================== ---- agent/mibgroup/ucd-snmp/lmsensorsMib.c (revision 0) -+++ agent/mibgroup/ucd-snmp/lmsensorsMib.c (revision 16739) -@@ -0,0 +1,205 @@ -+#include <net-snmp/net-snmp-config.h> -+#include <net-snmp/net-snmp-includes.h> -+#include <net-snmp/agent/net-snmp-agent-includes.h> -+#include <net-snmp/agent/hardware/sensors.h> -+#include "ucd-snmp/lmsensorsMib.h" -+ -+netsnmp_container *sensorContainer = NULL; -+ -+void initialize_lmSensorsTable(const char *tableName, oid *tableOID, -+ netsnmp_container_op *filter, int mult ); -+ -+int _sensor_filter_temp( netsnmp_container *c, const void *v ); -+int _sensor_filter_fan( netsnmp_container *c, const void *v ); -+int _sensor_filter_volt( netsnmp_container *c, const void *v ); -+int _sensor_filter_misc( netsnmp_container *c, const void *v ); -+ -+static oid lmTempSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,2}; -+static oid lmFanSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,3}; -+static oid lmVoltSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,4}; -+static oid lmMiscSensorsTable_oid[] = {1,3,6,1,4,1,2021,13,16,5}; -+ /* All the tables have the same length root OID */ -+size_t lmSensorsTables_oid_len = OID_LENGTH(lmMiscSensorsTable_oid); -+ -+ -+/* Initialise the LM Sensors MIB module */ -+void -+init_lmsensorsMib(void) -+{ -+ DEBUGMSGTL(("ucd-snmp/lmsensorsMib","Initializing LM-SENSORS-MIB tables\n")); -+ -+ /* -+ * Initialise the four LM-SENSORS-MIB tables -+ * -+ * They are almost identical, so we can use the same registration code. -+ */ -+ initialize_lmSensorsTable( "lmTempSensorsTable", lmTempSensorsTable_oid, -+ _sensor_filter_temp, 1000 ); /* MIB asks for mC */ -+ initialize_lmSensorsTable( "lmFanSensorsTable", lmFanSensorsTable_oid, -+ _sensor_filter_fan, 1); -+ initialize_lmSensorsTable( "lmVoltSensorsTable", lmVoltSensorsTable_oid, -+ _sensor_filter_volt, 1000 ); /* MIB asks for mV */ -+ initialize_lmSensorsTable( "lmMiscSensorsTable", lmMiscSensorsTable_oid, -+ _sensor_filter_misc, 1 ); -+} -+ -+/* -+ * Common initialisation code, used for setting up all four tables -+ */ -+void -+initialize_lmSensorsTable(const char *tableName, oid *tableOID, -+ netsnmp_container_op *filter, int mult ) -+{ -+ netsnmp_handler_registration *reg; -+ netsnmp_table_registration_info *table_info; -+ netsnmp_cache *cache; -+ netsnmp_container *container; -+ -+ /* -+ * Ensure the HAL sensors module has been initialised, -+ * and retrieve the main sensors container. -+ * This table will then be registered using a filter on this container. -+ */ -+ sensorContainer = get_sensor_container(); -+ if ( !sensorContainer ) { -+ init_hw_sensors( ); -+ sensorContainer = get_sensor_container(); -+ } -+ container = netsnmp_container_find("sensorTable:table_container"); -+ container->insert_filter = filter; -+ netsnmp_container_add_index( sensorContainer, container ); -+ -+ -+ /* -+ * Create a basic registration structure for the table -+ */ -+ reg = netsnmp_create_handler_registration( -+ tableName, lmSensorsTables_handler, -+ tableOID, lmSensorsTables_oid_len, HANDLER_CAN_RONLY -+ ); -+ -+ /* -+ * Register the table using the filtered container -+ * Include an indicator of any scaling to be applied to the sensor value -+ */ -+ reg->my_reg_void = (void *)mult; -+ table_info = SNMP_MALLOC_TYPEDEF( netsnmp_table_registration_info ); -+ netsnmp_table_helper_add_indexes(table_info, ASN_INTEGER, 0); -+ table_info->min_column = COLUMN_LMSENSORS_INDEX; -+ table_info->max_column = COLUMN_LMSENSORS_VALUE; -+ netsnmp_container_table_register( reg, table_info, container, 0 ); -+ -+ /* -+ * If the HAL sensors module was configured as an on-demand caching -+ * module (rather than being automatically loaded regularly), -+ * then ensure this table makes use of that cache. -+ */ -+ cache = get_sensor_cache(); -+ if ( cache ) { -+ netsnmp_inject_handler_before( reg, netsnmp_cache_handler_get( cache ), -+ "table_container"); -+ } -+ -+} -+ -+ -+/* -+ * Container filters for the four tables -+ * -+ * Used to ensure that sensor entries appear in the appropriate table. -+ */ -+int _sensor_filter_temp( netsnmp_container *c, const void *v ) { -+ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; -+ /* Only matches temperature sensors */ -+ return (( sp->type == NETSNMP_SENSOR_TYPE_TEMPERATURE ) ? 0 : 1 ); -+} -+ -+int _sensor_filter_fan( netsnmp_container *c, const void *v ) { -+ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; -+ /* Only matches fan sensors */ -+ return (( sp->type == NETSNMP_SENSOR_TYPE_RPM ) ? 0 : 1 ); -+} -+ -+int _sensor_filter_volt( netsnmp_container *c, const void *v ) { -+ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; -+ /* Only matches voltage sensors (AC or DC) */ -+ return ((( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_DC ) || -+ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_AC )) ? 0 : 1 ); -+} -+ -+int _sensor_filter_misc( netsnmp_container *c, const void *v ) { -+ const netsnmp_sensor_info *sp = (const netsnmp_sensor_info *)v; -+ /* Matches everything except temperature, fan or voltage sensors */ -+ return ((( sp->type == NETSNMP_SENSOR_TYPE_TEMPERATURE ) || -+ ( sp->type == NETSNMP_SENSOR_TYPE_RPM ) || -+ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_DC ) || -+ ( sp->type == NETSNMP_SENSOR_TYPE_VOLTAGE_AC )) ? 1 : 0 ); -+} -+ -+ -+/* -+ * Handle requests for any of the four lmXxxxSensorsTables -+ * -+ * This is possible because all the table share the -+ * same structure and behaviour. -+ */ -+int -+lmSensorsTables_handler( -+ netsnmp_mib_handler *handler, -+ netsnmp_handler_registration *reginfo, -+ netsnmp_agent_request_info *reqinfo, -+ netsnmp_request_info *requests) { -+ -+ netsnmp_request_info *request; -+ netsnmp_table_request_info *table_info; -+ netsnmp_sensor_info *sensor_info; -+ int mult = (int)reginfo->my_reg_void; -+ -+ DEBUGMSGTL(( "ucd-snmp/lmsensorsMib","lmSensorsTables_handler - root: ")); -+ DEBUGMSGOID(("ucd-snmp/lmsensorsMib", reginfo->rootoid, reginfo->rootoid_len)); -+ DEBUGMSG(( "ucd-snmp/lmsensorsMib",", mode %d\n", reqinfo->mode )); -+ /* -+ * This is a read-only table, so we only need to handle GET requests. -+ * (The container helper converts GETNEXT->GET requests automatically). -+ */ -+ switch (reqinfo->mode) { -+ case MODE_GET: -+ for (request=requests; request; request=request->next) { -+ sensor_info = (netsnmp_sensor_info *) -+ netsnmp_container_table_extract_context(request); -+ if ( !sensor_info ) { -+ netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE); -+ continue; -+ } -+ -+ table_info = netsnmp_extract_table_info(request); -+ switch (table_info->colnum) { -+ case COLUMN_LMSENSORS_INDEX: -+ snmp_set_var_typed_integer( request->requestvb, ASN_INTEGER, -+ sensor_info->idx.oids[0]); -+ break; -+ case COLUMN_LMSENSORS_DEVICE: -+ if ( sensor_info->descr[0] != '\0' ) { -+ snmp_set_var_typed_value( request->requestvb, ASN_OCTET_STR, -+ sensor_info->descr, strlen(sensor_info->descr)); -+ } else { -+ snmp_set_var_typed_value( request->requestvb, ASN_OCTET_STR, -+ sensor_info->name, strlen(sensor_info->name)); -+ } -+ break; -+ case COLUMN_LMSENSORS_VALUE: -+ /* Multiply the value by the appropriate scaling factor for this table */ -+ snmp_set_var_typed_integer( request->requestvb, ASN_GAUGE, -+ (int)(mult*sensor_info->value)); -+ break; -+ default: -+ netsnmp_set_request_error(reqinfo, request, -+ SNMP_NOSUCHOBJECT); -+ break; -+ } -+ } -+ break; -+ -+ } -+ return SNMP_ERR_NOERROR; -+} -Index: agent/mibgroup/ucd-snmp/lmsensorsMib.h -=================================================================== ---- agent/mibgroup/ucd-snmp/lmsensorsMib.h (revision 0) -+++ agent/mibgroup/ucd-snmp/lmsensorsMib.h (revision 16739) -@@ -0,0 +1,23 @@ -+#ifndef LM_SENSORS_MIB_H -+#define LM_SENSORS_MIB_H -+ -+config_require(hardware/sensors) -+config_add_mib(LM-SENSORS-MIB) -+ -+/* function declarations */ -+void init_lmsensorsMib(void); -+ -+/* -+ * Handler and Column definitions for lmXxxxSensorsTable -+ * -+ * Note that the same handler (and hence the same -+ * column identifiers) are used for all four tables. -+ * This is possible because all the table share the -+ * same structure and behaviour. -+ */ -+Netsnmp_Node_Handler lmSensorsTables_handler; -+#define COLUMN_LMSENSORS_INDEX 1 -+#define COLUMN_LMSENSORS_DEVICE 2 -+#define COLUMN_LMSENSORS_VALUE 3 -+ -+#endif /* LM_SENSORS_MIB_H */ -Index: agent/mibgroup/hardware/sensors.h -=================================================================== ---- agent/mibgroup/hardware/sensors.h (revision 0) -+++ agent/mibgroup/hardware/sensors.h (revision 16739) -@@ -0,0 +1,13 @@ -+config_require(hardware/sensors/hw_sensors) -+ -+#if defined(solaris) -+# if defined(HAVE_PICL_H) -+config_require(hardware/sensors/picld_sensors) -+# else -+config_require(hardware/sensors/kstat_sensors) -+# endif -+#else +diff -up net-snmp-5.5/agent/mibgroup/hardware/sensors.h.orig net-snmp-5.5/agent/mibgroup/hardware/sensors.h +--- net-snmp-5.5/agent/mibgroup/hardware/sensors.h.orig 2009-04-24 00:53:26.000000000 +0200 ++++ net-snmp-5.5/agent/mibgroup/hardware/sensors.h 2009-09-29 12:00:18.000000000 +0200 +@@ -7,7 +7,7 @@ config_require(hardware/sensors/picld_se + config_require(hardware/sensors/kstat_sensors) + # endif + #else +-config_require(hardware/sensors/lmsensors_v2) +config_require(hardware/sensors/lmsensors_v3) -+#endif -+ -+//config_require(hardware/sensors/dummy_sensors) -Index: agent/mibgroup/hardware/sensors/hw_sensors.h -=================================================================== ---- agent/mibgroup/hardware/sensors/hw_sensors.h (revision 0) -+++ agent/mibgroup/hardware/sensors/hw_sensors.h (revision 16739) -@@ -0,0 +1 @@ -+void init_hw_sensors( void ); -Index: agent/mibgroup/hardware/sensors/lmsensors_v2.h -=================================================================== ---- agent/mibgroup/hardware/sensors/lmsensors_v2.h (revision 0) -+++ agent/mibgroup/hardware/sensors/lmsensors_v2.h (revision 16739) -@@ -0,0 +1 @@ -+config_require(hardware/sensors/hw_sensors) -Index: agent/mibgroup/hardware/sensors/kstat_sensors.c -=================================================================== ---- agent/mibgroup/hardware/sensors/kstat_sensors.c (revision 0) -+++ agent/mibgroup/hardware/sensors/kstat_sensors.c (revision 16739) -@@ -0,0 +1,161 @@ -+#include <net-snmp/net-snmp-config.h> -+#include <net-snmp/net-snmp-includes.h> -+#include <net-snmp/agent/net-snmp-agent-includes.h> -+#include <net-snmp/agent/hardware/sensors.h> -+ -+#include "util_funcs.h" -+#include <time.h> -+ -+#include <kstat.h> -+#include </usr/platform/sun4u/include/sys/envctrl.h> -+ -+void netsnmp_sensor_arch_init( void ) { -+ DEBUGMSGTL(("sensors:arch", "Initialise KStat Sensors module\n")); -+} -+ -+ -+int -+netsnmp_sensor_arch_load(netsnmp_cache *cache, void *vp) { -+ netsnmp_sensor_info *sp; -+ -+ int i; -+ const char *fantypes[]={"CPU","PWR","AFB"}; -+ char name[ 256 ]; -+ -+ kstat_ctl_t *kc; -+ kstat_t *kp; -+ envctrl_fan_t *fan_info; -+ envctrl_ps_t *power_info; -+ envctrl_encl_t *enc_info; -+ -+ -+ DEBUGMSGTL(("sensors:arch", "Reload KStat Sensors module\n")); -+ -+ kc = kstat_open(); -+ if ( kc == 0) { -+ DEBUGMSGTL(("sensors:arch", "Couldn't open kstat\n")); -+ return 1; -+ } -+ -+ -+ /* -+ * Retrieve fan information -+ */ -+ kp = kstat_lookup( kc, ENVCTRL_MODULE_NAME, 0, ENVCTRL_KSTAT_FANSTAT); -+ if (( kp == 0 ) || (kstat_read( kc, kp, 0 ) == -1 )) { -+ DEBUGMSGTL(("sensors:arch", "No fan information\n")); -+ } else { -+ fan_info = (envctrl_fan_t *)kp->ks_data; <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-defaultconfig.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-lm_sensors_3.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.161&r2=1.162&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
