Merge branch 'release/debian/3.1.5-1'debian/3.1.5-1

5 files changed, 13 insertions, 11 deletions

diff --git a/util/ievents.c b/util/ievents.c
index 4f14516..c384b59 100644
--- a/util/ievents.c
+++ b/util/ievents.c
@@ -80,7 +80,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 extern char *progver;  /*from ipmiutil.c*/
 static char * progname  = "ipmiutil events";
 #else
-static char *progver   = "3.14";
+static char *progver   = "3.15";
 static char *progname  = "ievents";
 #endif
 static char fsensdesc = 0;   /* 1= get extended sensor descriptions*/
diff --git a/util/ipmiutil.c b/util/ipmiutil.c
index f43deb1..82c7506 100644
--- a/util/ipmiutil.c
+++ b/util/ipmiutil.c
@@ -57,7 +57,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ipmiutil.h"
 
 static char *progname  = "ipmiutil";
-char *progver   = "3.14";
+char *progver   = "3.15";
 // static char fdebug = 0;
 /*int ipmiutil(int argc, char **argv); */
 
diff --git a/util/ipmiutil.mak b/util/ipmiutil.mak
index 7595067..ba1e23c 100644
--- a/util/ipmiutil.mak
+++ b/util/ipmiutil.mak
@@ -27,7 +27,7 @@ L2_OBJ = $(L2_D)\helper.obj $(L2_D)\ipmi_strings.obj $(L2_D)\lanplus.obj \
 	$(L2_D)\lanplus_crypt_impl.obj $(L2_D)\lanplus_dump.obj \

 	$(L2_D)\lanplus_strings.obj $(L2_D)\lanplus_crypt.obj

 LF_LANPLUS=/LIBPATH:$(LIB_D) /LIBPATH:$(L2_D) $(L2_OBJ) ssleay32.lib libeay32.lib 

-CF_LANPLUS=/D HAVE_LANPLUS

+CF_LANPLUS=/DHAVE_LANPLUS /DHAVE_IPV6

 

 # Set your compiler options

 # To remove any GPL dependencies, use the CF_EX line with NON_GPL

diff --git a/util/ipmiutil64.mak b/util/ipmiutil64.mak
index cfd1719..4c27198 100644
--- a/util/ipmiutil64.mak
+++ b/util/ipmiutil64.mak
@@ -6,8 +6,6 @@
 LIBC_RT=libcmt.lib /NODEFAULTLIB:"msvcirt.lib"

 # LIBC_RT=msvcrt.lib /NODEFAULTLIB:"msvcirt.lib"

 

-#MARCH=IX86

-MARCH=X64

 # The ipmiutil directory

 SRC_D=.

 LIB_D=..\lib

diff --git a/util/isensor.c b/util/isensor.c
index df4a911..48755b7 100644
--- a/util/isensor.c
+++ b/util/isensor.c
@@ -80,6 +80,7 @@
  *                           fixup in decoding Proc,PS Comp readings
  * 01/25/08 ARCress  v2.7    allow float input with -u thresholds, 
  *                           add -p persist logic for -u thresholds.
+ * 09/20/19 ARCress  v3.15   workaround for Pigeon Point bad sa in SDR
  */
 /*M*
 Copyright (c) 2002-2006 Intel Corporation. 
@@ -259,7 +260,7 @@ char *decode_entity_id(int id) {
 extern char * progver;  /*from ipmiutil.c*/
 static char * progname  = "ipmiutil sensor";
 #else
-static char * progver   = "3.08";
+static char * progver   = "3.15";
 static char * progname  = "isensor";
 #endif
 #ifdef WIN32
@@ -284,6 +285,7 @@ static int fdoloop  = 0;   /* =1 if user specified number of loops */
 static int fpicmg   = 0;
 static int fchild   = 0;   /* =1 show child SDRs */
 static int fset_mc  = 0;   /* =1 -m to set_mc   */
+static int fbadsdr  = 0;   /* =1 to ignore bad SDR mc  */
 static int fdump    = 0;  
 static int frestore = 0;  
 static int fjumpstart = 0;  
@@ -1034,7 +1036,7 @@ GetSensorReading(uchar sens_num, void *psdr, uchar *sens_data)
 	uchar lun = 0;
 	uchar chan = 0;
 
-        if (psdr != NULL) {
+        if (psdr != NULL && fbadsdr == 0) {
            sdr = (SDR02REC *)psdr;
            mc = sdr->sens_ownid;
 	   if (mc != BMC_SA) {  /* not BMC, e.g. HSC or ME sensor */
@@ -2760,7 +2762,7 @@ ShowSDR(char *tag, uchar *sdr)
 	idstr[ilen] = 0;  /* stringify */
         if ((sdr02->sens_capab & 0x40) == 0) brearm = 'm'; /*manual rearm*/
         else brearm = 'a';  /*automatic rearm*/
-	if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%lu, s0=%x\n",
+	if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%zu, s0=%x\n",
 				ilen,idstr[0],sizeof(SDR02REC),sdr[ioff]);
 	memset(sens,0,sizeof(sens));
 	rc = GetSensorReading(sdr02->sens_num,sdr02,sens);
@@ -2936,7 +2938,7 @@ ShowSDR(char *tag, uchar *sdr)
 	if (ilen >= sizeof(idstr)) ilen = sizeof(idstr) - 1;
 	memcpy(idstr,&sdr[ioff],ilen);
 	idstr[ilen] = 0;  /* stringify */
-	if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%lu, s0=%x\n",
+	if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%zu, s0=%x\n",
 				ilen,idstr[0],sizeof(SDR11REC),sdr[ioff]);
         printf("%s", tag);
 	if (fsimple)
@@ -2966,7 +2968,7 @@ ShowSDR(char *tag, uchar *sdr)
 	if (ilen >= sizeof(idstr)) ilen = sizeof(idstr) - 1;
 	memcpy(idstr,&sdr[ioff],ilen);
 	idstr[ilen] = 0;  /* stringify */
-	if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%lu, s0=%x\n",
+	if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%zu, s0=%x\n",
 				ilen,idstr[0],sizeof(SDR12REC),sdr[ioff]);
         printf("%s", tag);
 	if (fsimple)
@@ -3484,9 +3486,11 @@ int i_sensor(int argc, char **argv)
 		if (is_grantley(vend_id,prod_id)) fGrantley = 1;
 		if (prod_id == 0x003E || fRomley || fGrantley)  /*Urbanna,CG2100*/
 		   set_max_kcs_loops(URNLOOPS); /*longer KCS timeout*/
-    } else if ((vend_id == VENDOR_SUPERMICRO)
+	} else if ((vend_id == VENDOR_SUPERMICRO)
                 || (vend_id == VENDOR_SUPERMICROX)) {
                    set_max_kcs_loops(URNLOOPS); /*longer KCS timeout*/
+	} else if (vend_id == 16394) { /*Pigeon Point*/ 
+		fbadsdr = 1;   /* SDR has bad sa/mc value, so ignore it */
 	} else {   /* Other products */
 		pstr = "BMC";
 		fmBMC = 0;