This commit was manufactured by cvs2svn to create tag 'IPMITOOL_1_5_8'.

hex strings on solaris

ipmitool/AUTHORS

@@ -0,0 +1,3 @@
+Duncan Laurie <duncan@sun.com>
+Fredrik <20>hrn <ohrn@chl.chalmers.se>
+Jon Cassorla <jon.cassorla@newisys.com>

ipmitool/ChangeLog

@@ -0,0 +1,46 @@
+version 1.5.8
+	* Enable static compilation of interfaces
+	* Fix types to be 64-bit safe
+	* Fix compilation problems on Solaris
+	* Fix multiple big-endian problems for Solaris/SPARC
+	* Fix channel access to save settings to NVRAM
+	* Set channel privilege limit to ADMIN during "access on"
+	* Enable gratuitous ARP in bmcautoconf.sh
+	* Add support for Linux kernel panic messages in SEL output
+	* Add support for type 3 SDR records
+
+version 1.5.7
+	* Add IPMIv1.5 eratta fixes
+	* Additions to FRU printing and FRU multirecords
+	* Better handling of SDR printing
+	* Contrib scripts for creating rrdtool graphs
+
+version 1.5.6
+	* Fix SEL event decoding for generic events
+	* Handle empty SEL gracefully when doing "sel list"
+	* Fix sdr handling of sensors that do not return a reading
+	* Fix for CSV display of sensor readings/units from Fredrik <20>hrn
+
+version 1.5.5
+	* Add -U option for setting LAN username
+	* Fix -v usage for plugin interfaces
+
+version 1.5.4
+	* Put interface plugin API into library
+	* Fix ipmievd
+
+version 1.5.3
+	* Add -g option to work with grizzly bmc
+
+version 1.5.2
+	* Add support for setting gratuitous arp interval
+
+version 1.5.1
+	* Better SEL support
+	* Fix display bug in SDR list
+
+version 1.5.0
+	* More robust UDP packet handling
+	* Add Intel IMB driver support
+	* Use autoconf/automake/libtool
+

ipmitool/Makefile.am

@@ -32,15 +32,13 @@
 # in the design, construction, operation or maintenance of any nuclear
 # facility.
 
-EXTRA_DIST = ipmitool.spec.in debian/*
+EXTRA_DIST = ipmitool.spec.in AUTHORS COPYING ChangeLog debian/*
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \
 	config.guess config.sub depcomp install-sh ltmain.sh missing \
 	mkinstalldirs config.h.in stamp-h.in $(distdir).tar.gz
 
-SUBDIRS = libltdl lib src include doc
-
-INCLUDES = $(LTDLINCL)
+SUBDIRS = libltdl lib src include doc contrib
 
 dist-hook: ipmitool.spec
 	cp ipmitool.spec $(distdir)

ipmitool/configure.in

@@ -2,8 +2,8 @@ dnl
 dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
-AM_INIT_AUTOMAKE([ipmitool], [1.5.6])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([ipmitool], [1.5.8])
+AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
 
@@ -13,53 +13,37 @@ AC_SUBST(ac_configure_args)
 
 dnl check for programs
 AC_PROG_CC
-AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 AC_CHECK_PROG(SED, sed, sed)
 
-dnl setup libtool and ltdl
+dnl setup libtool
 AC_LIB_LTDL
 AC_LIBTOOL_DLOPEN
 AC_LIBLTDL_CONVENIENCE
 AM_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
-AC_SUBST(LTDLINCL)
+AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
 AC_CONFIG_SUBDIRS(libltdl)
 
-AC_CHECK_LIB([m], [pow], [], [
-	echo "** libm library pow() not found!"
-	exit 1
-	])
-
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(socket, socket, ,
 	[AC_CHECK_LIB(nsl, socket, LIBS="$LIBS -lsocket -lnsl", , -lsocket)])
 
-AC_CHECK_LIB([ltdl], [lt_dlopen], [], [
-	echo "** libltdl library lt_dlopen() not found!"
-	exit 1
-	])
-
 dnl check for headers
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h])
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h])
 
-have_openipmi=no
-AC_CHECK_HEADER([linux/ipmi.h],
-	[have_openipmi=yes],
-	[AC_MSG_WARN([Unable to find OpenIPMI header files])])
-
 dnl check for typedefs, structs, and compiler options
 AC_C_CONST
 AC_C_INLINE
+AC_C_BIGENDIAN
 
 dnl check for lib functions
-AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_STAT
@@ -68,9 +52,20 @@ AC_CHECK_FUNCS([alarm gethostbyname socket select])
 AC_CHECK_FUNCS([memmove memset strchr strdup strerror])
 
 dnl check for byteswap functionality
-AC_CHECK_HEADERS([asm/byteorder.h byteswap.h])
-AC_CHECK_FUNCS([bswap_16 bswap_32])
-AC_C_BIGENDIAN
+AC_CHECK_HEADERS([sys/byteorder.h byteswap.h])
+
+dnl set kernel directory for openipmi header files
+AC_ARG_WITH([kerneldir],
+	[[  --with-kerneldir=DIR    Set kernel path to DIR]],
+	[kerneldir="$withval"],
+	[kerneldir="/usr/src/linux-2.4"])
+CFLAGS="$CFLAGS -I${kerneldir}/include"
+AC_SUBST(CFLAGS)
+
+have_openipmi=no
+AC_CHECK_HEADER([linux/ipmi.h],
+	[have_openipmi=yes],
+	[AC_MSG_WARN([Unable to find OpenIPMI header files])])
 
 if test "x$prefix" = "xNONE"; then
   prefix="$ac_default_prefix"
@@ -89,45 +84,94 @@ AC_ARG_WITH([plugin-path],
 AC_DEFINE_UNQUOTED(PLUGIN_PATH, "$pluginpath", "IPMI interface plugin path")
 AC_SUBST(pluginpath)
 
+STATIC_INTF_LIST=
+STATIC_INTF=
+STATIC_INTF_EXT=
+STATIC_INTF_LIB=
+
+PLUGIN_INTF_LAN=
+STATIC_INTF_LAN=
+LDFLAGS_INTF_LAN=
 AC_ARG_ENABLE([intf-lan],
 	[[  --enable-intf-lan       enable IPMI-over-LAN interface [default=yes]]],
 	[if test "x$enableval" = "xyes"; then
-	    PLUGINS="$PLUGINS lan"
+	    AC_SUBST(INTF_LAN,lan)
+            PLUGIN_INTF_LAN="libintf_lan.la"
+            LDFLAGS_INTF_LAN="-rpath $pluginpath -avoid-version"
+            DYNAMIC_INTF_LIST="lan $DYNAMIC_INTF_LIST" 
+         elif test "x$enableval" = "xstatic"; then
+            AC_SUBST(INTF_LAN,lan)
+            STATIC_INTF_LAN="libintf_lan.la"
+            STATIC_INTF_LIST="lan $STATIC_INTF_LIST"
 	fi],
-	[PLUGINS="$PLUGINS lan"])
+	[AC_SUBST(INTF_LAN,lan)
+         PLUGIN_INTF_LAN="libintf_lan.la"
+         LDFLAGS_INTF_LAN="-rpath $pluginpath -avoid-version"
+         DYNAMIC_INTF_LIST="lan $DYNAMIC_INTF_LIST"
+        ])
+AC_SUBST(PLUGIN_INTF_LAN)
+AC_SUBST(STATIC_INTF_LAN)
+AC_SUBST(LDFLAGS_INTF_LAN)
 
+PLUGIN_INTF_OPEN=
+STATIC_INTF_OPEN=
+LDFLAGS_INTF_OPEN=
 AC_ARG_ENABLE([intf-open],
 	[[  --enable-intf-open      enable OpenIPMI device interface [default=no]]],
 	[if test "x$enableval" = "xyes"; then
 	    if test "x$have_openipmi" = "xyes"; then
-		PLUGINS="$PLUGINS open"
+		AC_SUBST(INTF_OPEN,open)
+                PLUGIN_INTF_OPEN="libintf_open.la"
+                LDFLAGS_INTF_OPEN="-rpath $pluginpath -avoid-version"
+                DYNAMIC_INTF_LIST="open $DYNAMIC_INTF_LIST" 
 	    else
 		echo "** Unable to build OpenIPMI interface support!"
 		exit 1
 	    fi
+         elif test "x$enableval" = "xstatic"; then
+            AC_SUBST(INTF_OPEN,open)
+            STATIC_INTF_OPEN="libintf_open.la"
+            STATIC_INTF_LIST="open $STATIC_INTF_LIST"
 	fi])
+AC_SUBST(PLUGIN_INTF_OPEN)
+AC_SUBST(STATIC_INTF_OPEN)
+AC_SUBST(LDFLAGS_INTF_OPEN)
 
-AC_SUBST(PLUGINS)
+for name in $STATIC_INTF_LIST; do
+        STATIC_INTF="$STATIC_INTF { \"intf_${name}\", ${name}_intf_setup },";
+        STATIC_INTF_EXT="$STATIC_INTF_EXT extern int ${name}_intf_setup(struct ipmi_intf ** intf);";
+        STATIC_INTF_LIB="$STATIC_INTF_LIB \$(top_builddir)/src/plugins/${name}/libintf_${name}.la";
+done
+
+AC_SUBST(STATIC_INTF)
+AC_SUBST(STATIC_INTF_EXT)
+AC_SUBST(STATIC_INTF_LIB)
 
 AC_ARG_ENABLE([ipmievd],
-	[[  --enable-ipmievd        enable IPMI event daemon [default=no]]],,)
-
+	[[  --enable-ipmievd        enable IPMI event daemon [default=no]]],,enable_ipmievd=no)
 AM_CONDITIONAL(IPMIEVD, test "x$enable_ipmievd" = "xyes")
 
 AC_CONFIG_FILES([ipmitool.spec
 		Makefile
 		doc/Makefile
+		contrib/Makefile
 		lib/Makefile
 		include/Makefile
 		include/ipmitool/Makefile
 		src/Makefile
+		src/plugins/ipmi_intf_static.c
 		src/plugins/Makefile
 		src/plugins/lan/Makefile
 		src/plugins/open/Makefile])
 
 AC_OUTPUT
 
-echo
-echo Building $PACKAGE version $VERSION with interface plugins: $PLUGINS
-echo   Plugin Path:  $pluginpath
-echo
+AC_MSG_RESULT([])
+AC_MSG_RESULT([$PACKAGE $VERSION])
+AC_MSG_RESULT([])
+AC_MSG_RESULT([  Interface Path........ : $pluginpath])
+AC_MSG_RESULT([  Static Interfaces..... : $STATIC_INTF_LIST])
+AC_MSG_RESULT([  Dynamic Interfaces.... : $DYNAMIC_INTF_LIST])
+AC_MSG_RESULT([  Build ipmievd......... : $enable_ipmievd])
+AC_MSG_RESULT([])
+

ipmitool/contrib/Makefile.am

@@ -0,0 +1,38 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+# 
+# You acknowledge that this software is not designed or intended for use
+# in the design, construction, operation or maintenance of any nuclear
+# facility.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+EXTRA_DIST		= collect_data.sh create_rrds.sh create_webpage.sh
+

ipmitool/contrib/collect_data.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+#  Copyright (c) 2003 Fredrik Ohrn.  All Rights Reserved.
+#
+#  See the included COPYING file for license details.
+# 
+
+# Edit the variables
+
+hostname=$HOSTNAME
+
+ipmi_cmd="/usr/local/bin/ipmitool -I open"
+rrd_dir="/some/dir/rrd"
+
+# No need to edit below this point.
+
+IFS="
+"
+
+for line in `eval $ipmi_cmd -c sdr list full` ; do
+
+	IFS=,
+
+	split=($line)
+
+	file="$rrd_dir/$hostname-${split[0]}.rrd"
+
+	rrdupdate "$file" "N:${split[1]}"
+done

ipmitool/contrib/create_rrds.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+#  Copyright (c) 2003 Fredrik Ohrn.  All Rights Reserved.
+#
+#  See the included COPYING file for license details.
+#
+
+# Edit the variables
+
+hostname=$HOSTNAME
+
+ipmi_cmd="/usr/local/bin/ipmitool -I open"
+rrd_dir="/some/dir/rrd"
+
+# No need to edit below this point.
+
+IFS="
+"
+
+for line in `eval $ipmi_cmd -c -v sdr list full` ; do
+
+	IFS=,
+
+	split=($line)
+
+	file="$rrd_dir/$hostname-${split[0]}.rrd"
+
+	if [ -e "$file" ] ; then
+		echo "Skipping existing file $file"
+		continue
+	fi
+
+	echo "Creating file $file"
+
+	rrdtool create "$file" \
+		--step 300 DS:var:GAUGE:900:${split[16]}:${split[17]} \
+		RRA:AVERAGE:0.5:1:288 \
+		RRA:AVERAGE:0.5:6:336 \
+		RRA:AVERAGE:0.5:12:720
+done

ipmitool/contrib/create_webpage.sh

@@ -0,0 +1,191 @@
+#!/bin/bash
+#
+#  Copyright (c) 2003 Fredrik Ohrn.  All Rights Reserved.
+#
+#  See the included COPYING file for license details.
+#
+
+# Edit the variables
+
+hostname=$HOSTNAME
+
+ipmi_cmd="/usr/local/bin/ipmitool -I open"
+rrd_dir="/some/dir/rrd"
+
+# Full path to the rrdcgi executable.
+rrdcgi=/usr/local/bin/rrdcgi
+
+# Where should rrdcgi store the graphs? This path must be within the
+# document root and writable by the webserver user.
+img_dir=/usr/local/apache2/htdocs/images/graphs
+
+# Where will the graphs show up on the webserver?
+web_dir=/images/graphs
+
+# No need to edit below this point.
+
+color[0]="0000FF"
+color[1]="00FF00"
+color[2]="FF0000"
+color[3]="FFFF00"
+color[4]="FF00FF"
+color[5]="00FFFF"
+color[6]="4444AA"
+color[7]="44AA44"
+color[8]="AA4444"
+color[9]="AAAA44"
+color[10]="AA44AA"
+color[11]="44AAAA"
+
+cat << EOF
+#!$rrdcgi
+<html>
+<head>
+<title>$hostname</title>
+<RRD::GOODFOR 300>
+<body>
+<h2>$hostname</h2>
+EOF
+
+
+IFS="
+"
+
+i=0
+groups=
+
+for line in `eval $ipmi_cmd -c -v sdr list full` ; do
+
+	IFS=,
+
+	split=($line)
+
+	file="$rrd_dir/$hostname-${split[0]}.rrd"
+	group=`echo "${split[2]} ${split[*]:10:6}" | tr ' .-' ___`
+
+	group_color=${group}_color
+
+	if [ -z "${!group}" ] ; then
+		groups="$groups $group"
+
+		declare $group_color=0
+
+		group_unit=${group}_unit
+		declare $group_unit="${split[2]}"
+
+		group_title=${group}_title
+		declare $group_title="${split[5]} / ${split[6]}"
+
+		group_thres=${group}_thres
+		declare $group_thres="${split[10]},${split[11]},${split[12]},${split[13]},${split[14]},${split[15]}"
+	fi
+
+	declare $group="${!group}
+  DEF:var$i=\"$file\":var:AVERAGE LINE1:var$i#${color[${!group_color}]}:\"${split[0]}\""
+
+	declare $group_color=$[ ${!group_color} + 1 ]
+
+	c=$[ c + 1 ]
+	i=$[ i + 1 ]
+done
+
+IFS=" "
+
+for group in $groups ; do
+
+	group_unit=${group}_unit
+	group_title=${group}_title
+	group_thres=${group}_thres
+
+	IFS=,
+
+	split=(${!group_thres})
+
+	thres=
+
+	if [ -n "${split[0]}" ] ; then
+		if [ -n "${split[3]}" ] ; then
+			thres="
+  HRULE:${split[0]}#000000
+  HRULE:${split[3]}#000000:\"Upper & lower non-recoverable thresholds\""
+		else
+			thres="
+  HRULE:${split[0]}#000000:\"Upper non-recoverable threshold\""
+		fi
+	else
+		if [ -n "${split[3]}" ] ; then
+			thres="
+  HRULE:${split[3]}#000000:\"Lower non-recoverable threshold\""
+		fi
+	fi
+
+	if [ -n "${split[1]}" ] ; then
+		if [ -n "${split[4]}" ] ; then
+			thres="$thres
+  HRULE:${split[1]}#FF0000
+  HRULE:${split[4]}#FF0000:\"Upper & lower critical thresholds\""
+		else
+			thres="$thres
+  HRULE:${split[1]}#FF0000:\"Upper critical threshold\""
+		fi
+	else
+		if [ -n "${split[4]}" ] ; then
+			thres="$thres
+  HRULE:${split[4]}#FF0000:\"Lower critical threshold\""
+		fi
+	fi
+
+	if [ -n "${split[2]}" ] ; then
+		if [ -n "${split[5]}" ] ; then
+			thres="$thres
+  HRULE:${split[2]}#FFCC00
+  HRULE:${split[5]}#FFCC00:\"Upper & lower warning thresholds\""
+		else
+			thres="$thres
+  HRULE:${split[2]}#FFCC00:\"Upper warning threshold\""
+		fi
+	else
+		if [ -n "${split[5]}" ] ; then
+			thres="$thres
+  HRULE:${split[5]}#FFCC00:\"Lower warning threshold\""
+		fi
+	fi
+
+
+	cat << EOF
+<h3>${!group_title}</h3>
+<RRD::GRAPH "$img_dir/$hostname-$group-daily.gif"
+  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+  --lazy
+  --height 200
+  --vertical-label "${!group_unit}"
+  --title "Daily graph"
+  --width 576 ${!group} $thres
+>
+<RRD::GRAPH "$img_dir/$hostname-$group-weekly.gif"
+  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+  --lazy
+  --start -7d
+  --height 200
+  --vertical-label "${!group_unit}"
+  --title "Weelky graph"
+  --width 672 ${!group} $thres
+>
+EOF
+#<RRD::GRAPH "$img_dir/$hostname-$group-monthly.gif"
+#  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+#  --lazy
+#  --start -30d
+#  --height 200
+#  --vertical-label "${!group_unit}"
+#  --title "Monthly graph"
+#  --width 720 ${!group} $thres
+#>
+#EOF
+
+done
+
+cat << EOF
+</body>
+</html>
+EOF

ipmitool/debian/changelog

@@ -1,3 +1,26 @@
+ipmitool (1.5.8) unstable; urgency=low
+
+  * Enable static compilation of interfaces
+  * Fix types to be 64-bit safe
+  * Fix compilation problems on Solaris
+  * Fix multiple big-endian problems for Solaris/SPARC
+  * Fix channel access to save settings to NVRAM
+  * Set channel privilege limit to ADMIN during "access on"
+  * Enable gratuitous ARP in bmcautoconf.sh
+  * Add support for Linux kernel panic messages in SEL output
+  * Add support for type 3 SDR records
+
+ -- Duncan Laurie <duncan@sun.com>  Tue, 27 Jan 2004 16:23:25 -0700
+
+ipmitool (1.5.7) unstable; urgency=low
+
+  * add IPMIv1.5 eratta fixes
+  * additions to FRU printing and FRU multirecords
+  * better handling of SDR printing
+  * contrib scripts for creating rrdtool graphs
+
+ -- Duncan Laurie <duncan@sun.com>  Mon,  5 Jan 2004 17:29:50 -0700
+
 ipmitool (1.5.6) unstable; urgency=low
 
   * Fix SEL event decoding for generic events

ipmitool/debian/dirs

@@ -1,3 +1,2 @@
 usr/bin
-usr/lib/ipmitool
 usr/include/ipmitool

ipmitool/debian/rules

@@ -18,9 +18,12 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure --enable-intf-lan --enable-intf-open \
+	./configure --prefix=/usr \
+		    --with-pluginpath=/usr/lib/ipmitool \
+		    --enable-intf-lan=static \
+		    --enable-intf-open=static \
 		    --enable-ipmievd \
-		    --prefix=/usr --mandir=/usr/share/man
+		    --mandir=/usr/share/man
 	touch configure-stamp
 
 #Architecture 

ipmitool/doc/ipmitool.1

@@ -4,7 +4,7 @@
 ipmitool \- utility for controlling IPMI-enabled devices
 .SH "SYNTAX"
 .LP 
-ipmitool [\fB\-ghcvV\fR] \fB\-I\fR \fIlan\fP \fB\-H\fR \fIaddress\fP [\fB\-P\fR \fIpassword\fP] <\fIexpression\fP>
+ipmitool [\fB\-ghcvV\fR] \fB\-I\fR \fIlan\fP \fB\-H\fR \fIhostname\fP [\fB\-P\fR \fIpassword\fP] <\fIexpression\fP>
 .br 
 ipmitool [\fB\-ghcvV\fR] \fB\-I\fR \fIopen\fP <\fIexpression\fP>
 .SH "DESCRIPTION"
@@ -36,6 +36,9 @@ Remote server address, can be IP address or hostname.  This option is required f
 .TP 
 \fB\-P\fR <\fIpassword\fP>
 Remote server password, 16 character maximum.  This is optional for the LAN interface, if it is not provided the session will not be authenticated.
+.TP
+\fB\-U\fR <\fIusername\fP>
+Remote username, default is NULL user.
 .SH "EXPRESSIONS"
 .LP
 .TP
@@ -304,9 +307,7 @@ Once they are loaded there will be a dynamic char device entry that must exist a
 .LP 
 In order to force ipmitool to make use of the device interface you can specifiy it on the command line:
 .PP 
-ipmitool \-I open [option...]
-.LP 
-Alternatively if you do not provide a hostname on the command line ipmitool will assume you want to use the open interface.
+ipmitool \-I open <expression>
 .SH "LAN INTERFACE"
 .LP 
 The ipmitool \fIlan\fP interface communicates with the BMC over an Ethernet LAN connection using UDP under IPv4.  UDP datagrams are formatted to contain IPMI request/response messages with a IPMI session headers and RMCP headers.
@@ -317,7 +318,7 @@ The LAN interface is an authenticatiod multi\-session connection; messages deliv
 .LP 
 You can tell ipmitool to use the lan interface with the \fB\-I\fR option:
 .PP 
-ipmitool \-I lan [option...] <address> [password]
+ipmitool \-I lan \-H <hostname> \-P [password] <expression>
 .LP 
 A hostname \fBmust\fR be given on the command line in order to use the lan interface with ipmitool.  The password field is optional; if you do not provide a password on the command line ipmitool will attempt to connect without authentication.  If you specify a password it will use MD5 authentication if supported by the BMC and straight password/key otherwise.
 .SH "FILES"
@@ -341,8 +342,11 @@ Duncan Laurie <duncan@sun.com>
 .SH "SEE ALSO"
 .LP 
 .TP 
+IPMItool Homepage
+http://ipmitool.sourceforge.net
+.TP 
 Intelligent Platform Management Interface Specification
 http://www.intel.com/design/servers/ipmi/spec.htm
 .TP 
 OpenIPMI project (MontaVista IPMI kernel driver)
-http://openipmi.sourceforge.net/
+http://openipmi.sourceforge.net

ipmitool/include/ipmitool/Makefile.am

@@ -38,5 +38,5 @@ ipmitooldir = $(includedir)/ipmitool
 
 ipmitool_HEADERS = bswap.h helper.h ipmi.h ipmi_intf.h \
 	ipmi_chassis.h ipmi_entity.h ipmi_fru.h ipmi_lanp.h \
-	ipmi_sdr.h ipmi_sel.h ipmi_sol.h ipmi_bmc.h
+	ipmi_sdr.h ipmi_sel.h ipmi_sol.h ipmi_bmc.h ipmi_sensor.h
 

ipmitool/include/ipmitool/bswap.h

@@ -37,19 +37,20 @@
 #ifndef IPMI_BSWAP_H
 #define IPMI_BSWAP_H
 
-#if defined(__sun)
-
-#define BSWAP_16(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
-#define BSWAP_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) |\
-                     (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
 
+#if HAVE_BYTESWAP_H
+# include <byteswap.h>
+# define BSWAP_16(x) bswap_16(x)
+# define BSWAP_32(x) bswap_32(x)
+#elif HAVE_SYS_BYTEORDER_H
+# include <sys/byteorder.h>
 #else
-
-#include <byteswap.h>
-
-#define BSWAP_16(x) bswap_16(x)
-#define BSWAP_32(x) bswap_32(x)
-
+# define BSWAP_16(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+# define BSWAP_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) |\
+                     (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
 #endif
 
 #endif /* IPMI_BSWAP_H */

ipmitool/include/ipmitool/helper.h

@@ -37,14 +37,16 @@
 #ifndef IPMI_HELPER_H
 #define IPMI_HELPER_H
 
+#include <stdint.h>
+
 struct valstr {
-	unsigned char val;
+	unsigned short val;
 	const char * str;
 };
-const char * val2str(unsigned char val, const struct valstr * vs);
+const char * val2str(unsigned short val, const struct valstr * vs);
 
 unsigned short buf2short(unsigned char * buf);
-unsigned long buf2long(unsigned char * buf);
+uint32_t buf2long(unsigned char * buf);
 const char * buf2str(unsigned char * buf, int len);
 void printbuf(unsigned char * buf, int len, char * desc);
 

ipmitool/include/ipmitool/ipmi.h

@@ -39,6 +39,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <netinet/in.h>
 #include <ipmitool/helper.h>
 
@@ -54,9 +55,9 @@ struct ipmi_session {
 	unsigned char authtype;
 	unsigned char authcode[16];
 	unsigned char privlvl;
-	unsigned long in_seq;
-	unsigned long out_seq;
-	unsigned long id;
+	uint32_t in_seq;
+	uint32_t out_seq;
+	uint32_t id;
 	int active;
 };
 
@@ -85,8 +86,8 @@ struct ipmi_rs {
 	int data_len;
 	struct {
 		unsigned char authtype;
-		unsigned long seq;
-		unsigned long id;
+		uint32_t seq;
+		uint32_t id;
 	} session;
 	unsigned char msglen;
 	struct {

ipmitool/include/ipmitool/ipmi_entity.h

@@ -84,5 +84,50 @@ const struct valstr entity_id_vals[] __attribute__((unused)) = {
 	{ 0x00, NULL },
 };
 
+const struct valstr device_type_vals[] __attribute__((unused)) = {
+	{ 0x00, "Reserved" },
+	{ 0x01, "Reserved" },
+	{ 0x02, "DS1624 temperature sensor" },
+	{ 0x03, "DS1621 temperature sensor" },
+	{ 0x04, "LM75 Temperature Sensor" },
+	{ 0x05, "Heceta ASIC" },
+	{ 0x06, "Reserved" },
+	{ 0x07, "Reserved" },
+	{ 0x08, "EEPROM, 24C01" },
+	{ 0x09, "EEPROM, 24C02" },
+	{ 0x0a, "EEPROM, 24C04" },
+	{ 0x0b, "EEPROM, 24C08" },
+	{ 0x0c, "EEPROM, 24C16" },
+	{ 0x0d, "EEPROM, 24C17" },
+	{ 0x0e, "EEPROM, 24C32" },
+	{ 0x0f, "EEPROM, 24C64" },
+	{ 0x1000, "IPMI FRU Inventory" },
+	{ 0x1001, "DIMM Memory ID" },
+	{ 0x1002, "IPMI FRU Inventory" },
+	{ 0x1003, "System Processor Cartridge FRU" },
+	{ 0x11, "Reserved" },
+	{ 0x12, "Reserved" },
+	{ 0x13, "Reserved" },
+	{ 0x14, "PCF 8570 256 byte RAM" },
+	{ 0x15, "PCF 8573 clock/calendar" },
+	{ 0x16, "PCF 8574A I/O Port" },
+	{ 0x17, "PCF 8583 clock/calendar" },
+	{ 0x18, "PCF 8593 clock/calendar" },
+	{ 0x19, "Clock calendar" },
+	{ 0x1a, "PCF 8591 A/D, D/A Converter" },
+	{ 0x1b, "I/O Port" },
+	{ 0x1c, "A/D Converter" },
+	{ 0x1d, "D/A Converter" },
+	{ 0x1e, "A/D, D/A Converter" },
+	{ 0x1f, "LCD Controler/Driver" },
+	{ 0x20, "Core Logic (Chip set) Device" },
+	{ 0x21, "LMC6874 Intelligent Battery controller" },
+	{ 0x22, "Intelligent Batter controller" },
+	{ 0x23, "Combo Management ASIC" },
+	{ 0x24, "Maxim 1617 Temperature Sensor" },
+	{ 0xbf, "Other/Unspecified" },
+	{ 0x00, NULL },
+};
+
 #endif /* IPMI_ENTITY_H */
 

ipmitool/include/ipmitool/ipmi_fru.h

@@ -37,8 +37,13 @@
 #ifndef IPMI_FRU_H
 #define IPMI_FRU_H
 
+#include <stdint.h>
 #include <ipmitool/ipmi.h>
 
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #define GET_FRU_INFO		0x10
 #define GET_FRU_DATA		0x11
 #define SET_FRU_DATA		0x12
@@ -85,14 +90,15 @@ struct fru_area_chassis {
 };
 
 struct fru_area_board {
-	unsigned char	area_ver;
+	unsigned char area_ver;
 	unsigned char area_len;
 	unsigned char lang;
-	unsigned long mfg_date_time;
+	uint32_t mfg_date_time;
 	char * mfg;
 	char * prod;
 	char * serial;
 	char * part;
+	char * fru;
 };
 
 struct fru_area_product {
@@ -105,8 +111,105 @@ struct fru_area_product {
 	char * version;
 	char * serial;
 	char * asset;
+	char * fru;
 };
 
+struct fru_multirec_header {
+#define FRU_RECORD_TYPE_POWER_SUPPLY_INFORMATION 0x00
+#define FRU_RECORD_TYPE_DC_OUTPUT 0x01
+#define FRU_RECORD_TYPE_DC_LOAD 0x02
+#define FRU_RECORD_TYPE_MANAGEMENT_ACCESS 0x03
+#define FRU_RECORD_TYPE_BASE_COMPATIBILITY 0x04
+#define FRU_RECORD_TYPE_EXTENDED_COMPATIBILITY 0x05
+	unsigned char type;
+	unsigned char format;
+	unsigned char len;
+	unsigned char record_checksum;
+	unsigned char header_checksum;
+} __attribute__ ((packed));
+
+struct fru_multirec_powersupply {
+#if WORDS_BIGENDIAN
+	unsigned short capacity;
+#else
+	unsigned short capacity		: 12;
+	unsigned short __reserved1	: 4;
+#endif
+	unsigned short peak_va;
+	unsigned char  inrush_current;
+	unsigned char  inrush_interval;
+	unsigned short lowend_input1;
+	unsigned short highend_input1;
+	unsigned short lowend_input2;
+	unsigned short highend_input2;
+	unsigned char  lowend_freq;
+	unsigned char  highend_freq;
+	unsigned char  dropout_tolerance;
+#if WORDS_BIGENDIAN
+	unsigned char  __reserved2	: 3;
+	unsigned char  tach		: 1;
+	unsigned char  hotswap		: 1;
+	unsigned char  autoswitch	: 1;
+	unsigned char  pfc		: 1;
+	unsigned char  predictive_fail	: 1;
+#else
+	unsigned char  predictive_fail	: 1;
+	unsigned char  pfc		: 1;
+	unsigned char  autoswitch	: 1;
+	unsigned char  hotswap		: 1;
+	unsigned char  tach		: 1;
+	unsigned char  __reserved2	: 3;
+#endif
+	unsigned short peak_cap_ht;
+#if WORDS_BIGENDIAN
+	unsigned char  combined_voltage1 : 4;
+	unsigned char  combined_voltage2 : 4;
+#else
+	unsigned char  combined_voltage2 : 4;
+	unsigned char  combined_voltage1 : 4;
+#endif
+	unsigned short combined_capacity;
+	unsigned char  rps_threshold;
+} __attribute__ ((packed));
+
+static const char * combined_voltage_desc[] __attribute__((unused)) = {
+	"12 V", "-12 V", "5 V", "3.3 V"
+};
+
+struct fru_multirec_dcoutput {
+#if WORDS_BIGENDIAN
+	unsigned char  standby		: 1;
+	unsigned char  __reserved	: 3;
+	unsigned char  output_number	: 4;
+#else
+	unsigned char  output_number	: 4;
+	unsigned char  __reserved	: 3;
+	unsigned char  standby		: 1;
+#endif
+	short nominal_voltage;
+	short max_neg_dev;
+	short max_pos_dev;
+	unsigned short ripple_and_noise;
+	unsigned short min_current;
+	unsigned short max_current;
+} __attribute__ ((packed));
+
+struct fru_multirec_dcload {
+#if WORDS_BIGENDIAN
+	unsigned char  __reserved	: 4;
+	unsigned char  output_number	: 4;
+#else
+	unsigned char  output_number	: 4;
+	unsigned char  __reserved	: 4;
+#endif
+	short nominal_voltage;
+	short min_voltage;
+	short max_voltage;
+	unsigned short ripple_and_noise;
+	unsigned short min_current;
+	unsigned short max_current;
+} __attribute__ ((packed));
+
 static const char * chassis_type_desc[] __attribute__((unused)) = {
 	"Unspecified", "Other", "Unknown",
 	"Desktop", "Low Profile Desktop", "Pizza Box",

ipmitool/include/ipmitool/ipmi_intf.h

@@ -39,6 +39,11 @@
 
 #include <ipmitool/ipmi.h>
 
+struct static_intf {
+	char * name;
+	int (*setup)(struct ipmi_intf ** intf);
+};
+
 int ipmi_intf_init(void);
 void ipmi_intf_exit(void);
 struct ipmi_intf * ipmi_intf_load(char * name);

ipmitool/include/ipmitool/ipmi_sdr.h

@@ -37,6 +37,11 @@
 #ifndef IPMI_SDR_H
 #define IPMI_SDR_H
 
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdint.h>
 #include <math.h>
 #include <ipmitool/bswap.h>
 #include <ipmitool/ipmi.h>
@@ -44,20 +49,24 @@
 int ipmi_sdr_main(struct ipmi_intf *, int, char **);
 int utos(unsigned val, unsigned bits);
 
-#define __TO_TOL(mtol)     (unsigned short)(BSWAP_16(mtol) & 0x3f)
-#define __TO_M(mtol)       (unsigned short)(utos((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
-#define __TO_B(bacc)       (unsigned int)(utos((((BSWAP_32(bacc) & 0xff000000) >> 24) | \
-                           ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
-#define __TO_ACC(bacc)     (unsigned int)(((BSWAP_32(bacc) & 0x3f0000) >> 16) | ((BSWAP_32(bacc) & 0xf000) >> 6))
-#define __TO_ACC_EXP(bacc) (unsigned int)((BSWAP_32(bacc) & 0xc00) >> 10)
-#define __TO_R_EXP(bacc)   (unsigned int)(utos(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
-#define __TO_B_EXP(bacc)   (unsigned int)(utos((BSWAP_32(bacc) & 0xf), 4))
-
-#define CONVERT_RAW(val, m, b, k1, k2)	(float)(((m * val) + (b * pow(10, k1))) * pow(10, k2))
-#define CONVERT_TOL(val, m, k2)		(float)(((m * val) / 2) * pow(10, k2))
-
-#define CONVERT_SENSOR_RAW(sensor, val) (float)(((__TO_M((sensor)->mtol) * val) + (__TO_B((sensor)->bacc) * pow(10, __TO_B_EXP((sensor)->bacc)))) * pow(10, __TO_R_EXP((sensor)->bacc)))
-#define CONVERT_SENSOR_TOL(sensor)	(float)((((__TO_M((sensor)->mtol) * __TO_TOL((sensor)->mtol)) / 2) * pow(10, __TO_R_EXP((sensor)->bacc))))
+#if WORDS_BIGENDIAN
+# define __TO_TOL(mtol)     (unsigned short)(mtol & 0x3f)
+# define __TO_M(mtol)       (unsigned short)(utos((((mtol & 0xff00) >> 8) | ((mtol & 0xc0) << 2)), 10))
+# define __TO_B(bacc)       (unsigned int)(utos((((bacc & 0xff000000) >> 24) | ((bacc & 0xc00000) >> 14)), 10))
+# define __TO_ACC(bacc)     (unsigned int)(((bacc & 0x3f0000) >> 16) | ((bacc & 0xf000) >> 6))
+# define __TO_ACC_EXP(bacc) (unsigned int)((bacc & 0xc00) >> 10)
+# define __TO_R_EXP(bacc)   (unsigned int)(utos(((bacc & 0xf0) >> 4), 4))
+# define __TO_B_EXP(bacc)   (unsigned int)(utos((bacc & 0xf), 4))
+#else
+# define __TO_TOL(mtol)     (unsigned short)(BSWAP_16(mtol) & 0x3f)
+# define __TO_M(mtol)       (unsigned short)(utos((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
+# define __TO_B(bacc)       (unsigned int)(utos((((BSWAP_32(bacc) & 0xff000000) >> 24) | \
+                            ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
+# define __TO_ACC(bacc)     (unsigned int)(((BSWAP_32(bacc) & 0x3f0000) >> 16) | ((BSWAP_32(bacc) & 0xf000) >> 6))
+# define __TO_ACC_EXP(bacc) (unsigned int)((BSWAP_32(bacc) & 0xc00) >> 10)
+# define __TO_R_EXP(bacc)   (unsigned int)(utos(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
+# define __TO_B_EXP(bacc)   (unsigned int)(utos((BSWAP_32(bacc) & 0xf), 4))
+#endif
 
 #define GET_SDR_REPO_INFO	0x20
 #define GET_SDR_ALLOC_INFO	0x21
@@ -73,8 +82,8 @@ struct sdr_repo_info_rs {
 	unsigned char	version;	/* SDR version (51h) */
 	unsigned short	count;		/* number of records */
 	unsigned short	free;		/* free space in SDR */
-	unsigned long	add_stamp;	/* last add timestamp */
-	unsigned long	erase_stamp;	/* last del timestamp */
+	uint32_t	add_stamp;	/* last add timestamp */
+	uint32_t	erase_stamp;	/* last del timestamp */
 	unsigned char	op_support;	/* supported operations */
 } __attribute__ ((packed));
 
@@ -97,8 +106,17 @@ struct sdr_get_rs {
 	unsigned short	next;		/* next record id */
 	unsigned short	id;		/* record ID */
 	unsigned char	version;	/* SDR version (51h) */
-#define SDR_RECORD_TYPE_FULL_SENSOR	0x01
-#define SDR_RECORD_TYPE_COMPACT_SENSOR	0x02
+#define SDR_RECORD_TYPE_FULL_SENSOR		0x01
+#define SDR_RECORD_TYPE_COMPACT_SENSOR		0x02
+#define SDR_RECORD_TYPE_EVENTONLY_SENSOR	0x03
+#define SDR_RECORD_TYPE_ENTITY_ASSOC		0x08
+#define SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC	0x09
+#define SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR	0x10
+#define SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR	0x11
+#define SDR_RECORD_TYPE_MC_DEVICE_LOCATOR	0x12
+#define SDR_RECORD_TYPE_MC_CONFIRMATION		0x13
+#define SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO	0x14
+#define SDR_RECORD_TYPE_OEM			0xc0
 	unsigned char	type;		/* record type */
 	unsigned char	length;		/* remaining record bytes */
 } __attribute__ ((packed));
@@ -106,35 +124,65 @@ struct sdr_get_rs {
 struct sdr_record_compact_sensor {
 	struct {
 		unsigned char	owner_id;
-		unsigned char	lun         : 2,	/* sensor owner lun */
-				__reserved  : 2,
-				channel     : 4;	/* channel number */
+#if WORDS_BIGENDIAN
+		unsigned char	channel     : 4;	/* channel number */
+		unsigned char	__reserved  : 2;
+		unsigned char	lun         : 2;	/* sensor owner lun */
+#else
+		unsigned char	lun         : 2;	/* sensor owner lun */
+		unsigned char	__reserved  : 2;
+		unsigned char	channel     : 4;	/* channel number */
+#endif
 		unsigned char	sensor_num;		/* unique sensor number */
 	} keys;
 
 	struct {
 		unsigned char	id;			/* physical entity id */
-		unsigned char	instance    : 7,	/* instance number */
-				logical     : 1;	/* physical/logical */
+#if WORDS_BIGENDIAN
+		unsigned char	logical     : 1;	/* physical/logical */
+		unsigned char	instance    : 7;	/* instance number */
+#else
+		unsigned char	instance    : 7;	/* instance number */
+		unsigned char	logical     : 1;	/* physical/logical */
+#endif
 	} entity;
 	
 	struct {
 		struct {
-			unsigned char	sensor_scan  : 1,
-					event_gen    : 1,
-					type         : 1,
-					hysteresis   : 1,
-					thresholds   : 1,
-					events       : 1,
-					scanning     : 1,
-				        __reserved   : 1;
+#if WORDS_BIGENDIAN
+			unsigned char	__reserved   : 1;
+			unsigned char	scanning     : 1;
+			unsigned char	events       : 1;
+			unsigned char	thresholds   : 1;
+			unsigned char	hysteresis   : 1;
+			unsigned char	type         : 1;
+			unsigned char	event_gen    : 1;
+			unsigned char	sensor_scan  : 1;
+#else
+			unsigned char	sensor_scan  : 1;
+			unsigned char	event_gen    : 1;
+			unsigned char	type         : 1;
+			unsigned char	hysteresis   : 1;
+			unsigned char	thresholds   : 1;
+			unsigned char	events       : 1;
+			unsigned char	scanning     : 1;
+			unsigned char	__reserved   : 1;
+#endif
 		} init;
 		struct {
-			unsigned char	event_msg    : 2,
-					threshold    : 2,
-					hysteresis   : 2,
-					rearm        : 1,
-					ignore       : 1;
+#if WORDS_BIGENDIAN
+			unsigned char	ignore       : 1;
+			unsigned char	rearm        : 1;
+			unsigned char	hysteresis   : 2;
+			unsigned char	threshold    : 2;
+			unsigned char	event_msg    : 2;
+#else
+			unsigned char	event_msg    : 2;
+			unsigned char	threshold    : 2;
+			unsigned char	hysteresis   : 2;
+			unsigned char	rearm        : 1;
+			unsigned char	ignore       : 1;
+#endif
 		} capabilities;
 		unsigned char	type; /* sensor type */
 	} sensor;
@@ -156,10 +204,17 @@ struct sdr_record_compact_sensor {
 	} mask;
 
 	struct {
-		unsigned char		pct           : 1,
-				modifier      : 2,
-				rate          : 3,
-				analog        : 2;
+#if WORDS_BIGENDIAN
+		unsigned char	analog        : 2;
+		unsigned char	rate          : 3;
+		unsigned char	modifier      : 2;
+		unsigned char	pct           : 1;
+#else
+		unsigned char	pct           : 1;
+		unsigned char	modifier      : 2;
+		unsigned char	rate          : 3;
+		unsigned char	analog        : 2;
+#endif
 		struct {
 			unsigned char	base;
 			unsigned char	modifier;
@@ -167,11 +222,22 @@ struct sdr_record_compact_sensor {
 	} unit;
 
 	struct {
-		unsigned char	count       : 4,
-				mod_type    : 2,
-				__reserved  : 2;
-		unsigned char	mod_offset  : 7,
-				entity_inst : 1;
+#if WORDS_BIGENDIAN
+		unsigned char	__reserved  : 2;
+		unsigned char	mod_type    : 2;
+		unsigned char	count       : 4;
+#else
+		unsigned char	count       : 4;
+		unsigned char	mod_type    : 2;
+		unsigned char	__reserved  : 2;
+#endif
+#if WORDS_BIGENDIAN
+		unsigned char	entity_inst : 1;
+		unsigned char	mod_offset  : 7;
+#else
+		unsigned char	mod_offset  : 7;
+		unsigned char	entity_inst : 1;
+#endif
 	} share;
 
 	struct {
@@ -185,41 +251,125 @@ struct sdr_record_compact_sensor {
 	unsigned char	oem;		/* reserved for OEM use */
 	unsigned char	id_code;	/* sensor ID string type/length code */
 	unsigned char	id_string[16];	/* sensor ID string bytes, only if id_code != 0 */
+} __attribute__ ((packed));
+
+struct sdr_record_eventonly_sensor {
+	struct {
+		unsigned char	owner_id;
+#if WORDS_BIGENDIAN
+		unsigned char	channel     : 4;	/* channel number */
+		unsigned char	fru_owner   : 2;        /* fru device owner lun */
+		unsigned char	lun         : 2;	/* sensor owner lun */
+#else
+		unsigned char	lun         : 2;	/* sensor owner lun */
+		unsigned char	fru_owner   : 2;        /* fru device owner lun */
+		unsigned char	channel     : 4;	/* channel number */
+#endif
+		unsigned char	sensor_num;		/* unique sensor number */
+	} keys;
+
+	struct {
+		unsigned char	id;			/* physical entity id */
+#if WORDS_BIGENDIAN
+		unsigned char	logical     : 1;	/* physical/logical */
+		unsigned char	instance    : 7;	/* instance number */
+#else
+		unsigned char	instance    : 7;	/* instance number */
+		unsigned char	logical     : 1;	/* physical/logical */
+#endif
+	} entity;
+	
+	unsigned char	sensor_type;			/* sensor type */
+	unsigned char	event_type;			/* event/reading type code */
+
+	struct {
+#if WORDS_BIGENDIAN
+		unsigned char	__reserved  : 2;
+		unsigned char	mod_type    : 2;
+		unsigned char	count       : 4;
+#else
+		unsigned char	count       : 4;
+		unsigned char	mod_type    : 2;
+		unsigned char	__reserved  : 2;
+#endif
+#if WORDS_BIGENDIAN
+		unsigned char	entity_inst : 1;
+		unsigned char	mod_offset  : 7;
+#else
+		unsigned char	mod_offset  : 7;
+		unsigned char	entity_inst : 1;
+#endif
+	} share;
+
+	unsigned char	__reserved;
+	unsigned char	oem;		/* reserved for OEM use */
+	unsigned char	id_code;	/* sensor ID string type/length code */
+	unsigned char	id_string[16];	/* sensor ID string bytes, only if id_code != 0 */
 
 } __attribute__ ((packed));
 
 struct sdr_record_full_sensor {
 	struct {
 		unsigned char	owner_id;
-		unsigned char	lun         : 2,	/* sensor owner lun */
-				__reserved  : 2,
-				channel     : 4;	/* channel number */
+#if WORDS_BIGENDIAN
+		unsigned char	channel     : 4;	/* channel number */
+		unsigned char	__reserved  : 2;
+		unsigned char	lun         : 2;	/* sensor owner lun */
+#else
+		unsigned char	lun         : 2;	/* sensor owner lun */
+		unsigned char	__reserved  : 2;
+		unsigned char	channel     : 4;	/* channel number */
+#endif
 		unsigned char	sensor_num;		/* unique sensor number */
 	} keys;
 
 	struct {
 		unsigned char	id;			/* physical entity id */
-		unsigned char	instance    : 7,	/* instance number */
-				logical     : 1;	/* physical/logical */
+#if WORDS_BIGENDIAN
+		unsigned char	logical     : 1;	/* physical/logical */
+		unsigned char	instance    : 7;	/* instance number */
+#else
+		unsigned char	instance    : 7;	/* instance number */
+		unsigned char	logical     : 1;	/* physical/logical */
+#endif
 	} entity;
 
 	struct {
 		struct {
-			unsigned char	sensor_scan  : 1,
-					event_gen    : 1,
-					type         : 1,
-					hysteresis   : 1,
-					thresholds   : 1,
-					events       : 1,
-					scanning     : 1,
-				        __reserved   : 1;
+#if WORDS_BIGENDIAN
+			unsigned char	 __reserved  : 1;
+			unsigned char	scanning     : 1;
+			unsigned char	events       : 1;
+			unsigned char	thresholds   : 1;
+			unsigned char	hysteresis   : 1;
+			unsigned char	type         : 1;
+			unsigned char	event_gen    : 1;
+			unsigned char	sensor_scan  : 1;
+#else
+			unsigned char	sensor_scan  : 1;
+			unsigned char	event_gen    : 1;
+			unsigned char	type         : 1;
+			unsigned char	hysteresis   : 1;
+			unsigned char	thresholds   : 1;
+			unsigned char	events       : 1;
+			unsigned char	scanning     : 1;
+			unsigned char	 __reserved  : 1;
+#endif
 		} init;
 		struct {
-			unsigned char	event_msg    : 2,
-					threshold    : 2,
-					hysteresis   : 2,
-					rearm        : 1,
-					ignore       : 1;
+#if WORDS_BIGENDIAN
+			unsigned char	ignore       : 1;
+			unsigned char	rearm        : 1;
+			unsigned char	hysteresis   : 2;
+			unsigned char	threshold    : 2;
+			unsigned char	event_msg    : 2;
+#else
+			unsigned char	event_msg    : 2;
+			unsigned char	threshold    : 2;
+			unsigned char	hysteresis   : 2;
+			unsigned char	rearm        : 1;
+			unsigned char	ignore       : 1;
+#endif
 		} capabilities;
 		unsigned char	type;
 	} sensor;
@@ -241,10 +391,17 @@ struct sdr_record_full_sensor {
 	} mask;
 
 	struct {
-		unsigned char	pct           : 1,
-				modifier      : 2,
-				rate          : 3,
-				analog        : 2;
+#if WORDS_BIGENDIAN
+		unsigned char	analog        : 2;
+		unsigned char	rate          : 3;
+		unsigned char	modifier      : 2;
+		unsigned char	pct           : 1;
+#else
+		unsigned char	pct           : 1;
+		unsigned char	modifier      : 2;
+		unsigned char	rate          : 3;
+		unsigned char	analog        : 2;
+#endif
 		struct {
 			unsigned char	base;
 			unsigned char	modifier;
@@ -252,16 +409,21 @@ struct sdr_record_full_sensor {
 	} unit;
 
 	unsigned char	linearization;	/* 70h=non linear, 71h-7Fh=non linear, OEM */
-
 	unsigned short	mtol;		/* M, tolerance */
-
-	unsigned long	bacc;		/* accuracy, B, Bexp, Rexp */
+	uint32_t	bacc;		/* accuracy, B, Bexp, Rexp */
 
 	struct {
-		unsigned char	nominal_read  : 1,	/* nominal reading field specified */
-				normal_max    : 1,	/* normal max field specified */
-				normal_min    : 1,	/* normal min field specified */
-				__reserved    : 5;
+#if WORDS_BIGENDIAN
+		unsigned char	__reserved    : 5;
+		unsigned char	normal_min    : 1;	/* normal min field specified */
+		unsigned char	normal_max    : 1;	/* normal max field specified */
+		unsigned char	nominal_read  : 1;	/* nominal reading field specified */
+#else
+		unsigned char	nominal_read  : 1;	/* nominal reading field specified */
+		unsigned char	normal_max    : 1;	/* normal max field specified */
+		unsigned char	normal_min    : 1;	/* normal min field specified */
+		unsigned char	__reserved    : 5;
+#endif
 	} analog_flag;
 
 	unsigned char	nominal_read;	/* nominal reading, raw value */
@@ -292,6 +454,129 @@ struct sdr_record_full_sensor {
 	unsigned char	id_string[16];	/* sensor ID string bytes, only if id_code != 0 */
 } __attribute__ ((packed));
 
+struct sdr_record_fru_device_locator {
+	struct {
+#if WORDS_BIGENDIAN
+		unsigned char __reserved2	: 1;
+		unsigned char dev_access_addr	: 6;
+		unsigned char __reserved1	: 1;
+#else
+		unsigned char __reserved1	: 1;
+		unsigned char dev_access_addr	: 6;
+		unsigned char __reserved2	: 1;
+#endif
+		unsigned char fru_device_id;
+#if WORDS_BIGENDIAN
+		unsigned char logical_dev	: 1;
+		unsigned char __reserved3	: 2;
+		unsigned char access_lun	: 2;
+		unsigned char private_bus	: 3;
+#else
+		unsigned char private_bus	: 3;
+		unsigned char access_lun	: 2;
+		unsigned char __reserved3	: 2;
+		unsigned char logical_dev	: 1;
+#endif
+#if WORDS_BIGENDIAN
+		unsigned char channel_num	: 4;
+		unsigned char __reserved4	: 4;
+#else
+		unsigned char __reserved4	: 4;
+		unsigned char channel_num	: 4;
+#endif
+	} keys;
+
+	unsigned char __reserved;
+	unsigned char device_type;
+	unsigned char device_type_modifier;
+	unsigned char fru_entity_id;
+	unsigned char fru_entity_instance;
+	unsigned char oem;
+	unsigned char id_code;
+	unsigned char id_string[16];
+} __attribute__ ((packed));
+
+struct sdr_record_mc_locator {
+#if WORDS_BIGENDIAN
+	unsigned char dev_slave_addr	: 7;
+	unsigned char __reserved1	: 1;
+#else
+	unsigned char __reserved1	: 1;
+	unsigned char dev_slave_addr	: 7;
+#endif
+#if WORDS_BIGENDIAN
+	unsigned char __reserved2	: 4;
+	unsigned char channel_num 	: 4;
+#else
+	unsigned char channel_num 	: 4;
+	unsigned char __reserved2	: 4;
+#endif
+#if WORDS_BIGENDIAN
+	unsigned char pwr_state_notif	: 3;
+	unsigned char __reserved3	: 1;
+	unsigned char global_init	: 4;
+#else
+	unsigned char global_init	: 4;
+	unsigned char __reserved3	: 1;
+	unsigned char pwr_state_notif	: 3;
+#endif
+	unsigned char dev_support;
+	unsigned char __reserved4[3];
+	struct {
+		unsigned char id;
+		unsigned char instance;
+	} entity;
+	unsigned char oem;
+	unsigned char id_code;
+	unsigned char id_string[16];
+} __attribute__ ((packed));
+
+struct sdr_record_fru_locator {
+#if WORDS_BIGENDIAN
+	unsigned char dev_slave_addr	: 7;
+	unsigned char __reserved1	: 1;
+#else
+	unsigned char __reserved1	: 1;
+	unsigned char dev_slave_addr	: 7;
+#endif
+	unsigned char device_id;
+#if WORDS_BIGENDIAN
+	unsigned char bus		: 3;
+	unsigned char lun		: 2;
+	unsigned char __reserved2	: 2;
+	unsigned char logical		: 1;
+#else
+	unsigned char logical		: 1;
+	unsigned char __reserved2	: 2;
+	unsigned char lun		: 2;
+	unsigned char bus		: 3;
+#endif
+#if WORDS_BIGENDIAN
+	unsigned char __reserved3	: 4;
+	unsigned char channel_num	: 4;
+#else
+	unsigned char channel_num	: 4;
+	unsigned char __reserved3	: 4;
+#endif
+	unsigned char __reserved4;
+	unsigned char dev_type;
+	unsigned char dev_type_modifier;
+	struct {
+		unsigned char id;
+		unsigned char instance;
+	} entity;
+	unsigned char oem;
+	unsigned char id_code;
+	unsigned char id_string[16];
+} __attribute__ ((packed));
+
+struct ipmi_sdr_iterator
+{
+	unsigned short reservation;
+	int total;
+	int next;
+};
+
 /* unit description codes (IPMI v1.5 section 37.16) */
 #define UNIT_MAX	0x90
 static const char * unit_desc[] __attribute__((unused)) = {
@@ -322,4 +607,27 @@ static const char * unit_desc[] __attribute__((unused)) = {
 	"error", "correctable error", "uncorrectable error",
 };
 
+/* sensor type codes (IPMI v1.5 table 36.3) */
+#define SENSOR_TYPE_MAX 0x29
+static const char * sensor_type_desc[] __attribute__((unused)) = {
+	"reserved",
+	"Temperature", "Voltage", "Current", "Fan", "Physical Security", "Platform Security Violation Attempt",
+	"Processor", "Power Supply", "Power Unit", "Cooling Device", "Other", "Memory", "Drive Slot / Bay",
+	"POST Memory Resize", "System Firmware Progress", "Event Logging Disabled", "Watchdog", "System Event",
+	"Critical Interrupt", "Button", "Module / Board", "Microcontroller / Coprocessor", "Add-in Card",
+	"Chassis", "Chip Set", "Other FRU", "Cable / Interconnect", "Terminator", "System Boot Initiated",
+	"Boot Error", "OS Boot", "OS Critical Stop", "Slot / Connector", "System ACPI Power State", "Watchdog",
+	"Platform Alert", "Entity Presence", "Monitor ASIC / IC", "LAN", "Management Subsystem Health", "Battery"
+};
+
+struct ipmi_sdr_iterator * ipmi_sdr_start(struct ipmi_intf * intf);
+struct sdr_get_rs * ipmi_sdr_get_next_header(struct ipmi_intf * intf, struct ipmi_sdr_iterator * i);
+unsigned char * ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header, struct ipmi_sdr_iterator * i);
+void ipmi_sdr_end(struct ipmi_intf * intf, struct ipmi_sdr_iterator * i);
+void ipmi_sdr_print_sdr(struct ipmi_intf * intf, unsigned char type);
+const char * ipmi_sdr_get_status(unsigned char stat);
+float sdr_convert_sensor_reading(struct sdr_record_full_sensor * sensor, unsigned char val);
+struct ipmi_rs * ipmi_sdr_get_sensor_reading(struct ipmi_intf * intf, unsigned char sensor);
+
+
 #endif  /* IPMI_SDR_H */

ipmitool/include/ipmitool/ipmi_sel.h

@@ -37,8 +37,22 @@
 #ifndef IPMI_SEL_H
 #define IPMI_SEL_H
 
+#include <stdint.h>
 #include <ipmitool/ipmi.h>
 
+#define IPMI_CMD_GET_SEL_INFO		0x40
+#define IPMI_CMD_GET_SEL_ALLOC_INFO	0x41
+#define IPMI_CMD_RESERVE_SEL		0x42
+#define IPMI_CMD_GET_SEL_ENTRY		0x43
+#define IPMI_CMD_ADD_SEL_ENTRY		0x44
+#define IPMI_CMD_PARTIAL_ADD_SEL_ENTRY	0x45
+#define IPMI_CMD_DELETE_SEL_ENTRY	0x46
+#define IPMI_CMD_CLEAR_SEL		0x47
+#define IPMI_CMD_GET_SEL_TIME		0x48
+#define IPMI_CMD_SET_SEL_TIME		0x49
+#define IPMI_CMD_GET_AUX_LOG_STATUS	0x5A
+#define IPMI_CMD_SET_AUX_LOG_STATUS	0x5B
+
 enum {
 	IPMI_EVENT_CLASS_DISCRETE,
 	IPMI_EVENT_CLASS_DIGITAL,
@@ -56,13 +70,16 @@ struct sel_get_rq {
 struct sel_event_record {
 	unsigned short	record_id;
 	unsigned char	record_type;
-	unsigned long	timestamp;
+	uint32_t	timestamp;
 	unsigned short	gen_id;
 	unsigned char	evm_rev;
 	unsigned char	sensor_type;
 	unsigned char	sensor_num;
 	unsigned char	event_type : 7;
 	unsigned char	event_dir  : 1;
+#define DATA_BYTE2_SPECIFIED_MASK 0xc0    /* event_data[0] bit mask */
+#define DATA_BYTE3_SPECIFIED_MASK 0x30    /* event_data[0] bit mask */
+#define EVENT_OFFSET_MASK         0x0f    /* event_data[0] bit mask */
 	unsigned char	event_data[3];
 } __attribute__ ((packed));
 
@@ -70,7 +87,7 @@ struct sel_oem_record_ts {
 	unsigned short	next_id;
 	unsigned short	record_id;
 	unsigned char	record_type;
-	unsigned long	timestamp;
+	uint32_t	timestamp;
 	unsigned char	mfg_id[3];
 	unsigned char	oem_defined[6];
 } __attribute__ ((packed));
@@ -82,10 +99,11 @@ struct sel_oem_record_nots {
 	unsigned char	oem_defined[13];
 } __attribute__ ((packed));
 
-
 struct ipmi_event_sensor_types {
 	unsigned char	code;
 	unsigned char	offset;
+#define ALL_OFFSETS_SPECIFIED  0xff
+        unsigned char   data;
 	unsigned char	class;
 	const char	* type;
 	const char	* desc;
@@ -93,269 +111,275 @@ struct ipmi_event_sensor_types {
 
 static struct ipmi_event_sensor_types generic_event_types[] __attribute__((unused)) = {
 	/* Threshold Based States */
-	{ 0x01, 0x00, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Non-critical - going low" },
-	{ 0x01, 0x01, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Non-critical - going high" },
-	{ 0x01, 0x02, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Critical - going low" },
-	{ 0x01, 0x03, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Critical - going high" },
-	{ 0x01, 0x04, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Non-recoverable - going low" },
-	{ 0x01, 0x05, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Non-recoverable - going high" },
-	{ 0x01, 0x06, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Non-critical - going low" },
-	{ 0x01, 0x07, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Non-critical - going high" },
-	{ 0x01, 0x08, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Critical - going low" },
-	{ 0x01, 0x09, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Critical - going high" },
-	{ 0x01, 0x0a, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Non-recoverable - going low" },
-	{ 0x01, 0x0b, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Non-recoverable - going high" },
+	{ 0x01, 0x00, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Non-critical - going low" },
+	{ 0x01, 0x01, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Non-critical - going high" },
+	{ 0x01, 0x02, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Critical - going low" },
+	{ 0x01, 0x03, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Critical - going high" },
+	{ 0x01, 0x04, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Non-recoverable - going low" },
+	{ 0x01, 0x05, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Lower Non-recoverable - going high" },
+	{ 0x01, 0x06, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Non-critical - going low" },
+	{ 0x01, 0x07, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Non-critical - going high" },
+	{ 0x01, 0x08, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Critical - going low" },
+	{ 0x01, 0x09, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Critical - going high" },
+	{ 0x01, 0x0a, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Non-recoverable - going low" },
+	{ 0x01, 0x0b, 0xff, IPMI_EVENT_CLASS_THRESHOLD, "Threshold", "Upper Non-recoverable - going high" },
 	/* DMI-based "usage state" States */
-	{ 0x02, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Usage State", "Transition to Idle" },
-	{ 0x02, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Usage State", "Transition to Active" },
-	{ 0x02, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Usage State", "Transition to Busy" },
+	{ 0x02, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Usage State", "Transition to Idle" },
+	{ 0x02, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Usage State", "Transition to Active" },
+	{ 0x02, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Usage State", "Transition to Busy" },
 	/* Digital-Discrete Event States */
-	{ 0x03, 0x00, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "State Deasserted" },
-	{ 0x03, 0x01, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "State Asserted" },
-	{ 0x04, 0x00, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Predictive Failure Deasserted" },
-	{ 0x04, 0x01, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Predictive Failure Asserted" },
-	{ 0x05, 0x00, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Limit Not Exceeded" },
-	{ 0x05, 0x01, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Limit Exceeded" },
-	{ 0x06, 0x00, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Performance Met" },
-	{ 0x06, 0x01, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Performance Lags" },
+	{ 0x03, 0x00, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "State Deasserted" },
+	{ 0x03, 0x01, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "State Asserted" },
+	{ 0x04, 0x00, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Predictive Failure Deasserted" },
+	{ 0x04, 0x01, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Predictive Failure Asserted" },
+	{ 0x05, 0x00, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Limit Not Exceeded" },
+	{ 0x05, 0x01, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Limit Exceeded" },
+	{ 0x06, 0x00, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Performance Met" },
+	{ 0x06, 0x01, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Digital State",  "Performance Lags" },
 	/* Severity Event States */
-	{ 0x07, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to OK" },
-	{ 0x07, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Non-critial from OK" },
-	{ 0x07, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Critical from less severe" },
-	{ 0x07, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Non-recoverable from less severe" },
-	{ 0x07, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Non-critical from more severe" },
-	{ 0x07, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Critical from Non-recoverable" },
-	{ 0x07, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Non-recoverable" },
-	{ 0x07, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Monitor" },
-	{ 0x07, 0x08, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Informational" },
+	{ 0x07, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to OK" },
+	{ 0x07, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Non-critial from OK" },
+	{ 0x07, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Critical from less severe" },
+	{ 0x07, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Non-recoverable from less severe" },
+	{ 0x07, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Non-critical from more severe" },
+	{ 0x07, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Critical from Non-recoverable" },
+	{ 0x07, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Transition to Non-recoverable" },
+	{ 0x07, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Monitor" },
+	{ 0x07, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Severity State", "Informational" },
 	/* Availability Status States */
-	{ 0x08, 0x00, IPMI_EVENT_CLASS_DIGITAL, "Availability State",  "Device Removed/Absent" },
-	{ 0x08, 0x01, IPMI_EVENT_CLASS_DIGITAL, "Availability State",  "Device Inserted/Present" },
-	{ 0x09, 0x00, IPMI_EVENT_CLASS_DIGITAL, "Availability State",  "Device Disabled" },
-	{ 0x09, 0x01, IPMI_EVENT_CLASS_DIGITAL, "Availability State",  "Device Enabled" },
-	{ 0x0a, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Running" },
-	{ 0x0a, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to In Test" },
-	{ 0x0a, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Power Off" },
-	{ 0x0a, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to On Line" },
-	{ 0x0a, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Off Line" },
-	{ 0x0a, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Off Duty" },
-	{ 0x0a, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Degraded" },
-	{ 0x0a, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Power Save" },
-	{ 0x0a, 0x08, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Install Error" },
+	{ 0x08, 0x00, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Availability State",  "Device Removed/Absent" },
+	{ 0x08, 0x01, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Availability State",  "Device Inserted/Present" },
+	{ 0x09, 0x00, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Availability State",  "Device Disabled" },
+	{ 0x09, 0x01, 0xff, IPMI_EVENT_CLASS_DIGITAL, "Availability State",  "Device Enabled" },
+	{ 0x0a, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Running" },
+	{ 0x0a, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to In Test" },
+	{ 0x0a, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Power Off" },
+	{ 0x0a, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to On Line" },
+	{ 0x0a, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Off Line" },
+	{ 0x0a, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Off Duty" },
+	{ 0x0a, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Degraded" },
+	{ 0x0a, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Transition to Power Save" },
+	{ 0x0a, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Availability State", "Install Error" },
 	/* Redundancy States */
-	{ 0x0b, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Fully Redundant" },
-	{ 0x0b, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Redundancy Lost" },
-	{ 0x0b, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Redundancy Degraded" },
-	{ 0x0b, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Non-Redundant: Sufficient from Redundant" },
-	{ 0x0b, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Non-Redundant: Sufficient from Insufficient" },
-	{ 0x0b, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Non-Redundant: Insufficient Resources" },
-	{ 0x0b, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Redundancy Degraded from Fully Redundant" },
-	{ 0x0b, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Redundancy Degraded from Non-Redundant" },
+	{ 0x0b, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Fully Redundant" },
+	{ 0x0b, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Redundancy Lost" },
+	{ 0x0b, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Redundancy Degraded" },
+	{ 0x0b, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Non-Redundant: Sufficient from Redundant" },
+	{ 0x0b, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Non-Redundant: Sufficient from Insufficient" },
+	{ 0x0b, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Non-Redundant: Insufficient Resources" },
+	{ 0x0b, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Redundancy Degraded from Fully Redundant" },
+	{ 0x0b, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Redundancy State", "Redundancy Degraded from Non-Redundant" },
 	/* ACPI Device Power States */
-	{ 0x0c, 0x00, IPMI_EVENT_CLASS_DISCRETE, "ACPI Device Power State", "D0 Power State" },
-	{ 0x0c, 0x01, IPMI_EVENT_CLASS_DISCRETE, "ACPI Device Power State", "D1 Power State" },
-	{ 0x0c, 0x02, IPMI_EVENT_CLASS_DISCRETE, "ACPI Device Power State", "D2 Power State" },
-	{ 0x0c, 0x03, IPMI_EVENT_CLASS_DISCRETE, "ACPI Device Power State", "D3 Power State" },
+	{ 0x0c, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "ACPI Device Power State", "D0 Power State" },
+	{ 0x0c, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "ACPI Device Power State", "D1 Power State" },
+	{ 0x0c, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "ACPI Device Power State", "D2 Power State" },
+	{ 0x0c, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "ACPI Device Power State", "D3 Power State" },
 	/* END */
-	{ 0x00, 0x00, 0x00, NULL, NULL },
+	{ 0x00, 0x00, 0xff, 0x00, NULL, NULL },
 };
 
 static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unused)) = {
-	{ 0x00, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Reserved",	NULL },
-	{ 0x01, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Temperature",	NULL },
-	{ 0x02, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Voltage",	NULL },
-	{ 0x03, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Current",	NULL },
-	{ 0x04, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Fan",		NULL },
+	{ 0x00, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Reserved",	NULL },
+	{ 0x01, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Temperature",	NULL },
+	{ 0x02, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Voltage",	NULL },
+	{ 0x03, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Current",	NULL },
+	{ 0x04, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Fan",		NULL },
 
-	{ 0x05, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "General Chassis intrusion" },
-	{ 0x05, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "Drive Bay intrusion" },
-	{ 0x05, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "I/O Card area intrusion" },
-	{ 0x05, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "Processor area intrusion" },
-	{ 0x05, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "System unplugged from LAN" },
-	{ 0x05, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "Unauthorized dock/undock" },
-	{ 0x05, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "FAN area intrusion" },
+	{ 0x05, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "General Chassis intrusion" },
+	{ 0x05, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "Drive Bay intrusion" },
+	{ 0x05, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "I/O Card area intrusion" },
+	{ 0x05, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "Processor area intrusion" },
+	{ 0x05, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "System unplugged from LAN" },
+	{ 0x05, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "Unauthorized dock/undock" },
+	{ 0x05, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Physical Security", "FAN area intrusion" },
 
-	{ 0x06, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Front Panel Lockout violation attempted" },
-	{ 0x06, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Pre-boot password viiolation - user password" },
-	{ 0x06, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Pre-boot password violation - setup password" },
-	{ 0x06, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Pre-boot password violation - network boot password" },
-	{ 0x06, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Other pre-boot password violation" },
-	{ 0x06, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Out-of-band access password violation" },
+	{ 0x06, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Front Panel Lockout violation attempted" },
+	{ 0x06, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Pre-boot password viiolation - user password" },
+	{ 0x06, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Pre-boot password violation - setup password" },
+	{ 0x06, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Pre-boot password violation - network boot password" },
+	{ 0x06, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Other pre-boot password violation" },
+	{ 0x06, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Security", "Out-of-band access password violation" },
 
-	{ 0x07, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Processor", "IERR" },
-	{ 0x07, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Thermal Trip" },
-	{ 0x07, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Processor", "FRB1/BIST failure" },
-	{ 0x07, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Processor", "FRB2/Hang in POST failure" },
-	{ 0x07, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Processor", "FRB3/Processor startup/init failure" },
-	{ 0x07, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Configuration Error" },
-	{ 0x07, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Processor", "SM BIOS Uncorrectable CPU-complex Error" },
-	{ 0x07, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Presence detected" },
-	{ 0x07, 0x08, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Disabled" },
-	{ 0x07, 0x09, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Terminator presence detected" },
+	{ 0x07, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "IERR" },
+	{ 0x07, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Thermal Trip" },
+	{ 0x07, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "FRB1/BIST failure" },
+	{ 0x07, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "FRB2/Hang in POST failure" },
+	{ 0x07, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "FRB3/Processor startup/init failure" },
+	{ 0x07, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Configuration Error" },
+	{ 0x07, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "SM BIOS Uncorrectable CPU-complex Error" },
+	{ 0x07, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Presence detected" },
+	{ 0x07, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Disabled" },
+	{ 0x07, 0x09, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Terminator presence detected" },
 
-	{ 0x08, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Presence detected" },
-	{ 0x08, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Failure detected" },
-	{ 0x08, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Predictive failure" },
-	{ 0x08, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Power Supply AC lost" },
-	{ 0x08, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "AC lost or out-of-range" },
-	{ 0x08, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "AC out-of-range, but present" },
+	{ 0x08, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Presence detected" },
+	{ 0x08, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Failure detected" },
+	{ 0x08, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Predictive failure" },
+	{ 0x08, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Power Supply AC lost" },
+	{ 0x08, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "AC lost or out-of-range" },
+	{ 0x08, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "AC out-of-range, but present" },
 
-	{ 0x09, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Power off/down" },
-	{ 0x09, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Power cycle" },
-	{ 0x09, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "240VA power down" },
-	{ 0x09, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Interlock power down" },
-	{ 0x09, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "AC lost" },
-	{ 0x09, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Soft-power control failure" },
-	{ 0x09, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Failure detected" },
-	{ 0x09, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Predictive failure" },
+	{ 0x09, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Power off/down" },
+	{ 0x09, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Power cycle" },
+	{ 0x09, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "240VA power down" },
+	{ 0x09, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Interlock power down" },
+	{ 0x09, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "AC lost" },
+	{ 0x09, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Soft-power control failure" },
+	{ 0x09, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Failure detected" },
+	{ 0x09, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Predictive failure" },
 
-	{ 0x0a, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Cooling Device", NULL },
-	{ 0x0b, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Other Units-based Sensor", NULL },
+	{ 0x0a, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Cooling Device", NULL },
+	{ 0x0b, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Other Units-based Sensor", NULL },
 
-	{ 0x0c, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Correctable ECC" },
-	{ 0x0c, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Uncorrectable ECC" },
-	{ 0x0c, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Parity" },
-	{ 0x0c, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Memory Scrub Failed" },
-	{ 0x0c, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Memory Device Disabled" },
-	{ 0x0c, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Correctable ECC logging limit reached" },
+	{ 0x0c, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Correctable ECC" },
+	{ 0x0c, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Uncorrectable ECC" },
+	{ 0x0c, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Parity" },
+	{ 0x0c, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Memory Scrub Failed" },
+	{ 0x0c, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Memory Device Disabled" },
+	{ 0x0c, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Correctable ECC logging limit reached" },
 
-	{ 0x0d, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Drive Slot", NULL },
-	{ 0x0e, 0x00, IPMI_EVENT_CLASS_DISCRETE, "POST Memory Resize", NULL },
+	{ 0x0d, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Drive Slot", NULL },
+	{ 0x0e, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "POST Memory Resize", NULL },
 
-	{ 0x0f, 0x00, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Error" },
-	{ 0x0f, 0x01, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Hang" },
-	{ 0x0f, 0x02, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Progress" },
+	{ 0x0f, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Error" },
+	{ 0x0f, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Hang" },
+	{ 0x0f, 0x02, 0x00, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Progress 1" },
+	{ 0x0f, 0x02, 0x01, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Progress 2" },
+	{ 0x0f, 0x02, 0x02, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Progress 3" },
+	{ 0x0f, 0x02, 0x03, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Progress 4" },
+	{ 0x0f, 0x02, 0x04, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "Progress 5" },
+	{ 0x0f, 0x02, 0x13, IPMI_EVENT_CLASS_DISCRETE, "System Firmware", "System Boot Initiated" },
 
-	{ 0x10, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "Correctable memory error logging disabled" },
-	{ 0x10, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "Event logging disabled" },
-	{ 0x10, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "Log area reset/cleared" },
-	{ 0x10, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "All event logging disabled" },
+	{ 0x10, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "Correctable memory error logging disabled" },
+	{ 0x10, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "Event logging disabled" },
+	{ 0x10, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "Log area reset/cleared" },
+	{ 0x10, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "All event logging disabled" },
+	{ 0x10, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Event Logging Disabled", "Log full" },
 
-	{ 0x11, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "BIOS Reset" },
-	{ 0x11, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Reset" },
-	{ 0x11, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Shut Down" },
-	{ 0x11, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Power Down" },
-	{ 0x11, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Power Cycle" },
-	{ 0x11, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS NMI/diag Interrupt" },
-	{ 0x11, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Expired" },
-	{ 0x11, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS pre-timeout Interrupt" },
+	{ 0x11, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "BIOS Reset" },
+	{ 0x11, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Reset" },
+	{ 0x11, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Shut Down" },
+	{ 0x11, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Power Down" },
+	{ 0x11, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Power Cycle" },
+	{ 0x11, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS NMI/diag Interrupt" },
+	{ 0x11, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS Expired" },
+	{ 0x11, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 1", "OS pre-timeout Interrupt" },
 
-	{ 0x12, 0x00, IPMI_EVENT_CLASS_DISCRETE, "System Event", "System Reconfigured" },
-	{ 0x12, 0x01, IPMI_EVENT_CLASS_DISCRETE, "System Event", "OEM System boot event" },
-	{ 0x12, 0x02, IPMI_EVENT_CLASS_DISCRETE, "System Event", "Undetermined system hardware failure" },
-	{ 0x12, 0x03, IPMI_EVENT_CLASS_DISCRETE, "System Event", "Entry added to auxillary log" },
-	{ 0x12, 0x04, IPMI_EVENT_CLASS_DISCRETE, "System Event", "PEF Action" },
-	{ 0x12, 0x05, IPMI_EVENT_CLASS_DISCRETE, "System Event", "Timestamp Clock Sync." },
+	{ 0x12, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Event", "System Reconfigured" },
+	{ 0x12, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Event", "OEM System boot event" },
+	{ 0x12, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Event", "Undetermined system hardware failure" },
+	{ 0x12, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Event", "Entry added to auxillary log" },
+	{ 0x12, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Event", "PEF Action" },
+	{ 0x12, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Event", "Timestamp Clock Sync." },
 
-	{ 0x13, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Front Panel NMI" },
-	{ 0x13, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Timeout" },
-	{ 0x13, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "I/O Channel check NMI" },
-	{ 0x13, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Software NMI" },
-	{ 0x13, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "PCI PERR" },
-	{ 0x13, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "PCI SERR" },
-	{ 0x13, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "EISA failsafe timeout" },
-	{ 0x13, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Correctable error" },
-	{ 0x13, 0x08, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Uncorrectable error" },
-	{ 0x13, 0x09, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Fatal NMI" },
+	{ 0x13, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Front Panel NMI" },
+	{ 0x13, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Timeout" },
+	{ 0x13, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "I/O Channel check NMI" },
+	{ 0x13, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Software NMI" },
+	{ 0x13, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "PCI PERR" },
+	{ 0x13, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "PCI SERR" },
+	{ 0x13, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "EISA failsafe timeout" },
+	{ 0x13, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Correctable error" },
+	{ 0x13, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Uncorrectable error" },
+	{ 0x13, 0x09, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Fatal NMI" },
 
-	{ 0x14, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Button", "Power Button pressed" },
-	{ 0x14, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Button", "Sleep Button pressed" },
-	{ 0x14, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Button", "Reset Button pressed" },
+	{ 0x14, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Button", "Power Button pressed" },
+	{ 0x14, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Button", "Sleep Button pressed" },
+	{ 0x14, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Button", "Reset Button pressed" },
 
-	{ 0x15, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Module/Board", NULL },
-	{ 0x16, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Microcontroller/Coprocessor", NULL },
-	{ 0x17, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Add-in Card", NULL },
-	{ 0x18, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Chassis", NULL },
-	{ 0x19, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Chip Set", NULL },
-	{ 0x1a, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Other FRU", NULL },
-	{ 0x1b, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Cable/Interconnect", NULL },
-	{ 0x1c, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Terminator", NULL },
+	{ 0x15, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Module/Board", NULL },
+	{ 0x16, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Microcontroller/Coprocessor", NULL },
+	{ 0x17, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Add-in Card", NULL },
+	{ 0x18, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Chassis", NULL },
+	{ 0x19, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Chip Set", NULL },
+	{ 0x1a, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Other FRU", NULL },
+	{ 0x1b, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Cable/Interconnect", NULL },
+	{ 0x1c, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Terminator", NULL },
 
-	{ 0x1d, 0x00, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "Initiated by power up" },
-	{ 0x1d, 0x01, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "Initiated by hard reset" },
-	{ 0x1d, 0x02, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "Initiated by warm reset" },
-	{ 0x1d, 0x03, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "User requested PXE boot" },
-	{ 0x1d, 0x04, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "Automatic boot to diagnostic" },
+	{ 0x1d, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "Initiated by power up" },
+	{ 0x1d, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "Initiated by hard reset" },
+	{ 0x1d, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "Initiated by warm reset" },
+	{ 0x1d, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "User requested PXE boot" },
+	{ 0x1d, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System Boot Initiated", "Automatic boot to diagnostic" },
 
-	{ 0x1e, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "No bootable media" },
-	{ 0x1e, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "Non-bootable disk in drive" },
-	{ 0x1e, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "PXE server not found" },
-	{ 0x1e, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "Invalid boot sector" },
-	{ 0x1e, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "Timeout waiting for selection" },
+	{ 0x1e, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "No bootable media" },
+	{ 0x1e, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "Non-bootable disk in drive" },
+	{ 0x1e, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "PXE server not found" },
+	{ 0x1e, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "Invalid boot sector" },
+	{ 0x1e, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Boot Error", "Timeout waiting for selection" },
 
-	{ 0x1f, 0x00, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "A: boot completed" },
-	{ 0x1f, 0x01, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "C: boot completed" },
-	{ 0x1f, 0x02, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "PXE boot completed" },
-	{ 0x1f, 0x03, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "Diagnostic boot completed" },
-	{ 0x1f, 0x04, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "CD-ROM boot completed" },
-	{ 0x1f, 0x05, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "ROM boot completed" },
-	{ 0x1f, 0x06, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "boot completed - device not specified" },
+	{ 0x1f, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "A: boot completed" },
+	{ 0x1f, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "C: boot completed" },
+	{ 0x1f, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "PXE boot completed" },
+	{ 0x1f, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "Diagnostic boot completed" },
+	{ 0x1f, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "CD-ROM boot completed" },
+	{ 0x1f, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "ROM boot completed" },
+	{ 0x1f, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "boot completed - device not specified" },
 
-	{ 0x20, 0x00, IPMI_EVENT_CLASS_DISCRETE, "OS Critical Stop", "Stop during OS load/init" },
-	{ 0x20, 0x01, IPMI_EVENT_CLASS_DISCRETE, "OS Critical Stop", "Run-time stop" },
+	{ 0x20, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Critical Stop", "Stop during OS load/init" },
+	{ 0x20, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Critical Stop", "Run-time stop" },
 
-	{ 0x21, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Fault Status asserted" },
-	{ 0x21, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Identify Status asserted" },
-	{ 0x21, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot/Connector Device installed/attached" },
-	{ 0x21, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot/Connector ready for device installation" },
-	{ 0x21, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot/Connector ready for device removal" },
-	{ 0x21, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot Power is off" },
-	{ 0x21, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot/Connector device removal request" },
-	{ 0x21, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Interlock asserted" },
-	{ 0x21, 0x08, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot is disabled" },
+	{ 0x21, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Fault Status asserted" },
+	{ 0x21, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Identify Status asserted" },
+	{ 0x21, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot/Connector Device installed/attached" },
+	{ 0x21, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot/Connector ready for device installation" },
+	{ 0x21, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot/Connector ready for device removal" },
+	{ 0x21, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot Power is off" },
+	{ 0x21, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot/Connector device removal request" },
+	{ 0x21, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Interlock asserted" },
+	{ 0x21, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Slot/Connector", "Slot is disabled" },
 
-	{ 0x22, 0x00, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S0/G0: working" },
-	{ 0x22, 0x01, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S1: sleeping with system hw & processor context maintained" },
-	{ 0x22, 0x02, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S2: sleeping, processor context lost" },
-	{ 0x22, 0x03, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S3: sleeping, processor & hw context lost, memory retained" },
-	{ 0x22, 0x04, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S4: non-volatile sleep/suspend-to-disk" },
-	{ 0x22, 0x05, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S5/G2: soft-off" },
-	{ 0x22, 0x06, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S4/S5: soft-off" },
-	{ 0x22, 0x07, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "G3: mechanical off" },
-	{ 0x22, 0x08, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "Sleeping in S1/S2/S3 state" },
-	{ 0x22, 0x09, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "G1: sleeping" },
-	{ 0x22, 0x0a, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S5: entered by override" },
-	{ 0x22, 0x0b, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "Legacy ON state" },
-	{ 0x22, 0x0c, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "Legacy OFF state" },
-	{ 0x22, 0x0e, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "Unknown" },
+	{ 0x22, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S0/G0: working" },
+	{ 0x22, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S1: sleeping with system hw & processor context maintained" },
+	{ 0x22, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S2: sleeping, processor context lost" },
+	{ 0x22, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S3: sleeping, processor & hw context lost, memory retained" },
+	{ 0x22, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S4: non-volatile sleep/suspend-to-disk" },
+	{ 0x22, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S5/G2: soft-off" },
+	{ 0x22, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S4/S5: soft-off" },
+	{ 0x22, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "G3: mechanical off" },
+	{ 0x22, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "Sleeping in S1/S2/S3 state" },
+	{ 0x22, 0x09, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "G1: sleeping" },
+	{ 0x22, 0x0a, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "S5: entered by override" },
+	{ 0x22, 0x0b, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "Legacy ON state" },
+	{ 0x22, 0x0c, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "Legacy OFF state" },
+	{ 0x22, 0x0e, 0xff, IPMI_EVENT_CLASS_DISCRETE, "System ACPI Power State", "Unknown" },
 
-	{ 0x23, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Timer expired" },
-	{ 0x23, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Hard reset" },
-	{ 0x23, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Power down" },
-	{ 0x23, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Power cycle" },
-	{ 0x23, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "reserved" },
-	{ 0x23, 0x05, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "reserved" },
-	{ 0x23, 0x06, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "reserved" },
-	{ 0x23, 0x07, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "reserved" },
-	{ 0x23, 0x08, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Timer interrupt" },
+	{ 0x23, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Timer expired" },
+	{ 0x23, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Hard reset" },
+	{ 0x23, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Power down" },
+	{ 0x23, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Power cycle" },
+	{ 0x23, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "reserved" },
+	{ 0x23, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "reserved" },
+	{ 0x23, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "reserved" },
+	{ 0x23, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "reserved" },
+	{ 0x23, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Watchdog 2", "Timer interrupt" },
 
-	{ 0x24, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Platform Alert", "Platform generated page" },
-	{ 0x24, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Platform Alert", "Platform generated LAN alert" },
-	{ 0x24, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Platform Alert", "Platform Event Trap generated" },
-	{ 0x24, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Platform Alert", "Platform generated SNMP trap, OEM format" },
+	{ 0x24, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Alert", "Platform generated page" },
+	{ 0x24, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Alert", "Platform generated LAN alert" },
+	{ 0x24, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Alert", "Platform Event Trap generated" },
+	{ 0x24, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Platform Alert", "Platform generated SNMP trap, OEM format" },
 
-	{ 0x25, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Entity Presence", "Present" },
-	{ 0x25, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Entity Presence", "Absent" },
-	{ 0x25, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Entity Presence", "Disabled" },
+	{ 0x25, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Entity Presence", "Present" },
+	{ 0x25, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Entity Presence", "Absent" },
+	{ 0x25, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Entity Presence", "Disabled" },
 
-	{ 0x26, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Monitor ASIC/IC", NULL },
+	{ 0x26, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Monitor ASIC/IC", NULL },
 
-	{ 0x27, 0x00, IPMI_EVENT_CLASS_DISCRETE, "LAN", "Heartbeat Lost" },
-	{ 0x27, 0x01, IPMI_EVENT_CLASS_DISCRETE, "LAN", "Heartbeat" },
+	{ 0x27, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "LAN", "Heartbeat Lost" },
+	{ 0x27, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "LAN", "Heartbeat" },
 
-	{ 0x28, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Management Subsystem Health", "Sensor access degraded or unavailable" },
-	{ 0x28, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Management Subsystem Health", "Controller access degraded or unavailable" },
-	{ 0x28, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Management Subsystem Health", "Management controller off-line" },
-	{ 0x28, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Management Subsystem Health", "Management controller unavailable" },
+	{ 0x28, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Management Subsystem Health", "Sensor access degraded or unavailable" },
+	{ 0x28, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Management Subsystem Health", "Controller access degraded or unavailable" },
+	{ 0x28, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Management Subsystem Health", "Management controller off-line" },
+	{ 0x28, 0x03, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Management Subsystem Health", "Management controller unavailable" },
 
-	{ 0x29, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Battery", "Low" },
-	{ 0x29, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Battery", "Failed" },
-	{ 0x29, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Battery", "Presence Detected" },
+	{ 0x29, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Battery", "Low" },
+	{ 0x29, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Battery", "Failed" },
+	{ 0x29, 0x02, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Battery", "Presence Detected" },
 
-	{ 0x00, 0x00, 0x00, NULL, NULL },
+	{ 0x00, 0x00, 0x00, 0x00, NULL, NULL },
 };
 
 int ipmi_sel_main(struct ipmi_intf *, int, char **);
-void ipmi_sel_print_std_entry(int num, struct sel_event_record * evt);
+void ipmi_sel_print_std_entry(struct sel_event_record * evt);
 
 #endif /* IPMI_SEL_H */

ipmitool/include/ipmitool/ipmi_sensor.h

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+#ifndef IPMI_SENSOR_H
+#define IPMI_SENSOR_H
+
+#include <math.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+
+#define GET_SENSOR_READING      0x2d
+#define GET_SENSOR_FACTORS      0x23
+#define GET_SENSOR_THRES        0x27
+#define GET_SENSOR_TYPE         0x2f
+
+int ipmi_sensor_main(struct ipmi_intf *, int, char **);
+
+#endif  /* IPMI_SENSOR_H */

ipmitool/ipmitool.spec.in

@@ -32,7 +32,11 @@ fi
 %setup
 
 %build
-./configure @ac_configure_args@ \
+./configure \
+	--enable-ipmievd \
+	--enable-intf-lan=static \
+	--enable-intf-open=static \
+	--with-kerneldir=/usr/src/linux-2.4 \
 	--prefix=%{_prefix} \
 	--bindir=%{_bindir} \
 	--datadir=%{_datadir} \
@@ -43,7 +47,7 @@ fi
 make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install-strip
 
 %clean
 if [ "$RPM_BUILD_ROOT" ] && [ "$RPM_BUILD_ROOT" != "/" ]; then
@@ -55,8 +59,6 @@ rm -rf $RPM_BUILD_DIR/@IPMITOOL_PKG@-@VERSION@
 %defattr(-,root,root)
 %doc %{_mandir}/man1/*
 %{_bindir}/*
-%dir %{_libdir}/ipmitool
-%attr(755,root,root) %{_libdir}/ipmitool/*
 
 %files dev
 %defattr(-,root,root)
@@ -64,6 +66,23 @@ rm -rf $RPM_BUILD_DIR/@IPMITOOL_PKG@-@VERSION@
 %{_includedir}/ipmitool/*.h
 
 %changelog
+* Tue Jan 27 2004 <duncan@sun.com>  1.5.8-1
+ - Enable static compilation of interfaces
+ - Fix types to be 64-bit safe
+ - Fix compilation problems on Solaris
+ - Fix multiple big-endian problems for Solaris/SPARC
+ - Fix channel access to save settings to NVRAM
+ - Set channel privilege limit to ADMIN during "access on"
+ - Enable gratuitous ARP in bmcautoconf.sh
+ - Add support for Linux kernel panic messages in SEL output
+ - Add support for type 3 SDR records
+
+* Mon Jan  5 2004 <duncan@sun.com>  1.5.7-1
+ - add IPMIv1.5 eratta fixes
+ - additions to FRU printing and FRU multirecords
+ - better handling of SDR printing
+ - contrib scripts for creating rrdtool graphs
+
 * Thu Dec  4 2003 <duncan@sun.com>  1.5.6-1
  - Fix SEL event decoding for generic events
  - Handle empty SEL gracefully when doing "sel list"

ipmitool/lib/Makefile.am

@@ -37,7 +37,8 @@ MAINTAINERCLEANFILES		= Makefile.in
 
 noinst_LTLIBRARIES		= libipmitool.la
 libipmitool_la_SOURCES		= helper.c ipmi_sdr.c ipmi_sel.c ipmi_sol.c ipmi_lanp.c \
-				  ipmi_fru.c ipmi_chassis.c ipmi_bmc.c ipmi_intf.c
+				  ipmi_fru.c ipmi_chassis.c ipmi_bmc.c dimm_spd.c ipmi_sensor.c
 libipmitool_la_LDFLAGS		= -export-dynamic
-libipmitool_la_LIBADD		= -lm $(LIBLTDL)
-libipmitool_la_DEPENDENCIES	= $(LIBLTDL)
+libipmitool_la_LIBADD		= -lm
+libipmitool_la_DEPENDENCIES	= 
+

ipmitool/lib/dimm_spd.c

@@ -0,0 +1,767 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_fru.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+extern int verbose;
+
+const struct valstr spd_memtype_vals[] = {
+	{ 0x02, "EDO" },
+	{ 0x04, "SDRAM" },
+	{ 0x07, "DDR" },
+	{ 0x00, NULL },
+};
+
+const struct valstr spd_config_vals[] = {
+	{ 0x00, "None" },
+	{ 0x01, "Parity" },
+	{ 0x02, "ECC" },
+	{ 0x00, NULL },
+};
+
+const struct valstr spd_voltage_vals[] = {
+	{ 0x00, "5.0V TTL" },
+	{ 0x01, "LVTTL" },
+	{ 0x02, "HSTL 1.5V" },
+	{ 0x03, "SSTL 3.3V" },
+	{ 0x04, "SSTL 2.5V" },
+	{ 0x00, NULL },
+};
+
+/*
+ * JEDEC Standard Manufacturers Identification Code
+ * publication JEP106N, December 2003
+ */
+
+const struct valstr jedec_id1_vals[] = {
+	{ 0x01, "AMD" },
+	{ 0x02, "AMI" },
+	{ 0x83, "Fairchild" },
+	{ 0x04, "Fujitsu" },
+	{ 0x85, "GTE" },
+	{ 0x86, "Harris" },
+	{ 0x07, "Hitachi" },
+	{ 0x08, "Inmos" },
+	{ 0x89, "Intel" },
+	{ 0x8a, "I.T.T." },
+	{ 0x0b, "Intersil" },
+	{ 0x8c, "Monolithic Memories" },
+	{ 0x0d, "Mostek" },
+	{ 0x0e, "Motorola" },
+	{ 0x8f, "National" },
+	{ 0x10, "NEC" },
+	{ 0x91, "RCA" },
+	{ 0x92, "Raytheon" },
+	{ 0x13, "Conexant (Rockwell)" },
+	{ 0x94, "Seeq" },
+	{ 0x15, "Philips Semi. (Signetics)" },
+	{ 0x16, "Synertek" },
+	{ 0x97, "Texas Instruments" },
+	{ 0x98, "Toshiba" },
+	{ 0x19, "Xicor" },
+	{ 0x1a, "Zilog" },
+	{ 0x9b, "Eurotechnique" },
+	{ 0x1c, "Mitsubishi" },
+	{ 0x9d, "Lucent (AT&T)" },
+	{ 0x9e, "Exel" },
+	{ 0x1f, "Atmel" },
+	{ 0x20, "SGS/Thomson" },
+	{ 0xa1, "Lattice Semi." },
+	{ 0xa2, "NCR" },
+	{ 0x23, "Wafer Scale Integration" },
+	{ 0xa4, "IBM" },
+	{ 0x25, "Tristar" },
+	{ 0x26, "Visic" },
+	{ 0xa7, "Intl. CMOS Technology" },
+	{ 0xa8, "SSSI" },
+	{ 0x29, "Microchip Technology" },
+	{ 0x2a, "Ricoh Ltd." },
+	{ 0xab, "VLSI" },
+	{ 0x2c, "Micron Technology" },
+	{ 0xad, "Hyundai Electronics" },
+	{ 0xae, "OKI Semiconductor" },
+	{ 0x2f, "ACTEL" },
+	{ 0xb0, "Sharp" },
+	{ 0x31, "Catalyst" },
+	{ 0x32, "Panasonic" },
+	{ 0xb3, "IDT" },
+	{ 0x34, "Cypress" },
+	{ 0xb5, "DEC" },
+	{ 0xb6, "LSI Logic" },
+	{ 0x37, "Zarlink" },
+	{ 0x38, "UTMC" },
+	{ 0xb9, "Thinking Machine" },
+	{ 0xba, "Thomson CSF" },
+	{ 0x3b, "Integrated CMOS(Vertex)" },
+	{ 0xbc, "Honeywell" },
+	{ 0x3d, "Tektronix" },
+	{ 0x3e, "Sun Microsystems" },
+	{ 0xbf, "SST" },
+	{ 0x40, "MOSEL" },
+	{ 0xc1, "Infineon" },
+	{ 0xc2, "Macronix" },
+	{ 0x43, "Xerox" },
+	{ 0xc4, "Plus Logic" },
+	{ 0x45, "SunDisk" },
+	{ 0x46, "Elan Circuit Tech." },
+	{ 0xc7, "European Silicon Str." },
+	{ 0xc8, "Apple Computer" },
+	{ 0xc9, "Xilinx" },
+	{ 0x4a, "Compaq" },
+	{ 0xcb, "Protocol Engines" },
+	{ 0x4c, "SCI" },
+	{ 0xcd, "Seiko Instruments" },
+	{ 0xce, "Samsung" },
+	{ 0x4f, "I3 Design System" },
+	{ 0xd0, "Klic" },
+	{ 0x51, "Crosspoint Solutions" },
+	{ 0x52, "Alliance Semiconductor" },
+	{ 0xd3, "Tandem" },
+	{ 0x54, "Hewlett-Packard" },
+	{ 0xd5, "Intg. Silicon Solutions" },
+	{ 0xd6, "Brooktree" },
+	{ 0x57, "New Media" },
+	{ 0x58, "MHS Electronic" },
+	{ 0xd9, "Performance Semi." },
+	{ 0xda, "Winbond Electronic" },
+	{ 0x5b, "Kawasaki Steel" },
+	{ 0xdc, "Bright Micro" },
+	{ 0x5d, "TECMAR" },
+	{ 0x5e, "Exar" },
+	{ 0xdf, "PCMCIA" },
+	{ 0xe0, "LG Semiconductor" },
+	{ 0x61, "Northern Telecom" },
+	{ 0x62, "Sanyo" },
+	{ 0xe3, "Array Microsystems" },
+	{ 0x64, "Crystal Semiconductor" },
+	{ 0xe5, "Analog Devices" },
+	{ 0xe6, "PMC-Sierra" },
+	{ 0x67, "Asparix" },
+	{ 0x68, "Convex Computer" },
+	{ 0xe9, "Quality Semiconductor" },
+	{ 0xea, "Nimbus Technology" },
+	{ 0x6b, "Transwitch" },
+	{ 0xec, "Micronas (ITT Intermetall)" },
+	{ 0x6d, "Cannon" },
+	{ 0x6e, "Altera" },
+	{ 0xef, "NEXCOM" },
+	{ 0x70, "QUALCOMM" },
+	{ 0xf1, "Sony" },
+	{ 0xf2, "Cray Research" },
+	{ 0x73, "AMS (Austria Micro)" },
+	{ 0xf4, "Vitesse" },
+	{ 0x75, "Aster Electronics" },
+	{ 0x76, "Bay Networks (Synoptic)" },
+	{ 0xf7, "Zentrum" },
+	{ 0xf8, "TRW" },
+	{ 0x79, "Thesys" },
+	{ 0x7a, "Solbourne Computer" },
+	{ 0xfb, "Allied-Signal" },
+	{ 0x7c, "Dialog" },
+	{ 0xfd, "Media Vision" },
+	{ 0xfe, "Level One Communication" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id2_vals[] = {
+	{ 0x01, "Cirrus Logic" },
+	{ 0x02, "National Instruments" },
+	{ 0x83, "ILC Data Device" },
+	{ 0x04, "Alcatel Mietec" },
+	{ 0x85, "Micro Linear" },
+	{ 0x86, "Univ. of NC" },
+	{ 0x07, "JTAG Technologies" },
+	{ 0x08, "Loral" },
+	{ 0x89, "Nchip" },
+	{ 0x8A, "Galileo Tech" },
+	{ 0x0B, "Bestlink Systems" },
+	{ 0x8C, "Graychip" },
+	{ 0x0D, "GENNUM" },
+	{ 0x0E, "VideoLogic" },
+	{ 0x8F, "Robert Bosch" },
+	{ 0x10, "Chip Express" },
+	{ 0x91, "DATARAM" },
+	{ 0x92, "United Microelec Corp." },
+	{ 0x13, "TCSI" },
+	{ 0x94, "Smart Modular" },
+	{ 0x15, "Hughes Aircraft" },
+	{ 0x16, "Lanstar Semiconductor" },
+	{ 0x97, "Qlogic" },
+	{ 0x98, "Kingston" },
+	{ 0x19, "Music Semi" },
+	{ 0x1A, "Ericsson Components" },
+	{ 0x9B, "SpaSE" },
+	{ 0x1C, "Eon Silicon Devices" },
+	{ 0x9D, "Programmable Micro Corp" },
+	{ 0x9E, "DoD" },
+	{ 0x1F, "Integ. Memories Tech." },
+	{ 0x20, "Corollary Inc." },
+	{ 0xA1, "Dallas Semiconductor" },
+	{ 0xA2, "Omnivision" },
+	{ 0x23, "EIV(Switzerland)" },
+	{ 0xA4, "Novatel Wireless" },
+	{ 0x25, "Zarlink (formerly Mitel)" },
+	{ 0x26, "Clearpoint" },
+	{ 0xA7, "Cabletron" },
+	{ 0xA8, "Silicon Technology" },
+	{ 0x29, "Vanguard" },
+	{ 0x2A, "Hagiwara Sys-Com" },
+	{ 0xAB, "Vantis" },
+	{ 0x2C, "Celestica" },
+	{ 0xAD, "Century" },
+	{ 0xAE, "Hal Computers" },
+	{ 0x2F, "Rohm Company Ltd." },
+	{ 0xB0, "Juniper Networks" },
+	{ 0x31, "Libit Signal Processing" },
+	{ 0x32, "Enhanced Memories Inc." },
+	{ 0xB3, "Tundra Semiconductor" },
+	{ 0x34, "Adaptec Inc." },
+	{ 0xB5, "LightSpeed Semi." },
+	{ 0xB6, "ZSP Corp." },
+	{ 0x37, "AMIC Technology" },
+	{ 0x38, "Adobe Systems" },
+	{ 0xB9, "Dynachip" },
+	{ 0xBA, "PNY Electronics" },
+	{ 0x3B, "Newport Digital" },
+	{ 0xBC, "MMC Networks" },
+	{ 0x3D, "T Square" },
+	{ 0x3E, "Seiko Epson" },
+	{ 0xBF, "Broadcom" },
+	{ 0x40, "Viking Components" },
+	{ 0xC1, "V3 Semiconductor" },
+	{ 0xC2, "Flextronics (formerly Orbit)" },
+	{ 0x43, "Suwa Electronics" },
+	{ 0xC4, "Transmeta" },
+	{ 0x45, "Micron CMS" },
+	{ 0x46, "American Computer & Digital Components Inc" },
+	{ 0xC7, "Enhance 3000 Inc" },
+	{ 0xC8, "Tower Semiconductor" },
+	{ 0x49, "CPU Design" },
+	{ 0x4A, "Price Point" },
+	{ 0xCB, "Maxim Integrated Product" },
+	{ 0x4C, "Tellabs" },
+	{ 0xCD, "Centaur Technology" },
+	{ 0xCE, "Unigen Corporation" },
+	{ 0x4F, "Transcend Information" },
+	{ 0xD0, "Memory Card Technology" },
+	{ 0x51, "CKD Corporation Ltd." },
+	{ 0x52, "Capital Instruments, Inc." },
+	{ 0xD3, "Aica Kogyo, Ltd." },
+	{ 0x54, "Linvex Technology" },
+	{ 0xD5, "MSC Vertriebs GmbH" },
+	{ 0xD6, "AKM Company, Ltd." },
+	{ 0x57, "Dynamem, Inc." },
+	{ 0x58, "NERA ASA" },
+	{ 0xD9, "GSI Technology" },
+	{ 0xDA, "Dane-Elec (C Memory)" },
+	{ 0x5B, "Acorn Computers" },
+	{ 0xDC, "Lara Technology" },
+	{ 0x5D, "Oak Technology, Inc." },
+	{ 0x5E, "Itec Memory" },
+	{ 0xDF, "Tanisys Technology" },
+	{ 0xE0, "Truevision" },
+	{ 0x61, "Wintec Industries" },
+	{ 0x62, "Super PC Memory" },
+	{ 0xE3, "MGV Memory" },
+	{ 0x64, "Galvantech" },
+	{ 0xE5, "Gadzoox Nteworks" },
+	{ 0xE6, "Multi Dimensional Cons." },
+	{ 0x67, "GateField" },
+	{ 0x68, "Integrated Memory System" },
+	{ 0xE9, "Triscend" },
+	{ 0xEA, "XaQti" },
+	{ 0x6B, "Goldenram" },
+	{ 0xEC, "Clear Logic" },
+	{ 0x6D, "Cimaron Communications" },
+	{ 0x6E, "Nippon Steel Semi. Corp." },
+	{ 0xEF, "Advantage Memory" },
+	{ 0x70, "AMCC" },
+	{ 0xF1, "LeCroy" },
+	{ 0xF2, "Yamaha Corporation" },
+	{ 0x73, "Digital Microwave" },
+	{ 0xF4, "NetLogic Microsystems" },
+	{ 0x75, "MIMOS Semiconductor" },
+	{ 0x76, "Advanced Fibre" },
+	{ 0xF7, "BF Goodrich Data." },
+	{ 0xF8, "Epigram" },
+	{ 0x79, "Acbel Polytech Inc." },
+	{ 0x7A, "Apacer Technology" },
+	{ 0xFB, "Admor Memory" },
+	{ 0x7C, "FOXCONN" },
+	{ 0xFD, "Quadratics Superconductor" },
+	{ 0xFE, "3COM" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id3_vals[] = {
+	{ 0x01, "Camintonn Corporation" },
+	{ 0x02, "ISOA Incorporated" },
+	{ 0x83, "Agate Semiconductor" },
+	{ 0x04, "ADMtek Incorporated" },
+	{ 0x85, "HYPERTEC" },
+	{ 0x86, "Adhoc Technologies" },
+	{ 0x07, "MOSAID Technologies" },
+	{ 0x08, "Ardent Technologies" },
+	{ 0x89, "Switchcore" },
+	{ 0x8A, "Cisco Systems, Inc." },
+	{ 0x0B, "Allayer Technologies" },
+	{ 0x8C, "WorkX AG" },
+	{ 0x0D, "Oasis Semiconductor" },
+	{ 0x0E, "Novanet Semiconductor" },
+	{ 0x8F, "E-M Solutions" },
+	{ 0x10, "Power General" },
+	{ 0x91, "Advanced Hardware Arch." },
+	{ 0x92, "Inova Semiconductors GmbH" },
+	{ 0x13, "Telocity" },
+	{ 0x94, "Delkin Devices" },
+	{ 0x15, "Symagery Microsystems" },
+	{ 0x16, "C-Port Corporation" },
+	{ 0x97, "SiberCore Technologies" },
+	{ 0x98, "Southland Microsystems" },
+	{ 0x19, "Malleable Technologies" },
+	{ 0x1A, "Kendin Communications" },
+	{ 0x9B, "Great Technology Microcomputer" },
+	{ 0x1C, "Sanmina Corporation" },
+	{ 0x9D, "HADCO Corporation" },
+	{ 0x9E, "Corsair" },
+	{ 0x1F, "Actrans System Inc." },
+	{ 0x20, "ALPHA Technologies" },
+	{ 0xA1, "Cygnal Integrated Products Incorporated" },
+	{ 0xA2, "Artesyn Technologies" },
+	{ 0x23, "Align Manufacturing" },
+	{ 0xA4, "Peregrine Semiconductor" },
+	{ 0x25, "Chameleon Systems" },
+	{ 0x26, "Aplus Flash Technology" },
+	{ 0xA7, "MIPS Technologies" },
+	{ 0xA8, "Chrysalis ITS" },
+	{ 0x29, "ADTEC Corporation" },
+	{ 0x2A, "Kentron Technologies" },
+	{ 0xAB, "Win Technologies" },
+	{ 0x2C, "ASIC Designs Inc" },
+	{ 0xAD, "Extreme Packet Devices" },
+	{ 0xAE, "RF Micro Devices" },
+	{ 0x2F, "Siemens AG" },
+	{ 0xB0, "Sarnoff Corporation" },
+	{ 0x31, "Itautec Philco SA" },
+	{ 0x32, "Radiata Inc." },
+	{ 0xB3, "Benchmark Elect. (AVEX)" },
+	{ 0x34, "Legend" },
+	{ 0xB5, "SpecTek Incorporated" },
+	{ 0xB6, "Hi/fn" },
+	{ 0x37, "Enikia Incorporated" },
+	{ 0x38, "SwitchOn Networks" },
+	{ 0xB9, "AANetcom Incorporated" },
+	{ 0xBA, "Micro Memory Bank" },
+	{ 0x3B, "ESS Technology" },
+	{ 0xBC, "Virata Corporation" },
+	{ 0x3D, "Excess Bandwidth" },
+	{ 0x3E, "West Bay Semiconductor" },
+	{ 0xBF, "DSP Group" },
+	{ 0x40, "Newport Communications" },
+	{ 0xC1, "Chip2Chip Incorporated" },
+	{ 0xC2, "Phobos Corporation" },
+	{ 0x43, "Intellitech Corporation" },
+	{ 0xC4, "Nordic VLSI ASA" },
+	{ 0x45, "Ishoni Networks" },
+	{ 0x46, "Silicon Spice" },
+	{ 0xC7, "Alchemy Semiconductor" },
+	{ 0xC8, "Agilent Technologies" },
+	{ 0x49, "Centillium Communications" },
+	{ 0x4A, "W.L. Gore" },
+	{ 0xCB, "HanBit Electronics" },
+	{ 0x4C, "GlobeSpan" },
+        { 0xCD, "Element 14" },
+	{ 0xCE, "Pycon" },
+	{ 0x4F, "Saifun Semiconductors" },
+	{ 0xD0, "Sibyte, Incorporated" },
+	{ 0x51, "MetaLink Technologies" },
+	{ 0x52, "Feiya Technology" },
+	{ 0xD3, "I & C Technology" },
+	{ 0x54, "Shikatronics" },
+	{ 0xD5, "Elektrobit" },
+	{ 0xD6, "Megic" },
+	{ 0x57, "Com-Tier" },
+	{ 0x58, "Malaysia Micro Solutions" },
+	{ 0xD9, "Hyperchip" },
+	{ 0xDA, "Gemstone Communications" },
+	{ 0x5B, "Anadyne Microelectronics" },
+	{ 0xDC, "3ParData" },
+	{ 0x5D, "Mellanox Technologies" },
+	{ 0x5E, "Tenx Technologies" },
+	{ 0xDF, "Helix AG" },
+	{ 0xE0, "Domosys" },
+	{ 0x61, "Skyup Technology" },
+	{ 0x62, "HiNT Corporation" },
+	{ 0xE3, "Chiaro" },
+	{ 0x64, "MCI Computer GMBH" },
+	{ 0xE5, "Exbit Technology A/S" },
+	{ 0xE6, "Integrated Technology Express" },
+	{ 0x67, "AVED Memory" },
+	{ 0x68, "Legerity" },
+	{ 0xE9, "Jasmine Networks" },
+	{ 0xEA, "Caspian Networks" },
+	{ 0x6B, "nCUBE" },
+	{ 0xEC, "Silicon Access Networks" },
+	{ 0x6D, "FDK Corporation" },
+	{ 0x6E, "High Bandwidth Access" },
+	{ 0xEF, "MultiLink Technology" },
+	{ 0x70, "BRECIS" },
+	{ 0xF1, "World Wide Packets" },
+	{ 0xF2, "APW" },
+	{ 0x73, "Chicory Systems" },
+	{ 0xF4, "Xstream Logic" },
+	{ 0x75, "Fast-Chip" },
+	{ 0x76, "Zucotto Wireless" },
+	{ 0xF7, "Realchip" },
+	{ 0xF8, "Galaxy Power" },
+	{ 0x79, "eSilicon" },
+	{ 0x7A, "Morphics Technology" },
+	{ 0xFB, "Accelerant Networks" },
+	{ 0x7C, "Silicon Wave" },
+	{ 0xFD, "SandCraft" },
+	{ 0xFE, "Elpida" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id4_vals[] = {
+	{ 0x01, "Solectron" },
+	{ 0x02, "Optosys Technologies" },
+	{ 0x83, "Buffalo (Formerly Melco)" },
+	{ 0x04, "TriMedia Technologies" },
+	{ 0x85, "Cyan Technologies" },
+	{ 0x86, "Global Locate" },
+	{ 0x07, "Optillion" },
+	{ 0x08, "Terago Communications" },
+	{ 0x89, "Ikanos Communications" },
+	{ 0x8A, "Princeton Technology" },
+	{ 0x0B, "Nanya Technology" },
+	{ 0x8C, "Elite Flash Storage" },
+	{ 0x0D, "Mysticom" },
+	{ 0x0E, "LightSand Communications" },
+	{ 0x8F, "ATI Technologies" },
+	{ 0x10, "Agere Systems" },
+	{ 0x91, "NeoMagic" },
+	{ 0x92, "AuroraNetics" },
+	{ 0x13, "Golden Empire" },
+	{ 0x94, "Muskin" },
+	{ 0x15, "Tioga Technologies" },
+	{ 0x16, "Netlist" },
+	{ 0x97, "TeraLogic" },
+	{ 0x98, "Cicada Semiconductor" },
+	{ 0x19, "Centon Electronics" },
+	{ 0x1A, "Tyco Electronics" },
+	{ 0x9B, "Magis Works" },
+	{ 0x1C, "Zettacom" },
+	{ 0x9D, "Cogency Semiconductor" },
+	{ 0x9E, "Chipcon AS" },
+	{ 0x1F, "Aspex Technology" },
+	{ 0x20, "F5 Networks" },
+	{ 0xA1, "Programmable Silicon Solutions" },
+	{ 0xA2, "ChipWrights" },
+	{ 0x23, "Acorn Networks" },
+	{ 0xA4, "Quicklogic" },
+	{ 0x25, "Kingmax Semiconductor" },
+	{ 0x26, "BOPS" },
+	{ 0xA7, "Flasys" },
+	{ 0xA8, "BitBlitz Communications" },
+	{ 0x29, "eMemory Technology" },
+	{ 0x2A, "Procket Networks" },
+	{ 0xAB, "Purple Ray" },
+	{ 0x2C, "Trebia Networks" },
+	{ 0xAD, "Delta Electronics" },
+	{ 0xAE, "Onex Communications" },
+	{ 0x2F, "Ample Communications" },
+	{ 0xB0, "Memory Experts Intl" },
+	{ 0x31, "Astute Networks" },
+	{ 0x32, "Azanda Network Devices" },
+	{ 0xB3, "Dibcom" },
+	{ 0x34, "Tekmos" },
+	{ 0xB5, "API NetWorks" },
+	{ 0xB6, "Bay Microsystems" },
+	{ 0x37, "Firecron Ltd" },
+	{ 0x38, "Resonext Communications" },
+	{ 0xB9, "Tachys Technologies" },
+	{ 0xBA, "Equator Technology" },
+	{ 0x3B, "Concept Computer" },
+	{ 0xBC, "SILCOM" },
+	{ 0x3D, "3Dlabs" },
+	{ 0x3E, "ct Magazine" },
+	{ 0xBF, "Sanera Systems" },
+	{ 0x40, "Silicon Packets" },
+	{ 0xC1, "Viasystems Group" },
+	{ 0xC2, "Simtek" },
+	{ 0x43, "Semicon Devices Singapore" },
+	{ 0xC4, "Satron Handelsges" },
+	{ 0x45, "Improv Systems" },
+	{ 0x46, "INDUSYS GmbH" },
+	{ 0xC7, "Corrent" },
+	{ 0xC8, "Infrant Technologies" },
+	{ 0x49, "Ritek Corp" },
+	{ 0x4A, "empowerTel Networks" },
+	{ 0xCB, "Hypertec" },
+	{ 0x4C, "Cavium Networks" },
+	{ 0xCD, "PLX Technology" },
+	{ 0xCE, "Massana Design" },
+	{ 0x4F, "Intrinsity" },
+	{ 0xD0, "Valence Semiconductor" },
+	{ 0x51, "Terawave Communications" },
+	{ 0x52, "IceFyre Semiconductor" },
+	{ 0xD3, "Primarion" },
+	{ 0x54, "Picochip Designs Ltd" },
+	{ 0xD5, "Silverback Systems" },
+	{ 0xD6, "Jade Star Technologies" },
+	{ 0x57, "Pijnenburg Securealink" },
+	{ 0x58, "MemorySolutioN" },
+	{ 0xD9, "Cambridge Silicon Radio" },
+	{ 0xDA, "Swissbit" },
+	{ 0x5B, "Nazomi Communications" },
+	{ 0xDC, "eWave System" },
+	{ 0x5D, "Rockwell Collins" },
+	{ 0x5E, "PAION" },
+	{ 0xDF, "Alphamosaic Ltd" },
+	{ 0xE0, "Sandburst" },
+	{ 0x61, "SiCon Video" },
+	{ 0x62, "NanoAmp Solutions" },
+	{ 0xE3, "Ericsson Technology" },
+	{ 0x64, "PrairieComm" },
+	{ 0xE5, "Mitac International" },
+	{ 0xE6, "Layer N Networks" },
+	{ 0x67, "Atsana Semiconductor" },
+	{ 0x68, "Allegro Networks" },
+	{ 0xE9, "Marvell Semiconductors" },
+	{ 0xEA, "Netergy Microelectronic" },
+	{ 0x6B, "NVIDIA" },
+	{ 0xEC, "Internet Machines" },
+	{ 0x6D, "Peak Electronics" },
+	{ 0xEF, "Accton Technology" },
+	{ 0x70, "Teradiant Networks" },
+	{ 0xF1, "Europe Technologies" },
+	{ 0xF2, "Cortina Systems" },
+	{ 0x73, "RAM Components" },
+	{ 0xF4, "Raqia Networks" },
+	{ 0x75, "ClearSpeed" },
+	{ 0x76, "Matsushita Battery" },
+	{ 0xF7, "Xelerated" },
+	{ 0xF8, "SimpleTech" },
+	{ 0x79, "Utron Technology" },
+	{ 0x7A, "Astec International" },
+	{ 0xFB, "AVM gmbH" },
+	{ 0x7C, "Redux Communications" },
+	{ 0xFD, "Dot Hill Systems" },
+	{ 0xFE, "TeraChip" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id5_vals[] = {
+	{ 0x01, "T-RAM Incorporated" },
+	{ 0x02, "Innovics Wireless" },
+	{ 0x83, "Teknovus" },
+	{ 0x04, "KeyEye Communications" },
+	{ 0x85, "Runcom Technologies" },
+	{ 0x86, "RedSwitch" },
+	{ 0x07, "Dotcast" },
+	{ 0x08, "Silicon Mountain Memory" },
+	{ 0x89, "Signia Technologies" },
+	{ 0x8A, "Pixim" },
+	{ 0x0B, "Galazar Networks" },
+	{ 0x8C, "White Electronic Designs" },
+	{ 0x0D, "Patriot Scientific" },
+	{ 0x0E, "Neoaxiom Corporation" },
+	{ 0x8F, "3Y Power Technology" },
+	{ 0x10, "Europe Technologies" },
+	{ 0x91, "Potentia Power Systems" },
+	{ 0x92, "C-guys Incorporated" },
+	{ 0x13, "Digital Communications Technology Incorporated" },
+	{ 0x94, "Silicon-Based Technology" },
+	{ 0x15, "Fulcrum Microsystems" },
+	{ 0x16, "Positivo Informatica Ltd" },
+	{ 0x97, "XIOtech Corporation" },
+	{ 0x98, "PortalPlayer" },
+	{ 0x19, "Zhiying Software" },
+	{ 0x1A, "Direct2Data" },
+	{ 0x9B, "Phonex Broadband" },
+	{ 0x1C, "Skyworks Solutions" },
+	{ 0x9D, "Entropic Communications" },
+	{ 0x9E, "Pacific Force Technology" },
+	{ 0x1F, "Zensys A/S" },
+	{ 0x20, "Legend Silicon Corp." },
+	{ 0xA1, "sci-worx GmbH" },
+	{ 0xA2, "Oasis Silicon Systems" },
+	{ 0x23, "Renesas Technology" },
+	{ 0xA4, "Raza Microelectronics" },
+	{ 0x25, "Phyworks" },
+	{ 0x26, "MediaTek" },
+	{ 0xA7, "Non-cents Productions" },
+	{ 0xA8, "US Modular" },
+	{ 0x29, "Wintegra Ltd" },
+	{ 0x2A, "Mathstar" },
+	{ 0xAB, "StarCore" },
+	{ 0x2C, "Oplus Technologies" },
+	{ 0xAD, "Mindspeed" },
+	{ 0xAE, "Just Young Computer" },
+	{ 0x2F, "Radia Communications" },
+	{ 0xB0, "OCZ" },
+	{ 0x31, "Emuzed" },
+	{ 0x32, "LOGIC Devices" },
+	{ 0xB3, "Inphi Corporation" },
+	{ 0x34, "Quake Technologies" },
+	{ 0xB5, "Vixel" },
+	{ 0xB6, "SolusTek" },
+	{ 0x37, "Kongsberg Maritime" },
+	{ 0x38, "Faraday Technology" },
+	{ 0xB9, "Altium Ltd." },
+	{ 0xBA, "Insyte" },
+	{ 0x3B, "ARM Ltd." },
+	{ 0xBC, "DigiVision" },
+	{ 0x3D, "Vativ Technologies" },
+	{ 0x3E, "Endicott Interconnect Technologies" },
+	{ 0xBF, "Pericom" },
+	{ 0x40, "Bandspeed" },
+	{ 0xC1, "LeWiz Communications" },
+	{ 0xC2, "CPU Technology" },
+	{ 0x43, "Ramaxel Technology" },
+	{ 0xC4, "DSP Group" },
+	{ 0x45, "Axis Communications" },
+	{ 0x46, "Legacy Electronics" },
+	{ 0xC7, "Chrontel" },
+	{ 0xC8, "Powerchip Semiconductor" },
+	{ 0x49, "MobilEye Technologies" },
+	{ 0x4A, "Excel Semiconductor" },
+	{ 0xCB, "A-DATA Technology" },
+	{ 0x4C, "VirtualDigm" },
+	{ 0x00, NULL },
+};
+
+void ipmi_spd_print(struct ipmi_intf * intf, unsigned char id)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct fru_info fru;
+	unsigned char spd_data[256], msg_data[4];
+	int i, len, offset;
+	int size, conf;
+
+	msg_data[0] = id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp || rsp->ccode)
+		return;
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+
+	if (verbose > 1)
+		printf("fru.size = %d bytes (accessed by %s)\n",
+		       fru.size, fru.access ? "words" : "bytes");
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	offset = 0;
+	memset(spd_data, 0, 256);
+	do {
+		msg_data[0] = id;
+		msg_data[1] = offset;
+		msg_data[2] = 0;
+		msg_data[3] = 32;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (!rsp) {
+			printf("  Error while reading FRU data.\n");
+			return;
+		}
+		if (rsp->ccode == 0xc3) {
+			printf("  Timeout while reading FRU data. (Device not present?)\n");
+			return;
+		}
+		if (rsp->ccode)
+			break;
+
+		len = rsp->data[0];
+		memcpy(&spd_data[offset], rsp->data + 1, len);
+		offset += len;
+	} while (offset < fru.size);
+
+	if (verbose)
+		printbuf(spd_data, offset, "SPD DATA");
+
+	if (offset < 92)
+		return;		/* we need first 91 bytes to do our thing */
+
+	size = spd_data[5] * (spd_data[31] << 2);
+	printf("  Memory Size      : %d MB\n", size);
+	printf("  Memory Type      : %s\n", val2str(spd_data[2], spd_memtype_vals));
+	printf("  Voltage Intf     : %s\n", val2str(spd_data[8], spd_voltage_vals));
+	printf("  Error Detect/Cor : %s\n", val2str(spd_data[11], spd_config_vals));
+
+	/* handle jedec table bank continuation values */
+	printf("  Manufacturer     : ");
+	if (spd_data[64] != 0x7f)
+		printf("%s\n", val2str(spd_data[64], jedec_id1_vals));
+	else {
+		if (spd_data[65] != 0x7f)
+			printf("%s\n", val2str(spd_data[65], jedec_id2_vals));
+		else {
+			if (spd_data[66] != 0x7f)
+				printf("%s\n", val2str(spd_data[66], jedec_id3_vals));
+			else {
+				if (spd_data[67] != 0x7f)
+					printf("%s\n", val2str(spd_data[67], jedec_id4_vals));
+				else
+					printf("%s\n", val2str(spd_data[68], jedec_id5_vals));
+			}
+		}
+	}
+
+	if (spd_data[73]) {
+		char part[19];
+		memcpy(part, spd_data+73, 18);
+		part[18] = 0;
+		printf("  Part Number      : %s\n", part);
+	}
+}

ipmitool/lib/helper.c

@@ -36,15 +36,16 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <signal.h>
 #include <ipmitool/helper.h>
 
 #include <string.h>
 
 
-unsigned long buf2long(unsigned char * buf)
+uint32_t buf2long(unsigned char * buf)
 {
-	return (unsigned long)(buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]);
+	return (uint32_t)(buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]);
 }
 
 unsigned short buf2short(unsigned char * buf)
@@ -86,7 +87,7 @@ void printbuf(unsigned char * buf, int len, char * desc)
 	printf("\n");
 }
 
-const char * val2str(unsigned char val, const struct valstr *vs)
+const char * val2str(unsigned short val, const struct valstr *vs)
 {
 	static char un_str[16];
 	int i = 0;

ipmitool/lib/ipmi_chassis.c

@@ -103,15 +103,26 @@ static void ipmi_chassis_identify(struct ipmi_intf * intf, char * arg)
 	printf("Chassis identify interval: ");
 
 	if (arg) {
-		unsigned char interval = (unsigned char)atoi(arg);
+                struct {
+                    unsigned char interval;
+                    unsigned char force_on;
+                } identify_data;
+                
+                if (!strcmp(arg, "force")){
+                        identify_data.interval = 0;
+                        identify_data.force_on = 1;
+			printf("indefinite\n");
+                } else {
+                        identify_data.interval = (unsigned char)atoi(arg);
+                        identify_data.force_on = 0;
+                        if (identify_data.interval)
+			    printf("%d seconds\n", identify_data.interval);
+                        else
+			    printf("off\n");
+                }
 
-		req.msg.data = &interval;
-		req.msg.data_len = 1;
-
-		if (interval)
-			printf("%d seconds\n", interval);
-		else
-			printf("off\n");
+		req.msg.data = (unsigned char *)&identify_data;
+		req.msg.data_len = 2;
 	} else {
 		printf("default (15 seconds)\n");
 	}
@@ -123,7 +134,7 @@ static void ipmi_chassis_poh(struct ipmi_intf * intf)
 {
 	struct ipmi_rs * rsp;
 	struct ipmi_rq req;
-	unsigned long count;
+	uint32_t count;
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_CHASSIS;
@@ -137,7 +148,7 @@ static void ipmi_chassis_poh(struct ipmi_intf * intf)
 	memcpy(&count, rsp->data+1, 4);
 
 	printf("POH Counter  : %li hours total (%li days, %li hours)\n",
-	       count, (unsigned long)(count / 24), (unsigned long)(count % 24));
+	       count, (uint32_t)(count / 24), (uint32_t)(count % 24));
 }
 
 static void ipmi_chassis_restart_cause(struct ipmi_intf * intf)
@@ -246,6 +257,23 @@ static void ipmi_chassis_status(struct ipmi_intf * intf)
 	printf("Front-Panel Lockout  : %s\n", (rsp->data[2] & 0x2) ? "active" : "inactive");
 	printf("Drive Fault          : %s\n", (rsp->data[2] & 0x4) ? "true" : "false");
 	printf("Cooling/Fan Fault    : %s\n", (rsp->data[2] & 0x8) ? "true" : "false");
+
+        if (rsp->data_len > 3)
+        {
+            /* optional byte 4 */
+            if (rsp->data[3] == 0) {
+	        printf("Front Panel Control  : none\n");
+            } else {
+	        printf("Sleep Button Disable : %s\n", (rsp->data[3] & 0x80) ? "allowed" : "not allowed");
+	        printf("Diag Button Disable  : %s\n", (rsp->data[3] & 0x40) ? "allowed" : "not allowed");
+	        printf("Reset Button Disable : %s\n", (rsp->data[3] & 0x20) ? "allowed" : "not allowed");
+	        printf("Power Button Disable : %s\n", (rsp->data[3] & 0x10) ? "allowed" : "not allowed");
+	        printf("Sleep Button Disabled: %s\n", (rsp->data[3] & 0x80) ? "true" : "false");
+	        printf("Diag Button Disabled : %s\n", (rsp->data[3] & 0x40) ? "true" : "false");
+	        printf("Reset Button Disabled: %s\n", (rsp->data[3] & 0x20) ? "true" : "false");
+	        printf("Power Button Disabled: %s\n", (rsp->data[3] & 0x10) ? "true" : "false");
+            }
+        }
 }
 
 static void ipmi_chassis_set_bootparam(struct ipmi_intf * intf, unsigned char param, unsigned char * data, int len)
@@ -437,6 +465,7 @@ int ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv)
 			printf("chassis identify <interval>\n");
 			printf("                 default is 15 seconds\n");
 			printf("                 0 to turn off\n");
+			printf("                 force to turn on indefinitely\n");
 		} else {
 			ipmi_chassis_identify(intf, argv[1]);
 		}

ipmitool/lib/ipmi_fru.c

@@ -36,11 +36,17 @@
 
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_fru.h>
+#include <ipmitool/ipmi_sdr.h>
 
 #include <stdlib.h>
 #include <string.h>
 
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 extern int verbose;
+extern void ipmi_spd_print(struct ipmi_intf * intf, unsigned char id);
 
 static char * get_fru_area_str(unsigned char * data, int * offset)
 {
@@ -89,7 +95,8 @@ static void ipmi_fru_print(struct ipmi_intf * intf, unsigned char id)
 	rsp = intf->sendrecv(intf, &req);
 	if (!rsp || rsp->ccode)
 		return;
-	memcpy(&fru, rsp->data, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
 
 	if (verbose > 1)
 		printf("fru.size = %d bytes (accessed by %s)\n",
@@ -107,17 +114,41 @@ static void ipmi_fru_print(struct ipmi_intf * intf, unsigned char id)
 	req.msg.data_len = 4;
 
 	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode)
+
+	if (!rsp)
 		return;
+
+	if(rsp->ccode)
+	{
+		if (rsp->ccode == 0xc3)
+			printf ("  Timeout while reading FRU data. (Device not present?)\n");
+		return;
+	}
+
+	if (verbose > 1)
+		printbuf(rsp->data, rsp->data_len, "FRU DATA");
+
 	memcpy(&header, rsp->data + 1, 8);
 
+	if (header.version != 0x01)
+	{
+		printf ("  Unknown FRU header version %02x.\n", header.version);
+		return;
+	}
+
+	header.offset.internal *= 8;
+	header.offset.chassis *= 8;
+	header.offset.board *= 8;
+	header.offset.product *= 8;
+	header.offset.multi *= 8;
+
 	if (verbose > 1) {
 		printf("fru.header.version:         0x%x\n", header.version);
-		printf("fru.header.offset.internal: 0x%x\n", header.offset.internal * 8);
-		printf("fru.header.offset.chassis:  0x%x\n", header.offset.chassis * 8);
-		printf("fru.header.offset.board:    0x%x\n", header.offset.board * 8);
-		printf("fru.header.offset.product:  0x%x\n", header.offset.product * 8);
-		printf("fru.header.offset.multi:    0x%x\n", header.offset.multi * 8);
+		printf("fru.header.offset.internal: 0x%x\n", header.offset.internal);
+		printf("fru.header.offset.chassis:  0x%x\n", header.offset.chassis);
+		printf("fru.header.offset.board:    0x%x\n", header.offset.board);
+		printf("fru.header.offset.product:  0x%x\n", header.offset.product);
+		printf("fru.header.offset.multi:    0x%x\n", header.offset.multi);
 	}
 
 	offset = 0;
@@ -126,11 +157,11 @@ static void ipmi_fru_print(struct ipmi_intf * intf, unsigned char id)
 		msg_data[0] = id;
 		msg_data[1] = offset;
 		msg_data[2] = 0;
-		msg_data[3] = 32;
+		msg_data[3] = (fru.size - offset) > 32 ? 32 : (fru.size - offset);
 
 		rsp = intf->sendrecv(intf, &req);
 		if (!rsp || rsp->ccode)
-			continue;
+			break;
 
 		len = rsp->data[0];
 		memcpy(&fru_data[offset], rsp->data + 1, len);
@@ -138,79 +169,292 @@ static void ipmi_fru_print(struct ipmi_intf * intf, unsigned char id)
 	} while (offset < fru.size);
 
 	/* chassis area */
-	i = header.offset.chassis * 8;
-	chassis.area_ver = fru_data[i++];
-	chassis.area_len = fru_data[i++];
-	chassis.type = fru_data[i++];
-	chassis.part = get_fru_area_str(fru_data, &i);
-	chassis.serial = get_fru_area_str(fru_data, &i);
+
+	if (header.offset.chassis)
+	{
+		i = header.offset.chassis;
+		chassis.area_ver = fru_data[i++];
+		chassis.area_len = fru_data[i++] * 8;
+		chassis.type = fru_data[i++];
+		chassis.part = get_fru_area_str(fru_data, &i);
+		chassis.serial = get_fru_area_str(fru_data, &i);
+
+		printf("  Chassis Type     : %s\n", chassis_type_desc[chassis.type]);
+		printf("  Chassis Part     : %s\n", chassis.part);
+		printf("  Chassis Serial   : %s\n", chassis.serial);
+
+		while (fru_data[i] != 0xc1 && i < header.offset.chassis + chassis.area_len)
+		{
+			char *extra;
+
+			extra = get_fru_area_str(fru_data, &i);
+			if (extra [0]) printf("  Chassis Extra    : %s\n", extra);
+			free(extra);
+		}
+		free(chassis.part);
+		free(chassis.serial);
+	}
 
 	/* board area */
-	i = header.offset.board * 8;
-	board.area_ver = fru_data[i++];
-	board.area_len = fru_data[i++];
-	board.lang = fru_data[i++];
-	i += 3;	/* skip mfg. date time */
-	board.mfg = get_fru_area_str(fru_data, &i);
-	board.prod = get_fru_area_str(fru_data, &i);
-	board.serial = get_fru_area_str(fru_data, &i);
-	board.part = get_fru_area_str(fru_data, &i);
+
+	if (header.offset.board)
+	{
+		i = header.offset.board;
+		board.area_ver = fru_data[i++];
+		board.area_len = fru_data[i++] * 8;
+		board.lang = fru_data[i++];
+		i += 3;	/* skip mfg. date time */
+		board.mfg = get_fru_area_str(fru_data, &i);
+		board.prod = get_fru_area_str(fru_data, &i);
+		board.serial = get_fru_area_str(fru_data, &i);
+		board.part = get_fru_area_str(fru_data, &i);
+		board.fru = get_fru_area_str(fru_data, &i);
+
+		printf("  Board Mfg        : %s\n", board.mfg);
+		printf("  Board Product    : %s\n", board.prod);
+		printf("  Board Serial     : %s\n", board.serial);
+		printf("  Board Part       : %s\n", board.part);
+
+		if (verbose > 0)
+			printf("  Board FRU ID     : %s\n", board.fru);
+
+		while (fru_data[i] != 0xc1 && i < header.offset.board + board.area_len)
+		{
+			char *extra;
+
+			extra = get_fru_area_str(fru_data, &i);
+			if (extra [0]) printf("  Board Extra      : %s\n", extra);
+			free(extra);
+		}
+
+		free(board.mfg);
+		free(board.prod);
+		free(board.serial);
+		free(board.part);
+		free(board.fru);
+	}
 
 	/* product area */
-	i = header.offset.product * 8;
-	product.area_ver = fru_data[i++];
-	product.area_len = fru_data[i++];
-	product.lang = fru_data[i++];
-	product.mfg = get_fru_area_str(fru_data, &i);
-	product.name = get_fru_area_str(fru_data, &i);
-	product.part = get_fru_area_str(fru_data, &i);
-	product.version = get_fru_area_str(fru_data, &i);
-	product.serial = get_fru_area_str(fru_data, &i);
-	product.asset = get_fru_area_str(fru_data, &i);
 
-	printf("Chassis Type     : %s\n", chassis_type_desc[chassis.type]);
-	printf("Chassis Part     : %s\n", chassis.part);
-	printf("Chassis Serial   : %s\n", chassis.serial);
+	if (header.offset.product)
+	{
+		i = header.offset.product;
+		product.area_ver = fru_data[i++];
+		product.area_len = fru_data[i++] * 8;
+		product.lang = fru_data[i++];
+		product.mfg = get_fru_area_str(fru_data, &i);
+		product.name = get_fru_area_str(fru_data, &i);
+		product.part = get_fru_area_str(fru_data, &i);
+		product.version = get_fru_area_str(fru_data, &i);
+		product.serial = get_fru_area_str(fru_data, &i);
+		product.asset = get_fru_area_str(fru_data, &i);
+		product.fru = get_fru_area_str(fru_data, &i);
 
-	printf("Board Mfg        : %s\n", board.mfg);
-	printf("Board Product    : %s\n", board.prod);
-	printf("Board Serial     : %s\n", board.serial);
-	printf("Board Part       : %s\n", board.part);
+		printf("  Product Mfg      : %s\n", product.mfg);
+		printf("  Product Name     : %s\n", product.name);
+		printf("  Product Part     : %s\n", product.part);
+		printf("  Product Version  : %s\n", product.version);
+		printf("  Product Serial   : %s\n", product.serial);
+		printf("  Product Asset    : %s\n", product.asset);
 
-	printf("Product Mfg      : %s\n", product.mfg);
-	printf("Product Name     : %s\n", product.name);
-	printf("Product Part     : %s\n", product.part);
-	printf("Product Version  : %s\n", product.version);
-	printf("Product Serial   : %s\n", product.serial);
-	printf("Product Asset    : %s\n", product.asset);
+		if (verbose > 0)
+			printf("  Product FRU ID   : %s\n", product.fru);
 
-	free(chassis.part);
-	free(chassis.serial);
+		while (fru_data[i] != 0xc1 && i < header.offset.product + product.area_len)
+		{
+			char *extra;
 
-	free(board.mfg);
-	free(board.prod);
-	free(board.serial);
-	free(board.part);
+			extra = get_fru_area_str(fru_data, &i);
+			if (extra [0]) printf("  Product Extra    : %s\n", extra);
+			free(extra);
+		}
 
-	free(product.mfg);
-	free(product.name);
-	free(product.part);
-	free(product.version);
-	free(product.serial);
-	free(product.asset);
+		free(product.mfg);
+		free(product.name);
+		free(product.part);
+		free(product.version);
+		free(product.serial);
+		free(product.asset);
+		free(product.fru);
+	}
+
+	/* multirecord area */
+
+	if (header.offset.multi)
+	{
+		struct fru_multirec_header * h;
+		struct fru_multirec_powersupply * ps;
+		struct fru_multirec_dcoutput * dc;
+		struct fru_multirec_dcload * dl;
+		unsigned short peak_capacity;
+		unsigned char peak_hold_up_time;
+
+		i = header.offset.multi;
+
+		do
+		{
+			h = (struct fru_multirec_header *) (fru_data + i);
+
+			switch (h->type)
+			{
+			case FRU_RECORD_TYPE_POWER_SUPPLY_INFORMATION:
+				ps = (struct fru_multirec_powersupply *) (fru_data + i + sizeof (struct fru_multirec_header));
+
+#if WORDS_BIGENDIAN
+				ps->capacity		= BSWAP_16(ps->capacity);
+				ps->peak_va		= BSWAP_16(ps->peak_va);
+				ps->lowend_input1	= BSWAP_16(ps->lowend_input1);
+				ps->highend_input1	= BSWAP_16(ps->highend_input1);
+				ps->lowend_input2	= BSWAP_16(ps->lowend_input2);
+				ps->highend_input2	= BSWAP_16(ps->highend_input2);
+				ps->combined_capacity	= BSWAP_16(ps->combined_capacity);
+				ps->peak_cap_ht		= BSWAP_16(ps->peak_cap_ht);
+#endif
+				peak_hold_up_time 	= (ps->peak_cap_ht & 0xf000) >> 12;
+				peak_capacity 		= ps->peak_cap_ht & 0x0fff;
+
+				printf ("  Power Supply Record\n");
+				printf ("    Capacity               : %d W\n", ps->capacity);
+				printf ("    Peak VA                : %d VA\n", ps->peak_va);
+				printf ("    Inrush Current         : %d A\n", ps->inrush_current);
+				printf ("    Inrush Interval        : %d ms\n", ps->inrush_interval);
+				printf ("    Input Voltage Range 1  : %d-%d V\n", ps->lowend_input1 / 100, ps->highend_input1 / 100);
+				printf ("    Input Voltage Range 2  : %d-%d V\n", ps->lowend_input2 / 100, ps->highend_input2 / 100);
+				printf ("    Input Frequency Range  : %d-%d Hz\n", ps->lowend_freq, ps->highend_freq);
+				printf ("    A/C Dropout Tolerance  : %d ms\n", ps->dropout_tolerance);
+				printf ("    Flags                  : %s%s%s%s%s\n",
+					ps->predictive_fail ? "'Predictive fail' " : "",
+					ps->pfc ? "'Power factor correction' " : "",
+					ps->autoswitch ? "'Autoswitch voltage' " : "",
+					ps->hotswap ? "'Hot swap' " : "",
+					ps->predictive_fail ? ps->rps_threshold ?
+						ps->tach ? "'Two pulses per rotation'" : "'One pulse per rotation'" :
+						ps->tach ? "'Failure on pin de-assertion'" : "'Failure on pin assertion'" : "");
+				printf ("    Peak capacity          : %d W\n", peak_capacity);
+				printf ("    Peak capacity holdup   : %d s\n", peak_hold_up_time);
+				if (ps->combined_capacity == 0)
+					printf ("    Combined capacity      : not specified\n");
+				else
+					printf ("    Combined capacity      : %d W (%s and %s)\n", ps->combined_capacity,
+						combined_voltage_desc [ps->combined_voltage1],
+						combined_voltage_desc [ps->combined_voltage2]);
+				if (ps->predictive_fail)
+					printf ("    Fan lower threshold    : %d RPS\n", ps->rps_threshold);
+
+				break;
+
+			case FRU_RECORD_TYPE_DC_OUTPUT:
+				dc = (struct fru_multirec_dcoutput *) (fru_data + i + sizeof (struct fru_multirec_header));
+
+#if WORDS_BIGENDIAN
+				dc->nominal_voltage	= BSWAP_16(dc->nominal_voltage);
+				dc->max_neg_dev		= BSWAP_16(dc->max_neg_dev);
+				dc->max_pos_dev		= BSWAP_16(dc->max_pos_dev);
+				dc->ripple_and_noise	= BSWAP_16(dc->ripple_and_noise);
+				dc->min_current		= BSWAP_16(dc->min_current);
+				dc->max_current		= BSWAP_16(dc->max_current);
+#endif
+
+				printf ("  DC Output Record\n");
+				printf ("    Output Number          : %d\n", dc->output_number);
+				printf ("    Standby power          : %s\n", dc->standby ? "Yes" : "No");
+				printf ("    Nominal voltage        : %.2f V\n", (double) dc->nominal_voltage / 100);
+				printf ("    Max negative deviation : %.2f V\n", (double) dc->max_neg_dev / 100);
+				printf ("    Max positive deviation : %.2f V\n", (double) dc->max_pos_dev / 100);
+				printf ("    Ripple and noise pk-pk : %d mV\n", dc->ripple_and_noise);
+				printf ("    Minimum current draw   : %.3f A\n", (double) dc->min_current / 1000);
+				printf ("    Maximum current draw   : %.3f A\n", (double) dc->max_current / 1000);
+				break;
+
+			case FRU_RECORD_TYPE_DC_LOAD:
+				dl = (struct fru_multirec_dcload *) (fru_data + i + sizeof (struct fru_multirec_header));
+
+#if WORDS_BIGENDIAN
+				dl->nominal_voltage	= BSWAP_16(dl->nominal_voltage);
+				dl->min_voltage		= BSWAP_16(dl->min_voltage);
+				dl->max_voltage		= BSWAP_16(dl->max_voltage);
+				dl->ripple_and_noise	= BSWAP_16(dl->ripple_and_noise);
+				dl->min_current		= BSWAP_16(dl->min_current);
+				dl->max_current		= BSWAP_16(dl->max_current);
+#endif
+
+				printf ("  DC Load Record\n");
+				printf ("    Output Number          : %d\n", dl->output_number);
+				printf ("    Nominal voltage        : %.2f V\n", (double) dl->nominal_voltage / 100);
+				printf ("    Min voltage allowed    : %.2f V\n", (double) dl->min_voltage / 100);
+				printf ("    Max voltage allowed    : %.2f V\n", (double) dl->max_voltage / 100);
+				printf ("    Ripple and noise pk-pk : %d mV\n", dl->ripple_and_noise);
+				printf ("    Minimum current load   : %.3f A\n", (double) dl->min_current / 1000);
+				printf ("    Maximum current load   : %.3f A\n", (double) dl->max_current / 1000);
+				break;
+			}
+			i += h->len + sizeof (struct fru_multirec_header);
+		} while (!(h->format & 0x80));
+	}
+}
+
+static void ipmi_fru_print_all(struct ipmi_intf * intf)
+{
+	struct ipmi_sdr_iterator * itr;
+	struct sdr_get_rs * header;
+	struct sdr_record_fru_device_locator * fru;
+	char desc[17];
+
+	printf ("Builtin FRU device\n");
+	ipmi_fru_print(intf, 0); /* TODO: Figure out if FRU device 0 may show up in SDR records. */
+
+	if (!(itr = ipmi_sdr_start(intf)))
+		return;
+
+	while (header = ipmi_sdr_get_next_header(intf, itr))
+	{
+		if (header->type != SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR)
+			continue;
+
+		fru = (struct sdr_record_fru_device_locator *) ipmi_sdr_get_record(intf, header, itr);
+		if (!fru || fru->device_type != 0x10)
+			continue;
+
+		memset(desc, 0, sizeof(desc));
+		memcpy(desc, fru->id_string, fru->id_code & 0x01f);
+		desc[fru->id_code & 0x01f] = 0;
+		printf("\nFRU Device Description: %s    Device ID: %d\n", desc, fru->keys.fru_device_id);
+
+		switch (fru->device_type_modifier) {
+		case 0x00:
+		case 0x02:
+			ipmi_fru_print(intf, fru->keys.fru_device_id);
+			break;
+		case 0x01:
+			ipmi_spd_print(intf, fru->keys.fru_device_id);
+			break;
+		default:
+			if (verbose)
+				printf("  Unsupported device 0x%02x "
+					"type 0x%02x with modifier 0x%02x\n",
+					fru->keys.fru_device_id, fru->device_type,
+					fru->device_type_modifier);
+			else
+				printf("  Unsupported device\n");
+		}
+
+		free (fru);
+	}
+
+	ipmi_sdr_end(intf, itr);
 }
 
 int ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
 {
 	if (argc == 0) {
-		ipmi_fru_print(intf, 0);
+		ipmi_fru_print_all(intf);
 		return 0;
 	}
 
 	if (!strncmp(argv[0], "help", 4))
 		printf("FRU Commands:  print\n");
-	else if (!strncmp(argv[0], "print", 4))
-		ipmi_fru_print(intf, 0);
+	else if (!strncmp(argv[0], "print", 5))
+		ipmi_fru_print_all(intf);
 	else
 		printf("Invalid FRU command: %s\n", argv[0]);
 

ipmitool/lib/ipmi_lanp.c

@@ -225,7 +225,10 @@ ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel)
 
 	memset(&req, 0, sizeof(req));
 	rqdata[0] = channel & 0xf;
-	rqdata[1] = 0x80;	/* 0x80=active, 0x40=non-volatile */
+
+	/* get volatile settings */
+
+	rqdata[1] = 0x80; /* 0x80=active */
 	req.msg.netfn = IPMI_NETFN_APP;
 	req.msg.cmd = 0x41;
 	req.msg.data = rqdata;
@@ -236,10 +239,11 @@ ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel)
 		return;
 	}
 
-	printf("  Alerting              : %sabled\n", (rsp->data[0] & 0x20) ? "dis" : "en");
-	printf("  Per-message Auth      : %sabled\n", (rsp->data[0] & 0x10) ? "dis" : "en");
-	printf("  User Level Auth       : %sabled\n", (rsp->data[0] & 0x08) ? "dis" : "en");
-	printf("  Access Mode           : ");
+	printf("  Volatile(active) Settings\n");
+	printf("    Alerting            : %sabled\n", (rsp->data[0] & 0x20) ? "dis" : "en");
+	printf("    Per-message Auth    : %sabled\n", (rsp->data[0] & 0x10) ? "dis" : "en");
+	printf("    User Level Auth     : %sabled\n", (rsp->data[0] & 0x08) ? "dis" : "en");
+	printf("    Access Mode         : ");
 	switch (rsp->data[0] & 0x7) {
 	case 0:
 		printf("disabled\n");
@@ -257,38 +261,40 @@ ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel)
 		printf("unknown\n");
 		break;
 	}
-}
 
-#if 0
-static void suspend_lan_arp(struct ipmi_intf * intf, int suspend)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	unsigned char msg_data[2];
-
-	msg_data[0] = IPMI_LAN_CHANNEL_1;
-	msg_data[1] = suspend;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_TRANSPORT;
-	req.msg.cmd = IPMI_LAN_SUSPEND_ARP;
-	req.msg.data = msg_data;
-	req.msg.data_len = 2;
+	/* get non-volatile settings */
 
+	rqdata[1] = 0x40; /* 0x40=non-volatile */
 	rsp = intf->sendrecv(intf, &req);
-	if (rsp && !rsp->ccode)
-		printf("Suspend BMC ARP status  : 0x%x\n", rsp->data[0]);
-}
+	if (!rsp || rsp->ccode) {
+		return;
+	}
 
-static void set_lan_params(struct ipmi_intf * intf)
-{
-	lan_set_auth(intf);
-	lan_set_arp(intf);
-	suspend_lan_arp(intf, 0);
+	printf("  Non-Volatile Settings\n");
+	printf("    Alerting            : %sabled\n", (rsp->data[0] & 0x20) ? "dis" : "en");
+	printf("    Per-message Auth    : %sabled\n", (rsp->data[0] & 0x10) ? "dis" : "en");
+	printf("    User Level Auth     : %sabled\n", (rsp->data[0] & 0x08) ? "dis" : "en");
+	printf("    Access Mode         : ");
+	switch (rsp->data[0] & 0x7) {
+	case 0:
+		printf("disabled\n");
+		break;
+	case 1:
+		printf("pre-boot only\n");
+		break;
+	case 2:
+		printf("always available\n");
+		break;
+	case 3:
+		printf("shared\n");
+		break;
+	default:
+		printf("unknown\n");
+		break;
+	}
+	
 }
 
-#endif
-
 static void
 lan_set_arp_interval(struct ipmi_intf * intf, unsigned char chan, unsigned char * ival)
 {
@@ -302,12 +308,12 @@ lan_set_arp_interval(struct ipmi_intf * intf, unsigned char chan, unsigned char
 	if (ival) {
 		interval = ((unsigned char)atoi(ival) * 2) - 1;
 		set_lan_param(intf, chan, IPMI_LANP_GRAT_ARP, &interval, 1);
-		printf("BMC-generated Gratuitous ARP interval:  %.1f seconds\n",
-		       (float)((interval + 1) / 2));
 	} else {
-		printf("BMC-generated Gratuitous ARP interval:  %.1f seconds\n",
-		       (float)((lp->data[0] + 1) / 2));
+		interval = lp->data[0];
 	}
+
+	printf("BMC-generated Gratuitous ARP interval:  %.1f seconds\n",
+	       (float)((interval + 1) / 2));
 }
 
 static void
@@ -515,10 +521,10 @@ ipmi_set_channel_access(struct ipmi_intf * intf, unsigned char channel, unsigned
 	memset(&req, 0, sizeof(req));
 	rqdata[0] = channel & 0xf;
 
-	rqdata[1] = 0xa0;	/* set pef disabled, per-msg auth enabled */
+	rqdata[1] = 0x60;	/* save to nvram first */
 	if (enable)
 		rqdata[1] |= 0x2; /* set always available if enable is set */
-	rqdata[2] = 0x04; 	/* don't change channel privilege limit */
+	rqdata[2] = 0x44;	/* save to nvram first */
 	
 	req.msg.netfn = IPMI_NETFN_APP;
 	req.msg.cmd = 0x40;
@@ -532,6 +538,21 @@ ipmi_set_channel_access(struct ipmi_intf * intf, unsigned char channel, unsigned
 		return -1;
 	}
 
+	rqdata[1] = 0xa0;	/* set pef disabled, per-msg auth enabled */
+	if (enable)
+		rqdata[1] |= 0x2; /* set always available if enable is set */
+	rqdata[2] = 0x84; 	/* set channel privilege limit to ADMIN */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp || rsp->ccode) {
+		printf("Error:%x Set Channel Access Command (0x%x)\n",
+		       rsp ? rsp->ccode : 0, channel);
+		return -1;
+	}
+
+	if (!enable)		/* can't send close session if access off */
+		intf->abort = 1;
+
 	return 0;
 }
 
@@ -609,7 +630,7 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
 		return;
 	}
 
-	chan = (unsigned char) strtod(argv[0], NULL);
+	chan = (unsigned char)strtol(argv[0], NULL, 0);
 	if (chan != 0x6 && chan != 0x7) {
 		printf("valid LAN channels are 6 and 7\n");
 		return;
@@ -794,7 +815,7 @@ ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
 		 !strncmp(argv[0], "print", 5)) {
 		unsigned char chan = 7;
 		if (argc > 1)
-			chan = (unsigned char) strtod(argv[1], NULL);
+			chan = (unsigned char)strtol(argv[1], NULL, 0);
 		ipmi_lan_print(intf, chan);
 	}
 	else if (!strncmp(argv[0], "set", 3))

ipmitool/lib/ipmi_sel.c

@@ -80,12 +80,15 @@ ipmi_get_event_type(unsigned char code)
         return "Reserved";
 }
 
-static const char *
-ipmi_get_event_desc(struct sel_event_record * rec)
+static void
+ipmi_get_event_desc(struct sel_event_record * rec, char ** desc)
 {
 	unsigned char code, offset;
 	struct ipmi_event_sensor_types *evt;
 
+        if (desc == NULL)
+	        return;
+
 	if (rec->event_type == 0x6f) {
 		evt = sensor_specific_types;
 		code = rec->sensor_type;
@@ -97,12 +100,17 @@ ipmi_get_event_desc(struct sel_event_record * rec)
 	offset = rec->event_data[0] & 0xf;
 
 	while (evt->type) {
-		if (evt->code == code && evt->offset == offset)
-			return evt->desc;
+		if ((evt->code == code && evt->offset == offset)    &&
+                    ((evt->data == ALL_OFFSETS_SPECIFIED) ||
+                     ((rec->event_data[0] & DATA_BYTE2_SPECIFIED_MASK) &&
+                      (evt->data == rec->event_data[1]))))
+                {
+			*desc = (char *)malloc(strlen(evt->desc) + 32);
+                        sprintf(*desc, "%s", evt->desc);
+			return;
+                }
 		evt++;
 	}
-
-	return "Unknown Event";
 }
 
 static const char *
@@ -125,7 +133,7 @@ ipmi_sel_get_info(struct ipmi_intf * intf)
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = 0x40;
+	req.msg.cmd = IPMI_CMD_GET_SEL_INFO;
 
 	rsp = intf->sendrecv(intf, &req);
 	if (!rsp || rsp->ccode) {
@@ -162,7 +170,7 @@ ipmi_sel_get_info(struct ipmi_intf * intf)
 		/* get sel allocation info */
 		memset(&req, 0, sizeof(req));
 		req.msg.netfn = IPMI_NETFN_STORAGE;
-		req.msg.cmd = 0x41;
+		req.msg.cmd = IPMI_CMD_GET_SEL_ALLOC_INFO;
 
 		rsp = intf->sendrecv(intf, &req);
 		if (!rsp || rsp->ccode) {
@@ -179,8 +187,8 @@ ipmi_sel_get_info(struct ipmi_intf * intf)
 	}
 }
 
-static struct sel_event_record *
-ipmi_sel_get_std_entry(struct ipmi_intf * intf, unsigned short * next_id)
+static unsigned short
+ipmi_sel_get_std_entry(struct ipmi_intf * intf, unsigned short id, struct sel_event_record * evt)
 {
 	struct ipmi_rq req;
 	struct ipmi_rs * rsp;
@@ -190,111 +198,177 @@ ipmi_sel_get_std_entry(struct ipmi_intf * intf, unsigned short * next_id)
 	memset(msg_data, 0, 6);
 	msg_data[0] = 0x00;	/* no reserve id, not partial get */
 	msg_data[1] = 0x00;
-	memcpy(msg_data+2, next_id, sizeof(*next_id));
+	msg_data[2] = id & 0xff;
+	msg_data[3] = (id >> 8) & 0xff;
 	msg_data[4] = 0x00;	/* offset */
 	msg_data[5] = 0xff;	/* length */
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = 0x43;
+	req.msg.cmd = IPMI_CMD_GET_SEL_ENTRY;
 	req.msg.data = msg_data;
 	req.msg.data_len = 6;
 
 	rsp = intf->sendrecv(intf, &req);
 	if (!rsp || rsp->ccode) {
-		printf("Error%x in Get SEL Entry %x Command\n",
-		       rsp ? rsp->ccode : 0, *next_id);
-		return NULL;
+		printf("Error %x in Get SEL Entry %x Command\n",
+		       rsp ? rsp->ccode : 0, id);
+		return 0;
 	}
 	if (verbose > 2)
 		printbuf(rsp->data, rsp->data_len, "SEL Entry");
 
-	*next_id = (rsp->data[1] << 8) | rsp->data[0];
 
 	if (rsp->data[4] >= 0xc0) {
 		printf("Not a standard SEL Entry!\n");
-		return NULL;
+		return 0;
 	}
 
-	return (struct sel_event_record *) &rsp->data[2];
+	memset(evt, 0, sizeof(*evt));
+	evt->record_id = (rsp->data[3] << 8) | rsp->data[2];
+	evt->record_type = rsp->data[4];
+	evt->timestamp = (rsp->data[8] << 24) | (rsp->data[7] << 16) | (rsp->data[6] << 8) | rsp->data[5];
+	evt->gen_id = (rsp->data[10] << 8) | rsp->data[9];
+	evt->evm_rev = rsp->data[11];
+	evt->sensor_type = rsp->data[12];
+	evt->sensor_num = rsp->data[13];
+	evt->event_type = rsp->data[14] & 0x7f;
+	evt->event_dir = (rsp->data[14] & 0x80) >> 7;
+	evt->event_data[0] = rsp->data[15];
+	evt->event_data[1] = rsp->data[16];
+	evt->event_data[2] = rsp->data[17];
+
+	return (rsp->data[1] << 8) | rsp->data[0];
 }
 
 static char *
-ipmi_sel_timestamp(unsigned long stamp)
+ipmi_sel_timestamp(uint32_t stamp)
 {
 	static unsigned char tbuf[40];
-	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y %H:%M:%S", localtime(&stamp));
+	time_t s = (time_t)stamp;
+	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y %H:%M:%S", localtime(&s));
 	return tbuf;
 }
 
 static char *
-ipmi_sel_timestamp_date(unsigned long stamp)
+ipmi_sel_timestamp_date(uint32_t stamp)
 {
 	static unsigned char tbuf[11];
-	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y", localtime(&stamp));
+	time_t s = (time_t)stamp;
+	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y", localtime(&s));
 	return tbuf;
 }
 
 static char *
-ipmi_sel_timestamp_time(unsigned long stamp)
+ipmi_sel_timestamp_time(uint32_t stamp)
 {
 	static unsigned char tbuf[9];
-	strftime(tbuf, sizeof(tbuf), "%H:%M:%S", localtime(&stamp));
+	time_t s = (time_t)stamp;
+	strftime(tbuf, sizeof(tbuf), "%H:%M:%S", localtime(&s));
 	return tbuf;
 }
 
 void
-ipmi_sel_print_std_entry(int num, struct sel_event_record * evt)
+ipmi_sel_print_std_entry(struct sel_event_record * evt)
 {
+        char * description;
 	if (!evt)
 		return;
 
 	if (csv_output)
-		printf("%d,", num);
+		printf("%x,", evt->record_id);
 	else
-		printf("%4d | ", num);
+		printf("%4x | ", evt->record_id);
 
-	if (evt->timestamp < 0x20000000) {
-		printf("Pre-Init Time-stamp");
+	if (evt->record_type == 0xf0)
+	{
 		if (csv_output)
-			printf(",");
-		else
-			printf("   | ");
+			printf(",,");
+
+		printf ("Linux kernel panic: %.11s\n", (char *) evt + 5);
+		return;
 	}
-	else {
-		printf("%s", ipmi_sel_timestamp_date(evt->timestamp));
-		if (csv_output)
-			printf(",");
-		else
-			printf(" | ");
 
-		printf("%s", ipmi_sel_timestamp_time(evt->timestamp));
+	if (evt->record_type < 0xe0)
+	{
+		if (evt->timestamp < 0x20000000) {
+			printf("Pre-Init Time-stamp");
+			if (csv_output)
+				printf(",,");
+			else
+				printf("   | ");
+		}
+		else {
+			printf("%s", ipmi_sel_timestamp_date(evt->timestamp));
+			if (csv_output)
+				printf(",");
+			else
+				printf(" | ");
+
+			printf("%s", ipmi_sel_timestamp_time(evt->timestamp));
+			if (csv_output)
+				printf(",");
+			else
+				printf(" | ");
+		}
+	}
+	else
+	{
 		if (csv_output)
-			printf(",");
-		else
-			printf(" | ");
+			printf(",,");
+	}
+
+	if (evt->record_type >= 0xc0)
+	{
+		printf ("OEM record %02x\n", evt->record_type);
+		return;
 	}
 
 	printf("%s #0x%02x", ipmi_sel_get_sensor_type(evt->sensor_type), evt->sensor_num);
 
 	if (csv_output)
-		printf(",%s\n", ipmi_get_event_desc(evt));
+		printf(",");
 	else
-		printf(" | %s\n", ipmi_get_event_desc(evt));
+		printf(" | ");
+        ipmi_get_event_desc(evt, &description);
+	printf("%s\n", description ? description : "");
+        free(description);
 }
 
 void
 ipmi_sel_print_std_entry_verbose(struct sel_event_record * evt)
 {
+        char * description;
 	if (!evt)
 		return;
 
 	printf("SEL Record ID    : %04x\n",
 	       evt->record_id);
-	printf(" Record Type     : %02x\n",
-	       evt->record_type);
-	printf(" Timestamp       : %s\n",
-	       ipmi_sel_timestamp(evt->timestamp));
+
+	if (evt->record_type == 0xf0)
+	{
+		printf (" Record Type     : Linux kernel panic (OEM record %02x)\n", evt->record_type);
+		printf (" Panic string    : %.11s\n\n", (char *) evt + 5);
+		return;
+	}
+
+	if (evt->record_type >= 0xc0)
+		printf(" Record Type     : OEM record %02x\n", evt->record_type >= 0xc0);
+	else
+		printf(" Record Type     : %02x\n", evt->record_type);
+
+	if (evt->record_type < 0xe0)
+	{
+		printf(" Timestamp       : %s\n",
+		       ipmi_sel_timestamp(evt->timestamp));
+	}
+
+	if (evt->record_type >= 0xc0)
+	{
+		printf("\n");
+		return;
+	}
+
 	printf(" Generator ID    : %04x\n",
 	       evt->gen_id);
 	printf(" EvM Revision    : %02x\n",
@@ -309,8 +383,10 @@ ipmi_sel_print_std_entry_verbose(struct sel_event_record * evt)
 	       val2str(evt->event_dir, event_dir_vals));
 	printf(" Event Data      : %02x%02x%02x\n",
 	       evt->event_data[0], evt->event_data[1], evt->event_data[2]);
+        ipmi_get_event_desc(evt, &description);
 	printf(" Description     : %s\n",
-	       ipmi_get_event_desc(evt));
+               description ? description : "");
+        free(description);
 
 	printf("\n");
 }
@@ -321,34 +397,33 @@ ipmi_sel_list_entries(struct ipmi_intf * intf)
 	struct ipmi_rs * rsp;
 	struct ipmi_rq req;
 	unsigned short reserve_id, next_id = 0;
-	int num = 1;
-	struct sel_event_record * evt;
+	struct sel_event_record evt;
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = 0x40;
+	req.msg.cmd = IPMI_CMD_GET_SEL_INFO;
 
 	rsp = intf->sendrecv(intf, &req);
 	if (!rsp || rsp->ccode) {
-		printf("Error%x in Get SEL Info command\n",
+		printf("Error: %x from Get SEL Info command\n",
 		       rsp ? rsp->ccode : 0);
 		return;
 	}
 	if (verbose > 2)
 		printbuf(rsp->data, rsp->data_len, "sel_info");
 
-	if (!rsp->data[1]) {
+	if (!rsp->data[1] && !rsp->data[2]) {
 		printf("SEL has no entries\n");
 		return;
 	}
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = 0x42;	/* reserve SEL */
+	req.msg.cmd = IPMI_CMD_RESERVE_SEL;
 
 	rsp = intf->sendrecv(intf, &req);
 	if (!rsp || rsp->ccode) {
-		printf("Error:%x unable to reserve SEL\n",
+		printf("Error: %x from Reserve SEL command\n",
 		       rsp ? rsp->ccode : 0);
 		return;
 	}
@@ -360,15 +435,15 @@ ipmi_sel_list_entries(struct ipmi_intf * intf)
 	while (next_id != 0xffff) {
 		if (verbose > 1)
 			printf("SEL Next ID: %04x\n", next_id);
-		/* next_id is updated by this function */
-		evt = ipmi_sel_get_std_entry(intf, &next_id);
-		if (!evt)
+
+		next_id = ipmi_sel_get_std_entry(intf, next_id, &evt);
+		if (!next_id)
 			break;
+
 		if (verbose)
-			ipmi_sel_print_std_entry_verbose(evt);
+			ipmi_sel_print_std_entry_verbose(&evt);
 		else
-			ipmi_sel_print_std_entry(num, evt);
-		num++;
+			ipmi_sel_print_std_entry(&evt);
 	}
 }
 
@@ -380,7 +455,7 @@ ipmi_sel_reserve(struct ipmi_intf * intf)
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = 0x42;	/* reserve SEL */
+	req.msg.cmd = IPMI_CMD_RESERVE_SEL;
 
 	rsp = intf->sendrecv(intf, &req);
 	if (!rsp || rsp->ccode) {
@@ -414,7 +489,7 @@ ipmi_sel_clear(struct ipmi_intf * intf)
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = 0x47;	/* clear SEL */
+	req.msg.cmd = IPMI_CMD_CLEAR_SEL;
 	req.msg.data = msg_data;
 	req.msg.data_len = 6;
 
@@ -427,18 +502,67 @@ ipmi_sel_clear(struct ipmi_intf * intf)
 	printf("Clearing SEL.  Please allow a few seconds to erase.\n");
 }
 
+static void
+ipmi_sel_delete(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned short id;
+	unsigned char msg_data[4];
+
+	if (!argc || !strncmp(argv[0], "help", 4))
+	{
+		printf("usage: delete [id ...]\n");
+		return;
+	}
+
+	id = ipmi_sel_reserve(intf);
+	if (id == 0)
+		return;
+
+	memset(msg_data, 0, 4);
+	msg_data[0] = id & 0xff;
+	msg_data[1] = id >> 8;
+	while (argc)
+	{
+		id = atoi(argv[argc-1]);
+		msg_data[2] = id & 0xff;
+		msg_data[3] = id >> 8;
+
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_STORAGE;
+		req.msg.cmd = IPMI_CMD_DELETE_SEL_ENTRY;
+		req.msg.data = msg_data;
+		req.msg.data_len = 4;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (!rsp || rsp->ccode) 
+		{
+			if (!rsp) printf("No response\n");
+			printf("Error %x unable to delete entry %d\n", rsp ? rsp->ccode : 0, id);
+		}
+		else
+		{
+			printf("Deleted entry %d\n", id);
+		}
+                argc--;
+	}
+}
+
 int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
 {
 	if (!argc)
 		ipmi_sel_get_info(intf);
 	else if (!strncmp(argv[0], "help", 4))
-		printf("SEL Commands:  info clear list\n");
+		printf("SEL Commands:  info clear delete list\n");
 	else if (!strncmp(argv[0], "info", 4))
 		ipmi_sel_get_info(intf);
 	else if (!strncmp(argv[0], "list", 4))
 		ipmi_sel_list_entries(intf);
 	else if (!strncmp(argv[0], "clear", 5))
 		ipmi_sel_clear(intf);
+	else if (!strncmp(argv[0], "delete", 6))
+		ipmi_sel_delete(intf, argc-1, &argv[1]);
 	else
 		printf("Invalid SEL command: %s\n", argv[0]);
 	return 0;

ipmitool/lib/ipmi_sensor.c

@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+#include <string.h>
+#include <math.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_sensor.h>
+
+extern int verbose;
+
+#define READING_UNAVAILABLE	0x20
+#define SCANNING_DISABLED	0x80
+
+static void
+ipmi_get_sensor_info_compact(struct ipmi_intf * intf,
+                             struct sdr_record_compact_sensor * sensor)
+{
+}
+
+static void
+ipmi_get_sensor_info_full(struct ipmi_intf * intf,
+                           struct sdr_record_full_sensor * sensor)
+{
+    struct ipmi_rs * rsp;
+    char sval[16], unitstr[16], desc[17];
+    float val, tol;
+    unsigned raw_tol;
+    int i=0, not_available=0;
+
+    memset(desc, 0, sizeof(desc));
+    memcpy(desc, sensor->id_string, 16);
+
+    rsp = ipmi_sdr_get_sensor_reading(intf, sensor->keys.sensor_num);
+    if ((rsp && (rsp->data[1] & READING_UNAVAILABLE)) ||
+        (rsp && !(rsp->data[1] & SCANNING_DISABLED)))
+        not_available = 1;
+    else {
+        memset(unitstr, 0, sizeof(unitstr));
+        /* determine units with possible modifiers */
+        switch (sensor->unit.modifier) {
+        case 2:
+                i += snprintf(unitstr, sizeof(unitstr), "%s * %s",
+                              unit_desc[sensor->unit.type.base],
+                              unit_desc[sensor->unit.type.modifier]);
+                break;
+        case 1:
+                i += snprintf(unitstr, sizeof(unitstr), "%s/%s",
+                              unit_desc[sensor->unit.type.base],
+                              unit_desc[sensor->unit.type.modifier]);
+                break;
+        case 0:
+        default:
+                i += snprintf(unitstr, sizeof(unitstr), "%s",
+                              unit_desc[sensor->unit.type.base]);
+                break;
+        }
+
+        val = sdr_convert_sensor_reading(sensor, rsp->data[0]);
+        raw_tol = (sensor->mtol & 0x3f00) >> 8;
+        tol = sdr_convert_sensor_reading(sensor, raw_tol * 2);
+    }
+
+    if (!verbose) {
+        /*
+         * print sensor name, reading, state
+         */
+        printf("%-16s | ", sensor->id_code ? desc : NULL);
+
+        i = 0;
+        memset(sval, 0, sizeof(sval));
+        if (not_available) {
+            i += snprintf(sval, sizeof(sval), "no reading ");
+        } else {
+            i += snprintf(sval, sizeof(sval), "%.*f %s", (val==(int)val) ? 0 : 3, val, unitstr);
+        }
+        printf("%s", sval);
+
+        i--;
+        for (; i<sizeof(sval); i++)
+                printf(" ");
+        printf(" | ");
+
+        printf("%s", ipmi_sdr_get_status(rsp->data[2]));
+        printf("\n");
+    } else {
+        printf("Sensor ID              : %s (0x%x)\n", desc, sensor->keys.sensor_num);
+        if (not_available)
+            printf("Sensor Reading         : Unavailable");
+        else
+            printf("Sensor Reading         : %.*f (+/- %.*f) %s\n",
+                   (val==(int)val) ? 0 : 3, 
+                   val, 
+                   (tol==(int)tol) ? 0 : 3, 
+                   tol, 
+                   unitstr);
+        printf("\n");
+    }
+}
+
+static void
+ipmi_sensor_list(struct ipmi_intf * intf)
+{
+    ipmi_sdr_print_sdr(intf, 0xff);
+}
+
+int
+ipmi_sensor_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	if (!argc)
+		ipmi_sensor_list(intf);
+	else if (!strncmp(argv[0], "help", 4)) {
+		printf("Sensor Commands:  list\n");
+	}
+	else if (!strncmp(argv[0], "list", 4)) {
+		ipmi_sensor_list(intf);
+	}
+	else
+		printf("Invalid sensor command: %s\n", argv[0]);
+	return 0;
+}

ipmitool/src/Makefile.am

@@ -38,23 +38,17 @@ SUBDIRS			= plugins
 MAINTAINERCLEANFILES	= Makefile.in
 
 if IPMIEVD
-
 EXTRA_DIST		= bmcautoconf.sh
 bin_PROGRAMS		= ipmievd ipmitool
 ipmievd_SOURCES		= ipmievd.c
-ipmievd_LDADD		= $(top_srcdir)/lib/libipmitool.la
-ipmievd_LDFLAGS		= 
-
+ipmievd_LDADD		= $(top_srcdir)/lib/libipmitool.la $(top_srcdir)/src/plugins/libintf.la
 else
-
 EXTRA_DIST		= bmcautoconf.sh ipmievd.c
 bin_PROGRAMS		= ipmitool
-
 endif
 
 ipmitool_SOURCES	= ipmitool.c
-ipmitool_LDADD		= $(top_srcdir)/lib/libipmitool.la
-ipmitool_LDFLAGS	= 
+ipmitool_LDADD		= $(top_srcdir)/lib/libipmitool.la $(top_srcdir)/src/plugins/libintf.la
 
 bin_SCRIPTS		= bmcautoconf.sh
 

ipmitool/src/bmcautoconf.sh

@@ -145,5 +145,8 @@ ipmitool_lan_set "defgw macaddr" $DEF_ROUTE_MAC
 ipmitool_lan_set "auth callback,user,operator,admin" "md2,md5"
 ipmitool_lan_set "access" "on"
 ipmitool_lan_set "user"
+ipmitool_lan_set "arp generate" "on"
+ipmitool_lan_set "arp interval" "8"
 
 exit 0
+

ipmitool/src/ipmievd.c

@@ -56,7 +56,6 @@
 extern int errno;
 int verbose = 0;
 int csv_output = 0;
-int num = 0;
 
 static int enable_event_msg_buffer(struct ipmi_intf * intf)
 {
@@ -145,7 +144,7 @@ static void read_event(struct ipmi_intf * intf)
 	if (verbose)
 		ipmi_sel_print_std_entry_verbose((struct sel_event_record *)recv.msg.data);
 	else
-		ipmi_sel_print_std_entry(num++, (struct sel_event_record *)recv.msg.data);
+		ipmi_sel_print_std_entry((struct sel_event_record *)recv.msg.data);
 }
 
 static int do_exit(struct ipmi_intf * intf, int rv)

ipmitool/src/ipmitool.c

@@ -55,6 +55,7 @@
 #include <ipmitool/ipmi_lanp.h>
 #include <ipmitool/ipmi_chassis.h>
 #include <ipmitool/ipmi_bmc.h>
+#include <ipmitool/ipmi_sensor.h>
 
 struct ipmi_session lan_session;
 int csv_output = 0;
@@ -93,8 +94,8 @@ int ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv)
 		return -1;
 	}
 
-	netfn = strtod(argv[0], NULL);
-	cmd = strtod(argv[1], NULL);
+	netfn = (unsigned char)strtol(argv[0], NULL, 0);
+	cmd = (unsigned char)strtol(argv[1], NULL, 0);
 
 	memset(data, 0, sizeof(data));
 	memset(&req, 0, sizeof(req));
@@ -103,7 +104,7 @@ int ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv)
 	req.msg.data = data;
 
 	for (i=2; i<argc; i++) {
-		unsigned char val = strtod(argv[i], NULL);
+		unsigned char val = (unsigned char)strtol(argv[i], NULL, 0);
 		req.msg.data[i-2] = val;
 		req.msg.data_len++;
 	}
@@ -174,7 +175,7 @@ ipmi_get_user_access(struct ipmi_intf * intf, unsigned char channel, unsigned ch
 }
 
 static int
-ipmi_send_platform_event(struct ipmi_intf * intf)
+ipmi_send_platform_event(struct ipmi_intf * intf, int num)
 {
 	struct ipmi_rs * rsp;
 	struct ipmi_rq req;
@@ -183,35 +184,61 @@ ipmi_send_platform_event(struct ipmi_intf * intf)
 	memset(&req, 0, sizeof(req));
 	memset(rqdata, 0, 8);
 
-#if 0
-	/* System Interface */
-	rqdata[0] = 0x20;	/* generator ID */
-	rqdata[1] = 0x04;	/* EvMRev */
-	rqdata[2] = 0x01;	/* Sensor Type */
-	rqdata[3] = 0x30;	/* Sensor # */
-	rqdata[4] = 0x04;	/* Event Dir / Event Type */
-	rqdata[5] = 0x00;	/* Event Data 1 */
-	rqdata[6] = 0x00;	/* Event Data 2 */
-	rqdata[7] = 0x00;	/* Event Data 3 */
-#else
+	printf("Sending ");
+
 	/* IPMB/LAN/etc */
-	rqdata[0] = 0x04;	/* EvMRev */
-	rqdata[1] = 0x01;	/* Sensor Type */
-	rqdata[2] = 0x30;	/* Sensor # */
-	rqdata[3] = 0x04;	/* Event Dir / Event Type */
-	rqdata[4] = 0x00;	/* Event Data 1 */
-	rqdata[5] = 0x00;	/* Event Data 2 */
-	rqdata[6] = 0x00;	/* Event Data 3 */
-#endif
+	switch (num) {
+	case 0:			/* temperature */
+		printf("Temperature");
+		rqdata[0] = 0x04;	/* EvMRev */
+		rqdata[1] = 0x01;	/* Sensor Type */
+		rqdata[2] = 0x30;	/* Sensor # */
+		rqdata[3] = 0x04;	/* Event Dir / Event Type */
+		rqdata[4] = 0x00;	/* Event Data 1 */
+		rqdata[5] = 0x00;	/* Event Data 2 */
+		rqdata[6] = 0x00;	/* Event Data 3 */
+		break;
+	case 1:			/* correctable ECC */
+		printf("Memory Correctable ECC");
+		rqdata[0] = 0x04;	/* EvMRev */
+		rqdata[1] = 0x0c;	/* Sensor Type */
+		rqdata[2] = 0x01;	/* Sensor # */
+		rqdata[3] = 0x6f;	/* Event Dir / Event Type */
+		rqdata[4] = 0x00;	/* Event Data 1 */
+		rqdata[5] = 0x00;	/* Event Data 2 */
+		rqdata[6] = 0x00;	/* Event Data 3 */
+		break;
+	case 2:			/* uncorrectable ECC */
+		printf("Memory Uncorrectable ECC");
+		rqdata[0] = 0x04;	/* EvMRev */
+		rqdata[1] = 0x0c;	/* Sensor Type */
+		rqdata[2] = 0x01;	/* Sensor # */
+		rqdata[3] = 0x6f;	/* Event Dir / Event Type */
+		rqdata[4] = 0x01;	/* Event Data 1 */
+		rqdata[5] = 0x00;	/* Event Data 2 */
+		rqdata[6] = 0x00;	/* Event Data 3 */
+		break;
+	case 3:			/* parity error */
+		printf("Memory Parity Error");
+		rqdata[0] = 0x04;	/* EvMRev */
+		rqdata[1] = 0x0c;	/* Sensor Type */
+		rqdata[2] = 0x01;	/* Sensor # */
+		rqdata[3] = 0x6f;	/* Event Dir / Event Type */
+		rqdata[4] = 0x02;	/* Event Data 1 */
+		rqdata[5] = 0x00;	/* Event Data 2 */
+		rqdata[6] = 0x00;	/* Event Data 3 */
+		break;
+	default:
+		printf("Invalid event number: %d\n", num);
+		return -1;
+	}
+
+	printf(" event to BMC\n");
 
 	req.msg.netfn = IPMI_NETFN_SE;
 	req.msg.cmd = 0x02;
 	req.msg.data = rqdata;
-#if 0
-	req.msg.data_len = 8;
-#else
 	req.msg.data_len = 7;
-#endif
 
 	rsp = intf->sendrecv(intf, &req);
 	if (!rsp || rsp->ccode) {
@@ -291,14 +318,20 @@ int main(int argc, char ** argv)
 	intf->pedantic = pedantic;
 
 	if (!strncmp(argv[optind], "help", 4)) {
-		printf("Commands:  chassis, fru, lan, sdr, sel\n");
+		printf("Commands:  bmc, chaninfo, chassis, event, fru, lan, raw, sdr, sel, sensor, sol, userinfo\n");
 		goto out_free;
 	}
 	else if (!strncmp(argv[optind], "event", 5)) {
-		if (intf->open(intf, hostname, port, username, password) < 0)
+		if (argc-optind-1 > 0) {
+			unsigned char c = (unsigned char)strtol(argv[optind+1], NULL, 0);
+			if (intf->open(intf, hostname, port, username, password) < 0)
+				goto out_free;
+			ipmi_send_platform_event(intf, c);
+			goto out_close;
+		} else {
+			printf("event <num>\n");
 			goto out_free;
-		ipmi_send_platform_event(intf);
-		goto out_close;
+		}
 	}
 	else if (!strncmp(argv[optind], "bmc", 3)) {
 		submain = ipmi_bmc_main;
@@ -318,6 +351,9 @@ int main(int argc, char ** argv)
 	else if (!strncmp(argv[optind], "sel", 3)) {
 		submain = ipmi_sel_main;
 	}
+	else if (!strncmp(argv[optind], "sensor", 6)) {
+		submain = ipmi_sensor_main;
+	}
 	else if (!strncmp(argv[optind], "sol", 3)) {
 		submain = ipmi_sol_main;
 	}
@@ -326,7 +362,7 @@ int main(int argc, char ** argv)
 	}
 	else if (!strncmp(argv[optind], "userinfo", 8)) {
 		if (argc-optind-1 > 0) {
-			unsigned char c = strtod(argv[optind+1], NULL);
+			unsigned char c = (unsigned char)strtol(argv[optind+1], NULL, 0);
 			rc = intf->open(intf, hostname, port, username, password);
 			if (rc < 0)
 				goto out_free;
@@ -340,7 +376,7 @@ int main(int argc, char ** argv)
 	}
 	else if (!strncmp(argv[optind], "chaninfo", 8)) {
 		if (argc-optind-1 > 0) {
-			unsigned char c = strtod(argv[optind+1], NULL);
+			unsigned char c = (unsigned char)strtol(argv[optind+1], NULL, 0);
 			rc = intf->open(intf, hostname, port, username, password);
 			if (rc < 0)
 				goto out_free;

ipmitool/src/plugins/Makefile.am

@@ -32,8 +32,18 @@
 # in the design, construction, operation or maintenance of any nuclear
 # facility.
 
-MAINTAINERCLEANFILES = Makefile.in
+plugindir			= $(pluginpath)
 
-plugindir = $(pluginpath)
+INCLUDES			= -I$(top_srcdir)/include $(INCLTDL)
+MAINTAINERCLEANFILES		= Makefile.in ipmi_intf_static.c
+EXTRA_DIST			= ipmi_intf_static.c.in
+
+SUBDIRS				= @INTF_LAN@ @INTF_OPEN@
+DIST_SUBDIRS			= lan open
+
+noinst_LTLIBRARIES		= libintf.la
+libintf_la_SOURCES		= ipmi_intf.c ipmi_intf_static.c
+libintf_la_LDFLAGS		= -export-dynamic
+libintf_la_LIBADD		= $(LIBLTDL) @STATIC_INTF_LIB@
+libintf_la_DEPENDENCIES		= $(LIBLTDL) @STATIC_INTF_LIB@
 
-SUBDIRS = @PLUGINS@

ipmitool/src/plugins/ipmi_intf.c

@@ -42,6 +42,8 @@
 #include <ipmitool/ipmi_intf.h>
 #include <ipmitool/ipmi.h>
 
+extern struct static_intf static_intf_list[];
+
 /* ipmi_intf_init
  * initialize dynamic plugin interface
  */
@@ -78,23 +80,43 @@ struct ipmi_intf * ipmi_intf_load(char * name)
 {
 	lt_dlhandle handle;
 	struct ipmi_intf * intf;
-	int (*intf_setup)(struct ipmi_intf ** intf);
+	int (*setup)(struct ipmi_intf ** intf);
+	struct static_intf *i = static_intf_list;
+	char libname[16];
 
-	handle = lt_dlopenext(name);
-	if (handle == NULL) {
+	while (i->name) {
+		if (!strcmp(name, i->name)) {
+			if (i->setup(&intf) < 0) {
+				printf("ERROR: Unable to setup static interface %s\n", name);
+				return NULL;
+			}
+			return intf;
+		}
+		i++;
+	}
+
+	memset(libname, 0, 16);
+	if (snprintf(libname, sizeof(libname), "lib%s", name) <= 0) {
 		printf("ERROR: Unable to find plugin '%s' in '%s'\n",
 		       name, PLUGIN_PATH);
 		return NULL;
 	}
 
-	intf_setup = lt_dlsym(handle, "intf_setup");
-	if (!intf_setup) {
+	handle = lt_dlopenext(libname);
+	if (handle == NULL) {
+		printf("ERROR: Unable to find plugin '%s' in '%s'\n",
+		       libname, PLUGIN_PATH);
+		return NULL;
+	}
+
+	setup = lt_dlsym(handle, "intf_setup");
+	if (!setup) {
 		printf("ERROR: Unable to find interface setup symbol in plugin %s\n", name);
 		lt_dlclose(handle);
 		return NULL;
 	}
 
-	if (intf_setup(&intf) < 0) {
+	if (setup(&intf) < 0) {
 		printf("ERROR: Unable to run interface setup for plugin %s\n", name);
 		lt_dlclose(handle);
 		return NULL;

ipmitool/src/plugins/ipmi_intf_static.c.in

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <config.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi.h>
+
+@STATIC_INTF_EXT@
+
+struct static_intf static_intf_list[] = {
+	@STATIC_INTF@
+	{ 0, 0 }
+};

ipmitool/src/plugins/lan/Makefile.am

@@ -38,9 +38,10 @@ plugindir = $(pluginpath)
 
 INCLUDES = -I$(top_srcdir)/include
 
-intf_lan_la_LDFLAGS	= -module -avoid-version
-intf_lan_la_LIBADD	= $(top_srcdir)/lib/libipmitool.la
-intf_lan_la_SOURCES	= lan.c lan.h asf.h rmcp.h md5.c md5.h
-
-plugin_LTLIBRARIES	= intf_lan.la
+EXTRA_LTLIBRARIES	= libintf_lan.la
+plugin_LTLIBRARIES	= @PLUGIN_INTF_LAN@
+noinst_LTLIBRARIES	= @STATIC_INTF_LAN@
+libintf_lan_la_LDFLAGS	= @LDFLAGS_INTF_LAN@
+libintf_lan_la_LIBADD	= $(top_srcdir)/lib/libipmitool.la
+libintf_lan_la_SOURCES	= lan.c lan.h asf.h rmcp.h md5.c md5.h
 

ipmitool/src/plugins/lan/lan.c

@@ -36,6 +36,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -83,26 +84,6 @@ query_alarm(int signo)
 	siglongjmp(jmpbuf, 1);
 }
 
-#if 0
-const struct valstr ipmi_privlvl_vals[] = {
-	{ IPMI_SESSION_PRIV_CALLBACK,	"CALLBACK" },
-	{ IPMI_SESSION_PRIV_USER,	"USER" },
-	{ IPMI_SESSION_PRIV_OPERATOR,	"OPERATOR" },
-	{ IPMI_SESSION_PRIV_ADMIN,	"ADMINISTRATOR" },
-	{ IPMI_SESSION_PRIV_OEM,	"OEM" },
-	{ 0xF,				"NO ACCESS" },
-	{ 0,				NULL },
-};
-
-const struct valstr ipmi_authtype_vals[] = {
-	{ IPMI_SESSION_AUTHTYPE_NONE,	"NONE" },
-	{ IPMI_SESSION_AUTHTYPE_MD2,	"MD2" },
-	{ IPMI_SESSION_AUTHTYPE_MD5,	"MD5" },
-	{ IPMI_SESSION_AUTHTYPE_KEY,	"PASSWORD" },
-	{ IPMI_SESSION_AUTHTYPE_OEM,	"OEM" },
-	{ 0,				NULL },
-};
-#endif
 static const struct valstr ipmi_channel_protocol_vals[] = {
 	{ 0x00, "reserved" },
 	{ 0x01, "IPMB-1.0" },
@@ -298,8 +279,8 @@ ipmi_handle_pong(struct ipmi_intf * intf, struct ipmi_rs * rsp)
 	struct rmcp_pong {
 		struct rmcp_hdr rmcp;
 		struct asf_hdr asf;
-		unsigned long iana;
-		unsigned long oem;
+		uint32_t iana;
+		uint32_t oem;
 		unsigned char sup_entities;
 		unsigned char sup_interact;
 		unsigned char reserved[6];
@@ -456,7 +437,8 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
 		}
 			
 		if (rmcp_rsp.class != RMCP_CLASS_IPMI) {
-			printf("Invalid RMCP class: %x\n", rmcp_rsp.class);
+			if (verbose > 1)
+				printf("Invalid RMCP class: %x\n", rmcp_rsp.class);
 			rsp = ipmi_lan_recv_packet(intf);
 			continue;
 		}
@@ -600,8 +582,10 @@ ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
 	/* ipmi session header */
 	msg[len++] = lan_session.active ? lan_session.authtype : 0;
 
-	memcpy(msg+len, &lan_session.in_seq, 4);
-	len += 4;
+	msg[len++] = lan_session.in_seq & 0xff;
+	msg[len++] = (lan_session.in_seq >> 8) & 0xff;
+	msg[len++] = (lan_session.in_seq >> 16) & 0xff;
+	msg[len++] = (lan_session.in_seq >> 24) & 0xff;
 	memcpy(msg+len, &lan_session.id, 4);
 	len += 4;
 
@@ -717,103 +701,6 @@ ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
 	return rsp;
 }
 
-#if 0
-void
-ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	unsigned char rqdata[2];
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_APP;
-	req.msg.cmd = 0x42;
-	req.msg.data = &channel;
-	req.msg.data_len = 1;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (!rsp || rsp->ccode) {
-		printf("Error:%x Get Channel Info Command (0x%x)\n",
-		       rsp ? rsp->ccode : 0, channel);
-		return;
-	}
-
-	if (!verbose)
-		return;
-
-	printf("Channel 0x%x info:\n", rsp->data[0] & 0xf);
-
-	printf("  Channel Medium Type   : %s\n",
-	       val2str(rsp->data[1] & 0x7f, ipmi_channel_medium_vals));
-
-	printf("  Channel Protocol Type : %s\n",
-	       val2str(rsp->data[2] & 0x1f, ipmi_channel_protocol_vals));
-
-	printf("  Session Support       : ");
-	switch (rsp->data[3] & 0xc0) {
-	case 0x00:
-		printf("session-less\n");
-		break;
-	case 0x40:
-		printf("single-session\n");
-		break;
-	case 0x80:
-		printf("multi-session\n");
-		break;
-	case 0xc0:
-	default:
-		printf("session-based\n");
-		break;
-	}
-
-	printf("  Active Session Count  : %d\n",
-	       rsp->data[3] & 0x3f);
-	printf("  Protocol Vendor ID    : %d\n",
-	       rsp->data[4] | rsp->data[5] << 8 | rsp->data[6] << 16);
-
-	memset(&req, 0, sizeof(req));
-	rqdata[0] = channel & 0xf;
-	rqdata[1] = 0x80;	/* 0x80=active, 0x40=non-volatile */
-	req.msg.netfn = IPMI_NETFN_APP;
-	req.msg.cmd = 0x41;
-	req.msg.data = rqdata;
-	req.msg.data_len = 2;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode) {
-		printf("Error:%x Get Channel Access Command (0x%x)\n",
-		       rsp ? rsp->ccode : 0, channel);
-		return;
-	}
-
-	printf("  Alerting              : %sabled\n",
-	       (rsp->data[0] & 0x20) ? "dis" : "en");
-	printf("  Per-message Auth      : %sabled\n",
-	       (rsp->data[0] & 0x10) ? "dis" : "en");
-	printf("  User Level Auth       : %sabled\n",
-	       (rsp->data[0] & 0x08) ? "dis" : "en");
-	printf("  Access Mode           : ");
-	switch (rsp->data[0] & 0x7) {
-	case 0:
-		printf("disabled\n");
-		break;
-	case 1:
-		printf("pre-boot only\n");
-		break;
-	case 2:
-		printf("always available\n");
-		break;
-	case 3:
-		printf("shared\n");
-		break;
-	default:
-		printf("unknown\n");
-		break;
-	}
-}
-#endif
-
 /*
  * IPMI Get Channel Authentication Capabilities Command
  */
@@ -847,7 +734,7 @@ ipmi_get_auth_capabilities_cmd(struct ipmi_intf * intf)
 		return -1;
 	}
 
-	if (verbose) {
+	if (verbose > 1) {
 		printf("Channel %02x Authentication Capabilities:\n",
 		       rsp->data[0]);
 		printf("  Privilege Level : %s\n",
@@ -893,7 +780,7 @@ ipmi_get_auth_capabilities_cmd(struct ipmi_intf * intf)
 		return -1;
 	}
 
-	if (verbose)
+	if (verbose > 1)
 		printf("Proceeding with AuthType %s\n",
 		       val2str(lan_session.authtype, ipmi_authtype_vals));
 
@@ -947,7 +834,7 @@ ipmi_get_session_challenge_cmd(struct ipmi_intf * intf)
 	memcpy(&lan_session.id, rsp->data, 4);
 	memcpy(lan_session.challenge, rsp->data + 4, 16);
 
-	if (verbose) {
+	if (verbose > 1) {
 		printf("Opening Session\n");
 		printf("  Session ID      : %08lx\n",
 		       lan_session.id);
@@ -979,15 +866,13 @@ ipmi_activate_session_cmd(struct ipmi_intf * intf)
 
 	/* setup initial outbound sequence number */
 	get_random(msg_data+18, 4);
-//	lan_session.out_seq = 1;
-//	memcpy(msg_data + 18, &lan_session.out_seq, 4);
 
 	req.msg.data = msg_data;
 	req.msg.data_len = 22;
 
 	lan_session.active = 1;
 
-	if (verbose) {
+	if (verbose > 1) {
 		printf("  Privilege Level : %s\n",
 		       val2str(msg_data[1], ipmi_privlvl_vals));
 		printf("  Auth Type       : %s\n",
@@ -1036,9 +921,9 @@ ipmi_activate_session_cmd(struct ipmi_intf * intf)
 	}
 
 	memcpy(&lan_session.id, rsp->data + 1, 4);
-	memcpy(&lan_session.in_seq, rsp->data + 5, 4);
+	lan_session.in_seq = rsp->data[8] << 24 | rsp->data[7] << 16 | rsp->data[6] << 8 | rsp->data[5];
 
-	if (verbose) {
+	if (verbose > 1) {
 		printf("\nSession Activated\n");
 		printf("  Auth Type       : %s\n",
 		       val2str(rsp->data[0], ipmi_authtype_vals));
@@ -1080,7 +965,7 @@ ipmi_set_session_privlvl_cmd(struct ipmi_intf * intf)
 		       val2str(lan_session.privlvl, ipmi_privlvl_vals));
 		return -1;
 	}
-	if (verbose)
+	if (verbose > 1)
 		printf("Set Session Privilege Level to %s\n\n",
 		       val2str(rsp->data[0], ipmi_privlvl_vals));
 	return 0;
@@ -1122,7 +1007,7 @@ impi_close_session_cmd(struct ipmi_intf * intf)
 		return -1;
 	}
 
-	if (verbose)
+	if (verbose > 1)
 		printf("\nClosed Session %08lx\n\n", lan_session.id);
 
 	return 0;
@@ -1182,7 +1067,7 @@ ipmi_lan_activate_session(struct ipmi_intf * intf)
 		return -1;
 
 	/* channel 0xE will query current channel */
-	ipmi_get_channel_info(intf, IPMI_LAN_CHANNEL_E);
+//	ipmi_get_channel_info(intf, IPMI_LAN_CHANNEL_E);
 
 	return 0;
 }
@@ -1234,14 +1119,14 @@ int ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * use
 	if (rc <= 0) {
 		struct hostent *host = gethostbyname(hostname);
 		if (!host) {
-			herror("address lookup failed");
+			printf("address lookup failed\n");
 			return -1;
 		}
 		intf->addr.sin_family = host->h_addrtype;
 		memcpy(&intf->addr.sin_addr, host->h_addr, host->h_length);
 	}
 
-	if (verbose)
+	if (verbose > 1)
 		printf("IPMI LAN host %s port %d\n",
 		       hostname, ntohs(intf->addr.sin_port));
 
@@ -1278,8 +1163,10 @@ int ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * use
 	return intf->fd;
 }
 
-int intf_setup(struct ipmi_intf ** intf)
+int lan_intf_setup(struct ipmi_intf ** intf)
 {
 	*intf = &ipmi_lan_intf;
 	return 0;
 }
+
+int intf_setup(struct ipmi_intf ** intf) __attribute__ ((weak, alias("lan_intf_setup")));

ipmitool/src/plugins/lan/lan.h

@@ -68,6 +68,7 @@ void ipmi_lan_close(struct ipmi_intf * intf);
 void ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel);
 int ipmi_lan_ping(struct ipmi_intf * intf);
 
+int lan_intf_setup(struct ipmi_intf ** intf);
 struct ipmi_intf ipmi_lan_intf;
 
 #endif /*IPMI_LAN_H*/

ipmitool/src/plugins/open/Makefile.am

@@ -38,9 +38,10 @@ plugindir = $(pluginpath)
 
 INCLUDES = -I$(top_srcdir)/include
 
-intf_open_la_LDFLAGS	= -module -avoid-version
-intf_open_la_LIBADD	= $(top_srcdir)/lib/libipmitool.la
-intf_open_la_SOURCES	= open.c open.h
-
-plugin_LTLIBRARIES	= intf_open.la
+EXTRA_LTLIBRARIES	= libintf_open.la
+plugin_LTLIBRARIES	= @PLUGIN_INTF_OPEN@
+noinst_LTLIBRARIES	= @STATIC_INTF_OPEN@
+libintf_open_la_LDFLAGS	= @LDFLAGS_INTF_OPEN@
+libintf_open_la_LIBADD	= $(top_srcdir)/lib/libipmitool.la
+libintf_open_la_SOURCES	= open.c open.h
 

ipmitool/src/plugins/open/open.c

@@ -53,6 +53,7 @@
 
 static int curr_seq;
 extern int verbose;
+struct ipmi_session lan_session;
 
 struct ipmi_intf ipmi_openipmi_intf = {
 	.open     = ipmi_openipmi_open,
@@ -173,8 +174,10 @@ struct ipmi_rs * ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq
 	return &rsp;
 }
 
-int intf_setup(struct ipmi_intf ** intf)
+int open_intf_setup(struct ipmi_intf ** intf)
 {
 	*intf = &ipmi_openipmi_intf;
 	return 0;
 }
+
+int intf_setup(struct ipmi_intf ** intf) __attribute__ ((weak, alias("open_intf_setup")));

ipmitool/src/plugins/open/open.h

@@ -44,5 +44,6 @@
 struct ipmi_rs * ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req);
 int ipmi_openipmi_open(struct ipmi_intf * intf, char * dev, int __unused1, char * __unused2, char * __unused3);
 void ipmi_openipmi_close(struct ipmi_intf * intf);
+int open_intf_setup(struct ipmi_intf ** intf);
 
 #endif