Menu
▾
▴
[Openhpi-svn] SF.net SVN: openhpi:[6989] openhpi/branches/2.14.x
|
From: <sh...@us...> - 2009-04-02 17:58:39
|
Revision: 6989
http://openhpi.svn.sourceforge.net/openhpi/?rev=6989&view=rev
Author: shuah
Date: 2009-04-02 17:58:26 +0000 (Thu, 02 Apr 2009)
Log Message:
-----------
Merge from trunk revision 6988 into branch revision 6971:
Fixes for:
2726539, 2726553, 2726589, 2726620,
2726678, 2726719, 2726800, 2726734,
2726740, 2726887, 2726800, 2726771
Revision Links:
--------------
http://openhpi.svn.sourceforge.net/openhpi/?rev=6988&view=rev
http://openhpi.svn.sourceforge.net/openhpi/?rev=6971&view=rev
Modified Paths:
--------------
openhpi/branches/2.14.x/hpi_shell/cmdparser.c
openhpi/branches/2.14.x/hpi_shell/commands.c
openhpi/branches/2.14.x/hpi_shell/hpi_cmd.c
openhpi/branches/2.14.x/hpi_shell/sensor.c
openhpi/branches/2.14.x/hpi_shell/service.c
openhpi/branches/2.14.x/hpi_shell/session.c
openhpi/branches/2.14.x/include/SaHpiAtca.h
openhpi/branches/2.14.x/openhpi.spec.in
openhpi/branches/2.14.x/openhpid/Makefile.am
openhpi/branches/2.14.x/openhpid/oh_client.cpp
openhpi/branches/2.14.x/src/safhpi.c
openhpi/branches/2.14.x/ssl/Makefile.am
Property Changed:
----------------
openhpi/branches/2.14.x/
Property changes on: openhpi/branches/2.14.x
___________________________________________________________________
Added: svn:mergeinfo
+ /openhpi/trunk:6972-6988
Modified: openhpi/branches/2.14.x/hpi_shell/cmdparser.c
===================================================================
--- openhpi/branches/2.14.x/hpi_shell/cmdparser.c 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/hpi_shell/cmdparser.c 2009-04-02 17:58:26 UTC (rev 6989)
@@ -506,7 +506,7 @@
return(HPI_SHELL_CMD_ERROR);
};
str = term->term;
- if (isdigit(*str)) {
+ if (isdigit(*str) || *str == '-' ) {
res = sscanf(str, "%d", val);
return(res);
};
Modified: openhpi/branches/2.14.x/hpi_shell/commands.c
===================================================================
--- openhpi/branches/2.14.x/hpi_shell/commands.c 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/hpi_shell/commands.c 2009-04-02 17:58:26 UTC (rev 6989)
@@ -204,7 +204,7 @@
term = get_next_term();
if (term == NULL) {
- if (is_more) val = "NO";
+ if (is_more) val = "ON";
else val = "OFF";
printf("more = %s\n", val);
return(HPI_SHELL_OK);
@@ -1173,7 +1173,7 @@
time2str(info.DatUpdateTimestamp, date, 30);
printf(" DAT update count: %d DAT Timestamp : %s\n",
info.DatUpdateCount, date);
- printf(" ActiveAlarms: %d CriticalAlarms: %d Major: %d"
+ printf(" ActiveAlarms: %d CriticalAlarms: %d Major: %d "
"Minor: %d Limit: %d\n",
info.ActiveAlarms, info.CriticalAlarms, info.MajorAlarms,
info.MinorAlarms, info.DatUserAlarmLimit);
Modified: openhpi/branches/2.14.x/hpi_shell/hpi_cmd.c
===================================================================
--- openhpi/branches/2.14.x/hpi_shell/hpi_cmd.c 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/hpi_shell/hpi_cmd.c 2009-04-02 17:58:26 UTC (rev 6989)
@@ -29,7 +29,7 @@
{
int c, eflag = 0;
- while ( (c = getopt( argc, argv,"c:ef:xn?")) != EOF )
+ while ( (c = getopt( argc, argv,"c:ef:xn:?")) != EOF )
switch(c) {
case 'c':
setenv("OPENHPI_CONF", optarg, 1);
Modified: openhpi/branches/2.14.x/hpi_shell/sensor.c
===================================================================
--- openhpi/branches/2.14.x/hpi_shell/sensor.c 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/hpi_shell/sensor.c 2009-04-02 17:58:26 UTC (rev 6989)
@@ -539,7 +539,7 @@
return(HPI_SHELL_CMD_ERROR);
};
if ( timeout != SAHPI_TIMEOUT_BLOCK ) {
- printf("Auto-insert timeout: %lld\n", timeout);
+ printf("Auto-insert timeout: %lld nsec\n", timeout);
} else {
printf("Auto-insert timeout: BLOCK\n");
}
@@ -553,7 +553,7 @@
return(HPI_SHELL_CMD_ERROR);
};
if ( timeout != SAHPI_TIMEOUT_BLOCK ) {
- printf("Auto-extract timeout: %lld\n", timeout);
+ printf("Auto-extract timeout: %lld nsec\n", timeout);
} else {
printf("Auto-extract timeout: BLOCK\n");
}
Modified: openhpi/branches/2.14.x/hpi_shell/service.c
===================================================================
--- openhpi/branches/2.14.x/hpi_shell/service.c 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/hpi_shell/service.c 2009-04-02 17:58:26 UTC (rev 6989)
@@ -231,6 +231,7 @@
SaErrorT thres_value(SaHpiSensorReadingT *item, char *buf, int size)
{
char *val;
+ int i, n;
memset(buf, 0, size);
if (item->IsSupported != SAHPI_TRUE)
@@ -247,11 +248,14 @@
break;
case SAHPI_SENSOR_READING_TYPE_BUFFER:
val = (char *)(item->Value.SensorBuffer);
- if (val != NULL) {
- snprintf(buf, size, "%s", val);
- break;
- }
- return(-1);
+ if (val == NULL ) {
+ return(-1);
+ }
+ n = ( SAHPI_SENSOR_BUFFER_LENGTH > ( size / 2 ) ) ? ( size / 2 ) : SAHPI_SENSOR_BUFFER_LENGTH;
+ buf[0] = '\0';
+ for (i = 0; i < n; ++i) {
+ sprintf( buf + 2 * i, "%02x", val[i] );
+ }
};
return(SA_OK);
}
@@ -1079,7 +1083,7 @@
*outbuf = 0;
if (mes != (char *)NULL)
strcpy(outbuf,mes);
- if ((buf->DataLength < 2) && (buf->DataType != SAHPI_TL_TYPE_BINARY)) {
+ if ((buf->DataLength == 0) && (buf->DataType != SAHPI_TL_TYPE_BINARY)) {
if (meslast != (char *)NULL)
strcat(outbuf, meslast);
return;
@@ -1195,7 +1199,7 @@
if (mes != (char *)NULL) {
if (proc(mes) == HPI_UI_END) return(HPI_UI_END);
};
- if ((buf->DataLength < 2) && (buf->DataType != SAHPI_TL_TYPE_BINARY)) {
+ if ((buf->DataLength == 0) && (buf->DataType != SAHPI_TL_TYPE_BINARY)) {
return(HPI_UI_OK);
}
if (print_text_buffer_type(NULL, buf, ": ", proc) != HPI_UI_OK)
Modified: openhpi/branches/2.14.x/hpi_shell/session.c
===================================================================
--- openhpi/branches/2.14.x/hpi_shell/session.c 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/hpi_shell/session.c 2009-04-02 17:58:26 UTC (rev 6989)
@@ -113,7 +113,7 @@
memset(&event, 0xF, sizeof(event));
rv = saHpiEventGet(Domain->sessionId,
SAHPI_TIMEOUT_BLOCK, &event,
- NULL, NULL, NULL);
+ &rdr, &rptentry, NULL);
if (rv != SA_OK ) {
printf("saHpiEventGet failed with error <%d>", rv);
break;
@@ -133,9 +133,6 @@
if(rv == SA_OK)
oh_print_event(&event, &rptentry.ResourceEntity, 4);
else {
- printf("saHpiRptEntryGet failed for resource Id <%d> with error <%d>",
- event.Source, rv);
- printf("Wrong resource Id <%d> detected", event.Source);
oh_print_event(&event, NULL, 4);
}
}
Modified: openhpi/branches/2.14.x/include/SaHpiAtca.h
===================================================================
--- openhpi/branches/2.14.x/include/SaHpiAtca.h 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/include/SaHpiAtca.h 2009-04-02 17:58:26 UTC (rev 6989)
@@ -212,32 +212,32 @@
typedef SaHpiEntityTypeT AtcaHpiEntityTypeT;
#define ATCAHPI_ENT_POWER_ENTRY_MODULE_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 1
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 1)
#define ATCAHPI_ENT_SHELF_FRU_DEVICE_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 2
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 2)
#define ATCAHPI_ENT_SHELF_MANAGER_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 3
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 3)
#define ATCAHPI_ENT_FAN_TRAY_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 4
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 4)
#define ATCAHPI_ENT_FAN_FILTER_TRAY_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 5
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 5)
#define ATCAHPI_ENT_ALARM_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 6
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 6)
#define ATCAHPI_ENT_AMC_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 7
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 7)
#define ATCAHPI_ENT_PMC_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 8
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 8)
#define ATCAHPI_ENT_RTM_SLOT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_CHASSIS_SPECIFIC + 9
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_CHASSIS_SPECIFIC + 9)
#define ATCAHPI_ENT_PICMG_FRONT_BLADE \
- (AtcaHpiEntityTypeT)SAHPI_ENT_PHYSICAL_SLOT + 1
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_PHYSICAL_SLOT + 1)
#define ATCAHPI_ENT_SHELF_FRU_DEVICE \
- (AtcaHpiEntityTypeT)SAHPI_ENT_PHYSICAL_SLOT + 2
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_PHYSICAL_SLOT + 2)
#define ATCAHPI_ENT_FILTRATION_UNIT \
- (AtcaHpiEntityTypeT)SAHPI_ENT_PHYSICAL_SLOT + 3
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_PHYSICAL_SLOT + 3)
#define ATCAHPI_ENT_AMC \
- (AtcaHpiEntityTypeT)SAHPI_ENT_PHYSICAL_SLOT + 4
+ (AtcaHpiEntityTypeT)(SAHPI_ENT_PHYSICAL_SLOT + 4)
/***********************************************************************
Modified: openhpi/branches/2.14.x/openhpi.spec.in
===================================================================
--- openhpi/branches/2.14.x/openhpi.spec.in 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/openhpi.spec.in 2009-04-02 17:58:26 UTC (rev 6989)
@@ -9,9 +9,24 @@
%define _docdir %{_datadir}/doc/%{name}-%{version}
%define with_ipmi @WITH_IPMI@
+
+%if "x@IPMIDIRECT@" == "xipmidirect"
+%define with_ipmidirect 1
+%endif
+
%define with_bladecenter @WITH_SNMP_BC@
+
+%if "x@SIMULATOR@" == "xsimulator"
+%define with_simulator 1
+%endif
+
%define with_rtas @WITH_RTAS@
%define with_sysfs @WITH_SYSFS@
+
+%if "x@WATCHDOG@" == "xwatchdog"
+%define with_watchdog 1
+%endif
+
%define with_ilo2_ribcl @WITH_ILO2_RIBCL@
%define with_oa_soap @WITH_OA_SOAP@
%define with_docbook2html @WITH_DOCBOOK2HTML@
@@ -64,10 +79,12 @@
Requires: openhpi = %{version} OpenIPMI
%endif
+%if 0%{?with_ipmidirect}
%package ipmidirect
Summary: OpenHPI plugin for IPMI-enabled systems
Group: System/Monitoring
Requires: openhpi = %{version}
+%endif
%if 0%{?with_rtas}
%package rtas
@@ -77,10 +94,12 @@
Requires: openhpi = %{version} librtas
%endif
+%if 0%{?with_simulator}
%package simulator
Summary: OpenHPI plugin for testing the core library
Group: System/Monitoring
Requires: openhpi = %{version}
+%endif
%if 0%{?with_bladecenter}
%package bladecenter
@@ -97,10 +116,12 @@
Requires: openhpi = %{version} libsysfs
%endif
+%if 0%{?with_watchdog}
%package watchdog
Group: System/Monitoring
Summary: OpenHPI plugin for Linux software watchdog support
Requires: openhpi = %{version}
+%endif
%if 0%{?with_ilo2_ribcl}
%package ilo2_ribcl
@@ -140,9 +161,11 @@
any generic hardware topology that uses IPMI.
%endif
+%if 0%{?with_ipmidirect}
%description ipmidirect
This OpenHPI plugin connects directly to IPMI-enabled hardware
locally or over the network. Its focus is to support ATCA-type chassis.
+%endif
%if 0%{?with_rtas}
%description rtas
@@ -150,9 +173,11 @@
from IBM PPC systems.
%endif
+%if 0%{?with_simulator}
%description simulator
OpenHPI plugin that reports fakes hardware used for
testing the core library.
+%endif
%if 0%{?with_bladecenter}
%description bladecenter
@@ -166,9 +191,11 @@
OpenHPI plugin that reads system information from sysfs.
%endif
+%if 0%{?with_watchdog}
%description watchdog
OpenHPI plugin that uses the Linux software watchdog support
provided by the kernel.
+%endif
%if 0%{?with_ilo2_ribcl}
%description ilo2_ribcl
@@ -258,10 +285,12 @@
%endif
###################################################
+%if 0%{?with_ipmidirect}
%files ipmidirect
###################################################
%defattr(-,root,root)
%{_libdir}/%{name}/libipmidirect.*
+%endif
###################################################
%if 0%{?with_rtas}
@@ -272,10 +301,12 @@
%endif
###################################################
+%if 0%{?with_simulator}
%files simulator
###################################################
%defattr(-,root,root)
%{_libdir}/%{name}/libsimulator.*
+%endif
###################################################
%if 0%{?with_bladecenter}
@@ -294,16 +325,20 @@
%endif
###################################################
+%if 0%{?with_watchdog}
%files watchdog
###################################################
%defattr(-,root,root)
%{_libdir}/%{name}/libwatchdog.*
+%endif
###################################################
+%if 0%{?with_ilo2_ribcl}
%files ilo2_ribcl
###################################################
%defattr(-,root,root)
%{_libdir}/%{name}/libilo2_ribcl.*
+%endif
###################################################
%if 0%{?with_oa_soap}
Modified: openhpi/branches/2.14.x/openhpid/Makefile.am
===================================================================
--- openhpi/branches/2.14.x/openhpid/Makefile.am 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/openhpid/Makefile.am 2009-04-02 17:58:26 UTC (rev 6989)
@@ -31,6 +31,7 @@
openhpid_LDADD = $(top_builddir)/src/libopenhpi.la \
$(top_builddir)/utils/libopenhpiutils.la \
+ $(top_builddir)/marshal/libopenhpimarshal.la \
$(top_builddir)/marshal/libohtcpconnx.la
if HAVE_OPENSSL
openhpid_LDADD += $(top_builddir)/$(SSLDIR)/libopenhpi_ssl.la
@@ -51,6 +52,7 @@
libopenhpi_la_LDFLAGS = -version-info @HPI_LIB_VERSION@
libopenhpi_la_LIBADD = $(top_builddir)/marshal/libohtcpconnx.la -lstdc++ \
+ $(top_builddir)/marshal/libopenhpimarshal.la \
$(top_builddir)/utils/libopenhpiutils.la
install-data-local:
Modified: openhpi/branches/2.14.x/openhpid/oh_client.cpp
===================================================================
--- openhpi/branches/2.14.x/openhpid/oh_client.cpp 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/openhpid/oh_client.cpp 2009-04-02 17:58:26 UTC (rev 6989)
@@ -2489,11 +2489,11 @@
if (State != NULL) {
memcpy(&tmp_state, State, sizeof(SaHpiCtrlStateT));
if (oh_lookup_ctrltype(tmp_state.Type) == NULL) {
- tmp_state.Type = SAHPI_CTRL_TYPE_OEM;
+ tmp_state.Type = SAHPI_CTRL_TYPE_TEXT;
}
}
else {
- tmp_state.Type = SAHPI_CTRL_TYPE_OEM;
+ tmp_state.Type = SAHPI_CTRL_TYPE_TEXT;
}
cHpiMarshal *hm = HpiMarshalFind(eFsaHpiControlGet);
Modified: openhpi/branches/2.14.x/src/safhpi.c
===================================================================
--- openhpi/branches/2.14.x/src/safhpi.c 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/src/safhpi.c 2009-04-02 17:58:26 UTC (rev 6989)
@@ -2043,6 +2043,7 @@
}
+ /* Merging thresholds*/
SaHpiSensorThresholdsT tmp;
rv = saHpiSensorThresholdsGet( SessionId, ResourceId, SensorNum, &tmp );
@@ -2054,32 +2055,24 @@
return rv;
}
- /* Merging thresholds*/
- if (SensorThresholds->UpCritical.IsSupported == SAHPI_TRUE) {
- tmp.UpCritical = SensorThresholds->UpCritical;
- }
- if (SensorThresholds->UpMajor.IsSupported == SAHPI_TRUE) {
- tmp.UpMajor = SensorThresholds->UpMajor;
- }
- if (SensorThresholds->UpMinor.IsSupported == SAHPI_TRUE) {
- tmp.UpMinor = SensorThresholds->UpMinor;
- }
- if (SensorThresholds->LowCritical.IsSupported == SAHPI_TRUE) {
- tmp.LowCritical = SensorThresholds->LowCritical;
- }
- if (SensorThresholds->LowMajor.IsSupported == SAHPI_TRUE) {
- tmp.LowMajor = SensorThresholds->LowMajor;
- }
- if (SensorThresholds->LowMinor.IsSupported == SAHPI_TRUE) {
- tmp.LowMinor = SensorThresholds->LowMinor;
- }
- if (SensorThresholds->PosThdHysteresis.IsSupported == SAHPI_TRUE) {
- tmp.PosThdHysteresis = SensorThresholds->PosThdHysteresis;
- }
- if (SensorThresholds->NegThdHysteresis.IsSupported == SAHPI_TRUE) {
- tmp.NegThdHysteresis = SensorThresholds->NegThdHysteresis;
- }
+ SaHpiSensorThdMaskT wmask = rdr->RdrTypeUnion.SensorRec.ThresholdDefn.WriteThold;
+#define COPY_TH( TH, MASK ) \
+{ \
+ if ( ( SensorThresholds->TH.IsSupported == SAHPI_TRUE ) && ( ( wmask & MASK ) != 0 ) ) { \
+ tmp.TH = SensorThresholds->TH; \
+ } \
+}
+ COPY_TH( UpCritical, SAHPI_STM_UP_CRIT );
+ COPY_TH( UpMajor, SAHPI_STM_UP_MAJOR );
+ COPY_TH( UpMinor, SAHPI_STM_UP_MINOR );
+ COPY_TH( LowCritical, SAHPI_STM_LOW_CRIT );
+ COPY_TH( LowMajor, SAHPI_STM_LOW_MAJOR );
+ COPY_TH( LowMinor, SAHPI_STM_LOW_MINOR );
+ COPY_TH( PosThdHysteresis, SAHPI_STM_UP_HYSTERESIS );
+ COPY_TH( NegThdHysteresis, SAHPI_STM_LOW_HYSTERESIS );
+#undef COPY_TH
+
rv = oh_valid_thresholds(&tmp, rdr);
if (rv != SA_OK) { /* Invalid sensor threshold */
err("Invalid sensor threshold.");
Modified: openhpi/branches/2.14.x/ssl/Makefile.am
===================================================================
--- openhpi/branches/2.14.x/ssl/Makefile.am 2009-04-02 16:51:25 UTC (rev 6988)
+++ openhpi/branches/2.14.x/ssl/Makefile.am 2009-04-02 17:58:26 UTC (rev 6989)
@@ -18,4 +18,4 @@
libopenhpi_ssl_la_SOURCES = oh_ssl.c
-libopenhpi_ssl_la_LDFLAGS = -version-info @HPI_LIB_VERSION@
+libopenhpi_ssl_la_LDFLAGS = -version-info @HPI_LIB_VERSION@ @CRYPTO_LIB@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|