diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:42:54 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:42:54 +0200 |
| commit | a8f1f2fbd1fe78c185b5c320c11d0265b49f8668 (patch) | |
| tree | 869216c945841ed46e2ca4b69af46f54a738d3cd | |
| parent | 42de6cdd540e080b6e34e5e27cb8c44151711010 (diff) | |
| parent | c0cffd791bfaffaad631076141fcdfc000adcac1 (diff) | |
Merge tag 'upstream/3.0.4'
Upstream version 3.0.4
46 files changed, 297 insertions, 142 deletions
@@ -4220,7 +4220,7 @@ wdt.8 iwdt.8 (ipmiutil wdt) idiscover(ipmiutil discover) ver 1.11 ipmi_port (ipmi_port) ver 1.4 -02/16/2016 ARCress ipmiutil-3.0.2 changes +02/16/2017 ARCress ipmiutil-3.0.2 changes util/isensor.c - if oem sensors, vary output by fsimple scripts/ipmiutil_wdt - fixup for systemd (from Mike Williams) README, COPYING - clarify that md2.h is not included unless --enable-gpl @@ -4243,14 +4243,14 @@ wdt.8 iwdt.8 (ipmiutil wdt) idiscover(ipmiutil discover) ver 1.11 ipmi_port (ipmi_port) ver 1.4 -03/24/2016 ARCress ipmiutil-3.0.3 changes +03/24/2017 ARCress ipmiutil-3.0.3 changes (iver 3.03) util/ihealth.c - add more SuperMicro product strings for X11, - add some Lenovo and HP restrictions + add some Lenovo and HP restrictions util/iseltime.c - add get_sel_utc/set_sel_utc routines util/oem_hp.c - Remove custom 0x40 Init for HP (support#22 fix) util/ilan.c - added GetUserInfo routine for iuser - util/iuser.c - new file, user subfunctions util/ilan.c - fix indenting + util/iuser.c - new file, user subfunctions util/Makefile.am - add iuser.c util/*.mak - add iuser.c ipmiutil-3.0.3 contains: @@ -4260,3 +4260,13 @@ wdt.8 iwdt.8 (ipmiutil wdt) ihpm (ipmiutil hpm) ver 1.09 idiscover (ipmiutil discover) ver 1.11 ipmi_port (ipmi_port) ver 1.4 + +04/24/2017 ARCress ipmiutil-3.0.4 changes (iver 3.04) + util/ievents.c - resolve type 0xDB printf warning (support #24) + util/iuser.c - resolve compile warning + util/oem_dell.c - resolve compile warning + util/oem_lenovo.c - added custom DIMM and CPU sensor meanings (#23) + util/oem_supermicro.c - fix fan sensors for simple mode format + util/isensor.c - add simple param to decode_sensor_supermicro + util/AnsiTerm.cpp - pick default instead of assert if bad SGR (#25) + @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for ipmiutil 3.0.3. +# Generated by GNU Autoconf 2.63 for ipmiutil 3.0.4. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ipmiutil' PACKAGE_TARNAME='ipmiutil' -PACKAGE_VERSION='3.0.3' -PACKAGE_STRING='ipmiutil 3.0.3' +PACKAGE_VERSION='3.0.4' +PACKAGE_STRING='ipmiutil 3.0.4' PACKAGE_BUGREPORT='' ac_unique_file="util/ipmiutil.c" @@ -1503,7 +1503,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ipmiutil 3.0.3 to adapt to many kinds of systems. +\`configure' configures ipmiutil 3.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1573,7 +1573,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ipmiutil 3.0.3:";; + short | recursive ) echo "Configuration of ipmiutil 3.0.4:";; esac cat <<\_ACEOF @@ -1683,7 +1683,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ipmiutil configure 3.0.3 +ipmiutil configure 3.0.4 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1697,7 +1697,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ipmiutil $as_me 3.0.3, which was +It was created by ipmiutil $as_me 3.0.4, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2551,7 +2551,7 @@ fi # Define the identity of the package. PACKAGE='ipmiutil' - VERSION='3.0.3' + VERSION='3.0.4' cat >>confdefs.h <<_ACEOF @@ -13943,7 +13943,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ipmiutil $as_me 3.0.3, which was +This file was extended by ipmiutil $as_me 3.0.4, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14006,7 +14006,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -ipmiutil config.status 3.0.3 +ipmiutil config.status 3.0.4 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 7e21f7a..9ba80e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(ipmiutil,3.0.3) +AC_INIT(ipmiutil,3.0.4) AC_CONFIG_SRCDIR(util/ipmiutil.c) echo "ipmiutil version ${PACKAGE_VERSION}" AM_CONFIG_HEADER(config.h) diff --git a/debpkg/changelog b/debpkg/changelog index bb882b1..247e8f8 100644 --- a/debpkg/changelog +++ b/debpkg/changelog @@ -1,3 +1,63 @@ +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 14:18:26 -0400 + +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 14:17:44 -0400 + +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 14:06:38 -0400 + +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 14:01:50 -0400 + +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 14:00:53 -0400 + +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 13:57:42 -0400 + +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 13:46:58 -0400 + +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 13:42:10 -0400 + +ipmiutil (3.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 13:38:31 -0400 + +ipmiutil (3.0.3-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Mon, 03 Apr 2017 13:37:52 -0400 + ipmiutil (3.0.3-1) unstable; urgency=low * New upstream version. diff --git a/doc/Makefile b/doc/Makefile index 5f0e9ee..0f23c85 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run automake-1.11 +AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -99,7 +99,7 @@ LIB_DIR = /usr/lib64 LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -113,9 +113,9 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 3.0.3 +PACKAGE_STRING = ipmiutil 3.0.4 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.0.3 +PACKAGE_VERSION = 3.0.4 PATH_SEPARATOR = : PKG_DIR = /root/rpmbuild RANLIB = ranlib @@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1 STRIP = strip SUBDIR_S = doc scripts lib util SYSTEMD_DIR = /usr/share/ipmiutil -VERSION = 3.0.3 -abs_builddir = /usr/dev/ipmiutil-3.0.3/doc -abs_srcdir = /usr/dev/ipmiutil-3.0.3/doc -abs_top_builddir = /usr/dev/ipmiutil-3.0.3 -abs_top_srcdir = /usr/dev/ipmiutil-3.0.3 +VERSION = 3.0.4 +abs_builddir = /usr/dev/ipmiutil-3.0.4/doc +abs_srcdir = /usr/dev/ipmiutil-3.0.4/doc +abs_top_builddir = /usr/dev/ipmiutil-3.0.4 +abs_top_srcdir = /usr/dev/ipmiutil-3.0.4 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -159,7 +159,7 @@ host_vendor = redhat htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.3/install-sh +install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.4/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/doc/UserGuide b/doc/UserGuide index 6c2207e..eb86edc 100644 --- a/doc/UserGuide +++ b/doc/UserGuide @@ -1,6 +1,6 @@ IPMIUTIL USER GUIDE - VERSION 3.0.3 + VERSION 3.0.4 An easy-to-use IPMI server management utility diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec index 01dbbcf..107d3e1 100644 --- a/doc/ipmiutil.spec +++ b/doc/ipmiutil.spec @@ -3,7 +3,7 @@ # Copyright (c) 2012 Andy Cress # Name: ipmiutil -Version: 3.0.3 +Version: 3.0.4 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD diff --git a/lib/Makefile b/lib/Makefile index 7c7afca..5cb97f6 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -47,12 +47,12 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run automake-1.11 +AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -101,7 +101,7 @@ LIB_DIR = /usr/lib64 LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -115,9 +115,9 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 3.0.3 +PACKAGE_STRING = ipmiutil 3.0.4 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.0.3 +PACKAGE_VERSION = 3.0.4 PATH_SEPARATOR = : PKG_DIR = /root/rpmbuild RANLIB = ranlib @@ -129,11 +129,11 @@ SHR_LINK = libipmiutil.so.1 STRIP = strip SUBDIR_S = doc scripts lib util SYSTEMD_DIR = /usr/share/ipmiutil -VERSION = 3.0.3 -abs_builddir = /usr/dev/ipmiutil-3.0.3/lib -abs_srcdir = /usr/dev/ipmiutil-3.0.3/lib -abs_top_builddir = /usr/dev/ipmiutil-3.0.3 -abs_top_srcdir = /usr/dev/ipmiutil-3.0.3 +VERSION = 3.0.4 +abs_builddir = /usr/dev/ipmiutil-3.0.4/lib +abs_srcdir = /usr/dev/ipmiutil-3.0.4/lib +abs_top_builddir = /usr/dev/ipmiutil-3.0.4 +abs_top_srcdir = /usr/dev/ipmiutil-3.0.4 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -161,7 +161,7 @@ host_vendor = redhat htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.3/install-sh +install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.4/install-sh libdir = $(iprefix)/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc index 10acea4..0f73ef4 100644 --- a/lib/libipmiutil.pc +++ b/lib/libipmiutil.pc @@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@ Name: libipmiutil Description: Library for ipmiutil -Version: 3.0.3 +Version: 3.0.4 Libs: -L${libdir} -lipmi_lanplus Cflags: -I${includedir} diff --git a/scripts/Makefile b/scripts/Makefile index 1e5d70c..cf2fddc 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run automake-1.11 +AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -99,7 +99,7 @@ LIB_DIR = /usr/lib64 LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.3/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -113,9 +113,9 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 3.0.3 +PACKAGE_STRING = ipmiutil 3.0.4 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.0.3 +PACKAGE_VERSION = 3.0.4 PATH_SEPARATOR = : PKG_DIR = /root/rpmbuild RANLIB = ranlib @@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1 STRIP = strip SUBDIR_S = doc scripts lib util SYSTEMD_DIR = /usr/share/ipmiutil -VERSION = 3.0.3 -abs_builddir = /usr/dev/ipmiutil-3.0.3/scripts -abs_srcdir = /usr/dev/ipmiutil-3.0.3/scripts -abs_top_builddir = /usr/dev/ipmiutil-3.0.3 -abs_top_srcdir = /usr/dev/ipmiutil-3.0.3 +VERSION = 3.0.4 +abs_builddir = /usr/dev/ipmiutil-3.0.4/scripts +abs_srcdir = /usr/dev/ipmiutil-3.0.4/scripts +abs_top_builddir = /usr/dev/ipmiutil-3.0.4 +abs_top_srcdir = /usr/dev/ipmiutil-3.0.4 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -159,7 +159,7 @@ host_vendor = redhat htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.3/install-sh +install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.4/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -6,7 +6,7 @@ # [doinc?] is 'n'. # if [doinc?] is 'r', reverse increment (decrement). # -ver=3.0.2 +ver=3.0.4 rel=1 tmped=/tmp/edver.tmp tmpspec=/tmp/edspec.tmp @@ -198,10 +198,11 @@ q fi cmdc="ialarms.c icmd.c iconfig.c ievents.c ifru.c igetevent.c ihealth.c - ilan.c ireset.c isel.c isensor.c iserial.c isol.c iwdt.c - ifruset.c oem_sun.c ipicmg.c ifirewall.c oem_dell.c itsol.c - idcmi.c iseltime.c iuser.c oem_supermicro.c - ifwum.c ihpm.c iekanalyzer.c idiscover.c" + ilan.c ireset.c isel.c isensor.c iserial.c isol.c iwdt.c itsol.c + ifruset.c ipicmg.c ifirewall.c idcmi.c iuser.c iseltime.c + oem_intel.c oem_kontron.c oem_dell.c oem_hp.c oem_sun.c oem_asus.c + oem_fujitsu.c oem_lenovo.c oem_newisys.c oem_quanta.c oem_supermicro.c + iekanalyzer.c ifwum.c ihpm.c idiscover.c" if [ $skipinc -ne 1 ] then @@ -214,7 +215,8 @@ then echo $utilc >$cmdf cd util - echo " ipmiutil-$ver contains:" >$relnote + # echo " ipmiutil-$ver contains:" >$relnote + num=0 for f in $utilc do fver=`grep "progver = " $f |cut -f2 -d'=' |cut -f2 -d'"'` @@ -222,23 +224,23 @@ then fver2=`echo $fver |cut -f2 -d'.'` if [ $reverseinc -eq 1 ] then - fvernew=${fver1}.`expr $fver2 - 1` + fvernew=${fver1}.`expr $fver2 - 1` else - # fvernew=${fver1}.`expr $fver2 + 1` - # use the specified version from above - fvernew=${v12}${v3} + # fvernew=${fver1}.`expr $fver2 + 1` + # use the specified version from above + fvernew=${v12}${v3} fi tmpf=/tmp/$f.new tag=`grep "progname = " $f |cut -f2 -d'=' |cut -f2 -d'"'` alias=`grep "int argc" $f |head -n1 |cut -f1 -d'(' |awk '{print $2}' |sed -e 's/i_/ipmiutil /'` if [ "$f" = "ipmi_port.c" ]; then do_incr=0 - tag=ipmi_port - alias=ipmi_port + tag=ipmi_port + alias=ipmi_port elif [ "$f" = "iseltime.c" ]; then - alias=iseltime + alias=iseltime elif [ "$f" = "ifruset.c" ]; then - alias=ifruset + alias=ifruset elif [ "$f" = "idiscover.c" ]; then do_incr=0 elif [ "$f" = "iekanalyzer.c" ]; then @@ -250,23 +252,23 @@ then else do_incr=1 fi + num=`expr $num + 1` f1=`echo $f |cut -f1 -d'.'` - if [ $do_incr -eq 0 ] - then + if [ $do_incr -eq 0 ]; then # don't update the version fvernew=$fver echo "$tag progver: $fvernew" - echo " $tag ($alias) ver $fvernew" >>$relnote + # echo " $tag ($alias) ver $fvernew" >>$relnote else # update the version automatically - echo "$tag progver: $fvernew" - echo " $tag ($alias) ver $fvernew" >>$relnote sed -e "s/progver = .${fver}/progver = \"${fvernew}/" $f >$tmpf cp -f $tmpf $f + echo "$tag progver: $fvernew" + # echo " $tag ($alias) ver $fvernew" >>$relnote fi done cd .. - cat $relnote >>ChangeLog + # cat $relnote >>ChangeLog fi echo "" diff --git a/util/AnsiTerm.cpp b/util/AnsiTerm.cpp index 750fd52..956ec98 100644 --- a/util/AnsiTerm.cpp +++ b/util/AnsiTerm.cpp @@ -1774,7 +1774,8 @@ CAnsiTerm::ProcessSGR(void) break; default: - assert(false); + dbglog("ERROR: bad SGR param %d (0x%02x)\n",index,index); + m_Attribute = kDefaultAttribute; break; } } @@ -1798,6 +1799,7 @@ CAnsiTerm::ProcessSM(void) { case 0: default: + dbglog("ERROR: bad private SM param %d\n",m_Parameters[0]); assert(false); break; case DECCKM: @@ -1846,8 +1848,9 @@ CAnsiTerm::ProcessSM(void) { case 20: m_bLineFeedNewLineMode = true; break; // LNM default: - dbglog("ProcessSM: param %d != 20\n",m_Parameters[0]); - assert(false); break; + dbglog("ProcessSM: param %d != 20\n",m_Parameters[0]); + assert(false); + break; } } } diff --git a/util/ialarms.c b/util/ialarms.c index 3b73885..7260356 100644 --- a/util/ialarms.c +++ b/util/ialarms.c @@ -75,7 +75,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* * Global variables */ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "ialarms"; static char fdebug = 0; static char fbmctam = 0; diff --git a/util/icmd.c b/util/icmd.c index 2f62b00..ec467e7 100644 --- a/util/icmd.c +++ b/util/icmd.c @@ -78,7 +78,7 @@ extern void ipmi_lan_set_timeout(int ipmito, int tries, int pingto); /* * Global variables */ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "icmd"; static char fdebug = 0; static char fquiet = 0; diff --git a/util/iconfig.c b/util/iconfig.c index d29dd8f..f7b9972 100644 --- a/util/iconfig.c +++ b/util/iconfig.c @@ -172,7 +172,7 @@ typedef struct /* * Global variables */ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "iconfig"; static char fdebug = 0; static char fipmilan = 0; diff --git a/util/idcmi.c b/util/idcmi.c index 9382aa7..0cce3c0 100644 --- a/util/idcmi.c +++ b/util/idcmi.c @@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "idcmi.h" static char * progname = "idcmi"; -static char * progver = "3.03"; +static char * progver = "3.04"; extern char fdebug; /*from ipmicmd.c*/ static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; diff --git a/util/ievents.c b/util/ievents.c index dc49508..10b665b 100644 --- a/util/ievents.c +++ b/util/ievents.c @@ -76,7 +76,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define SELprintf printf #define SMS_SA 0x41 #define SMI_SA 0x21 -static char *progver = "3.03"; +static char *progver = "3.04"; static char *progname = "ievents"; static char fsensdesc = 0; /* 1= get extended sensor descriptions*/ static char fcanonical = 0; /* 1= show canonical, delimited output*/ @@ -1595,20 +1595,21 @@ int decode_sel_entry( uchar *pevt, char *outbuf, int szbuf) char fhave_sdr = 0; char mdesc[80]; /*used for oem memory description*/ int msz; + char *mfgstr; + int mfg; if (outbuf == NULL) return(ERR_BAD_PARAM); if (pevt == NULL) { outbuf[0] = 0; return(ERR_BAD_PARAM); } - get_mfgid(&vend,&prod); /*saved from ipmi_getdeviceid */ + get_mfgid(&vend,&prod); /*saved from ipmi_getdeviceid */ psel = (SEL_RECORD *)pevt; j = decode_sel_oem(vend,pevt,outbuf,szbuf,fsensdesc,fdebug); if (j == 0) return(0); /*successful, have the description*/ if (psel->record_type == RT_OEMIU) { /* 0xDB usu ipmiutil OEM string */ - int ix = 0; /* ipmiutil OEM event with 9-byte string */ pc = (uchar *)&psel->generator_id; /* offset 7 */ evtime = (uchar *)&psel->timestamp; @@ -1616,9 +1617,9 @@ int decode_sel_entry( uchar *pevt, char *outbuf, int szbuf) (evtime[2] << 16) + (evtime[3] << 24); fmt_time(eventTime, timebuf, sizeof(timebuf)); if (fcanonical) - sprintf(outbuf,"%04x %c %s %c %s %c %02x %c %06x %c %s %c OEM Event ", - psel->record_id, bdelim, timebuf, bdelim, - get_sev_str(sev), bdelim, psel->record_type, bdelim); + sprintf(outbuf,"%04x %c %s %c %s %c %02x %c OEM Event ", + psel->record_id, bdelim, timebuf, bdelim, + get_sev_str(sev), bdelim, psel->record_type, bdelim); else sprintf(outbuf,"%04x %s %s %02x OEM Event ", psel->record_id, timebuf, get_sev_str(sev), @@ -1633,8 +1634,6 @@ int decode_sel_entry( uchar *pevt, char *outbuf, int szbuf) outbuf[j++] = 0; } else if (psel->record_type == 0xDC) { /* OEM Record: these are usually Microsoft */ - char *mfgstr; - int mfg; evtime = (uchar *)&psel->timestamp; eventTime = evtime[0] + (evtime[1] << 8) + (evtime[2] << 16) + (evtime[3] << 24); @@ -1659,8 +1658,6 @@ int decode_sel_entry( uchar *pevt, char *outbuf, int szbuf) outbuf[j++] = '\n'; outbuf[j++] = 0; } else if (psel->record_type == 0xDD) { /* usu Intel OEM string */ - char *mfgstr; - int mfg; int ix = 0; /* Windows reboot reason string from MS ipmidrv.sys */ evtime = (uchar *)&psel->timestamp; diff --git a/util/ifirewall.c b/util/ifirewall.c index e3e7626..719d2b8 100644 --- a/util/ifirewall.c +++ b/util/ifirewall.c @@ -64,7 +64,7 @@ /* global variables */ static char * progname = "ifirewall"; -static char * progver = "3.03"; +static char * progver = "3.04"; static char fdebug = 0; static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; diff --git a/util/ifru.c b/util/ifru.c index 6c3573c..c91fab2 100644 --- a/util/ifru.c +++ b/util/ifru.c @@ -116,7 +116,7 @@ extern int ipmi_kontronoem_main(void * intf, int argc, char ** argv); #endif static char *progname = "ifru"; -static char *progver = "3.03"; +static char *progver = "3.04"; static int vend_id = 0; static int prod_id = 0; static char fdebug = 0; diff --git a/util/ifruset.c b/util/ifruset.c index b62d885..d24b089 100644 --- a/util/ifruset.c +++ b/util/ifruset.c @@ -106,7 +106,7 @@ extern void fmt_time(time_t etime, char *buf, int bufsz); /*see ievents.c*/ #define IPROD_OEM 7 static char *progname = "ifruset"; -static char *progver = "3.03"; +static char *progver = "3.04"; static char fdebug = 0; static char fpicmg = 0; static char fonlybase = 0; diff --git a/util/igetevent.c b/util/igetevent.c index 9f8a2c0..40c5e4a 100644 --- a/util/igetevent.c +++ b/util/igetevent.c @@ -169,7 +169,7 @@ extern void free_sdr_cache(uchar *pret); /*see isensor.c*/ * Global variables */ static char * progname = "igetevent"; -static char * progver = "3.03"; +static char * progver = "3.04"; static char fdebug = 0; static char fipmilan = 0; static char frunonce = 0; diff --git a/util/ihealth.c b/util/ihealth.c index be5c57a..974fa95 100644 --- a/util/ihealth.c +++ b/util/ihealth.c @@ -82,7 +82,7 @@ extern int oem_supermicro_get_firmware_str(char *pstr, int sz); /*oem_supermicro * Global variables */ static char * progname = "ihealth"; -static char * progver = "3.03"; +static char * progver = "3.04"; static char fdebug = 0; static char fipmilan = 0; static char fcanonical = 0; diff --git a/util/ilan.c b/util/ilan.c index 6451ba8..6f63fe5 100644 --- a/util/ilan.c +++ b/util/ilan.c @@ -305,8 +305,8 @@ extern char *get_sensor_type_desc (uchar stype); /*from ievents.c */ /* * Global variables */ -static char *progver = "3.03"; -static char *progname = "ilan"; +static char * progname = "ilan"; +static char * progver = "3.04"; static char fdebug = 0; static char fipmilan = 0; static char fIPMI10 = 0; /* =1 if IPMI v1.0 or less */ @@ -4058,15 +4058,14 @@ PefDesc (int idx, uchar stype) #ifdef METACOMMAND -int -i_lan (int argc, char **argv) +int i_lan(int argc, char **argv) #else #ifdef WIN32 int __cdecl #else int #endif -main (int argc, char **argv) +main(int argc, char **argv) #endif { int ret; diff --git a/util/ipicmg.c b/util/ipicmg.c index 8019a3f..e463424 100644 --- a/util/ipicmg.c +++ b/util/ipicmg.c @@ -81,7 +81,7 @@ /* Global data */ static char * progname = "ipicmg"; -static char * progver = "3.03"; +static char * progver = "3.04"; static char fdebug = 0; static char fset_mc = 0; static uint8_t g_bus = PUBLIC_BUS; diff --git a/util/ipmiutil.c b/util/ipmiutil.c index 26b156a..ffddc86 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"; -static char *progver = "3.03"; +static char *progver = "3.04"; // static char fdebug = 0; /*int ipmiutil(int argc, char **argv); */ diff --git a/util/ireset.c b/util/ireset.c index 45133fe..3584cb1 100644 --- a/util/ireset.c +++ b/util/ireset.c @@ -108,7 +108,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* * Global variables */ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "ireset"; static uchar ipmi_maj; static uchar ipmi_min; diff --git a/util/isel.c b/util/isel.c index a1d4fdb..9045d62 100644 --- a/util/isel.c +++ b/util/isel.c @@ -162,7 +162,7 @@ typedef struct #define RDATA_OFFSET 13 //byte offset to the record event data static char *progname = "isel"; -static char *progver = "3.03"; +static char *progver = "3.04"; #ifdef WIN32 #define IDXFILE "sel.idx" static char idxfile[80] = IDXFILE; diff --git a/util/iseltime.c b/util/iseltime.c index 3aa9f27..2f5c7e1 100644 --- a/util/iseltime.c +++ b/util/iseltime.c @@ -78,7 +78,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* * Global variables */ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "iseltime"; static char fdebug = 0; static char fset = 0; diff --git a/util/isensor.c b/util/isensor.c index 3de3d38..69d901f 100644 --- a/util/isensor.c +++ b/util/isensor.c @@ -161,7 +161,7 @@ extern int decode_sensor_fujitsu(uchar *sdr,uchar *reading,char *pstring, extern int decode_sensor_sun(uchar *sdr,uchar *reading,char *pstring, int slen); /*see oem_sun.c*/ extern int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, - int slen); /*see oem_supermicro.c*/ + int slen, int fsimple); /*see oem_supermicro.c*/ extern int decode_sensor_quanta(uchar *sdr,uchar *reading,char *pstring, int slen); /*see oem_quanta.c*/ extern int decode_sensor_dell(uchar *sdr,uchar *reading,char *pstring, @@ -255,7 +255,7 @@ char *decode_entity_id(int id) { * Global Data ************************/ static char *progname = "isensor"; -static char *progver = "3.03"; +static char *progver = "3.04"; #ifdef WIN32 static char savefile[] = "%ipmiutildir%\\thresholds.cmd"; #else @@ -1952,7 +1952,7 @@ int decode_oem_sensor(uchar *sdr,uchar *reading,char *pstring,int slen) case VENDOR_MAGNUM: case VENDOR_SUPERMICRO: case VENDOR_SUPERMICROX: - rv = decode_sensor_supermicro(sdr, reading, pstring, slen); + rv = decode_sensor_supermicro(sdr, reading, pstring, slen, fsimple); break; case VENDOR_QUANTA: rv = decode_sensor_quanta(sdr, reading, pstring, slen); diff --git a/util/iserial.c b/util/iserial.c index 8bed75c..a087614 100644 --- a/util/iserial.c +++ b/util/iserial.c @@ -155,7 +155,7 @@ typedef struct /* * Global variables */ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "iserial"; static int vend_id = 0; static int prod_id = 0; diff --git a/util/isol.c b/util/isol.c index 8bd5a2f..fab0994 100644 --- a/util/isol.c +++ b/util/isol.c @@ -165,7 +165,7 @@ void dbglog( char *pattn, ... ); /*local prototype*/ /* * Global variables */ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "isol"; static char fdebug = 0; static char fpicmg = 0; diff --git a/util/itsol.c b/util/itsol.c index 8d5ba1b..6997ffe 100644 --- a/util/itsol.c +++ b/util/itsol.c @@ -98,7 +98,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz); extern int verbose; extern char fdebug; /*from ipmicmd.c*/ static char * progname = "itsol"; -static char * progver = "3.03"; +static char * progver = "3.04"; static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; static uchar g_lun = BMC_LUN; diff --git a/util/iuser.c b/util/iuser.c index 7cbe661..e6a7b29 100644 --- a/util/iuser.c +++ b/util/iuser.c @@ -57,7 +57,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* global variables */ static char * progname = "iuser"; -static char * progver = "3.03"; +static char * progver = "3.04"; static char fdebug = 0; static char fcanonical = 0; static char bdelim = '|'; @@ -69,10 +69,12 @@ extern int verbose; /*see ipmilanplus.c*/ extern void lprintf(int level, const char * format, ...); /*ipmilanplus.c*/ -int GetUserInfo(uchar unum, uchar chan, uchar *enab, uchar *priv, char *uname, char fdebug); +/* from ilan.c */ +char *parse_priv(uchar c); +int DisableUser (int unum, uchar chan); int SetPasswd(int unum, char *uname, char *upswd, uchar chan, uchar priv); int GetBmcEthDevice(uchar lan_parm, uchar *pchan); -char *parse_priv(uchar c); +int GetUserInfo(uchar unum, uchar chan, uchar *enab, uchar *priv, char *uname, char fdebug); static void printf_user_usage(void) { diff --git a/util/iwdt.c b/util/iwdt.c index 820d57b..13253b3 100644 --- a/util/iwdt.c +++ b/util/iwdt.c @@ -100,7 +100,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* * Global variables */ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "iwdt"; static char fdebug = 0; static char fdontlog = 0; diff --git a/util/oem_asus.c b/util/oem_asus.c index 24226b9..cd5c01e 100644 --- a/util/oem_asus.c +++ b/util/oem_asus.c @@ -60,8 +60,8 @@ extern uchar bitnum(ushort value); /*isensor.c*/ extern char fdebug; /*ipmicmd.c*/ void set_loglevel(int level); /*prototype */ -static char * progver = "3.02"; -static char * progname = "ioemasus"; +static char * progname = "iasusoem"; +static char * progver = "3.04"; static int verbose = 0; static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; diff --git a/util/oem_dell.c b/util/oem_dell.c index f8caf9a..4f9a7ab 100644 --- a/util/oem_dell.c +++ b/util/oem_dell.c @@ -132,7 +132,7 @@ char NIC_Selection_Mode_String_12g[] [50] = { "shared with failover all loms" }; -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "idelloem"; static int verbose = 0; static char fdebug = 0; @@ -4476,10 +4476,9 @@ static int ipmi_print_power_cap(void* intf,uint8_t unit ) tempbtuphrconv=watt_to_btuphr_conversion(ipmipowercap.PowerCap); printf ("Power cap : %ld BTU/hr\n",tempbtuphrconv); }else{ - - printf ("Maximum power: %ld Watt\n",ipmipowercap.MaximumPowerConsmp); - printf ("Minimum power: %ld Watt\n",ipmipowercap.MinimumPowerConsmp); - printf ("Power cap : %ld Watt\n",ipmipowercap.PowerCap); + printf ("Maximum power: %d Watt\n",ipmipowercap.MaximumPowerConsmp); + printf ("Minimum power: %d Watt\n",ipmipowercap.MinimumPowerConsmp); + printf ("Power cap : %d Watt\n",ipmipowercap.PowerCap); } } return rc; @@ -5676,8 +5675,8 @@ char * get_dell_evt_desc(uchar *sel_rec, int *psev) { if(0x51 == version) { - snprintf(tmpdesc, SIZE_OF_DESC, "DIMM %s", ('A'+ data3)); - strcat(desc, tmpdesc); + snprintf(tmpdesc, SIZE_OF_DESC, "DIMM %c", (char)('A'+ data3)); + strcat(desc, tmpdesc); } else if( ((data2 >> 4) > 0x07) && ((data2 >> 4) != 0x0F)) { diff --git a/util/oem_fujitsu.c b/util/oem_fujitsu.c index 362df96..9a4783a 100644 --- a/util/oem_fujitsu.c +++ b/util/oem_fujitsu.c @@ -52,6 +52,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* extern void get_mfgid(int *vend, int *prod); * from ipmicmd.h*/ /* extern int get_lan_options(); * from ipmicmd.h */ +static char * progver = "3.04"; +static char * progname = "ifujitsuoem"; static char fdebug = 0; static char freadok = 1; #define ERRLED 0 /*GEL - red Global Error LED*/ @@ -770,4 +772,11 @@ int decode_sensor_fujitsu(uchar *sdr,uchar *reading,char *pstring, int slen) return(rv); } +#ifdef METACOMMAND +int i_fujitsuoem(int argc, char **argv) +{ + printf("%s ver %s\n", progname,progver); + return(0); +} +#endif /* end oem_fujitsu.c */ diff --git a/util/oem_hp.c b/util/oem_hp.c index b7f7d07..081ea6f 100644 --- a/util/oem_hp.c +++ b/util/oem_hp.c @@ -44,6 +44,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ievents.h" #include "isensor.h" +static char * progver = "3.04"; +static char * progname = "ihpoem"; + static char *redund_str(uchar b) { char *pstr; @@ -153,4 +156,11 @@ void show_oemsdr_hp(uchar *sdr) return; } +#ifdef METACOMMAND +int i_hpoem(int argc, char **argv) +{ + printf("%s ver %s\n", progname,progver); + return(0); +} +#endif /* end oem_hp.c */ diff --git a/util/oem_intel.c b/util/oem_intel.c index 6f61010..bf21ec5 100644 --- a/util/oem_intel.c +++ b/util/oem_intel.c @@ -83,6 +83,8 @@ extern char fdebug; /*ipmicmd.c*/ /* * Global variables */ +static char * progver = "3.04"; +static char * progname = "iinteloem"; static char fRelayBits = 0; static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; @@ -1893,4 +1895,11 @@ void show_enc_leds_intel(uchar val, int numd) else show_enc_leds_i2c(val, numd); } +#ifdef METACOMMAND +int i_inteloem(int argc, char **argv) +{ + printf("%s ver %s\n", progname,progver); + return(0); +} +#endif /* end oem_intel.c */ diff --git a/util/oem_kontron.c b/util/oem_kontron.c index 891075a..b8fedf7 100644 --- a/util/oem_kontron.c +++ b/util/oem_kontron.c @@ -73,6 +73,8 @@ typedef uint32_t socklen_t; #define FRU_TYPE_COMPONENT 0x01 #define FRU_TYPE_BASEBOARD 0x07 +static char * progver = "3.04"; +static char * progname = "ikontronoem"; const struct valstr ktc5520_post[] = { /*from EAS*/ { 0x0003, "Start POST Init" }, { 0x0004, "Check CMOS" }, @@ -1103,4 +1105,11 @@ int decode_sensor_kontron(uchar *sdr,uchar *reading,char *pstring, int slen) return(rv); } +#ifdef METACOMMAND +int i_kontronoem(int argc, char **argv) +{ + printf("%s ver %s\n", progname,progver); + return(0); +} +#endif /* end oem_kontron.c */ diff --git a/util/oem_lenovo.c b/util/oem_lenovo.c index a1162bb..dc15a5d 100644 --- a/util/oem_lenovo.c +++ b/util/oem_lenovo.c @@ -61,8 +61,8 @@ extern uchar bitnum(ushort value); /*isensor.c*/ extern char fdebug; /*ipmicmd.c*/ void set_loglevel(int level); /*prototype */ -static char * progver = "3.02"; -static char * progname = "ioemlenovo"; +static char * progver = "3.04"; +static char * progname = "ilenovooem"; static int verbose = 0; static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; @@ -92,6 +92,7 @@ int decode_sensor_lenovo(uchar *sdr,uchar *reading,char *pstring, int slen) ushort rval; char *pstr = NULL; int b; + int vend, prod; if (sdr == NULL || reading == NULL) return(rv); if (pstring == NULL || slen == 0) return(rv); @@ -103,11 +104,12 @@ int decode_sensor_lenovo(uchar *sdr,uchar *reading,char *pstring, int slen) etype = sdr[13]; rval = reading[2] | ((reading[3] & 0x7f) << 8); b = bitnum(rval); - if (fdebug) printf("oem_lenovo: sensor type=%x evt=%x entity=%x rval=%04x\n", - stype,etype,entity,rval); + get_mfgid(&vend,&prod); /*saved from ipmi_getdeviceid */ + if (fdebug) printf("oem_lenovo: mfg=%04x:%04x sensor type=%x evt=%x entity=%x rval=%04x\n", + vend,prod,stype,etype,entity,rval); switch(stype) { - case 0x07: /* All CPUs */ - if (etype == 0x6F) { + case 0x07: /* CPU sensor type */ + if ((etype == 0x6F) && (entity == 25)) { /*All CPUs*/ switch(b) { case 0x00: pstr = "OK"; break; case 0x02: pstr = "BIST_Fail"; break; @@ -118,6 +120,28 @@ int decode_sensor_lenovo(uchar *sdr,uchar *reading,char *pstring, int slen) } rv = 0; } + else if ((etype == 0x6F) && (entity == 3)) { /*CPU status*/ + /* Special CPU status reported on IBM/Lenovo */ + switch(rval) { + case 0x00: pstr = "Absent"; break; + case 0x80: pstr = "Present"; break; + default: pstr = "Error"; break; + } + rv = 0; + } + break; + case 0x0C: /* DIMM slot status */ + /* Special DIMM status reported on IBM/Lenovo */ + /* IBM x3650 M2 (0x0002, 0x00dc) and + * Lenovo x3650 M4 (0x4f4d, 0x0143) */ + if (etype == 0x6F) { + switch(rval) { + case 0x00: pstr = "Absent"; break; + case 0x40: pstr = "Present"; break; + default: pstr = "Error"; break; + } + rv = 0; + } break; case 0x0D: /* Disk Drive slots */ if (etype == 0x6F) { @@ -204,6 +228,7 @@ int decode_sensor_lenovo(uchar *sdr,uchar *reading,char *pstring, int slen) rv = 0; } break; + default: break; } if (rv == 0) snprintf(pstring,slen,"%s",pstr); diff --git a/util/oem_newisys.c b/util/oem_newisys.c index dd4d759..6b21e1b 100644 --- a/util/oem_newisys.c +++ b/util/oem_newisys.c @@ -43,6 +43,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ipmicmd.h" #include "ievents.h" +static char * progver = "3.04"; +static char * progname = "inewisysoem"; static char fdebug = 0; static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; @@ -126,4 +128,11 @@ int decode_sel_newisys(uchar *evt, char *outbuf, int outsz, char fdesc, return rv; } +#ifdef METACOMMAND +int i_newisysoem(int argc, char **argv) +{ + printf("%s ver %s\n", progname,progver); + return(0); +} +#endif /* end oem_newisys.c */ diff --git a/util/oem_quanta.c b/util/oem_quanta.c index a0ee3bb..a6cfd6a 100644 --- a/util/oem_quanta.c +++ b/util/oem_quanta.c @@ -45,6 +45,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. extern int decode_sensor_intel_nm(uchar *sdr,uchar *reading, char *pstring,int slen); /*oem_intel.c*/ +static char * progver = "3.04"; +static char * progname = "iquantaoem"; static char fdbg = 0; /* @@ -139,4 +141,11 @@ int decode_sel_quanta(uchar *evt, char *outbuf, int outsz, char fdesc, return(rv); } +#ifdef METACOMMAND +int i_quantaoem(int argc, char **argv) +{ + printf("%s ver %s\n", progname,progver); + return(0); +} +#endif /* end oem_quanta.c */ diff --git a/util/oem_sun.c b/util/oem_sun.c index 1d25301..8aa211b 100644 --- a/util/oem_sun.c +++ b/util/oem_sun.c @@ -109,7 +109,7 @@ static const struct valstr sunoem_led_mode_optvals[] = { /* global variables */ static char * progname = "isunoem"; -static char * progver = "3.03"; +static char * progver = "3.04"; static char fdebug = 0; static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; diff --git a/util/oem_supermicro.c b/util/oem_supermicro.c index 165bf88..a480b7f 100644 --- a/util/oem_supermicro.c +++ b/util/oem_supermicro.c @@ -68,7 +68,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. void set_loglevel(int level); /*prototype */ extern char fsm_debug; /*mem_if.c*/ -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "ismcoem"; static int verbose = 0; static char fdebug = 0; @@ -414,7 +414,8 @@ int decode_threshold_supermicro(uchar rval, uchar *thresh) * non-zero otherwise, to use default interpretations. * pstring = contains the sensor reading interpretation string (if rv==0) */ -int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen) +int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen, + int fsimple) { int i, rv = -1; uchar stype, etype, snum; @@ -455,7 +456,9 @@ int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen) sdr01 = (SDR01REC *)sdr; val = RawToFloat(reading[0],sdr); typestr = get_unit_type(sdr01->sens_units,sdr01->sens_base,sdr01->sens_mod, 0); - snprintf(pstring, slen, "%s %.2f %s",pstr,val,typestr); + if (fsimple) + snprintf(pstring, slen, "%s | %.2f %s",pstr,val,typestr); + else snprintf(pstring, slen, "%s %.2f %s",pstr,val,typestr); return(rv); } switch(stype) { diff --git a/util/oem_supermicro.h b/util/oem_supermicro.h index daf08d6..c8f9147 100644 --- a/util/oem_supermicro.h +++ b/util/oem_supermicro.h @@ -48,7 +48,7 @@ int oem_supermicro_get_lan_port(uchar *val); int oem_supermicro_set_lan_port(uchar val); char *oem_supermicro_lan_port_string(uchar val); -int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen); +int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen, int fsimple); int decode_mem_supermicro(int prod, uchar b2, uchar b3, char *desc, int *psz); int decode_sel_supermicro(uchar *evt, char *outbuf, int outsz, char fdesc, char fdebug); |