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

40 files changed, 154 insertions, 5865 deletions

diff --git a/ipmitool/Makefile b/ipmitool/Makefile
deleted file mode 100644
index 7a81b8f..0000000
--- a/ipmitool/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.
-
-V_MAJ	= 1
-V_MIN	= 4
-V_REV	= 1.1
-VERSION	= $(V_MAJ).$(V_MIN).$(V_REV)
-
-PROG	= ipmitool
-SPEC	= $(PROG).spec
-MAN	= $(PROG).1
-OBJS	= main.o ipmi_sdr.o ipmi_sel.o ipmi_fru.o ipmi_chassis.o ipmi_lanp.o
-
-LIB	= libipmitool.a
-LIB_OBJS= lib/helper.o lib/ipmi_dev.o lib/ipmi_lan.o
-
-CC	= gcc
-RM	= rm -f
-AR	= ar rc
-RANLIB	= ranlib
-STRIP	= strip
-
-INCLUDE	= -I include
-CFLAGS	= -g -Wall -Werror -D_GNU_SOURCE -DVERSION=\"$(VERSION)\"
-LDFLAGS	= -L . -lm -lipmitool
-
-SBINDIR	= $(DESTDIR)/usr/sbin
-MANDIR	= $(DESTDIR)/usr/share/man/man1
-
-.PHONY:	all
-all: $(LIB) $(PROG) man
-
-$(PROG): $(OBJS)
-	$(CC) $(INCLUDE) -o $@ $(OBJS) $(LDFLAGS)
-
-$(LIB): $(LIB_OBJS)
-	$(AR) $(LIB) $?
-	$(RANLIB) $(LIB)
-
-install: $(PROG)
-	strip $(PROG)
-	install -m755 -o root -g root $(PROG) $(SBINDIR)/$(PROG)
-
-install-man: man
-	gzip -c $(PROG).1 > $(MANDIR)/$(PROG).1.gz
-
-clean:
-	-$(RM) $(PROG) $(SPEC) $(MAN) $(LIB)
-	-$(RM) $(OBJS)
-	-$(RM) $(LIB_OBJS)
-
-dist: clean spec
-	tar -C .. -czf ../$(PROG)-$(VERSION).tar.gz $(PROG)
-
-man:
-	sed -e "s/@@VERSION@@/$(VERSION)/" $(MAN).in > $(MAN)
-
-spec:
-	sed -e "s/@@VERSION@@/$(VERSION)/" $(SPEC).in > $(SPEC)
-
-rpm: spec
-	tar -C .. -czf $(PROG).tar.gz $(PROG); \
-	RPM=`which rpmbuild`; \
-	if [ -z "$$RPM" ]; then RPM=rpm; fi; \
-	$$RPM -ta $(PROG).tar.gz; \
-	rm $(PROG).tar.gz
-
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDE) -c $(@D)/$(<F) -o $(@D)/$(@F)
-
diff --git a/ipmitool/Makefile.am b/ipmitool/Makefile.am
index fe29d30..9d47845 100644
--- a/ipmitool/Makefile.am
+++ b/ipmitool/Makefile.am
@@ -32,7 +32,7 @@
 # in the design, construction, operation or maintenance of any nuclear
 # facility.
 
-EXTRA_DIST = ipmitool.spec.in control/pkginfo control/prototype debian/*
+EXTRA_DIST = ipmitool.spec.in debian/*
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \
 	config.guess config.sub depcomp install-sh ltmain.sh missing \
diff --git a/ipmitool/bmcautoconf.sh b/ipmitool/bmcautoconf.sh
deleted file mode 100755
index 0a64c47..0000000
--- a/ipmitool/bmcautoconf.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-# bmcautoconf [interface] [channel]
-#
-#
-# 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.
-#
-
-: ${DEBUG:=0}
-: ${IFACE:=eth0}
-: ${CHANNEL:=7}
-: ${IPMIINTF:=dev}
-
-# util locations
-IPMITOOL=/usr/sbin/ipmitool
-PING=/bin/ping
-ARP=/sbin/arp
-IFCONFIG=/sbin/ifconfig
-ROUTE=/sbin/route
-
-ipmitool_lan_set ()
-{
-    [ $# -lt 2 ] && return
-    PARAM=$1
-    VALUE=$2
-
-    if [ $DEBUG -gt 0 ]; then
-	echo "Setting LAN parameter ${PARAM} to ${VALUE}"
-	echo "$IPMITOOL -I $IPMIINTF lan set $CHANNEL $PARAM $VALUE"
-    fi
-}
-
-if [ ! -x $IPMITOOL ]; then
-    echo "Error: unable to find $IPMITOOL"
-    exit 1
-fi
-
-if [ $# -ge 1 ]; then
-    IFACE=$1
-    if ! $IFCONFIG $IFACE | grep -q "inet addr:" >/dev/null 2>&1 ; then
-	echo "Error: unable to find interface $IFACE"
-	exit 1
-    fi
-fi
-
-if [ $# -ge 2 ]; then
-    CHANNEL=$2
-    if [ $CHANNEL -ne 6 ] && [ $CHANNEL -ne 7 ]; then
-	echo "Invalid channel: $CHANNEL"
-	exit 1
-    fi
-fi
-
-[ $DEBUG -gt 0 ] && echo "Auto-configuring $IFACE (channel $CHANNEL)"
-
-# IP Address
-IP_ADDRESS=$( $IFCONFIG $IFACE | grep "inet addr:" | awk -F"[:[:space:]]+" '{ print $4 }' )
-if [ X$IP_ADDRESS = X ]; then
-    echo "Unable to determine IP address for interface $IFACE"
-    exit 2
-fi
-
-# Netmask
-IP_NETMASK=$( $IFCONFIG $IFACE | grep "inet addr:" | awk -F"[:[:space:]]+" '{ print $8 }' )
-if [ X$IP_NETMASK = X ]; then
-    echo "Unable to determine IP netmask for interface $IFACE"
-    exit 3
-fi
-
-# MAC Address
-MAC_ADDRESS=$( $IFCONFIG $IFACE | grep "HWaddr" | awk '{ print $5 }' )
-if [ X$MAC_ADDRESS = X ]; then
-    echo "Unable to determine MAC address for interface $IFACE"
-    exit 4
-fi
-
-# default route IP Address
-DEF_ROUTE_IP=$( $ROUTE -n | awk '/^0.0.0.0/ { print $2 }' )
-if [ X$DEF_ROUTE_IP = X ]; then
-    echo "Unable to determine default route IP address"
-    exit 5
-fi
-
-# Default Route MAC Address
-# (ping it first to populate arp table)
-$PING -q -c1 >/dev/null 2>&1
-DEF_ROUTE_MAC=$( $ARP -an -i $IFACE | grep $DEF_ROUTE_IP | awk '{ print $4 }' )
-if [ X$DEF_ROUTE_MAC = X ]; then
-    echo "Unable to determine default route MAC address"
-    exit 6
-fi
-
-ipmitool_lan_set "ipsrc" "static"
-ipmitool_lan_set "ipaddr" $IP_ADDRESS
-ipmitool_lan_set "netmask" $IP_NETMASK
-ipmitool_lan_set "macaddr" $MAC_ADDRESS
-ipmitool_lan_set "defgw ipaddr" $DEF_ROUTE_IP
-ipmitool_lan_set "defgw macaddr" $DEF_ROUTE_MAC
-ipmitool_lan_set "auth callback,user,operator,admin" 
-
-exit 0
diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 529d0cf..fecd7cf 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -2,7 +2,7 @@ dnl
 dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
-AM_INIT_AUTOMAKE([ipmitool], [1.5.4])
+AM_INIT_AUTOMAKE([ipmitool], [1.5.6])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
diff --git a/ipmitool/debian/changelog b/ipmitool/debian/changelog
index 87a4f41..8f6be40 100644
--- a/ipmitool/debian/changelog
+++ b/ipmitool/debian/changelog
@@ -1,3 +1,19 @@
+ipmitool (1.5.6) unstable; urgency=low
+
+  * 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 Öhrn
+
+ -- Duncan Laurie <duncan@sun.com>  Thu,  4 Dec 2003 14:47:19 -0700
+
+ipmitool (1.5.5) unstable; urgency=low
+
+  * Add -U option for setting LAN username
+  * Fix -v usage for plugin interfaces
+
+ -- Duncan Laurie <duncan@sun.com>  Tue, 25 Nov 2003 15:10:48 -0700
+
 ipmitool (1.5.4) unstable; urgency=low
 
   * Put interface plugin API into library
diff --git a/ipmitool/debian/ipmitool.1 b/ipmitool/debian/ipmitool.1
deleted file mode 100644
index 65c82ca..0000000
--- a/ipmitool/debian/ipmitool.1
+++ /dev/null
@@ -1,290 +0,0 @@
-.TH "ipmitool" "1" "1.4.1.1" "Duncan Laurie" ""
-.SH "NAME"
-.LP 
-ipmitool \- utility for IPMI control
-.SH "SYNTAX"
-.LP 
-ipmitool [\fB\-hcvV\fR] \fB\-I\fR \fIlan\fP \fB\-H\fR \fIaddress\fP [\fB\-P\fR \fIpassword\fP] <\fIexpression\fP>
-.br 
-ipmitool [\fB\-hcvV\fR] \fB\-I\fR \fIdev\fP <\fIexpression\fP>
-.SH "DESCRIPTION"
-.LP 
-This program lets you perform various IPMI functions with either a kernel device driver or over a LAN interface.  These functions include printing FRU information, LAN configuration, sensor readings, and remote chassis power control.
-.SH "OPTIONS"
-.LP 
-.TP 
-\fB\-h\fR
-Get basic usage help from the command line.
-.TP 
-\fB\-c\fR
-Make output suitable for parsing where possible by separating fields with commas instead of spaces.
-.TP 
-\fB\-V\fR
-Display version information.
-.TP
-\fB\-v\fR
-Increase verbose output level.  This option may be specified multiple times to increase the level of debug output.  If given three times you will get hexdumps of all incoming and outgoing packets.
-.TP 
-\fB\-I\fR <\fIinterface\fP>
-Selects IPMI interface to use.  Possible interfaces are \fIlan\fP or \fIdev\fP.
-.TP 
-\fB\-H\fR <\fIaddress\fP>
-Remote server address, can be IP address or hostname.  This option is required for the LAN interface connection.
-.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.
-.SH "EXPRESSIONS"
-.LP
-.TP
-.I help
-This can be used to get command-line help on ipmitool commands.  It may also be placed at the end of commands to get option usage help.
-.RS
-.PP
-ipmitool -I dev help
-.br
-Commands:  chassis, fru, lan, sdr, sel
-.LP
-.PP
-ipmitool -I dev chassis help
-.br
-Chassis Commands:  status, power, identify, policy, restart_cause
-.LP
-.PP
-ipmitool -I dev chassis power help
-.br
-Chassis Power Commands: status, on, off, cycle, reset, diag, soft
-.LP
-.RE
-.TP
-\fIraw\fP <\fBnetfn\fR> <\fBcmd\fR> [\fBdata\fR]
-This will allow you to execute raw IPMI commands.  For example to query the POH counter with a raw command:
-.RS
-.PP
-ipmitool -I dev raw 0x0 0xf
-.br
-RAW REQ (netfn=0x0 cmd=0xf data_len=0)
-.br
-RAW RSP (5 bytes)
-.br
- 3c 72 0c 00 00
-.LP
-.RE
-.TP
-\fIchaninfo\fP [\fBchannel\fR]
-This command will display information about the selected channel.  If no channel is given it will display information about the currently used channel:
-.RS
-.PP
-ipmitool -I dev chaninfo
-.br
-Channel 0xf info:
-.br
-  Channel Medium Type   : System Interface
-.br
-  Channel Protocol Type : KCS
-.br
-  Session Support       : session-less
-.br
-  Active Session Count  : 0
-.br
-  Protocol Vendor ID    : 7154
-.LP
-.RE
-.TP
-.I chassis
-.RS
-.TP
-.I status
-This command returns information about the high-level status of the system chassis and main power subsystem.
-.TP
-.I poh
-This command will return the Power-On Hours counter.
-.TP
-\fIidentify\fP <\fBinterval\fR>
-Control the front panel identify light.  Default is 15.  Use 0 to turn off.
-.TP
-.I restart_cause
-Query the chassis for the cause of the last system restart.
-.TP
-.I policy
-Set the chassis power policy in the event power failure.
-.RS
-.TP
-.I list
-Return supported policies.
-.TP
-.I always-on
-Turn on when power is restored.
-.TP
-.I previous
-Returned to previous state when power is restored.
-.TP
-.I always-off
-Stay off after power is restored.
-.RE
-.TP
-.I power
-Performs a chassis control command to view and change the power state.
-.RS
-.TP
-.I status
-Show current chassis power status.
-.TP
-.I on
-Power up chassis.
-.TP
-.I off
-Power down chassis into soft off (S4/S5 state).  WARNING: this command does not initiate a clean shutdown of the operating system prior to powering down the system.
-.TP
-.I cycle
-This command provides a power off interval of at least 1 second.  No action should occur if chassis power is in S4/S5 state, but it is recommended to check power state first and only issue a power cycle command if the system power is on or in lower sleep state than S4/S5.
-.TP
-.I reset
-This command will perform a hard reset.
-.TP
-.I diag
-Pulse a version of a diagnostic interrupt (NMI) that goes directly to the processor(s).
-.TP
-.I soft
-Initiate a soft\-shutdown of OS via ACPI by emulating a fatal overtemperature.
-.RE
-.RE
-.TP
-.I lan
-.RS
-.TP
-\fIprint\fP <\fBchannel\fR>
-Print the current configuration for the given channel.
-.TP
-\fIset\fP <\fBchannel\fR> <\fBparameter\fR>
-Set the given parameter on the given channel.  Valid parameters are:
-.RS
-.TP
-\fIipaddr\fP <\fBx.x.x.x\fR>
-Set the IP address for this channel.
-.TP
-\fInetmask\fP <\fBx.x.x.x\fR>
-Set the netmask for this channel.
-.TP
-\fImacaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
-Set the MAC adddress for this channel.
-.TP
-\fIdefgw\fP \fIipaddr\fP <\fBx.x.x.x\fR>
-Set the default gateway IP address.
-.TP
-\fIdefgw\fP \fImacaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
-Set the default gateway MAC address.
-.TP
-\fIbakgw\fP \fIipaddr\fP <\fBx.x.x.x\fR>
-Set the backup gateway IP address.
-.TP
-\fIbakgw\fP \fImacaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
-Set the backup gateway MAC address.
-.TP
-\fIpassword\fP <\fBpass\fR>
-Set the null user password.
-.TP
-\fIauth\fP <\fBlevel,...\fR> <\fBtype,...\fR>
-Set the valid authtypes for a given auth level.
-.RS
-Levels:
-.B callback
-.B user
-.B operator
-.B admin
-.br
-Types: 
-.B none
-.B md2
-.B key
-.RE
-.RE
-.RE
-.TP
-.I fru
-.RS
-.TP
-.I print
-This command will read all Field Replacable Unit inventory data and extract such information as serial number, part number, asset tags, and short strings describing the chassis, board, or product. 
-.RE
-.TP
-.I sdr
-.RS
-.TP
-.I list
-This command will read the SDR and extract sensor information, then query each sensor and print its name, reading, and status.
-.RE
-.TP
-.I sel
-.RS
-.TP
-.I info
-This command will query the BMC for information about the SEL and its contents.
-.TP
-.I list
-This command will list the contents of the SEL.
-.RE
-.SH "DEV INTERFACE"
-.LP 
-The ipmitool \fIdev\fP interface utilizes the MontaVista OpenIPMI kernel device driver.  This driver is present in 2.5.57 and later development kernels and in 2.4.21pre1 and later stable kernels.  There are also IPMI driver kernel patches for different versions available from the OpenIPMI homepage.
-.LP 
-The following kernel modules must be loaded in order for ipmitool to work:
-.TP 
-.B ipmi_msghandler
-Incoming and outgoing message handler for IPMI interfaces.
-.TP 
-.B ipmi_kcs_drv
-An IPMI Keyboard Controler Style (KCS) interface driver for the message handler.
-.TP 
-.B ipmi_devintf
-Linux character device interface for the message handler.
-.LP 
-Once they are loaded there will be a dynamic char device entry that must exist at \fB/dev/ipmi/0\fR.  Usually if this is the first dynamic device it will be major number \fB254\fR and minor number \fB0\fR so you would create the dev entry with:
-.LP 
-.I mknod /dev/ipmi/0 c 254 0
-.LP 
-In order to force ipmitool to make use of the device interface you can specifiy it on the command line:
-.PP 
-ipmitool \-I dev [option...]
-.LP 
-Alternatively if you do not provide a hostname on the command line ipmitool will assume you want to use the dev interface.
-.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.
-.LP 
-IPMI\-over\-LAN uses version 1 of the Remote Management Control Protocol (RMCP) to support \fIpre\-OS\fP and \fIOS\-absent\fP management.  RMCP is a request\-response protocol delivered using UDP datagrams to port 623.
-.LP 
-The LAN interface is an authenticatiod multi\-session connection; messages delivered to the BMC can (and should) be authenticated with a challenge/response protocol with either straight password/key.  ipmitool will attempt to connect with administrator privilege level as this is required to perform chassis power functions.
-.LP 
-You can tell ipmitool to use the lan interface with the \fB\-I\fR option:
-.PP 
-ipmitool \-I lan [option...] <address> [password]
-.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 straight password/key.
-.SH "FILES"
-.TP 
-.I /dev/ipmi/0
-This character device file is used by the OpenIPMI kernel driver.
-.SH "EXAMPLES"
-.LP 
-If you want to remotely control the power of an IPMI\-over\-LAN enabled system you can use:
-.LP 
-ipmitool \-I lan \-H 192.168.1.1 \-P password chassis power on
-.LP 
-Chassis Power is off.
-.br 
-Chassis Power Control: on
-.LP 
-ipmitool \-I lan \-H 192.168.1.1 \-P password chassis power status
-.LP 
-Chassis Power is on.
-.SH "AUTHOR"
-.LP 
-Duncan Laurie <duncan@sun.com>
-.SH "SEE ALSO"
-.LP 
-.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/
diff --git a/ipmitool/include/asf.h b/ipmitool/include/asf.h
deleted file mode 100644
index 2f5dfaf..0000000
--- a/ipmitool/include/asf.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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 __ASF_H
-#define __ASF_H
-
-#include <helper.h>
-#include <ipmi_lan.h>
-
-#define ASF_RMCP_IANA		0x000011be
-
-#define ASF_TYPE_PING		0x80
-#define ASF_TYPE_PONG		0x40
-
-static const struct valstr asf_type_vals[] __attribute__((unused)) = {
-	{ 0x10, "Reset" },
-	{ 0x11, "Power-up" },
-	{ 0x12, "Unconditional Power-down" },
-	{ 0x13, "Power Cycle" },
-	{ 0x40, "Presence Pong" },
-	{ 0x41, "Capabilities Response" },
-	{ 0x42, "System State Response" },
-	{ 0x80, "Presence Ping" },
-	{ 0x81, "Capabilities Request" },
-	{ 0x82, "System State Request" },
-	{ 0x00, NULL }
-};
-
-/* ASF message header */
-struct asf_hdr {
-	unsigned long iana;
-	unsigned char type;
-	unsigned char tag;
-	unsigned char __reserved;
-	unsigned char len;
-} __attribute__((packed));
-
-int handle_asf(struct ipmi_intf * intf, unsigned char * data, int data_len);
-
-#endif /* __ASF_H */
diff --git a/ipmitool/include/helper.h b/ipmitool/include/helper.h
deleted file mode 100644
index f1bf5d4..0000000
--- a/ipmitool/include/helper.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 __HELPER_H
-#define __HELPER_H
-
-struct valstr {
-	unsigned char val;
-	const char * str;
-};
-const char * val2str(unsigned char val, const struct valstr * vs);
-
-unsigned short buf2short(unsigned char * buf);
-unsigned long buf2long(unsigned char * buf);
-const char * buf2str(unsigned char * buf, int len);
-void printbuf(unsigned char * buf, int len, char * desc);
-
-void signal_handler(int sig, void * handler);
-
-#define SIG_IGNORE(s)         ((void)signal((s), SIG_IGN))
-#define SIG_DEFAULT(s)        ((void)signal((s), SIG_DFL))
-#define SIG_HANDLE(s,h)       ((void)signal_handler((s), (h)))
-
-#endif /* __HELPER_H */
-
diff --git a/ipmitool/include/ipmi.h b/ipmitool/include/ipmi.h
deleted file mode 100644
index 060030c..0000000
--- a/ipmitool/include/ipmi.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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_H
-#define _IPMI_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <netinet/in.h>
-#include <linux/ipmi.h>
-
-#define BUF_SIZE 256
-
-extern int verbose;
-extern int csv_output;
-
-struct ipmi_session {
-	unsigned char username[16];
-	unsigned char challenge[16];
-	unsigned char password;
-	unsigned char authtype;
-	unsigned char authcode[16];
-	unsigned char privlvl;
-	unsigned long in_seq;
-	unsigned long out_seq;
-	unsigned long id;
-	int active;
-};
-
-struct ipmi_req_entry {
-	struct ipmi_req req;
-	struct ipmi_intf * intf;
-	struct ipmi_session * session;
-	unsigned char rq_seq;
-	unsigned char * msg_data;
-	int msg_len;
-	struct ipmi_req_entry * next;
-};
-
-struct ipmi_rsp {
-	unsigned char ccode;
-	unsigned char data[BUF_SIZE];
-	int data_len;
-	struct {
-		unsigned char authtype;
-		unsigned long seq;
-		unsigned long id;
-	} session;
-	unsigned char msglen;
-	struct {
-		unsigned char rq_addr;
-		unsigned char netfn;
-		unsigned char rq_lun;
-		unsigned char rs_addr;
-		unsigned char rq_seq;
-		unsigned char rs_lun;
-		unsigned char cmd;
-	} header;
-};
-
-struct ipmi_intf {
-	int fd;
-	struct sockaddr_in addr;
-	int (*open)(struct ipmi_intf *, char *, int, char *);
-	void (*close)(struct ipmi_intf *);
-	struct ipmi_rsp *(*sendrecv)(struct ipmi_intf *, struct ipmi_req *);
-	int (*ll_send)(struct ipmi_intf *, unsigned char *, int);
-	struct ipmi_rsp *(*ll_recv)(struct ipmi_intf *, int);
-};
-
-#define IPMI_NETFN_CHASSIS		0x0
-#define IPMI_NETFN_BRIDGE		0x2
-#define IPMI_NETFN_SE			0x4
-#define IPMI_NETFN_APP			0x6
-#define IPMI_NETFN_FIRMWARE		0x8
-#define IPMI_NETFN_STORAGE		0xa
-#define IPMI_NETFN_TRANSPORT		0xc
-
-#define IPMI_BMC_SLAVE_ADDR		0x20
-#define IPMI_REMOTE_SWID		0x81
-
-int handle_ipmi(struct ipmi_intf *intf, unsigned char * data, int data_len);
-
-#endif /* _IPMI_H */
diff --git a/ipmitool/include/ipmi_chassis.h b/ipmitool/include/ipmi_chassis.h
deleted file mode 100644
index 712408e..0000000
--- a/ipmitool/include/ipmi_chassis.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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_CHASSIS_H
-#define _IPMI_CHASSIS_H
-
-#include <ipmi.h>
-
-#define IPMI_CHASSIS_CTL_POWER_DOWN	0x0
-#define IPMI_CHASSIS_CTL_POWER_UP	0x1
-#define IPMI_CHASSIS_CTL_POWER_CYCLE	0x2
-#define IPMI_CHASSIS_CTL_HARD_RESET	0x3
-#define IPMI_CHASSIS_CTL_PULSE_DIAG	0x4
-#define IPMI_CHASSIS_CTL_ACPI_SOFT	0x5
-
-#define IPMI_CHASSIS_POLICY_NO_CHANGE	0x3
-#define IPMI_CHASSIS_POLICY_ALWAYS_ON	0x2
-#define IPMI_CHASSIS_POLICY_PREVIOUS	0x1
-#define IPMI_CHASSIS_POLICY_ALWAYS_OFF	0x0
-
-int ipmi_chassis_main(struct ipmi_intf *, int, char **);
-
-#endif /*_IPMI_CHASSIS_H*/
diff --git a/ipmitool/include/ipmi_dev.h b/ipmitool/include/ipmi_dev.h
deleted file mode 100644
index f2f58b2..0000000
--- a/ipmitool/include/ipmi_dev.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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_DEV_H
-#define _IPMI_DEV_H
-
-#include <linux/ipmi.h>
-#include "ipmi.h"
-
-struct ipmi_rsp * ipmi_dev_send_cmd(struct ipmi_intf * intf, struct ipmi_req * req);
-int ipmi_dev_open(struct ipmi_intf * intf, char * dev, int __unused1, char * __unused2);
-void ipmi_dev_close(struct ipmi_intf * intf);
-
-struct ipmi_intf ipmi_dev_intf;
-
-#endif
diff --git a/ipmitool/include/ipmi_entity.h b/ipmitool/include/ipmi_entity.h
deleted file mode 100644
index dfc9a6a..0000000
--- a/ipmitool/include/ipmi_entity.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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_ENTITY
-#define _IPMI_ENTITY
-
-#include <helper.h>
-
-const struct valstr entity_id_vals[] __attribute__((unused)) = {
-	{ 0x00, "Unspecified" },
-	{ 0x01, "Other" },
-	{ 0x02, "Unknown" },
-	{ 0x03, "Processor" },
-	{ 0x04, "Disk or Disk Bay" },
-	{ 0x05, "Peripheral Bay" },
-	{ 0x06, "System Management Module" },
-	{ 0x07, "System Board" },
-	{ 0x08, "Memory Module" },
-	{ 0x09, "Processor Module" },
-	{ 0x0a, "Power Supply" },
-	{ 0x0b, "Add-in Card" },
-	{ 0x0c, "Front Panel Board" },
-	{ 0x0d, "Back Panel Board" },
-	{ 0x0e, "Power System Board" },
-	{ 0x0f, "Drive Backplane" },
-	{ 0x10, "System Internal Expansion Board" },
-	{ 0x11, "Other System Board" },
-	{ 0x12, "Processor Board" },
-	{ 0x13, "Power Unit" },
-	{ 0x14, "Power Module" },
-	{ 0x15, "Power Management" },
-	{ 0x16, "Chassis Back Panel Board" },
-	{ 0x17, "System Chassis" },
-	{ 0x18, "Sub-Chassis" },
-	{ 0x19, "Other Chassis Board" },
-	{ 0x1a, "Disk Drive Bay" },
-	{ 0x1b, "Peripheral Bay" },
-	{ 0x1c, "Device Bay" },
-	{ 0x1d, "Fan Device" },
-	{ 0x1e, "Cooling Unit" },
-	{ 0x1f, "Cable/Interconnect" },
-	{ 0x20, "Memory Device" },
-	{ 0x21, "System Management Software" },
-	{ 0x22, "BIOS" },
-	{ 0x23, "Operating System" },
-	{ 0x24, "System Bus" },
-	{ 0x25, "Group" },
-	{ 0x26, "Remote Management Device" },
-	{ 0x27, "External Environment" },
-	{ 0x28, "Battery" },
-	{ 0x00, NULL },
-};
-
-#endif /* _IPMI_ENTITY */
-
diff --git a/ipmitool/include/ipmi_fru.h b/ipmitool/include/ipmi_fru.h
deleted file mode 100644
index 8b24b37..0000000
--- a/ipmitool/include/ipmi_fru.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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_FRU_H
-#define _IPMI_FRU_H
-
-#define GET_FRU_INFO		0x10
-#define GET_FRU_DATA		0x11
-#define SET_FRU_DATA		0x12
-
-enum {
-	FRU_CHASSIS_PARTNO,
-	FRU_CHASSIS_SERIAL,
-	FRU_BOARD_MANUF,
-	FRU_BOARD_PRODUCT,
-	FRU_BOARD_SERIAL,
-	FRU_BOARD_PARTNO,
-	FRU_PRODUCT_MANUF,
-	FRU_PRODUCT_NAME,
-	FRU_PRODUCT_PARTNO,
-	FRU_PRODUCT_VERSION,
-	FRU_PRODUCT_SERIAL,
-	FRU_PRODUCT_ASSET,
-};
-
-struct fru_info {
-	unsigned short size;
-	unsigned char access : 1;
-} __attribute__ ((packed));
-
-struct fru_header {
-	unsigned char version;
-	struct {
-		unsigned char internal;
-		unsigned char chassis;
-		unsigned char board;
-		unsigned char product;
-		unsigned char multi;
-	} offset;
-	unsigned char pad;
-	unsigned char checksum;
-} __attribute__ ((packed));
-
-struct fru_area_chassis {
-	unsigned char area_ver;
-	unsigned char area_len;
-	unsigned char type;
-	char * part;
-	char * serial;
-};
-
-struct fru_area_board {
-	unsigned char	area_ver;
-	unsigned char area_len;
-	unsigned char lang;
-	unsigned long mfg_date_time;
-	char * mfg;
-	char * prod;
-	char * serial;
-	char * part;
-};
-
-struct fru_area_product {
-	unsigned char area_ver;
-	unsigned char area_len;
-	unsigned char lang;
-	char * mfg;
-	char * name;
-	char * part;
-	char * version;
-	char * serial;
-	char * asset;
-};
-
-static const char * chassis_type_desc[] __attribute__((unused)) = {
-	"Unspecified", "Other", "Unknown",
-	"Desktop", "Low Profile Desktop", "Pizza Box",
-	"Mini Tower", "Tower",
-	"Portable", "LapTop", "Notebook", "Hand Held", "Docking Station",
-	"All in One", "Sub Notebook", "Space-saving", "Lunch Box",
-	"Main Server Chassis", "Expansion Chassis", "SubChassis",
-	"Bus Expansion Chassis", "Peripheral Chassis", "RAID Chassis",
-	"Rack Mount Chassis"
-};
-
-void ipmi_print_fru(struct ipmi_intf *, unsigned char);
-int ipmi_fru_main(struct ipmi_intf *, int, char **);
-
-#endif /* _IPMI_FRU_H */
diff --git a/ipmitool/include/ipmi_lan.h b/ipmitool/include/ipmi_lan.h
deleted file mode 100644
index 301812d..0000000
--- a/ipmitool/include/ipmi_lan.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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_LAN_H
-#define _IPMI_LAN_H
-
-#include <linux/ipmi.h>
-#include "ipmi.h"
-
-#define IPMI_LAN_SET_CONFIG	0x01
-#define IPMI_LAN_GET_CONFIG	0x02
-#define IPMI_LAN_SUSPEND_ARP	0x03
-# define IPMI_LAN_SUSPEND_ARP_RESP (2)
-# define IPMI_LAN_SUSPEND_ARP_GRAT (1)
-#define IPMI_LAN_GET_STAT	0x04
-
-#define IPMI_LAN_CHANNEL_1	0x07
-#define IPMI_LAN_CHANNEL_2	0x06
-#define IPMI_LAN_CHANNEL_E	0x0e
-
-enum {
-	IPMI_LANP_SET_IN_PROGRESS,
-	IPMI_LANP_AUTH_TYPE,
-	IPMI_LANP_AUTH_TYPE_ENABLE,
-	IPMI_LANP_IP_ADDR,
-	IPMI_LANP_IP_ADDR_SRC,
-	IPMI_LANP_MAC_ADDR,
-	IPMI_LANP_SUBNET_MASK,
-	IPMI_LANP_IP_HEADER,
-	IPMI_LANP_PRI_RMCP_PORT,
-	IPMI_LANP_SEC_RMCP_PORT,
-	IPMI_LANP_BMC_ARP,
-	IPMI_LANP_GRAT_ARP,
-	IPMI_LANP_DEF_GATEWAY_IP,
-	IPMI_LANP_DEF_GATEWAY_MAC,
-	IPMI_LANP_BAK_GATEWAY_IP,
-	IPMI_LANP_BAK_GATEWAY_MAC,
-	IPMI_LANP_SNMP_STRING,
-	IPMI_LANP_NUM_DEST,
-	IPMI_LANP_DEST_TYPE,
-	IPMI_LANP_DEST_ADDR,
-	IPMI_LANP_OEM_ALERT_STRING=96,
-	IPMI_LANP_ALERT_RETRY=97,
-	IPMI_LANP_UTC_OFFSET=98,
-	IPMI_LANP_DHCP_SERVER_IP=192,
-	IPMI_LANP_DHCP_SERVER_MAC=193,
-	IPMI_LANP_DHCP_ENABLE=194,
-	IPMI_LANP_CHAN_ACCESS_MODE=201,
-};
-
-static struct lan_param {
-	int cmd;
-	int size;
-	char desc[24];
-	unsigned char * data;
-} ipmi_lan_params[] __attribute__((unused)) = {
-	{ IPMI_LANP_SET_IN_PROGRESS,	1,	"Set in Progress"	},
-	{ IPMI_LANP_AUTH_TYPE,		1,	"Auth Type"		},
-	{ IPMI_LANP_AUTH_TYPE_ENABLE,	5,	"Auth Type Enable"	},
-	{ IPMI_LANP_IP_ADDR,		4,	"IP Address"		},
-	{ IPMI_LANP_IP_ADDR_SRC,	1,	"IP Address Source"	},
-	{ IPMI_LANP_MAC_ADDR,		6,	"MAC Address"		},
-	{ IPMI_LANP_SUBNET_MASK,	4,	"Subnet Mask"		},
-	{ IPMI_LANP_IP_HEADER,		3,	"IP Header"		},
-	{ IPMI_LANP_PRI_RMCP_PORT,	2,	"Primary RMCP Port"	},
-	{ IPMI_LANP_SEC_RMCP_PORT,	2,	"Secondary RMCP Port"	},
-	{ IPMI_LANP_BMC_ARP,		1,	"BMC ARP Control"	},
-	{ IPMI_LANP_GRAT_ARP,		1,	"Gratituous ARP Intrvl"	},
-	{ IPMI_LANP_DEF_GATEWAY_IP,	4,	"Default Gateway IP"	},
-	{ IPMI_LANP_DEF_GATEWAY_MAC,	6,	"Default Gateway MAC"	},
-	{ IPMI_LANP_BAK_GATEWAY_IP,	4,	"Backup Gateway IP"	},
-	{ IPMI_LANP_BAK_GATEWAY_MAC,	6,	"Backup Gateway MAC"	},
-	{ IPMI_LANP_SNMP_STRING,	18,	"Community String"	},
-	{ IPMI_LANP_NUM_DEST,		1,	"Number of Destinations"},
-	{ IPMI_LANP_DEST_TYPE,		4,	"Destination Type"	},
-	{ IPMI_LANP_DEST_ADDR,		13,	"Destination Addresses"	},
-	{ IPMI_LANP_OEM_ALERT_STRING,	28,	"OEM Alert String"	},
-	{ IPMI_LANP_ALERT_RETRY,	1,	"Alert Retry Algorithm" },
-	{ IPMI_LANP_UTC_OFFSET,		3,	"UTC Offset"		},
-	{ IPMI_LANP_DHCP_SERVER_IP,	4,	"DHCP Server IP"	},
-	{ IPMI_LANP_DHCP_SERVER_MAC,	6,	"DHDP Server MAC"	},
-	{ IPMI_LANP_DHCP_ENABLE,	1,	"DHCP Enable"		},
-	{ IPMI_LANP_CHAN_ACCESS_MODE,	2,	"Channel Access Mode"	},
-	{ -1 }
-};
-
-#define IPMI_SESSION_AUTHTYPE_NONE	0x0
-#define IPMI_SESSION_AUTHTYPE_MD2	0x1
-#define IPMI_SESSION_AUTHTYPE_KEY	0x4
-#define IPMI_SESSION_AUTHTYPE_OEM	0x5
-
-#define IPMI_SESSION_PRIV_CALLBACK	0x1
-#define IPMI_SESSION_PRIV_USER		0x2
-#define IPMI_SESSION_PRIV_OPERATOR	0x3
-#define IPMI_SESSION_PRIV_ADMIN		0x4
-#define IPMI_SESSION_PRIV_OEM		0x5
-
-extern struct ipmi_session lan_session;
-
-unsigned char ipmi_csum(unsigned char * d, int s);
-
-struct ipmi_rsp * ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_req * req);
-int  ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * password);
-void ipmi_lan_close(struct ipmi_intf * intf);
-void ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel);
-int  ipmi_lan_main(struct ipmi_intf *, int, char **);
-
-struct ipmi_intf ipmi_lan_intf;
-
-#endif /*_IPMI_LAN_H*/
diff --git a/ipmitool/include/ipmi_sdr.h b/ipmitool/include/ipmi_sdr.h
deleted file mode 100644
index 062c9d4..0000000
--- a/ipmitool/include/ipmi_sdr.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * 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_SDR_H
-#define _IPMI_SDR_H
-
-#include <math.h>
-#include <byteswap.h>
-#include <ipmi.h>
-
-int ipmi_sdr_main(struct ipmi_intf *, int, char **);
-int utos(unsigned val, unsigned bits);
-
-#define __TO_TOL(mtol)     (bswap_16(mtol) & 0x3f)
-#define __TO_M(mtol)       (utos((((bswap_16(mtol) & 0xff00) >> 8) | ((bswap_16(mtol) & 0xc0) << 2)), 10))
-#define __TO_B(bacc)       (utos((((bswap_32(bacc) & 0xff000000) >> 24) | \
-                           ((bswap_32(bacc) & 0xc00000) >> 14)), 10))
-#define __TO_ACC(bacc)     (((bswap_32(bacc) & 0x3f0000) >> 16) | ((bswap_32(bacc) & 0xf000) >> 6))
-#define __TO_ACC_EXP(bacc) ((bswap_32(bacc) & 0xc00) >> 10)
-#define __TO_R_EXP(bacc)   (utos(((bswap_32(bacc) & 0xf0) >> 4), 4))
-#define __TO_B_EXP(bacc)   (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))))
-
-#define GET_SDR_REPO_INFO	0x20
-#define GET_SDR_ALLOC_INFO	0x21
-
-#define SDR_SENSOR_STAT_LO_NC	(1<<0)
-#define SDR_SENSOR_STAT_LO_CR	(1<<1)
-#define SDR_SENSOR_STAT_LO_NR	(1<<2)
-#define SDR_SENSOR_STAT_HI_NC	(1<<3)
-#define SDR_SENSOR_STAT_HI_CR	(1<<4)
-#define SDR_SENSOR_STAT_HI_NR	(1<<5)
-
-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 */
-	unsigned char	op_support;	/* supported operations */
-} __attribute__ ((packed));
-
-#define GET_SDR_RESERVE_REPO	0x22
-struct sdr_reserve_repo_rs {
-	unsigned short	reserve_id;	/* reservation ID */
-} __attribute__ ((packed));
-
-#define GET_SDR		0x23
-struct sdr_get_rq {
-	unsigned short	reserve_id;	/* reservation ID */
-	unsigned short	id;		/* record ID */
-	unsigned char	offset;		/* offset into SDR */
-#define GET_SDR_ENTIRE_RECORD	0xff
-#define GET_SDR_MAX_LEN		30
-	unsigned char	length;		/* length to read */
-} __attribute__ ((packed));
-
-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
-	unsigned char	type;		/* record type */
-	unsigned char	length;		/* remaining record bytes */
-} __attribute__ ((packed));
-
-struct sdr_record_compact_sensor {
-	struct {
-		unsigned char	owner_id;
-		unsigned char	lun         : 2,	/* sensor owner lun */
-				__reserved  : 2,
-				channel     : 4;	/* channel number */
-		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 */
-	} entity;
-	
-	struct {
-		struct {
-			unsigned char	sensor_scan  : 1,
-					event_gen    : 1,
-					type         : 1,
-					hysteresis   : 1,
-					thresholds   : 1,
-					events       : 1,
-					scanning     : 1,
-				        __reserved   : 1;
-		} init;
-		struct {
-			unsigned char	event_msg    : 2,
-					threshold    : 2,
-					hysteresis   : 2,
-					rearm        : 1,
-					ignore       : 1;
-		} capabilities;
-		unsigned char	type; /* sensor type */
-	} sensor;
-
-	unsigned char	event_type; /* event/reading type code */
-
-	union {
-		struct {
-			unsigned short	assert_event;	/* assertion event mask */
-			unsigned short	deassert_event;	/* de-assertion event mask */
-			unsigned short	read;		/* discrete reaading mask */
-		} discrete;
-		struct {
-			unsigned short	lower;		/* lower threshold reading mask */
-			unsigned short	upper;		/* upper threshold reading mask */
-			unsigned char	set;		/* settable threshold mask */
-			unsigned char	read;		/* readable threshold mask */
-		} threshold;
-	} mask;
-
-	struct {
-		unsigned char		pct           : 1,
-				modifier      : 2,
-				rate          : 3,
-				analog        : 2;
-		struct {
-			unsigned char	base;
-			unsigned char	modifier;
-		} type;
-	} unit;
-
-	struct {
-		unsigned char	count       : 4,
-				mod_type    : 2,
-				__reserved  : 2;
-		unsigned char	mod_offset  : 7,
-				entity_inst : 1;
-	} share;
-
-	struct {
-		struct {
-			unsigned char	positive;
-			unsigned char	negative;
-		} hysteresis;
-	} threshold;
-
-	unsigned char	__reserved[3];
-	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 */
-		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 */
-	} entity;
-
-	struct {
-		struct {
-			unsigned char	sensor_scan  : 1,
-					event_gen    : 1,
-					type         : 1,
-					hysteresis   : 1,
-					thresholds   : 1,
-					events       : 1,
-					scanning     : 1,
-				        __reserved   : 1;
-		} init;
-		struct {
-			unsigned char	event_msg    : 2,
-					threshold    : 2,
-					hysteresis   : 2,
-					rearm        : 1,
-					ignore       : 1;
-		} capabilities;
-		unsigned char	type;
-	} sensor;
-
-	unsigned char	event_type;			/* event/reading type code */
-
-	union {
-		struct {
-			unsigned short	assert_event;	/* assertion event mask */
-			unsigned short	deassert_event;	/* de-assertion event mask */
-			unsigned short	read;		/* discrete reaading mask */
-		} discrete;
-		struct {
-			unsigned short	lower;		/* lower threshold reading mask */
-			unsigned short	upper;		/* upper threshold reading mask */
-			unsigned char	set;		/* settable threshold mask */
-			unsigned char	read;		/* readable threshold mask */
-		} threshold;
-	} mask;
-
-	struct {
-		unsigned char	pct           : 1,
-				modifier      : 2,
-				rate          : 3,
-				analog        : 2;
-		struct {
-			unsigned char	base;
-			unsigned char	modifier;
-		} type;
-	} unit;
-
-	unsigned char	linearization;	/* 70h=non linear, 71h-7Fh=non linear, OEM */
-
-	unsigned short	mtol;		/* M, tolerance */
-
-	unsigned long	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;
-	} analog_flag;
-
-	unsigned char	nominal_read;	/* nominal reading, raw value */
-	unsigned char	normal_max;	/* normal maximum, raw value */
-	unsigned char	normal_min;	/* normal minimum, raw value */
-	unsigned char	sensor_max;	/* sensor maximum, raw value */
-	unsigned char	sensor_min;	/* sensor minimum, raw value */
-
-	struct {
-		struct {
-			unsigned char	non_recover;
-			unsigned char	critical;
-			unsigned char	non_critical;
-		} upper;
-		struct {
-			unsigned char	non_recover;
-			unsigned char	critical;
-			unsigned char	non_critical;
-		} lower;
-		struct {
-			unsigned char	positive;
-			unsigned char	negative;
-		} hysteresis;
-	} threshold;
-	unsigned char	__reserved[2];
-	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));
-
-/* unit description codes (IPMI v1.5 section 37.16) */
-#define UNIT_MAX	0x90
-static const char * unit_desc[] __attribute__((unused)) = {
-	"unspecified",
-	"degrees C", "degrees F", "degrees K",
-	"Volts", "Amps", "Watts", "Joules",
-	"Coulombs", "VA", "Nits",
-	"lumen", "lux", "Candela",
-	"kPa", "PSI", "Newton",
-	"CFM", "RPM", "Hz",
-	"microsecond", "millisecond", "second", "minute", "hour", "day", "week",
-	"mil", "inches", "feet", "cu in", "cu feet", "mm", "cm", "m", "cu cm", "cu m",
-	"liters", "fluid ounce",
-	"radians", "steradians", "revolutions", "cycles", "gravities",
-	"ounce", "pound", "ft-lb", "oz-in",
-	"gauss", "gilberts", "henry", "millihenry",
-	"farad", "microfarad", "ohms", "siemens", "mole", "becquerel",
-	"PPM", "reserved",
-	"Decibels", "DbA", "DbC",
-	"gray", "sievert", "color temp deg K",
-	"bit", "kilobit", "megabit", "gigabit",
-	"byte", "kilobyte", "megabyte", "gigabyte",
-	"word", "dword", "qword", "line",
-	"hit", "miss", "retry", "reset",
-	"overflow", "underrun",
-	"collision", "packets",
-	"messages", "characters",
-	"error", "correctable error", "uncorrectable error",
-};
-
-#endif  /* _IPMI_SDR_H */
-
diff --git a/ipmitool/include/ipmi_sel.h b/ipmitool/include/ipmi_sel.h
deleted file mode 100644
index 1fa0a0e..0000000
--- a/ipmitool/include/ipmi_sel.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * 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_SEL_H
-#define _IPMI_SEL_H
-
-#include <ipmi.h>
-
-enum {
-	IPMI_EVENT_CLASS_DISCRETE,
-	IPMI_EVENT_CLASS_DIGITAL,
-	IPMI_EVENT_CLASS_THRESHOLD,
-	IPMI_EVENT_CLASS_OEM,
-};
-
-struct sel_get_rq {
-	unsigned short	reserve_id;
-	unsigned short	record_id;
-	unsigned char	offset;
-	unsigned char	length;
-} __attribute__ ((packed));
-
-struct sel_event_record {
-	unsigned short	next_id;
-	unsigned short	record_id;
-	unsigned char	record_type;
-	unsigned long	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;
-	unsigned char	event_data[3];
-} __attribute__ ((packed));
-
-struct sel_oem_record_ts {
-	unsigned short	next_id;
-	unsigned short	record_id;
-	unsigned char	record_type;
-	unsigned long	timestamp;
-	unsigned char	mfg_id[3];
-	unsigned char	oem_defined[6];
-} __attribute__ ((packed));
-
-struct sel_oem_record_nots {
-	unsigned short	next_id;
-	unsigned short	record_id;
-	unsigned char	record_type;
-	unsigned char	oem_defined[13];
-} __attribute__ ((packed));
-
-
-struct ipmi_event_type {
-	unsigned char code;
-	unsigned char offset;
-	unsigned char class;
-	const char * desc;
-};
-
-static struct ipmi_event_type event_types[] __attribute__((unused)) = {
-	/* Threshold Based States */
-	{ 0x01, 0x00, IPMI_EVENT_CLASS_THRESHOLD, "Lower Non-critical - going low" },
-	{ 0x01, 0x01, IPMI_EVENT_CLASS_THRESHOLD, "Lower Non-critical - going high" },
-	{ 0x01, 0x02, IPMI_EVENT_CLASS_THRESHOLD, "Lower Critical - going low" },
-	{ 0x01, 0x03, IPMI_EVENT_CLASS_THRESHOLD, "Lower Critical - going high" },
-	{ 0x01, 0x04, IPMI_EVENT_CLASS_THRESHOLD, "Lower Non-recoverable - going low" },
-	{ 0x01, 0x05, IPMI_EVENT_CLASS_THRESHOLD, "Lower Non-recoverable - going high" },
-	{ 0x01, 0x06, IPMI_EVENT_CLASS_THRESHOLD, "Upper Non-critical - going low" },
-	{ 0x01, 0x07, IPMI_EVENT_CLASS_THRESHOLD, "Upper Non-critical - going high" },
-	{ 0x01, 0x08, IPMI_EVENT_CLASS_THRESHOLD, "Upper Critical - going low" },
-	{ 0x01, 0x09, IPMI_EVENT_CLASS_THRESHOLD, "Upper Critical - going high" },
-	{ 0x01, 0x0a, IPMI_EVENT_CLASS_THRESHOLD, "Upper Non-recoverable - going low" },
-	{ 0x01, 0x0b, IPMI_EVENT_CLASS_THRESHOLD, "Upper Non-recoverable - going high" },
-	/* DMI-based "usage state" States */
-	{ 0x02, 0x00, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Idle" },
-	{ 0x02, 0x01, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Active" },
-	{ 0x02, 0x02, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Busy" },
-	/* Digital-Discrete Event States */
-	{ 0x03, 0x00, IPMI_EVENT_CLASS_DIGITAL,   "State Deasserted" },
-	{ 0x03, 0x01, IPMI_EVENT_CLASS_DIGITAL,   "State Asserted" },
-	{ 0x04, 0x00, IPMI_EVENT_CLASS_DIGITAL,   "Predictive Failure Deasserted" },
-	{ 0x04, 0x01, IPMI_EVENT_CLASS_DIGITAL,   "Predictive Failure Asserted" },
-	{ 0x05, 0x00, IPMI_EVENT_CLASS_DIGITAL,   "Limit Not Exceeded" },
-	{ 0x05, 0x01, IPMI_EVENT_CLASS_DIGITAL,   "Limit Exceeded" },
-	{ 0x06, 0x00, IPMI_EVENT_CLASS_DIGITAL,   "Performance Met" },
-	{ 0x06, 0x01, IPMI_EVENT_CLASS_DIGITAL,   "Performance Lags" },
-	/* Severity Event States */
-	{ 0x07, 0x00, IPMI_EVENT_CLASS_DISCRETE,  "Transition to OK" },
-	{ 0x07, 0x01, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Non-critial from OK" },
-	{ 0x07, 0x02, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Critical from less severe" },
-	{ 0x07, 0x03, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Non-recoverable from less severe" },
-	{ 0x07, 0x04, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Non-critical from more severe" },
-	{ 0x07, 0x05, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Critical from Non-recoverable" },
-	{ 0x07, 0x06, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Non-recoverable" },
-	{ 0x07, 0x07, IPMI_EVENT_CLASS_DISCRETE,  "Monitor" },
-	{ 0x07, 0x08, IPMI_EVENT_CLASS_DISCRETE,  "Informational" },
-	/* Availability Status States */
-	{ 0x08, 0x00, IPMI_EVENT_CLASS_DIGITAL,   "Device Removed/Absent" },
-	{ 0x08, 0x01, IPMI_EVENT_CLASS_DIGITAL,   "Device Inserted/Present" },
-	{ 0x09, 0x00, IPMI_EVENT_CLASS_DIGITAL,   "Device Disabled" },
-	{ 0x09, 0x01, IPMI_EVENT_CLASS_DIGITAL,   "Device Enabled" },
-	{ 0x0a, 0x00, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Running" },
-	{ 0x0a, 0x01, IPMI_EVENT_CLASS_DISCRETE,  "Transition to In Test" },
-	{ 0x0a, 0x02, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Power Off" },
-	{ 0x0a, 0x03, IPMI_EVENT_CLASS_DISCRETE,  "Transition to On Line" },
-	{ 0x0a, 0x04, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Off Line" },
-	{ 0x0a, 0x05, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Off Duty" },
-	{ 0x0a, 0x06, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Degraded" },
-	{ 0x0a, 0x07, IPMI_EVENT_CLASS_DISCRETE,  "Transition to Power Save" },
-	{ 0x0a, 0x08, IPMI_EVENT_CLASS_DISCRETE,  "Install Error" },
-	/* Redundancy States */
-	{ 0x0b, 0x00, IPMI_EVENT_CLASS_DISCRETE,  "Fully Redundant" },
-	{ 0x0b, 0x01, IPMI_EVENT_CLASS_DISCRETE,  "Redundancy Lost" },
-	{ 0x0b, 0x02, IPMI_EVENT_CLASS_DISCRETE,  "Redundancy Degraded" },
-	{ 0x0b, 0x03, IPMI_EVENT_CLASS_DISCRETE,  "Non-Redundant: Sufficient from Redundant" },
-	{ 0x0b, 0x04, IPMI_EVENT_CLASS_DISCRETE,  "Non-Redundant: Sufficient from Insufficient" },
-	{ 0x0b, 0x05, IPMI_EVENT_CLASS_DISCRETE,  "Non-Redundant: Insufficient Resources" },
-	{ 0x0b, 0x06, IPMI_EVENT_CLASS_DISCRETE,  "Redundancy Degraded from Fully Redundant" },
-	{ 0x0b, 0x07, IPMI_EVENT_CLASS_DISCRETE,  "Redundancy Degraded from Non-Redundant" },
-	/* ACPI Device Power States */
-	{ 0x0c, 0x00, IPMI_EVENT_CLASS_DISCRETE,  "D0 Power State" },
-	{ 0x0c, 0x01, IPMI_EVENT_CLASS_DISCRETE,  "D1 Power State" },
-	{ 0x0c, 0x02, IPMI_EVENT_CLASS_DISCRETE,  "D2 Power State" },
-	{ 0x0c, 0x03, IPMI_EVENT_CLASS_DISCRETE,  "D3 Power State" },
-	/* END */
-	{ 0x00, 0x00, 0x00, NULL },
-};
-
-struct ipmi_sensor_types {
-	unsigned char code;
-	unsigned char offset;
-	const char * type;
-	const char * event;
-};
-
-static struct ipmi_sensor_types sensor_types[] __attribute__((unused)) = {
-	{ 0x00, 0x00, "Reserved",	NULL },
-	{ 0x01, 0x00, "Temperature",	NULL },
-	{ 0x02, 0x00, "Voltage",	NULL },
-	{ 0x03, 0x00, "Current",	NULL },
-	{ 0x04, 0x00, "Fan",		NULL },
-
-	{ 0x05, 0x00, "Chassis Intrusion", "General Chassis intrusion" },
-	{ 0x05, 0x01, "Chassis Intrusion", "Drive Bay intrusion" },
-	{ 0x05, 0x02, "Chassis Intrusion", "I/O Card area intrusion" },
-	{ 0x05, 0x03, "Chassis Intrusion", "Processor area intrusion" },
-	{ 0x05, 0x04, "Chassis Intrusion", "System unplugged from LAN" },
-	{ 0x05, 0x05, "Chassis Intrusion", "Unauthorized dock/undock" },
-	{ 0x05, 0x06, "Chassis Intrusion", "FAN area intrusion" },
-
-	{ 0x06, 0x00, "Platform Security", "Front Panel Lockout violation attempted" },
-	{ 0x06, 0x01, "Platform Security", "Pre-boot password viiolation - user password" },
-	{ 0x06, 0x02, "Platform Security", "Pre-boot password violation - setup password" },
-	{ 0x06, 0x03, "Platform Security", "Pre-boot password violation - network boot password" },
-	{ 0x06, 0x04, "Platform Security", "Other pre-boot password violation" },
-	{ 0x06, 0x05, "Platform Security", "Out-of-band access password violation" },
-
-	{ 0x07, 0x00, "Processor", "IERR" },
-	{ 0x07, 0x01, "Processor", "Thermal Trip" },
-	{ 0x07, 0x02, "Processor", "FRB1/BIST failure" },
-	{ 0x07, 0x03, "Processor", "FRB2/Hang in POST failure" },
-	{ 0x07, 0x04, "Processor", "FRB3/Processor startup/init failure" },
-	{ 0x07, 0x05, "Processor", "Configuration Error" },
-	{ 0x07, 0x06, "Processor", "SM BIOS Uncorrectable CPU-complex Error" },
-	{ 0x07, 0x07, "Processor", "Presence detected" },
-	{ 0x07, 0x08, "Processor", "Disabled" },
-	{ 0x07, 0x09, "Processor", "Terminator presence detected" },
-
-	{ 0x08, 0x00, "Power Supply", "Presence detected" },
-	{ 0x08, 0x01, "Power Supply", "Failure detected" },
-	{ 0x08, 0x02, "Power Supply", "Predictive failure" },
-	{ 0x08, 0x03, "Power Supply", "Power Supply AC lost" },
-	{ 0x08, 0x04, "Power Supply", "AC lost or out-of-range" },
-	{ 0x08, 0x05, "Power Supply", "AC out-of-range, but present" },
-
-	{ 0x09, 0x00, "Power Unit", "Power off/down" },
-	{ 0x09, 0x01, "Power Unit", "Power cycle" },
-	{ 0x09, 0x02, "Power Unit", "240VA power down" },
-	{ 0x09, 0x03, "Power Unit", "Interlock power down" },
-	{ 0x09, 0x04, "Power Unit", "AC lost" },
-	{ 0x09, 0x05, "Power Unit", "Soft-power control failure" },
-	{ 0x09, 0x06, "Power Unit", "Failure detected" },
-	{ 0x09, 0x07, "Power Unit", "Predictive failure" },
-
-	{ 0x0a, 0x00, "Cooling Device", NULL },
-	{ 0x0b, 0x00, "Other Units-based Sensor", NULL },
-
-	{ 0x0c, 0x00, "Memory", "Correctable ECC" },
-	{ 0x0c, 0x01, "Memory", "Uncorrectable ECC" },
-	{ 0x0c, 0x02, "Memory", "Parity" },
-	{ 0x0c, 0x03, "Memory", "Memory Scrub Failed" },
-	{ 0x0c, 0x04, "Memory", "Memory Device Disabled" },
-	{ 0x0c, 0x05, "Memory", "Correctable ECC logging limit reached" },
-
-	{ 0x0d, 0x00, "Drive Slot", NULL },
-	{ 0x0e, 0x00, "POST Memory Resize", NULL },
-
-	{ 0x0f, 0x00, "System Firmware", "Error" },
-	{ 0x0f, 0x01, "System Firmware", "Hang" },
-	{ 0x0f, 0x02, "System Firmware", "Progress" },
-
-	{ 0x10, 0x00, "Event Logging Disabled", "Correctable memory error logging disabled" },
-	{ 0x10, 0x01, "Event Logging Disabled", "Event logging disabled" },
-	{ 0x10, 0x02, "Event Logging Disabled", "Log area reset/cleared" },
-	{ 0x10, 0x03, "Event Logging Disabled", "All event logging disabled" },
-
-	{ 0x11, 0x00, "Watchdog 1", "BIOS Reset" },
-	{ 0x11, 0x01, "Watchdog 1", "OS Reset" },
-	{ 0x11, 0x02, "Watchdog 1", "OS Shut Down" },
-	{ 0x11, 0x03, "Watchdog 1", "OS Power Down" },
-	{ 0x11, 0x04, "Watchdog 1", "OS Power Cycle" },
-	{ 0x11, 0x05, "Watchdog 1", "OS NMI/diag Interrupt" },
-	{ 0x11, 0x06, "Watchdog 1", "OS Expired" },
-	{ 0x11, 0x07, "Watchdog 1", "OS pre-timeout Interrupt" },
-
-	{ 0x12, 0x00, "System Event", "System Reconfigured" },
-	{ 0x12, 0x01, "System Event", "OEM System boot event" },
-	{ 0x12, 0x02, "System Event", "Undetermined system hardware failure" },
-	{ 0x12, 0x03, "System Event", "Entry added to auxillary log" },
-	{ 0x12, 0x04, "System Event", "PEF Action" },
-
-	{ 0x13, 0x00, "Critical Interrupt", "Front Panel NMI" },
-	{ 0x13, 0x01, "Critical Interrupt", "Bus Timeout" },
-	{ 0x13, 0x02, "Critical Interrupt", "I/O Channel check NMI" },
-	{ 0x13, 0x03, "Critical Interrupt", "Software NMI" },
-	{ 0x13, 0x04, "Critical Interrupt", "PCI PERR" },
-	{ 0x13, 0x05, "Critical Interrupt", "PCI SERR" },
-	{ 0x13, 0x06, "Critical Interrupt", "EISA failsafe timeout" },
-	{ 0x13, 0x07, "Critical Interrupt", "Bus Correctable error" },
-	{ 0x13, 0x08, "Critical Interrupt", "Bus Uncorrectable error" },
-	{ 0x13, 0x09, "Critical Interrupt", "Fatal NMI" },
-
-	{ 0x14, 0x00, "Button", "Power Button pressed" },
-	{ 0x14, 0x01, "Button", "Sleep Button pressed" },
-	{ 0x14, 0x02, "Button", "Reset Button pressed" },
-
-	{ 0x15, 0x00, "Module/Board", NULL },
-	{ 0x16, 0x00, "Microcontroller/Coprocessor", NULL },
-	{ 0x17, 0x00, "Add-in Card", NULL },
-	{ 0x18, 0x00, "Chassis", NULL },
-	{ 0x19, 0x00, "Chip Set", NULL },
-	{ 0x1a, 0x00, "Other FRU", NULL },
-	{ 0x1b, 0x00, "Cable/Interconnect", NULL },
-	{ 0x1c, 0x00, "Terminator", NULL },
-
-	{ 0x1d, 0x00, "System Boot Initiated", "Initiated by power up" },
-	{ 0x1d, 0x01, "System Boot Initiated", "Initiated by hard reset" },
-	{ 0x1d, 0x02, "System Boot Initiated", "Initiated by warm reset" },
-	{ 0x1d, 0x03, "System Boot Initiated", "User requested PXE boot" },
-	{ 0x1d, 0x04, "System Boot Initiated", "Automatic boot to diagnostic" },
-
-	{ 0x1e, 0x00, "Boot Error", "No bootable media" },
-	{ 0x1e, 0x01, "Boot Error", "Non-bootable disk in drive" },
-	{ 0x1e, 0x02, "Boot Error", "PXE server not found" },
-	{ 0x1e, 0x03, "Boot Error", "Invalid boot sector" },
-	{ 0x1e, 0x04, "Boot Error", "Timeout waiting for selection" },
-
-	{ 0x1f, 0x00, "OS Boot", "A: boot completed" },
-	{ 0x1f, 0x01, "OS Boot", "C: boot completed" },
-	{ 0x1f, 0x02, "OS Boot", "PXE boot completed" },
-	{ 0x1f, 0x03, "OS Boot", "Diagnostic boot completed" },
-	{ 0x1f, 0x04, "OS Boot", "CD-ROM boot completed" },
-	{ 0x1f, 0x05, "OS Boot", "ROM boot completed" },
-	{ 0x1f, 0x06, "OS Boot", "boot completed - device not specified" },
-
-	{ 0x20, 0x00, "OS Critical Stop", "Stop during OS load/init" },
-	{ 0x20, 0x01, "OS Critical Stop", "Run-time stop" },
-
-	{ 0x21, 0x00, "Slot/Connector", "Fault Status asserted" },
-	{ 0x21, 0x01, "Slot/Connector", "Identify Status asserted" },
-	{ 0x21, 0x02, "Slot/Connector", "Slot/Connector Device installed/attached" },
-	{ 0x21, 0x03, "Slot/Connector", "Slot/Connector ready for device installation" },
-	{ 0x21, 0x04, "Slot/Connector", "Slot/Connector ready for device removal" },
-	{ 0x21, 0x05, "Slot/Connector", "Slot Power is off" },
-	{ 0x21, 0x06, "Slot/Connector", "Slot/Connector device removal request" },
-	{ 0x21, 0x07, "Slot/Connector", "Interlock asserted" },
-	{ 0x21, 0x08, "Slot/Connector", "Slot is disabled" },
-
-	{ 0x22, 0x00, "System ACPI Power State", "S0/G0: working" },
-	{ 0x22, 0x01, "System ACPI Power State", "S1: sleeping with system hw & processor context maintained" },
-	{ 0x22, 0x02, "System ACPI Power State", "S2: sleeping, processor context lost" },
-	{ 0x22, 0x03, "System ACPI Power State", "S3: sleeping, processor & hw context lost, memory retained" },
-	{ 0x22, 0x04, "System ACPI Power State", "S4: non-volatile sleep/suspend-to-disk" },
-	{ 0x22, 0x05, "System ACPI Power State", "S5/G2: soft-off" },
-	{ 0x22, 0x06, "System ACPI Power State", "S4/S5: soft-off" },
-	{ 0x22, 0x07, "System ACPI Power State", "G3: mechanical off" },
-	{ 0x22, 0x08, "System ACPI Power State", "Sleeping in S1/S2/S3 state" },
-	{ 0x22, 0x09, "System ACPI Power State", "G1: sleeping" },
-	{ 0x22, 0x0a, "System ACPI Power State", "S5: entered by override" },
-	{ 0x22, 0x0b, "System ACPI Power State", "Legacy ON state" },
-	{ 0x22, 0x0c, "System ACPI Power State", "Legacy OFF state" },
-	{ 0x22, 0x0e, "System ACPI Power State", "Unknown" },
-
-	{ 0x23, 0x00, "Watchdog 2", "Timer expired" },
-	{ 0x23, 0x01, "Watchdog 2", "Hard reset" },
-	{ 0x23, 0x02, "Watchdog 2", "Power down" },
-	{ 0x23, 0x03, "Watchdog 2", "Power cycle" },
-	{ 0x23, 0x04, "Watchdog 2", "reserved" },
-	{ 0x23, 0x05, "Watchdog 2", "reserved" },
-	{ 0x23, 0x06, "Watchdog 2", "reserved" },
-	{ 0x23, 0x07, "Watchdog 2", "reserved" },
-	{ 0x23, 0x08, "Watchdog 2", "Timer interrupt" },
-
-	{ 0x24, 0x00, "Platform Alert", "Platform generated page" },
-	{ 0x24, 0x01, "Platform Alert", "Platform generated LAN alert" },
-	{ 0x24, 0x02, "Platform Alert", "Platform Event Trap generated" },
-	{ 0x24, 0x03, "Platform Alert", "Platform generated SNMP trap, OEM format" },
-
-	{ 0x25, 0x00, "Entity Presence", "Present" },
-	{ 0x25, 0x01, "Entity Presence", "Absent" },
-	{ 0x25, 0x02, "Entity Presence", "Disabled" },
-
-	{ 0x26, 0x00, "Monitor ASIC/IC", NULL },
-
-	{ 0x27, 0x00, "LAN", "Heartbeat Lost" },
-	{ 0x27, 0x01, "LAN", "Heartbeat" },
-
-	{ 0x28, 0x00, "Management Subsystem Health", "Sensor access degraded or unavailable" },
-	{ 0x28, 0x01, "Management Subsystem Health", "Controller access degraded or unavailable" },
-	{ 0x28, 0x02, "Management Subsystem Health", "Management controller off-line" },
-	{ 0x28, 0x03, "Management Subsystem Health", "Management controller unavailable" },
-
-	{ 0x29, 0x00, "Battery", "Low" },
-	{ 0x29, 0x01, "Battery", "Failed" },
-	{ 0x29, 0x02, "Battery", "Presence Detected" },
-
-	{ 0x00, 0x00, NULL, NULL },
-};
-
-int ipmi_sel_main(struct ipmi_intf *, int, char **);
-
-#endif /*_IPMI_SEL_H*/
diff --git a/ipmitool/include/ipmitool/ipmi.h b/ipmitool/include/ipmitool/ipmi.h
index cef5833..8d71d62 100644
--- a/ipmitool/include/ipmitool/ipmi.h
+++ b/ipmitool/include/ipmitool/ipmi.h
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <netinet/in.h>
+#include <ipmitool/helper.h>
 
 #define BUF_SIZE 256
 
@@ -104,7 +105,7 @@ struct ipmi_intf {
 	struct sockaddr_in addr;
 	int abort;
 	int pedantic;
-	int (*open)(struct ipmi_intf *, char *, int, char *);
+	int (*open)(struct ipmi_intf *, char *, int, char *, char *);
 	void (*close)(struct ipmi_intf *);
 	struct ipmi_rs *(*sendrecv)(struct ipmi_intf *, struct ipmi_rq *);
 };
@@ -121,6 +122,6 @@ struct ipmi_intf {
 #define IPMI_BMC_SLAVE_ADDR		0x20
 #define IPMI_REMOTE_SWID		0x81
 
-int handle_ipmi(struct ipmi_intf *intf, unsigned char * data, int data_len);
+const struct valstr completion_code_vals[25];
 
 #endif /* IPMI_H */
diff --git a/ipmitool/include/rmcp.h b/ipmitool/include/rmcp.h
deleted file mode 100644
index a7e1cdf..0000000
--- a/ipmitool/include/rmcp.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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 __RMCP_H
-#define __RMCP_H
-
-#include <helper.h>
-#include <ipmi_lan.h>
-
-#define RMCP_VERSION_1		0x06
-
-#define RMCP_UDP_PORT		0x26f /* port 623 */
-#define RMCP_UDP_SECURE_PORT	0x298 /* port 664 */
-
-#define RMCP_TYPE_MASK		0x80
-#define RMCP_TYPE_NORM		0x00
-#define RMCP_TYPE_ACK		0x01
-
-static const struct valstr rmcp_type_vals[] __attribute__((unused)) = {
-	{ RMCP_TYPE_NORM,	"Normal RMCP" },
-	{ RMCP_TYPE_ACK,	"RMCP ACK" },
-	{ 0,			NULL }
-};
-
-#define RMCP_CLASS_MASK		0x1f
-#define RMCP_CLASS_ASF		0x06
-#define RMCP_CLASS_IPMI		0x07
-#define RMCP_CLASS_OEM		0x08
-
-static const struct valstr rmcp_class_vals[] __attribute__((unused)) = {
-	{ RMCP_CLASS_ASF,	"ASF" },
-	{ RMCP_CLASS_IPMI,	"IPMI" },
-	{ RMCP_CLASS_OEM,	"OEM" },
-	{ 0,			NULL }
-};
-
-/* RMCP message header */
-struct rmcp_hdr {
-	unsigned char ver;
-	unsigned char __reserved;
-	unsigned char seq;
-	unsigned char class;
-} __attribute__((packed));
-
-int handle_rmcp(struct ipmi_intf * intf, unsigned char * data, int data_len);
-
-#endif /* __RMCP_H */
diff --git a/ipmitool/ipmi_chassis.c b/ipmitool/ipmi_chassis.c
deleted file mode 100644
index ea003d2..0000000
--- a/ipmitool/ipmi_chassis.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * 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 <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <helper.h>
-#include <ipmi.h>
-#include <ipmi_chassis.h>
-
-static int ipmi_chassis_power_status(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0x1;
-	req.msg.data_len = 0;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode) {
-		printf("error in Chassis Status Command\n");
-		return 0;
-	}
-
-	printf("Chassis Power is %s\n", (rsp->data[0] & 0x1) ? "on" : "off");
-
-	return rsp->data[0] & 0x1;
-}
-
-static const struct valstr ipmi_chassis_power_control_vals[] = {
-	{ 0x00, "Down/Off" },
-	{ 0x01, "Up/On" },
-	{ 0x02, "Cycle" },
-	{ 0x03, "Reset" },
-	{ 0x04, "Pulse" },
-	{ 0x05, "Soft" },
-	{ 0x00, NULL },
-};
-
-static void ipmi_chassis_power_control(struct ipmi_intf * intf, unsigned char ctl)
-{
-	struct ipmi_req req;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0x2;
-	req.msg.data = &ctl;
-	req.msg.data_len = 1;
-
-	printf("Chassis Power Control: %s\n", val2str(ctl, ipmi_chassis_power_control_vals));
-
-	intf->sendrecv(intf, &req);
-}
-
-static void ipmi_chassis_identify(struct ipmi_intf * intf, char * arg)
-{
-	struct ipmi_req req;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0x4;
-
-	printf("Chassis identify interval: ");
-
-	if (arg) {
-		unsigned char interval = (unsigned char)atoi(arg);
-
-		req.msg.data = &interval;
-		req.msg.data_len = 1;
-
-		if (interval)
-			printf("%d seconds\n", interval);
-		else
-			printf("off\n");
-	} else {
-		printf("default (15 seconds)\n");
-	}
-
-	intf->sendrecv(intf, &req);
-}
-
-static void ipmi_chassis_poh(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned long count;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0xf;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (!rsp || rsp->ccode)
-		return;
-
-	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));
-}
-
-static void ipmi_chassis_restart_cause(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0x7;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (!rsp || rsp->ccode)
-		return;
-
-	printf("System restart cause: ");
-
-	switch (rsp->data[0] & 0xf) {
-	case 0:
-		printf("unknown\n");
-		break;
-	case 1:
-		printf("chassis power control command\n");
-		break;
-	case 2:
-		printf("reset via pushbutton\n");
-		break;
-	case 3:
-		printf("power-up via pushbutton\n");
-		break;
-	case 4:
-		printf("watchdog expired\n");
-		break;
-	case 5:
-		printf("OEM\n");
-		break;
-	case 6:
-		printf("power-up due to always-restore power policy\n");
-		break;
-	case 7:
-		printf("power-up due to restore-previous power policy\n");
-		break;
-	case 8:
-		printf("reset via PEF\n");
-		break;
-	case 9:
-		printf("power-cycle via PEF\n");
-		break;
-	default:
-		printf("error!\n");
-	}
-}
-
-static void ipmi_chassis_status(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0x1;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode)
-		return;
-
-	/* byte 1 */
-	printf("System Power         : %s\n", (rsp->data[0] & 0x1) ? "on" : "off");
-	printf("Power Overload       : %s\n", (rsp->data[0] & 0x2) ? "true" : "false");
-	printf("Power Interlock      : %s\n", (rsp->data[0] & 0x4) ? "active" : "inactive");
-	printf("Main Power Fault     : %s\n", (rsp->data[0] & 0x8) ? "true" : "false");
-	printf("Power Control Fault  : %s\n", (rsp->data[0] & 0x10) ? "true" : "false");
-	printf("Power Restore Policy : ");
-	switch ((rsp->data[0] & 0x60) >> 5) {
-	case 0x0:
-		printf("always-off\n");
-		break;
-	case 0x1:
-		printf("previous\n");
-		break;
-	case 0x2:
-		printf("always-on\n");
-		break;
-	case 0x3:
-	default:
-		printf("unknown\n");
-	}
-
-	/* byte 2 */
-	printf("Last Power Event     : ");
-	if (rsp->data[1] & 0x1)
-		printf("ac-failed ");
-	if (rsp->data[1] & 0x2)
-		printf("overload ");
-	if (rsp->data[1] & 0x4)
-		printf("interlock ");
-	if (rsp->data[1] & 0x8)
-		printf("fault ");
-	if (rsp->data[1] & 0x10)
-		printf("command");
-	printf("\n");
-
-	/* byte 3 */
-	printf("Chassis Intrusion    : %s\n", (rsp->data[2] & 0x1) ? "active" : "inactive");
-	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");
-}
-
-static void ipmi_chassis_set_bootparam(struct ipmi_intf * intf, unsigned char param, unsigned char * data, int len)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char msg_data[16];
-
-	memset(msg_data, 0, 16);
-	msg_data[0] = param & 0x7f;
-	memcpy(msg_data+1, data, len);
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0x8;
-	req.msg.data = msg_data;
-	req.msg.data_len = len + 1;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode) {
-		printf("Error setting Chassis Boot Parameter %d\n", param);
-		return;
-	}
-
-	printf("Chassis Set Boot Param %d to %s\n", param, data);
-}
-
-static void ipmi_chassis_get_bootparam(struct ipmi_intf * intf, char * arg)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char msg_data[3];
-
-	if (!arg)
-		return;
-
-	memset(msg_data, 0, 3);
-
-	msg_data[0] = (unsigned char)atoi(arg) & 0x7f;
-	msg_data[1] = 0;
-	msg_data[2] = 0;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0x9;
-	req.msg.data = msg_data;
-	req.msg.data_len = 3;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode)
-		return;
-
-	if (verbose > 2)
-		printbuf(rsp->data, rsp->data_len, "Boot Option");
-
-	printf("Boot parameter version: %d\n", rsp->data[0]);
-	printf("Boot parameter %d is %s\n", rsp->data[1] & 0x7f,
-	       (rsp->data[1] & 0x80) ? "invalid/locked" : "valid/unlocked");
-	printf("Boot parameter data: %s\n", buf2str(rsp->data+2, rsp->data_len - 2));
-}
-
-static void ipmi_chassis_set_bootflag(struct ipmi_intf * intf, char * arg)
-{
-	unsigned char flags[5];
-
-	if (!arg) {
-		printf("Error: no bootflag argument supplied\n");
-		return;
-	}
-
-	if (!strncmp(arg, "force_pxe", 9)) {
-		flags[1] = 0x04; // 00000100
-	}
-	else if (!strncmp(arg, "force_disk", 10)) {
-		flags[1] = 0x08; // 00001000
-	}
-	else if (!strncmp(arg, "force_diag", 10)) {
-		flags[1] = 0x10; // 00010000
-	}
-	else if (!strncmp(arg, "force_cdrom", 11)) {
-		flags[1] = 0x14; // 00010100
-	}
-	else if (!strncmp(arg, "force_floppy", 12)) {
-		flags[1] = 0x3c; // 00111100
-	}
-	else {
-		printf("Invalid bootflag: %s\n", arg);
-		return;
-	}
-
-	flags[0] = 0x80;	/* set flag valid bit */
-	ipmi_chassis_set_bootparam(intf, 5, flags, 5);
-
-	flags[0] = 0x08;	/* don't automatically clear boot flag valid bit in 60 seconds */
-	ipmi_chassis_set_bootparam(intf, 3, flags, 1);
-}
-
-static void ipmi_chassis_power_policy(struct ipmi_intf * intf, unsigned char policy)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-
-	if (!policy)
-		return;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_CHASSIS;
-	req.msg.cmd = 0x6;
-	req.msg.data = &policy;
-	req.msg.data_len = 1;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode)
-		return;
-
-	if (policy == IPMI_CHASSIS_POLICY_NO_CHANGE) {
-		printf("Supported chassis power policy:  ");
-		if (rsp->data[0] & (1<<IPMI_CHASSIS_POLICY_ALWAYS_OFF))
-			printf("always-off ");
-		if (rsp->data[0] & (1<<IPMI_CHASSIS_POLICY_ALWAYS_ON))
-			printf("always-on ");
-		if (rsp->data[0] & (1<<IPMI_CHASSIS_POLICY_PREVIOUS))
-			printf("previous");
-		printf("\n");
-	}
-	else {
-		printf("Set chassis power restore policy to ");
-		switch (policy) {
-		case IPMI_CHASSIS_POLICY_ALWAYS_ON:
-			printf("always-on\n");
-			break;
-		case IPMI_CHASSIS_POLICY_ALWAYS_OFF:
-			printf("always-off\n");
-			break;
-		case IPMI_CHASSIS_POLICY_PREVIOUS:
-			printf("previous\n");
-			break;
-		default:
-			printf("unknown\n");
-		}
-	}
-}
-
-int ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	if (!argc || !strncmp(argv[0], "help", 4)) {
-		printf("Chassis Commands:  status, power, identify, policy, restart_cause, poh\n");
-		return 0;
-	}
-	else if (!strncmp(argv[0], "status", 6)) {
-		ipmi_chassis_status(intf);
-	}
-	else if (!strncmp(argv[0], "power", 5)) {
-		unsigned char ctl = 0;
-
-		if (argc < 2 || !strncmp(argv[1], "help", 4)) {
-			printf("chassis power Commands: status, on, off, cycle, reset, diag, soft\n");
-			return 0;
-		}
-		if (!strncmp(argv[1], "status", 6)) {
-			ipmi_chassis_power_status(intf);
-			return 0;
-		}
-
-		if (!strncmp(argv[1], "up", 2) || !strncmp(argv[1], "on", 2))
-			ctl = IPMI_CHASSIS_CTL_POWER_UP;
-		else if (!strncmp(argv[1], "down", 4) || !strncmp(argv[1], "off", 3))
-			ctl = IPMI_CHASSIS_CTL_POWER_DOWN;
-		else if (!strncmp(argv[1], "cycle", 5))
-			ctl = IPMI_CHASSIS_CTL_POWER_CYCLE;
-		else if (!strncmp(argv[1], "reset", 5))
-			ctl = IPMI_CHASSIS_CTL_HARD_RESET;
-		else if (!strncmp(argv[1], "diag", 5))
-			ctl = IPMI_CHASSIS_CTL_PULSE_DIAG;
-		else if (!strncmp (argv[1], "acpi", 4) || !strncmp(argv[1], "soft", 4))
-			ctl = IPMI_CHASSIS_CTL_ACPI_SOFT;
-		else {
-			printf("Invalid chassis power command: %s\n", argv[1]);
-			return -1;
-		}
-
-		ipmi_chassis_power_control(intf, ctl);
-	}
-	else if (!strncmp(argv[0], "identify", 8)) {
-		if (argc < 2) {
-			ipmi_chassis_identify(intf, NULL);
-		}
-		else if (!strncmp(argv[1], "help", 4)) {
-			printf("chassis identify <interval>\n");
-			printf("                 default is 15 seconds\n");
-			printf("                 0 to turn off\n");
-		} else {
-			ipmi_chassis_identify(intf, argv[1]);
-		}
-	}
-	else if (!strncmp(argv[0], "poh", 3)) {
-		ipmi_chassis_poh(intf);
-	}
-	else if (!strncmp(argv[0], "restart_cause", 13)) {
-		ipmi_chassis_restart_cause(intf);
-	}
-	else if (!strncmp(argv[0], "policy", 4)) {
-		if (argc < 2 || !strncmp(argv[1], "help", 4)) {
-			printf("chassis policy <state>\n");
-			printf("   list        : return supported policies\n");
-			printf("   always-on   : turn on when power is restored\n");
-			printf("   previous    : return to previous state when power is restored\n");
-			printf("   always-off  : stay off after power is restored\n");
-		} else {
-			unsigned char ctl;
-
-			if (!strncmp(argv[1], "list", 4))
-				ctl = IPMI_CHASSIS_POLICY_NO_CHANGE;
-			else if (!strncmp(argv[1], "always-on", 9))
-				ctl = IPMI_CHASSIS_POLICY_ALWAYS_ON;
-			else if (!strncmp(argv[1], "previous", 8))
-				ctl = IPMI_CHASSIS_POLICY_PREVIOUS;
-			else if (!strncmp(argv[1], "always-off", 10))
-				ctl = IPMI_CHASSIS_POLICY_ALWAYS_OFF;
-			else {
-				printf("invalid chassis policy: %s\n", argv[1]);
-				return -1;
-			}
-
-			ipmi_chassis_power_policy(intf, ctl);
-		}
-	}
-	else if (!strncmp(argv[0], "bootparam", 7)) {
-		if (argc < 3 || !strncmp(argv[1], "help", 4)) {
-			printf("bootparam get|set <option> [value ...]\n");
-		}
-		else {
-			if (!strncmp(argv[1], "get", 3)) {
-				ipmi_chassis_get_bootparam(intf, argv[2]);
-			}
-			else if (!strncmp(argv[1], "set", 3)) {
-				if (argc < 4) {
-					printf("bootparam set <option> [value ...]\n");
-				} else {
-					if (!strncmp(argv[2], "bootflag", 8)) {
-						ipmi_chassis_set_bootflag(intf, argv[3]);
-					}
-					else {
-						printf("bootparam set <option> [value ...]\n");
-					}
-				}
-			}
-			else {
-				printf("bootparam get|set <option> [value]\n");
-			}
-		}
-	}
-	else {
-		printf("Invalid Chassis command: %s\n", argv[0]);
-		return -1;
-	}
-	return 0;
-}
diff --git a/ipmitool/ipmi_fru.c b/ipmitool/ipmi_fru.c
deleted file mode 100644
index 17bfeb5..0000000
--- a/ipmitool/ipmi_fru.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * 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 <ipmi.h>
-#include <ipmi_fru.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-static char * get_fru_area_str(unsigned char * data, int * offset)
-{
-	char * str;
-	int len;
-	int off = *offset;
-
-	len = data[off++];
-	len &= 0x3f;		/* bits 0:5 contain length */
-
-	str = malloc(len+1);
-	if (!str)
-		return NULL;
-	str[len] = '\0';
-
-	memcpy(str, &data[off], len);
-
-	off += len;
-	*offset = off;
-
-	return str;
-}
-
-static void ipmi_fru_print(struct ipmi_intf * intf, unsigned char id)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char fru_data[256], msg_data[4];
-	int i, len, offset;
-
-	struct fru_area_chassis chassis;
-	struct fru_area_board board;
-	struct fru_area_product product;
-
-	struct fru_info fru;
-	struct fru_header header;
-
-	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;
-	memcpy(&fru, rsp->data, sizeof(fru));
-
-	if (verbose > 1)
-		printf("fru.size = %d bytes (accessed by %s)\n",
-		       fru.size, fru.access ? "words" : "bytes");
-
-	msg_data[0] = id;
-	msg_data[1] = 0;
-	msg_data[2] = 0;
-	msg_data[3] = 8;
-
-	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;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode)
-		return;
-	memcpy(&header, rsp->data + 1, 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);
-	}
-
-	offset = 0;
-	memset(fru_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 || rsp->ccode)
-			continue;
-
-		len = rsp->data[0];
-		memcpy(&fru_data[offset], rsp->data + 1, len);
-		offset += len;
-	} 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);
-
-	/* 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);
-
-	/* 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);
-
-	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);
-
-	free(chassis.part);
-	free(chassis.serial);
-
-	free(board.mfg);
-	free(board.prod);
-	free(board.serial);
-	free(board.part);
-
-	free(product.mfg);
-	free(product.name);
-	free(product.part);
-	free(product.version);
-	free(product.serial);
-	free(product.asset);
-}
-
-int ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	if (argc == 0) {
-		ipmi_fru_print(intf, 0);
-		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
-		printf("Invalid FRU command: %s\n", argv[0]);
-
-	return 0;
-}
diff --git a/ipmitool/ipmi_lanp.c b/ipmitool/ipmi_lanp.c
deleted file mode 100644
index 9a11de0..0000000
--- a/ipmitool/ipmi_lanp.c
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
- * 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <netdb.h>
-
-#include <ipmi.h>
-#include <ipmi_lan.h>
-#include <helper.h>
-
-static struct lan_param * get_lan_param(struct ipmi_intf * intf, unsigned char chan, int param)
-{
-	struct lan_param * p;
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char msg_data[4];
-
-	p = &ipmi_lan_params[param];
-	if (!p)
-		return NULL;
-
-	msg_data[0] = chan;
-	msg_data[1] = p->cmd;
-	msg_data[2] = 0;
-	msg_data[3] = 0;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn    = IPMI_NETFN_TRANSPORT;
-	req.msg.cmd      = IPMI_LAN_GET_CONFIG;
-	req.msg.data     = msg_data;
-	req.msg.data_len = 4;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (!rsp || rsp->ccode)
-		return NULL;
-
-	p->data = rsp->data + 1;
-
-	return p;
-}
-
-static int set_lan_param(struct ipmi_intf * intf, unsigned char chan, int param, unsigned char * data, int len)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char msg_data[32];
-	
-	if (param < 0)
-		return -1;
-
-	msg_data[0] = chan;
-	msg_data[1] = param;
-
-	memcpy(&msg_data[2], data, len);
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_TRANSPORT;
-	req.msg.cmd = IPMI_LAN_SET_CONFIG;
-	req.msg.data = msg_data;
-	req.msg.data_len = len+2;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode)
-		return -1;
-
-	return 0;
-}
-
-#if 0
-static void suspend_lan_arp(struct ipmi_intf * intf, int suspend)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req 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;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp && !rsp->ccode)
-		printf("Suspend BMC ARP status  : 0x%x\n", rsp->data[0]);
-}
-
-/* Enable Gratuitous ARP and Interval */
-static void lan_set_arp(struct ipmi_intf * intf)
-{
-	unsigned char data;
-
-	data = 0x01;
-	set_lan_param(intf, IPMI_LANP_BMC_ARP, &data, 1);
-
-	data = 0x03;
-	set_lan_param(intf, IPMI_LANP_GRAT_ARP, &data, 1);
-}
-
-static void set_lan_params(struct ipmi_intf * intf)
-{
-	lan_set_auth(intf);
-	lan_set_arp(intf);
-	suspend_lan_arp(intf, 0);
-}
-
-#endif
-
-static void ipmi_lan_print(struct ipmi_intf * intf, unsigned char chan)
-{
-	struct lan_param * p;
-
-	p = get_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE);
-	if (p) printf("%-24s: 0x%02x\n", p->desc, p->data[0]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE_ENABLE);
-	if (p) printf("%-24s: callback=0x%02x user=0x%02x operator=0x%02x admin=0x%02x oem=0x%02x\n",
-		      p->desc, p->data[0], p->data[1], p->data[2], p->data[3], p->data[4]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_IP_ADDR_SRC);
-	if (p) printf("%-24s: 0x%02x\n", p->desc, p->data[0]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_IP_ADDR);
-	if (p) printf("%-24s: %d.%d.%d.%d\n", p->desc,
-		      p->data[0], p->data[1], p->data[2], p->data[3]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_SUBNET_MASK);
-	if (p) printf("%-24s: %d.%d.%d.%d\n", p->desc,
-		      p->data[0], p->data[1], p->data[2], p->data[3]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_MAC_ADDR);
-	if (p) printf("%-24s: %02x:%02x:%02x:%02x:%02x:%02x\n", p->desc,
-		      p->data[0], p->data[1], p->data[2], p->data[3], p->data[4], p->data[5]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_SNMP_STRING);
-	if (p) printf("%-24s: %s\n", p->desc, p->data);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_IP_HEADER);
-	if (p) printf("%-24s: TTL=0x%02x flags=0x%02x precedence=0x%02x TOS=0x%02x\n",
-		      p->desc, p->data[0], p->data[1] & 0xe0, p->data[2] & 0xe0, p->data[2] & 0x1e);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_BMC_ARP);
-	if (p) printf("%-24s: 0x%02x\n", p->desc, p->data[0]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_GRAT_ARP);
-	if (p) printf("%-24s: 0x%02x\n", p->desc, p->data[0]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_IP);
-	if (p) printf("%-24s: %d.%d.%d.%d\n", p->desc,
-		      p->data[0], p->data[1], p->data[2], p->data[3]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_MAC);
-	if (p) printf("%-24s: %02x:%02x:%02x:%02x:%02x:%02x\n", p->desc,
-		      p->data[0], p->data[1], p->data[2], p->data[3], p->data[4], p->data[5]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_IP);
-	if (p) printf("%-24s: %d.%d.%d.%d\n", p->desc,
-		      p->data[0], p->data[1], p->data[2], p->data[3]);
-
-	p = get_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_MAC);
-	if (p) printf("%-24s: %02x:%02x:%02x:%02x:%02x:%02x\n", p->desc,
-		      p->data[0], p->data[1], p->data[2], p->data[3], p->data[4], p->data[5]);
-}
-
-/* Configure Authentication Types */
-static void ipmi_lan_set_auth(struct ipmi_intf * intf, unsigned char chan, char * level, char * types)
-{
-	unsigned char data[5];
-	unsigned char authtype = 0;
-	char * p;
-	struct lan_param * lp;
-
-	if (!level || !types)
-		return;
-
-	lp = get_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE_ENABLE);
-	if (!lp)
-		return;
-	if (verbose > 1)
-		printf("%-24s: callback=0x%02x user=0x%02x operator=0x%02x admin=0x%02x oem=0x%02x\n",
-		       lp->desc, lp->data[0], lp->data[1], lp->data[2], lp->data[3], lp->data[4]);
-	memset(data, 0, 5);
-	memcpy(data, lp->data, 5);
-
-	p = types;
-	while (p) {
-		if (!strncmp(p, "none", 4))
-			authtype |= 1 << IPMI_SESSION_AUTHTYPE_NONE;
-		else if (!strncmp(p, "md2", 3))
-			authtype |= 1 << IPMI_SESSION_AUTHTYPE_MD2;
-		else if (!strncmp(p, "key", 3))
-			authtype |= 1 << IPMI_SESSION_AUTHTYPE_KEY;
-		else
-			printf("invalid authtype: %s\n", p);
-		p = strchr(p, ',');
-		if (p)
-			p++;
-	}
-
-	p = level;
-	while (p) {
-		if (!strncmp(p, "callback", 8))
-			data[0] = authtype;
-		else if (!strncmp(p, "user", 4))
-			data[1] = authtype;
-		else if (!strncmp(p, "operator", 8))
-			data[2] = authtype;
-		else if (!strncmp(p, "admin", 5))
-			data[3] = authtype;
-		else 
-			printf("invalid auth level: %s\n", p);
-		p = strchr(p, ',');
-		if (p)
-			p++;
-	}
-
-	if (verbose > 1)
-		printbuf(data, 5, "authtype data");
-
-	set_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE_ENABLE, data, 5);
-}
-
-static void
-ipmi_lan_set_password(struct ipmi_intf * intf,
-	unsigned char userid, unsigned char * password)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char data[18];
-
-	memset(&data, 0, sizeof(data));
-	data[0] = userid & 0x3f;/* user ID */
-	data[1] = 0x02;		/* set password */
-	memcpy(data+2, password, (strlen(password) > 16) ? 16 : strlen(password));
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_APP;
-	req.msg.cmd = 0x47;
-	req.msg.data = data;
-	req.msg.data_len = 18;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (!rsp || rsp->ccode) {
-		printf("Error:%x setting user %d password to %s\n",
-		       rsp ? rsp->ccode : 0, userid, password);
-		return;
-	}
-
-	/* adjust our session password
-	 * or we will no longer be able to communicate with BMC
-	 */
-	lan_session.password = 1;
-	memset(lan_session.authcode, 0, 16);
-	memcpy(lan_session.authcode, password, strlen(password));
-
-	printf("Password for user %d set to %s\n", userid, lan_session.authcode);
-}
-
-static int
-get_cmdline_macaddr(char * arg, unsigned char * buf)
-{
-	unsigned m1, m2, m3, m4, m5, m6;
-	if (sscanf(arg, "%02x:%02x:%02x:%02x:%02x:%02x",
-		   &m1, &m2, &m3, &m4, &m5, &m6) != 6) {
-		printf("Invalid MAC address: %s\n", arg);
-		return -1;
-	}
-	buf[0] = m1;
-	buf[1] = m2;
-	buf[2] = m3;
-	buf[3] = m4;
-	buf[4] = m5;
-	buf[5] = m6;
-	return 0;
-}
-
-static int
-get_cmdline_ipaddr(char * arg, unsigned char * buf)
-{
-	unsigned ip1, ip2, ip3, ip4;
-	if (sscanf(arg, "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4) != 4) {
-		printf("Invalid IP address: %s\n", arg);
-		return -1;
-	}
-	buf[0] = ip1;
-	buf[1] = ip2;
-	buf[2] = ip3;
-	buf[3] = ip4;
-	return 0;
-}
-
-static void ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	unsigned char data[32];
-	unsigned char chan;
-	memset(&data, 0, sizeof(data));
-
-	if (argc < 2 || !strncmp(argv[0], "help", 4)) {
-		printf("usage: lan set <channel> <command>\n");
-		printf("LAN set commands: ipaddr, netmask, macaddr, defgw, bakgw, password, auth, ipsrc\n");
-		return;
-	}
-
-	chan = (unsigned char) strtod(argv[0], NULL);
-	if (chan != 0x6 && chan != 0x7) {
-		printf("valid LAN channels are 6 and 7\n");
-		return;
-	}
-
-	/* set authentication types */
-	if (!strncmp(argv[1], "auth", 4)) {
-		if (argc < 3 || !strncmp(argv[2], "help", 4)) {
-			printf("lan set <channel> auth <level> <type,type,...>\n");
-			printf("  level = callback, user, operator, admin\n");
-			printf("  types = none, md2, key\n");
-			printf("example: lan set 7 auth admin key\n");
-			return;
-		}
-		ipmi_lan_set_auth(intf, chan, argv[2], argv[3]);
-		return;
-	}
-	/* ip address source */
-	else if (!strncmp(argv[1], "ipsrc", 5)) {
-		if (argc < 3 || !strncmp(argv[2], "help", 4)) {
-			printf("lan set <channel> ipsrc <source>\n");
-			printf("  none   = unspecified\n");
-			printf("  static = static address (manually configured)\n");
-			printf("  dhcp   = address obtained by BMC running DHCP\n");
-			printf("  bios   = address loaded by BIOS or system software\n");
-			return;
-		}
-		if (!strncmp(argv[2], "none", 4))
-			data[0] = 0;
-		else if (!strncmp(argv[2], "static", 5))
-			data[0] = 1;
-		else if (!strncmp(argv[2], "dhcp", 4))
-			data[0] = 2;
-		else if (!strncmp(argv[2], "bios", 4))
-			data[0] = 3;
-		else
-			return;
-		set_lan_param(intf, chan, IPMI_LANP_IP_ADDR_SRC, data, 1);
-	}
-	/* session password
-	 * not strictly a lan setting, but its used for lan connections */
-	else if (!strncmp(argv[1], "password", 8)) {
-		ipmi_lan_set_password(intf, 1, argv[2]);
-	}
-	/* ip address */
-	else if (!strncmp(argv[1], "ipaddr", 6) &&
-		 !get_cmdline_ipaddr(argv[2], data)) {
-		printf("Setting LAN %s to %d.%d.%d.%d\n",
-		       ipmi_lan_params[IPMI_LANP_IP_ADDR].desc,
-		       data[0], data[1], data[2], data[3]);
-		set_lan_param(intf, chan, IPMI_LANP_IP_ADDR, data, 4);
-		/* also set ip address source to "static" */
-		data[0] = 0x1;
-		set_lan_param(intf, chan, IPMI_LANP_IP_ADDR_SRC, data, 1);
-	}
-	/* network mask */
-	else if (!strncmp(argv[1], "netmask", 7) &&
-		 !get_cmdline_ipaddr(argv[2], data)) {
-		printf("Setting LAN %s to %d.%d.%d.%d\n",
-		       ipmi_lan_params[IPMI_LANP_SUBNET_MASK].desc,
-		       data[0], data[1], data[2], data[3]);
-		set_lan_param(intf, chan, IPMI_LANP_SUBNET_MASK, data, 4);
-	}
-	/* mac address */
-	else if (!strncmp(argv[1], "macaddr", 7) &&
-		 !get_cmdline_macaddr(argv[2], data)) {
-		printf("Setting LAN %s to %02x:%02x:%02x:%02x:%02x:%02x\n",
-		       ipmi_lan_params[IPMI_LANP_MAC_ADDR].desc,
-		       data[0], data[1], data[2], data[3], data[4], data[5]);
-		set_lan_param(intf, chan, IPMI_LANP_MAC_ADDR, data, 6);
-	}
-	/* default gateway settings */
-	else if (!strncmp(argv[1], "defgw", 5)) {
-		if (argc < 4 || !strncmp(argv[2], "help", 4)) {
-			printf("LAN set default gateway Commands: ipaddr, mac\n");
-		}
-		else if (!strncmp(argv[2], "ipaddr", 5) &&
-			 !get_cmdline_ipaddr(argv[3], data)) {
-			printf("Setting LAN %s to %d.%d.%d.%d\n",
-			       ipmi_lan_params[IPMI_LANP_DEF_GATEWAY_IP].desc,
-			       data[0], data[1], data[2], data[3]);
-			set_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_IP, data, 4);
-		}
-		else if (!strncmp(argv[2], "macaddr", 7) &&
-			 !get_cmdline_macaddr(argv[3], data)) {
-			printf("Setting LAN %s to %02x:%02x:%02x:%02x:%02x:%02x\n",
-			       ipmi_lan_params[IPMI_LANP_DEF_GATEWAY_MAC].desc,
-			       data[0], data[1], data[2], data[3], data[4], data[5]);
-			set_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_MAC, data, 6);
-		}
-	}
-	/* backup gateway settings */
-	else if (!strncmp(argv[1], "bakgw", 5)) {
-		if (argc < 4 || !strncmp(argv[2], "help", 4)) {
-			printf("LAN set backup gateway commands: ipaddr, mac\n");
-		}
-		else if (!strncmp(argv[2], "ipaddr", 5) &&
-			 !get_cmdline_ipaddr(argv[3], data)) {
-			printf("Setting LAN %s to %d.%d.%d.%d\n",
-			       ipmi_lan_params[IPMI_LANP_BAK_GATEWAY_IP].desc,
-			       data[0], data[1], data[2], data[3]);
-			set_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_IP, data, 4);
-		}
-		else if (!strncmp(argv[2], "macaddr", 7) &&
-			 !get_cmdline_macaddr(argv[3], data)) {
-			printf("Setting LAN %s to %02x:%02x:%02x:%02x:%02x:%02x\n",
-			       ipmi_lan_params[IPMI_LANP_BAK_GATEWAY_MAC].desc,
-			       data[0], data[1], data[2], data[3], data[4], data[5]);
-			set_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_MAC, data, 6);
-		}
-	}
-}
-
-int ipmi_lan_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	if (!argc || !strncmp(argv[0], "help", 4))
-		printf("LAN Commands:  print, set\n");
-	else if (!strncmp(argv[0], "printconf", 9) ||
-		 !strncmp(argv[0], "print", 5)) {
-		unsigned char chan = 7;
-		if (argc > 1)
-			chan = (unsigned char) strtod(argv[1], NULL);
-		ipmi_lan_print(intf, chan);
-	}
-	else if (!strncmp(argv[0], "set", 3))
-		ipmi_lan_set(intf, argc-1, &(argv[1]));
-	else
-		printf("Invalid LAN command: %s\n", argv[0]);
-
-	return 0;
-}
-
diff --git a/ipmitool/ipmi_sdr.c b/ipmitool/ipmi_sdr.c
deleted file mode 100644
index 507c562..0000000
--- a/ipmitool/ipmi_sdr.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * 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 <ipmi.h>
-#include <ipmi_sdr.h>
-#include <ipmi_entity.h>
-
-/* convert unsigned value to 2's complement signed */
-int utos(unsigned val, unsigned bits)
-{
-	int x = pow(10, bits-1);
-	if (val & x) {
-		x = pow(2, bits-1);
-		return -((~val & (x-1))+1);
-	}
-	else return val;
-}
-
-static float
-sdr_convert_sensor_reading(struct sdr_record_full_sensor * sensor, unsigned char val)
-{
-	int m, b, k1, k2;
-
-	m  = __TO_M(sensor->mtol);
-	b  = __TO_B(sensor->bacc);
-	k1 = __TO_B_EXP(sensor->bacc);
-	k2 = __TO_R_EXP(sensor->bacc);
-
-	return (float)(((m * val) + (b * pow(10, k1))) * pow(10, k2));
-}
-
-#define GET_SENSOR_READING	0x2d
-#define GET_SENSOR_FACTORS      0x23
-#define GET_SENSOR_THRES	0x27
-#define GET_SENSOR_TYPE		0x2f
-
-static inline struct ipmi_rsp *
-ipmi_sdr_get_sensor_reading(struct ipmi_intf * intf, unsigned char sensor)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_SE;
-	req.msg.cmd = GET_SENSOR_READING;
-	req.msg.data = &sensor;
-	req.msg.data_len = sizeof(sensor);
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (!rsp || rsp->ccode)
-		return NULL;
-
-	return rsp;
-}
-
-static const char *
-ipmi_sdr_get_status(unsigned char stat)
-{
-	/* cr = critical
-	 * nc = non-critical
-	 * us = unspecified
-	 * nr = non-recoverable
-	 * ok = ok
-	 */
-	if (stat & (SDR_SENSOR_STAT_LO_NR | SDR_SENSOR_STAT_HI_NR))
-		return "nr";
-	else if (stat & (SDR_SENSOR_STAT_LO_CR | SDR_SENSOR_STAT_HI_CR))
-		return "cr";	
-	else if (stat & (SDR_SENSOR_STAT_LO_NC | SDR_SENSOR_STAT_HI_NC))
-		return "nc";
-	else
-		return "ok";
-}
-
-static struct sdr_get_rs *
-ipmi_sdr_get_header(struct ipmi_intf * intf, unsigned short reserve_id, unsigned short record_id)
-{
-	struct ipmi_req req;
-	struct ipmi_rsp * rsp;
-	struct sdr_get_rq sdr_rq;
-	static struct sdr_get_rs sdr_rs;
-
-	memset(&sdr_rq, 0, sizeof(sdr_rq));
-	sdr_rq.reserve_id = reserve_id;
-	sdr_rq.id = record_id;
-	sdr_rq.offset = 0;
-	sdr_rq.length = 5;	/* only get the header */
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = GET_SDR;
-	req.msg.data = (unsigned char *)&sdr_rq;
-	req.msg.data_len = sizeof(sdr_rq);
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || !rsp->data_len) {
-		printf("Error getting SDR record id 0x%04x\n", record_id);
-		return NULL;
-	}
-
-	if (verbose > 1)
-		printf("SDR Record ID   : 0x%04x\n", record_id);
-
-	memcpy(&sdr_rs, rsp->data, sizeof(sdr_rs));
-
-	if (sdr_rs.length == 0) {
-		printf("Error in SDR record id 0x%04x: invalid length %d\n",
-		       record_id, sdr_rs.length);
-		return NULL;
-	}
-
-	if (verbose > 1) {
-		printf("SDR record type : %d\n", sdr_rs.type);
-		printf("SDR record next : %d\n", sdr_rs.next);
-		printf("SDR record bytes: %d\n", sdr_rs.length);
-	}
-
-	return &sdr_rs;
-}
-
-static struct sdr_record_full_sensor *
-ipmi_sdr_get_entry(struct ipmi_intf * intf, unsigned short reserve_id, unsigned short record_id, int len)
-{
-	struct ipmi_req req;
-	struct ipmi_rsp * rsp;
-	struct sdr_get_rq sdr_rq;
-	struct sdr_get_rs sdr_rs;
-	struct sdr_record_full_sensor * sensor;
-	unsigned char data[256];
-	int i;
-
-	memset(&sdr_rq, 0, sizeof(sdr_rq));
-	sdr_rq.reserve_id = reserve_id;
-	sdr_rq.id = record_id;
-	sdr_rq.offset = 0;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = GET_SDR;
-	req.msg.data = (unsigned char *)&sdr_rq;
-	req.msg.data_len = sizeof(sdr_rq);
-
-	memcpy(&sdr_rs, rsp->data, sizeof(sdr_rs));
-
-	/* read SDR record with partial (30 byte) reads
-	 * because a full read (0xff) exceeds the maximum
-	 * transport buffer size.  (completion code 0xca)
-	 */
-	memset(data, 0, sizeof(data));
-	for (i=0; i<len; i+=GET_SDR_MAX_LEN) {
-		sdr_rq.length = (len-i < GET_SDR_MAX_LEN) ? len-i : GET_SDR_MAX_LEN;
-		sdr_rq.offset = i+5; /* 5 header bytes */
-		if (verbose > 1)
-			printf("getting %d bytes from SDR at offset %d\n",
-			       sdr_rq.length, sdr_rq.offset);
-		rsp = intf->sendrecv(intf, &req);
-		if (rsp && rsp->data)
-			memcpy(data+i, rsp->data+2, sdr_rq.length);
-	}
-
-	sensor = malloc(sizeof(*sensor));
-	memcpy(sensor, data, sizeof(*sensor));
-
-	if (verbose > 1) {
-		printbuf(data, len, "SDR Entry");
-
-		printf("keys.owner_id:   0x%x\n", sensor->keys.owner_id);
-		printf("keys.lun:        0x%x\n", sensor->keys.lun);
-		printf("keys.channel:    0x%x\n", sensor->keys.channel);
-		printf("keys.sensor_num: 0x%x\n", sensor->keys.sensor_num);
-		
-		printf("entity:          %d.%d\n", sensor->entity.id, sensor->entity.instance);
-		
-		printf("entity.id:       %s\n", val2str(sensor->entity.id, entity_id_vals));
-		printf("entity.instance: %d\n", sensor->entity.instance);
-		printf("entity.logical:  %d\n", sensor->entity.logical);
-		
-		printf("sensor unit.pct: 0x%x\n", sensor->unit.pct);
-		printf("sensor unit.rate: 0x%x\n", sensor->unit.rate);
-		printf("sensor unit.analog: 0x%x\n", sensor->unit.analog);
-		printf("sensor unit.modifier: 0x%x\n", sensor->unit.modifier);
-		printf("sensor unit.type.base: 0x%x\n", sensor->unit.type.base);
-		printf("sensor unit.type.modifier: 0x%x\n", sensor->unit.type.modifier);
-		
-		printf("sensor linearization: 0x%x\n", sensor->linearization);
-		
-		printf("sensor tolerance: 0x%x\n", __TO_TOL(sensor->mtol));
-		printf("sensor M: 0x%x\n", __TO_M(sensor->mtol));
-		printf("sensor B: 0x%x\n", __TO_B(sensor->bacc));
-		printf("sensor B exp: %d\n", __TO_B_EXP(sensor->bacc));
-		printf("sensor R exp: %d\n", __TO_R_EXP(sensor->bacc));
-		printf("sensor accuracy: 0x%x\n", __TO_ACC(sensor->bacc));
-		printf("sensor accuracy exp: 0x%x\n", __TO_ACC_EXP(sensor->bacc));
-		
-		printf("sensor.type: 0x%02x\n", sensor->sensor.type);
-		printf("event_type:  0x%02x\n", sensor->event_type);
-		
-		printf("sensor min=0x%x max=0x%x\n", sensor->sensor_min, sensor->sensor_max);
-		printf("sensor id code: 0x%x\n", sensor->id_code);
-
-		printf("Nominal Reading                 : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->nominal_read));
-		printf("Normal Minimum Reading          : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->normal_min));
-		printf("Normal Maximum Reading          : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->normal_max));
-		printf("Upper non-recoverable Threshold : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->threshold.upper.non_recover));
-		printf("Upper critical Threshold        : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->threshold.upper.critical));
-		printf("Upper non-critical Threshold    : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->threshold.upper.non_critical));
-		printf("Lower non-recoverable Threshold : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->threshold.lower.non_recover));
-		printf("Lower critical Threshold        : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->threshold.lower.critical));
-		printf("Lower non-critical Threshold    : %.3f\n",
-		       sdr_convert_sensor_reading(sensor, sensor->threshold.lower.non_critical));
-		
-		if (sensor->id_code)
-			printf("sensor id: %s\n", sensor->id_string);
-	}
-
-	return sensor;
-}
-
-static void
-ipmi_sdr_print_sensors(struct ipmi_intf * intf, int do_unit)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	struct sdr_repo_info_rs sdr_info;
-	struct sdr_reserve_repo_rs sdr_reserve;
-	struct sdr_get_rs * header;
-	struct sdr_record_full_sensor * sensor;
-
-	int next = 0, i = 0, total;
-	unsigned short reservation;
-	float val;
-	char sval[16], unitstr[16];
-
-	if (verbose)
-		printf("Querying SDR for sensor list\n");
-
-	/* get sdr repository info */
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = GET_SDR_REPO_INFO;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || !rsp->data_len)
-		return;
-	memcpy(&sdr_info, rsp->data, sizeof(sdr_info));
-
-	/* byte 1 is SDR version, should be 51h */
-	if (sdr_info.version != 0x51) {
-		printf("SDR repository version mismatch!\n");
-		return;
-	}
-	total = sdr_info.count;
-	if (verbose > 1) {
-		printf("SDR free space: %d\n", sdr_info.free);
-		printf("SDR records: %d\n", total);
-	}
-
-	/* obtain reservation ID */
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = GET_SDR_RESERVE_REPO;
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || !rsp->data_len)
-		return;
-	memcpy(&sdr_reserve, rsp->data, sizeof(sdr_reserve));
-	reservation = sdr_reserve.reserve_id;
-	if (verbose > 1)
-		printf("SDR reserveration ID %04x\n", reservation);
-
-	while (next < total) {
-		i = 0;
-
-		header = ipmi_sdr_get_header(intf, reservation, next);
-		if (!header)
-			break;
-
-		if (header->type != SDR_RECORD_TYPE_FULL_SENSOR) {
-			if (verbose > 1)
-				printf("Invalid SDR type 0x%02x\n", header->type);
-			next = header->next;
-			continue;
-		}
-
-		sensor = ipmi_sdr_get_entry(intf, reservation, next, header->length);
-		next = header->next;
-
-		/* only handle linear sensors (for now) */
-		if (sensor->linearization) {
-			printf("non-linear!\n");
-			continue;
-		}
-
-		rsp = ipmi_sdr_get_sensor_reading(intf, sensor->keys.sensor_num);
-		if (!rsp || rsp->ccode) {
-			printf("error reading sensor\n");
-			continue;
-		}
-
-		/* convert RAW reading into units */
-		val = rsp->data[0] ? sdr_convert_sensor_reading(sensor, rsp->data[0]) : 0;
-
-		if (do_unit) {
-			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;
-			}
-		}
-
-		if (!verbose) {
-			/*
-			 * print sensor name, reading, state
-			 */
-			if (csv_output)
-				printf("%s,",
-				       sensor->id_code ? sensor->id_string : NULL);
-			else
-				printf("%-16s | ",
-				       sensor->id_code ? sensor->id_string : NULL);
-
-			memset(sval, 0, sizeof(sval));
-			i += snprintf(sval, sizeof(sval), "%.*f",
-				     (val==(int)val) ? 0 : 3, val);
-			printf("%s", sval);
-
-			if (do_unit)
-				printf(" %s", unitstr);
-
-			if (csv_output)
-				printf(",");
-			else {
-				for (; i<sizeof(sval); i++)
-					printf(" ");
-				printf(" | ");
-			}
-
-			printf("%s", ipmi_sdr_get_status(rsp->data[2]));
-			printf("\n");
-		}
-		else {
-			printf("Sensor  | %s (0x%x)\n",
-			       sensor->id_code ? sensor->id_string : NULL,
-			       sensor->keys.sensor_num);
-			printf("Entity  | %d.%d (%s)\n",
-			       sensor->entity.id, sensor->entity.instance,
-			       val2str(sensor->entity.id, entity_id_vals));
-			printf("Reading | %.*f %s\n",
-			       (val==(int)val) ? 0 : 3, val, unitstr);
-			printf("Status  | %s\n",
-			       ipmi_sdr_get_status(rsp->data[2]));
-			printf("\n");
-		}
-
-		free(sensor);
-	}
-}
-
-int ipmi_sdr_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	if (!argc)
-		ipmi_sdr_print_sensors(intf, 1);
-	else if (!strncmp(argv[0], "help", 4))
-		printf("SDR Commands:  list\n");
-	else if (!strncmp(argv[0], "list", 4))
-		ipmi_sdr_print_sensors(intf, 1);
-	else
-		printf("Invalid SDR command: %s\n", argv[0]);
-	return 0;
-}
diff --git a/ipmitool/ipmi_sel.c b/ipmitool/ipmi_sel.c
deleted file mode 100644
index abc9ed7..0000000
--- a/ipmitool/ipmi_sel.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * 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 <helper.h>
-#include <ipmi.h>
-#include <ipmi_sel.h>
-
-static const struct valstr event_dir_vals[] = {
-	{ 0, "Assertion Event" },
-	{ 1, "Deassertion Event" },
-};
-
-static int
-ipmi_get_event_class(unsigned char code)
-{
-	if (code == 0)
-		return -1;
-	if (code == 1)
-		return IPMI_EVENT_CLASS_THRESHOLD;
-	if (code >= 0x02 && code <= 0x0b)
-		return IPMI_EVENT_CLASS_DISCRETE;
-	if (code == 0x6f)
-		return IPMI_EVENT_CLASS_DISCRETE;
-	if (code >= 0x70 && code <= 0x7f)
-		return IPMI_EVENT_CLASS_OEM;
-	return -1;
-}
-
-static const char *
-ipmi_get_event_type(unsigned char code)
-{
-        if (code == 0)
-                return "Unspecified";
-        if (code == 1)
-                return "Threshold";
-        if (code >= 0x02 && code <= 0x0b)
-                return "Generic Discrete";
-        if (code == 0x6f)
-                return "Sensor-specific Discrete";
-        if (code >= 0x70 && code <= 0x7f)
-                return "OEM";
-        return "Reserved";
-}
-
-static const char *
-ipmi_get_event_desc(struct sel_event_record * rec)
-{
-	int class;
-	unsigned char offset = 0;
-	struct ipmi_event_type *evt;
-
-	class = ipmi_get_event_class(rec->event_type);
-	if (class < 0)
-		return "Invalid Class";
-
-	switch (class) {
-	case IPMI_EVENT_CLASS_DISCRETE:
-		offset = rec->event_data[0] & 0xf;
-		break;
-	case IPMI_EVENT_CLASS_DIGITAL:
-		offset = rec->event_data[0] & 0xf;
-		break;
-	case IPMI_EVENT_CLASS_THRESHOLD:
-		offset = rec->event_data[0] & 0xf;
-		break;
-	default:
-		return "Unknown Class";
-	}
-
-	if (verbose > 2)
-		printf("offset: 0x%02x\n", offset);
-
-	evt = event_types;
-	while (evt->desc) {
-		if (evt->code == rec->event_type && evt->offset == offset)
-			return evt->desc;
-		evt++;
-	}
-
-	return "Unknown Event";
-}
-
-static const char *
-ipmi_sel_get_sensor_type(unsigned char code)
-{
-	struct ipmi_sensor_types *st = sensor_types;
-	while (st->type) {
-		if (st->code == code)
-			return st->type;
-		st++;
-	}
-	return NULL;
-}
-
-static void ipmi_sel_get_info(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = 0x40;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode) {
-		printf("Error%x in Get SEL Info command\n",
-		       rsp ? rsp->ccode : 0);
-		return;
-	}
-	if (verbose > 2)
-		printbuf(rsp->data, rsp->data_len, "sel_info");
-
-	printf("SEL Information\n");
-	printf("  Version          : %x%x\n",
-	       (rsp->data[0] & 0xf0) >> 4, rsp->data[0] & 0xf);
-	printf("  Entries          : %d\n",
-	       buf2short(rsp->data + 1));
-	printf("  Free Space       : %d\n",
-	       buf2short(rsp->data + 3));
-	printf("  Last Add Time    : %08lx\n",
-	       buf2long(rsp->data + 5));
-	printf("  Last Del Time    : %08lx\n",
-	       buf2long(rsp->data + 9));
-	printf("  Overflow         : %s\n",
-	       rsp->data[13] & 0x80 ? "true" : "false");
-	printf("  Delete cmd       : %ssupported\n",
-	       rsp->data[13] & 0x8 ? "" : "un");
-	printf("  Parial add cmd   : %ssupported\n",
-	       rsp->data[13] & 0x4 ? "" : "un");
-	printf("  Reserve cmd      : %ssupported\n",
-	       rsp->data[13] & 0x2 ? "" : "un");
-	printf("  Get Alloc Info   : %ssupported\n",
-	       rsp->data[13] & 0x1 ? "" : "un");
-
-	if (rsp->data[13] & 0x1) {
-		/* get sel allocation info */
-		memset(&req, 0, sizeof(req));
-		req.msg.netfn = IPMI_NETFN_STORAGE;
-		req.msg.cmd = 0x41;
-
-		rsp = intf->sendrecv(intf, &req);
-		if (!rsp || rsp->ccode) {
-			printf("error%d in Get SEL Allocation Info command\n",
-			       rsp ? rsp->ccode : 0);
-			return;
-		}
-
-		printf("  # of Alloc Units : %d\n", buf2short(rsp->data));
-		printf("  Alloc Unit Size  : %d\n", buf2short(rsp->data + 2));
-		printf("  # Free Units     : %d\n", buf2short(rsp->data + 4));
-		printf("  Largest Free Blk : %d\n", buf2short(rsp->data + 6));
-		printf("  Max Record Size  : %d\n", rsp->data[7]);
-	}
-}
-
-static void * ipmi_sel_get_entry(struct ipmi_intf * intf, unsigned short record_id)
-{
-	struct ipmi_req req;
-	struct ipmi_rsp * rsp;
-	unsigned char msg_data[6];
-	unsigned char type;
-
-	memset(msg_data, 0, 6);
-	msg_data[0] = 0x00;	/* no reserve id, not partial get */
-	msg_data[1] = 0x00;
-	memcpy(msg_data+2, &record_id, 2);
-	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.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, record_id);
-		return NULL;
-	}
-	if (verbose > 2)
-		printbuf(rsp->data, rsp->data_len, "SEL Entry");
-
-	type = rsp->data[2];
-	if (type < 0xc0) {
-		/* standard SEL event record */
-		return (struct sel_event_record *) rsp->data;
-	}
-	else if (type < 0xe0) {
-		/* OEM timestamp record */
-		return (struct sel_oem_record_ts *) rsp->data;
-	}
-	else {
-		/* OEM no-timestamp record */
-		return (struct sel_oem_record_nots *) rsp->data;
-	}
-	return NULL;
-}
-
-static void ipmi_sel_list_entries(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned short reserve_id, next_id;
-	struct sel_event_record * evt;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_STORAGE;
-	req.msg.cmd = 0x42;	/* reserve SEL */
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp || rsp->ccode) {
-		printf("Error:%x unable to reserve SEL\n",
-		       rsp ? rsp->ccode : 0);
-		return;
-	}
-
-	reserve_id = rsp->data[0] | rsp->data[1] << 8;
-	if (verbose)
-		printf("SEL Reservation ID: %04x\n", reserve_id);
-
-	next_id = 0;
-	while (next_id != 0xffff) {
-		evt = (struct sel_event_record *) ipmi_sel_get_entry(intf, next_id);
-		if (!evt)
-			return;
-
-		printf("SEL Record ID     : %04x\n", evt->record_id);
-		printf("  Record Type     : %02x\n", evt->record_type);
-		printf("  Timestamp       : %08lx\n", evt->timestamp);
-		printf("  Generator ID    : %04x\n", evt->gen_id);
-		printf("  EvM Revision    : %02x\n", evt->evm_rev);
-		printf("  Sensor Type     : %s\n", ipmi_sel_get_sensor_type(evt->sensor_type));
-		printf("  Sensor Num      : %02x\n", evt->sensor_num);
-		printf("  Event Type      : %s\n", ipmi_get_event_type(evt->event_type));
-		printf("  Event Direction : %s\n", 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]);
-		printf("  Description     : %s\n", ipmi_get_event_desc(evt));
-		printf("\n");
-
-		next_id = evt->next_id;
-	}
-}
-
-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\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
-		printf("Invalid SEL command: %s\n", argv[0]);
-	return 0;
-}
-
diff --git a/ipmitool/ipmitool.1.in b/ipmitool/ipmitool.1.in
deleted file mode 100644
index a2aaf47..0000000
--- a/ipmitool/ipmitool.1.in
+++ /dev/null
@@ -1,290 +0,0 @@
-.TH "ipmitool" "1" "@@VERSION@@" "Duncan Laurie" ""
-.SH "NAME"
-.LP 
-ipmitool \- utility for IPMI control
-.SH "SYNTAX"
-.LP 
-ipmitool [\fB\-hcvV\fR] \fB\-I\fR \fIlan\fP \fB\-H\fR \fIaddress\fP [\fB\-P\fR \fIpassword\fP] <\fIexpression\fP>
-.br 
-ipmitool [\fB\-hcvV\fR] \fB\-I\fR \fIdev\fP <\fIexpression\fP>
-.SH "DESCRIPTION"
-.LP 
-This program lets you perform various IPMI functions with either a kernel device driver or over a LAN interface.  These functions include printing FRU information, LAN configuration, sensor readings, and remote chassis power control.
-.SH "OPTIONS"
-.LP 
-.TP 
-\fB\-h\fR
-Get basic usage help from the command line.
-.TP 
-\fB\-c\fR
-Make output suitable for parsing where possible by separating fields with commas instead of spaces.
-.TP 
-\fB\-V\fR
-Display version information.
-.TP
-\fB\-v\fR
-Increase verbose output level.  This option may be specified multiple times to increase the level of debug output.  If given three times you will get hexdumps of all incoming and outgoing packets.
-.TP 
-\fB\-I\fR <\fIinterface\fP>
-Selects IPMI interface to use.  Possible interfaces are \fIlan\fP or \fIdev\fP.
-.TP 
-\fB\-H\fR <\fIaddress\fP>
-Remote server address, can be IP address or hostname.  This option is required for the LAN interface connection.
-.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.
-.SH "EXPRESSIONS"
-.LP
-.TP
-.I help
-This can be used to get command-line help on ipmitool commands.  It may also be placed at the end of commands to get option usage help.
-.RS
-.PP
-ipmitool -I dev help
-.br
-Commands:  chassis, fru, lan, sdr, sel
-.LP
-.PP
-ipmitool -I dev chassis help
-.br
-Chassis Commands:  status, power, identify, policy, restart_cause
-.LP
-.PP
-ipmitool -I dev chassis power help
-.br
-Chassis Power Commands: status, on, off, cycle, reset, diag, soft
-.LP
-.RE
-.TP
-\fIraw\fP <\fBnetfn\fR> <\fBcmd\fR> [\fBdata\fR]
-This will allow you to execute raw IPMI commands.  For example to query the POH counter with a raw command:
-.RS
-.PP
-ipmitool -I dev raw 0x0 0xf
-.br
-RAW REQ (netfn=0x0 cmd=0xf data_len=0)
-.br
-RAW RSP (5 bytes)
-.br
- 3c 72 0c 00 00
-.LP
-.RE
-.TP
-\fIchaninfo\fP [\fBchannel\fR]
-This command will display information about the selected channel.  If no channel is given it will display information about the currently used channel:
-.RS
-.PP
-ipmitool -I dev chaninfo
-.br
-Channel 0xf info:
-.br
-  Channel Medium Type   : System Interface
-.br
-  Channel Protocol Type : KCS
-.br
-  Session Support       : session-less
-.br
-  Active Session Count  : 0
-.br
-  Protocol Vendor ID    : 7154
-.LP
-.RE
-.TP
-.I chassis
-.RS
-.TP
-.I status
-This command returns information about the high-level status of the system chassis and main power subsystem.
-.TP
-.I poh
-This command will return the Power-On Hours counter.
-.TP
-\fIidentify\fP <\fBinterval\fR>
-Control the front panel identify light.  Default is 15.  Use 0 to turn off.
-.TP
-.I restart_cause
-Query the chassis for the cause of the last system restart.
-.TP
-.I policy
-Set the chassis power policy in the event power failure.
-.RS
-.TP
-.I list
-Return supported policies.
-.TP
-.I always-on
-Turn on when power is restored.
-.TP
-.I previous
-Returned to previous state when power is restored.
-.TP
-.I always-off
-Stay off after power is restored.
-.RE
-.TP
-.I power
-Performs a chassis control command to view and change the power state.
-.RS
-.TP
-.I status
-Show current chassis power status.
-.TP
-.I on
-Power up chassis.
-.TP
-.I off
-Power down chassis into soft off (S4/S5 state).  WARNING: this command does not initiate a clean shutdown of the operating system prior to powering down the system.
-.TP
-.I cycle
-This command provides a power off interval of at least 1 second.  No action should occur if chassis power is in S4/S5 state, but it is recommended to check power state first and only issue a power cycle command if the system power is on or in lower sleep state than S4/S5.
-.TP
-.I reset
-This command will perform a hard reset.
-.TP
-.I diag
-Pulse a version of a diagnostic interrupt (NMI) that goes directly to the processor(s).
-.TP
-.I soft
-Initiate a soft\-shutdown of OS via ACPI by emulating a fatal overtemperature.
-.RE
-.RE
-.TP
-.I lan
-.RS
-.TP
-\fIprint\fP <\fBchannel\fR>
-Print the current configuration for the given channel.
-.TP
-\fIset\fP <\fBchannel\fR> <\fBparameter\fR>
-Set the given parameter on the given channel.  Valid parameters are:
-.RS
-.TP
-\fIipaddr\fP <\fBx.x.x.x\fR>
-Set the IP address for this channel.
-.TP
-\fInetmask\fP <\fBx.x.x.x\fR>
-Set the netmask for this channel.
-.TP
-\fImacaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
-Set the MAC adddress for this channel.
-.TP
-\fIdefgw\fP \fIipaddr\fP <\fBx.x.x.x\fR>
-Set the default gateway IP address.
-.TP
-\fIdefgw\fP \fImacaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
-Set the default gateway MAC address.
-.TP
-\fIbakgw\fP \fIipaddr\fP <\fBx.x.x.x\fR>
-Set the backup gateway IP address.
-.TP
-\fIbakgw\fP \fImacaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
-Set the backup gateway MAC address.
-.TP
-\fIpassword\fP <\fBpass\fR>
-Set the null user password.
-.TP
-\fIauth\fP <\fBlevel,...\fR> <\fBtype,...\fR>
-Set the valid authtypes for a given auth level.
-.RS
-Levels:
-.B callback
-.B user
-.B operator
-.B admin
-.br
-Types: 
-.B none
-.B md2
-.B key
-.RE
-.RE
-.RE
-.TP
-.I fru
-.RS
-.TP
-.I print
-This command will read all Field Replacable Unit inventory data and extract such information as serial number, part number, asset tags, and short strings describing the chassis, board, or product. 
-.RE
-.TP
-.I sdr
-.RS
-.TP
-.I list
-This command will read the SDR and extract sensor information, then query each sensor and print its name, reading, and status.
-.RE
-.TP
-.I sel
-.RS
-.TP
-.I info
-This command will query the BMC for information about the SEL and its contents.
-.TP
-.I list
-This command will list the contents of the SEL.
-.RE
-.SH "DEV INTERFACE"
-.LP 
-The ipmitool \fIdev\fP interface utilizes the MontaVista OpenIPMI kernel device driver.  This driver is present in 2.5.57 and later development kernels and in 2.4.21pre1 and later stable kernels.  There are also IPMI driver kernel patches for different versions available from the OpenIPMI homepage.
-.LP 
-The following kernel modules must be loaded in order for ipmitool to work:
-.TP 
-.B ipmi_msghandler
-Incoming and outgoing message handler for IPMI interfaces.
-.TP 
-.B ipmi_kcs_drv
-An IPMI Keyboard Controler Style (KCS) interface driver for the message handler.
-.TP 
-.B ipmi_devintf
-Linux character device interface for the message handler.
-.LP 
-Once they are loaded there will be a dynamic char device entry that must exist at \fB/dev/ipmi/0\fR.  Usually if this is the first dynamic device it will be major number \fB254\fR and minor number \fB0\fR so you would create the dev entry with:
-.LP 
-.I mknod /dev/ipmi/0 c 254 0
-.LP 
-In order to force ipmitool to make use of the device interface you can specifiy it on the command line:
-.PP 
-ipmitool \-I dev [option...]
-.LP 
-Alternatively if you do not provide a hostname on the command line ipmitool will assume you want to use the dev interface.
-.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.
-.LP 
-IPMI\-over\-LAN uses version 1 of the Remote Management Control Protocol (RMCP) to support \fIpre\-OS\fP and \fIOS\-absent\fP management.  RMCP is a request\-response protocol delivered using UDP datagrams to port 623.
-.LP 
-The LAN interface is an authenticatiod multi\-session connection; messages delivered to the BMC can (and should) be authenticated with a challenge/response protocol with either straight password/key.  ipmitool will attempt to connect with administrator privilege level as this is required to perform chassis power functions.
-.LP 
-You can tell ipmitool to use the lan interface with the \fB\-I\fR option:
-.PP 
-ipmitool \-I lan [option...] <address> [password]
-.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 straight password/key.
-.SH "FILES"
-.TP 
-.I /dev/ipmi/0
-This character device file is used by the OpenIPMI kernel driver.
-.SH "EXAMPLES"
-.LP 
-If you want to remotely control the power of an IPMI\-over\-LAN enabled system you can use:
-.LP 
-ipmitool \-I lan \-H 192.168.1.1 \-P password chassis power on
-.LP 
-Chassis Power is off.
-.br 
-Chassis Power Control: on
-.LP 
-ipmitool \-I lan \-H 192.168.1.1 \-P password chassis power status
-.LP 
-Chassis Power is on.
-.SH "AUTHOR"
-.LP 
-Duncan Laurie <duncan@sun.com>
-.SH "SEE ALSO"
-.LP 
-.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/
diff --git a/ipmitool/ipmitool.spec.in b/ipmitool/ipmitool.spec.in
index 333f0ca..ab51039 100644
--- a/ipmitool/ipmitool.spec.in
+++ b/ipmitool/ipmitool.spec.in
@@ -64,6 +64,16 @@ rm -rf $RPM_BUILD_DIR/@IPMITOOL_PKG@-@VERSION@
 %{_includedir}/ipmitool/*.h
 
 %changelog
+* 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"
+ - Fix sdr handling of sensors that do not return a reading
+ - Fix for CSV display of sensor readings/units from Fredrik Öhrn
+
+* Tue Nov 25 2003 <duncan@sun.com>  1.5.5-1
+ - Add -U option for setting LAN username
+ - Fix -v usage for plugin interfaces
+
 * Fri Nov 14 2003 <duncan@sun.com>  1.5.4-1
  - pull interface plugin api into library
  - fix ipmievd
diff --git a/ipmitool/lib/ipmi_bmc.c b/ipmitool/lib/ipmi_bmc.c
index 3db4ef7..cbeab1c 100644
--- a/ipmitool/lib/ipmi_bmc.c
+++ b/ipmitool/lib/ipmi_bmc.c
@@ -44,6 +44,34 @@
 
 extern int verbose;
 
+const struct valstr completion_code_vals[] = {
+	{ 0x00, "Command completed normally" },
+	{ 0xc0, "Node busy" },
+	{ 0xc1, "Invalid command" },
+	{ 0xc2, "Invalid command on LUN" },
+	{ 0xc3, "Timeout" },
+	{ 0xc4, "Out of space" },
+	{ 0xc5, "Reservation cancelled or invalid" },
+	{ 0xc6, "Request data truncated" },
+	{ 0xc7, "Request data length invalid" },
+	{ 0xc8, "Request data field length limit exceeded" },
+	{ 0xc9, "Parameter out of range" },
+	{ 0xca, "Cannot return number of requested data bytes" },
+	{ 0xcb, "Requested sensor, data, or record not found" },
+	{ 0xcc, "Invalid data field in request" },
+	{ 0xcd, "Command illegal for specified sensor or record type" },
+	{ 0xce, "Command response could not be provided" },
+	{ 0xcf, "Cannot execute duplicated request" },
+	{ 0xd0, "SDR Repository in update mode" },
+	{ 0xd1, "Device firmeware in update mode" },
+	{ 0xd2, "BMC initialization in progress" },
+	{ 0xd3, "Destination unavailable" },
+	{ 0xd4, "Insufficient priviledge level" },
+	{ 0xd5, "Command not supported in present state" },
+	{ 0xff, "Unspecified error" },
+	{ 0x00, NULL }
+};
+
 static int ipmi_bmc_reset(struct ipmi_intf * intf, int cmd)
 {
 	struct ipmi_rs * rsp;
diff --git a/ipmitool/lib/ipmi_dev.c b/ipmitool/lib/ipmi_dev.c
deleted file mode 100644
index 7f05f7c..0000000
--- a/ipmitool/lib/ipmi_dev.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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 <fcntl.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include <linux/ipmi.h>
-#include <ipmi.h>
-#include <ipmi_dev.h>
-#include <helper.h>
-
-static int curr_seq;
-extern int verbose;
-
-struct ipmi_intf ipmi_dev_intf = {
-	.open     = ipmi_dev_open,
-	.close    = ipmi_dev_close,
-	.sendrecv = ipmi_dev_send_cmd,
-};
-
-void ipmi_dev_close(struct ipmi_intf * intf)
-{
-	if (intf && intf->fd >= 0)
-		close(intf->fd);
-}
-
-int ipmi_dev_open(struct ipmi_intf * intf, char * dev, int __unused1, char * __unused2)
-{
-	int i = 0;
-
-	if (!dev)
-		intf->fd = open("/dev/ipmi/0", O_RDWR);
-	else
-		intf->fd = open(dev, O_RDWR);
-
-	if (intf->fd < 0) {
-		perror("Could not open ipmi device");
-		return -1;
-	}
-
-	if (ioctl(intf->fd, IPMICTL_SET_GETS_EVENTS_CMD, &i)) {
-		perror("Could not set to get events");
-		return -1;
-	}
-
-	curr_seq = 0;
-
-	return intf->fd;
-}
-
-struct ipmi_rsp * ipmi_dev_send_cmd(struct ipmi_intf * intf, struct ipmi_req * req)
-{
-	struct ipmi_recv recv;
-	struct ipmi_addr addr;
-	struct ipmi_system_interface_addr bmc_addr;
-	static struct ipmi_rsp rsp;
-	fd_set rset;
-
-	if (!req)
-		return NULL;
-
-	if (verbose > 2)
-		printbuf(req->msg.data, req->msg.data_len, "send_ipmi_cmd_dev");
-
-	FD_ZERO(&rset);
-	FD_SET(intf->fd, &rset);
-
-	bmc_addr.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
-	bmc_addr.channel = IPMI_BMC_CHANNEL;
-	bmc_addr.lun = 0;
-	req->addr = (char *) &bmc_addr;
-	req->addr_len = sizeof(bmc_addr);
-	req->msgid = curr_seq++;
-
-	if (ioctl(intf->fd, IPMICTL_SEND_COMMAND, req) < 0) {
-		printf("Error sending command: %s\n", strerror(errno));
-		return NULL;
-	}
-	if (select(intf->fd+1, &rset, NULL, NULL, NULL) < 0) {
-		perror("select");
-		return NULL;
-	}
-	if (!FD_ISSET(intf->fd, &rset)) {
-		printf("Error no data available\n");
-		return NULL;
-	}
-
-	recv.addr = (char *) &addr;
-	recv.addr_len = sizeof(addr);
-	recv.msg.data = rsp.data;
-	recv.msg.data_len = sizeof(rsp.data);
-
-	/* get data */
-	if (ioctl(intf->fd, IPMICTL_RECEIVE_MSG_TRUNC, &recv) < 0) {
-		printf("Error receiving message: %s\n", strerror(errno));
-		if (errno != EMSGSIZE)
-			return NULL;
-	}
-
-	if (verbose > 1) {
-		printf("Got message:\n");
-		printf("  type      = %d\n", recv.recv_type);
-		printf("  channel   = 0x%x\n", addr.channel);
-		printf("  msgid     = %ld\n", recv.msgid);
-		printf("  netfn     = 0x%x\n", recv.msg.netfn);
-		printf("  cmd       = 0x%x\n", recv.msg.cmd);
-		if (recv.msg.data && recv.msg.data_len) {
-			printf("  data_len  = %d\n", recv.msg.data_len);
-			printf("  data      =");
-			printbuf(recv.msg.data, recv.msg.data_len, "data");
-		}
-	}
-
-	rsp.ccode = recv.msg.data[0];
-	rsp.data_len = recv.msg.data_len - 1;
-
-	if (!rsp.ccode && rsp.data_len) {
-		memmove(rsp.data, rsp.data + 1, rsp.data_len);
-		rsp.data[recv.msg.data_len] = 0;
-	}
-
-	return &rsp;
-}
-
diff --git a/ipmitool/lib/ipmi_lan.c b/ipmitool/lib/ipmi_lan.c
deleted file mode 100644
index d251617..0000000
--- a/ipmitool/lib/ipmi_lan.c
+++ /dev/null
@@ -1,1159 +0,0 @@
-/*
- * 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <netdb.h>
-#include <fcntl.h>
-
-#include <helper.h>
-
-#include <linux/ipmi.h>
-#include <ipmi.h>
-#include <ipmi_lan.h>
-
-#include <rmcp.h>
-#include <asf.h>
-
-#define RECV_TIMEOUT	3
-#define SEND_RETRY	2
-
-struct ipmi_req_entry * ipmi_req_entries;
-static struct ipmi_req_entry * ipmi_req_entries_tail;
-
-extern int h_errno;
-int verbose;
-
-static int curr_seq;
-static sigjmp_buf jmpbuf;
-struct ipmi_session lan_session;
-
-static int ipmi_lan_send_packet(struct ipmi_intf * intf, unsigned char * data, int data_len);
-static struct ipmi_rsp * ipmi_lan_recv_packet(struct ipmi_intf * intf, int timeout);
-static struct ipmi_rsp * ipmi_lan_poll_recv(struct ipmi_intf * intf);
-
-struct ipmi_intf ipmi_lan_intf = {
-	.open     = ipmi_lan_open,
-	.close    = ipmi_lan_close,
-	.sendrecv = ipmi_lan_send_cmd,
-	.ll_send  = ipmi_lan_send_packet,
-	.ll_recv  = ipmi_lan_recv_packet,
-};
-
-static void
-query_alarm(int signo)
-{
-	siglongjmp(jmpbuf, 1);
-}
-
-static 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" },
-	{ 0,				NULL },
-};
-
-static const struct valstr ipmi_authtype_vals[] = {
-	{ IPMI_SESSION_AUTHTYPE_NONE,	"NONE" },
-	{ IPMI_SESSION_AUTHTYPE_MD2,	"MD2" },
-	{ IPMI_SESSION_AUTHTYPE_KEY,	"PASSWORD" },
-	{ IPMI_SESSION_AUTHTYPE_OEM,	"OEM" },
-	{ 0,				NULL },
-};
-
-static const struct valstr ipmi_channel_protocol_vals[] = {
-	{ 0x00, "reserved" },
-	{ 0x01, "IPMB-1.0" },
-	{ 0x02, "ICMB-1.0" },
-	{ 0x03, "reserved" },
-	{ 0x04, "IPMI-SMBus" },
-	{ 0x05, "KCS" },
-	{ 0x06, "SMIC" },
-	{ 0x07, "BT-10" },
-	{ 0x08, "BT-15" },
-	{ 0x09, "TMode" },
-	{ 0x1c, "OEM 1" },
-	{ 0x1d, "OEM 2" },
-	{ 0x1e, "OEM 3" },
-	{ 0x1f, "OEM 4" },
-	{ 0x00, NULL },
-};
-
-static const struct valstr ipmi_channel_medium_vals[] = {
-	{ 0x00, "reserved" },
-	{ 0x01, "IPMB (I2C)" },
-	{ 0x02, "ICMB v1.0" },
-	{ 0x03, "ICMB v0.9" },
-	{ 0x04, "802.3 LAN" },
-	{ 0x05, "Serial/Modem" },
-	{ 0x06, "Other LAN" },
-	{ 0x07, "PCI SMBus" },
-	{ 0x08, "SMBus v1.0/v1.1" },
-	{ 0x09, "SMBus v2.0" },
-	{ 0x0a, "USB 1.x" },
-	{ 0x0b, "USB 2.x" },
-	{ 0x0c, "System Interface" },
-	{ 0x00, NULL },
-};
-
-static struct ipmi_req_entry *
-ipmi_req_lookup_entry(unsigned char seq, unsigned char cmd)
-{
-	struct ipmi_req_entry * e = ipmi_req_entries;
-	while (e && (e->rq_seq != seq || e->req.msg.cmd != cmd)) {
-		if (e == e->next)
-			return NULL;
-		e = e->next;
-	}
-	return e;
-}
-
-static void
-ipmi_req_remove_entry(unsigned char seq, unsigned char cmd)
-{
-	struct ipmi_req_entry * p, * e;
-
-	e = p = ipmi_req_entries;
-
-	while (e && (e->rq_seq != seq || e->req.msg.cmd != cmd)) {
-		p = e;
-		e = e->next;
-	}
-	if (e) {
-		if (verbose > 3)
-			printf("removed list entry seq=0x%02x cmd=0x%02x\n", seq, cmd);
-		p->next = (p->next == e->next) ? NULL : e->next;
-		if (ipmi_req_entries == e) {
-			if (ipmi_req_entries != p)
-				ipmi_req_entries = p;
-			else
-				ipmi_req_entries = NULL;
-		}
-		if (ipmi_req_entries_tail == e) {
-			if (ipmi_req_entries_tail != p)
-				ipmi_req_entries_tail = p;
-			else
-				ipmi_req_entries_tail = NULL;
-		}
-		free(e);
-	}
-}
-
-static void
-ipmi_req_clear_entries(void)
-{
-	struct ipmi_req_entry * p, * e;
-
-	e = ipmi_req_entries;
-	while (e) {
-		if (verbose > 3)
-			printf("cleared list entry seq=0x%02x cmd=0x%02x\n",
-			       e->rq_seq, e->req.msg.cmd);
-		p = e->next;
-		free(e);
-		e = p;
-	}
-}
-
-static int
-get_random(void *data, unsigned int len)
-{
-	int fd = open("/dev/random", O_RDONLY);
-	int rv;
-
-	if (fd == -1)
-		return errno;
-
-	rv = read(fd, data, len);
-
-	close(fd);
-	return rv;
-}
-
-int ipmi_lan_send_packet(struct ipmi_intf * intf, unsigned char * data, int data_len)
-{
-	socklen_t addrlen;
-
-	if (verbose > 2)
-		printbuf(data, data_len, "send_packet");
-
-	addrlen = sizeof(intf->addr);
-
-	return sendto(intf->fd, data, data_len, 0,
-		      (struct sockaddr *)&intf->addr, addrlen);
-}
-
-struct ipmi_rsp * ipmi_lan_recv_packet(struct ipmi_intf * intf, int timeout)
-{
-	static struct ipmi_rsp rsp;
-	volatile int try;
-	int rc;
-
-	/* setup alarm timeout */
-	try = 0;
-	if (sigsetjmp(jmpbuf, 1) != 0 && ++try >= SEND_RETRY) {
-		printf("server is not responding\n");
-		alarm(0);
-		return NULL;
-	}
-
-	alarm(timeout);
-	rc = recv(intf->fd, &rsp.data, BUF_SIZE, 0);
-	alarm(0);
-
-	/* the first read may return ECONNREFUSED because the rmcp ping
-	 * packet--sent to UDP port 623--will be processed by both the
-	 * BMC and the OS.
-	 *
-	 * The problem with this is that the ECONNREFUSED takes
-	 * priority over any other received datagram; that means that
-	 * the Connection Refused shows up _before_ the response packet,
-	 * regardless of the order they were sent out.  (unless the
-	 * response is read before the connection refused is returned)
-	 */
-	if (rc < 0) {
-		alarm(timeout);
-		rc = recv(intf->fd, &rsp.data, BUF_SIZE, 0);
-		alarm(0);
-		if (rc < 0) {
-			perror("recv failed");
-			return NULL;
-		}
-	}
-	rsp.data[rc] = '\0';
-	rsp.data_len = rc;
-
-	return &rsp;
-}
-
-/*
- * parse response RMCP "pong" packet
- *
- * return -1 if ping response not received
- * returns 0 if IPMI is NOT supported
- * returns 1 if IPMI is supported
- *
- * udp.source	= 0x026f	// RMCP_UDP_PORT
- * udp.dest	= ?		// udp.source from rmcp-ping
- * udp.len	= ?
- * udp.check	= ?
- * rmcp.ver	= 0x06		// RMCP Version 1.0
- * rmcp.__res	= 0x00		// RESERVED
- * rmcp.seq	= 0xff		// no RMCP ACK
- * rmcp.class	= 0x06		// RMCP_CLASS_ASF
- * asf.iana	= 0x000011be	// ASF_RMCP_IANA
- * asf.type	= 0x40		// ASF_TYPE_PONG
- * asf.tag	= ?		// asf.tag from rmcp-ping
- * asf.__res	= 0x00		// RESERVED
- * asf.len	= 0x10		// 16 bytes
- * asf.data[3:0]= 0x000011be	// IANA# = RMCP_ASF_IANA if no OEM
- * asf.data[7:4]= 0x00000000	// OEM-defined (not for IPMI)
- * asf.data[8]	= 0x81		// supported entities
- * 				// [7]=IPMI [6:4]=RES [3:0]=ASF_1.0
- * asf.data[9]	= 0x00		// supported interactions (reserved)
- * asf.data[f:a]= 0x000000000000
- */
-static int
-ipmi_handle_pong(struct ipmi_intf * intf, struct ipmi_rsp * rsp)
-{
-	struct rmcp_pong {
-		struct rmcp_hdr rmcp;
-		struct asf_hdr asf;
-		unsigned long iana;
-		unsigned long oem;
-		unsigned char sup_entities;
-		unsigned char sup_interact;
-		unsigned char reserved[6];
-	} * pong;
-
-	if (!rsp)
-		return -1;
-
-	pong = (struct rmcp_pong *)rsp->data;
-
-	if (verbose)
-		printf("Received IPMI/RMCP response packet: "
-		       "IPMI%s Supported\n",
-		       (pong->sup_entities & 0x80) ? "" : " NOT");
-
-	if (verbose > 1)
-		printf("  ASF Version %s\n"
-		       "  RMCP Version %s\n"
-		       "  RMCP Sequence %d\n"
-		       "  IANA Enterprise %d\n\n",
-		       (pong->sup_entities & 0x01) ? "1.0" : "unknown",
-		       (pong->rmcp.ver == 6) ? "1.0" : "unknown",
-		       pong->rmcp.seq,
-		       ntohl(pong->iana));
-
-	return (pong->sup_entities & 0x80) ? 1 : 0;
-}
-
-/* build and send RMCP presence ping packet
- *
- * RMCP ping
- *
- * udp.source	= ?
- * udp.dest	= 0x026f	// RMCP_UDP_PORT
- * udp.len	= ?
- * udp.check	= ?
- * rmcp.ver	= 0x06		// RMCP Version 1.0
- * rmcp.__res	= 0x00		// RESERVED
- * rmcp.seq	= 0xff		// no RMCP ACK
- * rmcp.class	= 0x06		// RMCP_CLASS_ASF
- * asf.iana	= 0x000011be	// ASF_RMCP_IANA
- * asf.type	= 0x80		// ASF_TYPE_PING
- * asf.tag	= ?		// ASF sequence number
- * asf.__res	= 0x00		// RESERVED
- * asf.len	= 0x00
- *
- */
-static int
-ipmi_ping(struct ipmi_intf * intf)
-{
-	struct asf_hdr asf_ping = {
-		.iana	= ASF_RMCP_IANA,
-		.type	= ASF_TYPE_PING,
-	};
-	struct rmcp_hdr rmcp_ping = {
-		.ver	= RMCP_VERSION_1,
-		.class	= RMCP_CLASS_ASF,
-		.seq	= 0xff,
-	};
-	unsigned char * data;
-	int len = sizeof(rmcp_ping) + sizeof(asf_ping);
-	int rv;
-
-	data = malloc(len);
-	memset(data, 0, len);
-	memcpy(data, &rmcp_ping, sizeof(rmcp_ping));
-	memcpy(data+sizeof(rmcp_ping), &asf_ping, sizeof(asf_ping));
-
-	if (verbose)
-		printf("Sending IPMI/RMCP presence ping packet\n");
-
-	rv = intf->ll_send(intf, data, len);
-
-	free(data);
-
-	if (rv < 0) {
-		printf("Unable to send IPMI presence ping packet\n");
-		return -1;
-	}
-
-	if (!ipmi_lan_poll_recv(intf))
-		return 0;
-
-	return 1;
-}
-
-unsigned char ipmi_csum(unsigned char * d, int s)
-{
-	unsigned char c = 0;
-	for (; s > 0; s--, d++)
-		c += *d;
-	return -c;
-}
-
-static struct ipmi_rsp *
-ipmi_lan_poll_recv(struct ipmi_intf * intf)
-{
-	struct rmcp_hdr rmcp_rsp;
-	struct ipmi_rsp * rsp;
-	struct ipmi_req_entry * entry;
-	int x, rv;
-
-	rsp = intf->ll_recv(intf, RECV_TIMEOUT);
-	while (rsp) {
-
-		/* parse response headers */
-		memcpy(&rmcp_rsp, rsp->data, 4);
-
-		if (rmcp_rsp.class == RMCP_CLASS_ASF) {
-			/* might be ping response packet */
-			rv = ipmi_handle_pong(intf, rsp);
-			return (rv <= 0) ? NULL : rsp;
-		}
-			
-		if (rmcp_rsp.class != RMCP_CLASS_IPMI) {
-			printf("Invalid RMCP class: %x\n", rmcp_rsp.class);
-			rsp = intf->ll_recv(intf, RECV_TIMEOUT);
-			continue;
-		}
-
-		x = 4;
-		rsp->session.authtype = rsp->data[x++];
-		memcpy(&rsp->session.seq, rsp->data+x, 4);
-		x += 4;
-		memcpy(&rsp->session.id, rsp->data+x, 4);
-		x += 4;
-
-		if (lan_session.active && lan_session.authtype)
-			x += 16;
-
-		rsp->msglen = rsp->data[x++];
-		rsp->header.rq_addr = rsp->data[x++];
-		rsp->header.netfn   = rsp->data[x] >> 2;
-		rsp->header.rq_lun  = rsp->data[x++] & 0x3;
-		x++;		/* checksum */
-		rsp->header.rs_addr = rsp->data[x++];
-		rsp->header.rq_seq  = rsp->data[x] >> 2;
-		rsp->header.rs_lun  = rsp->data[x++] & 0x3;
-		rsp->header.cmd     = rsp->data[x++]; 
-		rsp->ccode          = rsp->data[x++];
-
-		if (verbose > 2) {
-			printbuf(rsp->data, x, "ipmi message header");
-			printf("<< IPMI Response Session Header\n");
-			printf("<<   Authtype   : %s\n",
-			       val2str(rsp->session.authtype, ipmi_authtype_vals));
-			printf("<<   Sequence   : 0x%08lx\n", rsp->session.seq);
-			printf("<<   Session ID : 0x%08lx\n", rsp->session.id);
-			
-			printf("<< IPMI Response Message Header\n");
-			printf("<<   Rq Addr    : %02x\n", rsp->header.rq_addr);
-			printf("<<   NetFn      : %02x\n", rsp->header.netfn);
-			printf("<<   Rq LUN     : %01x\n", rsp->header.rq_lun);
-			printf("<<   Rs Addr    : %02x\n", rsp->header.rs_addr);
-			printf("<<   Rq Seq     : %02x\n", rsp->header.rq_seq);
-			printf("<<   Rs Lun     : %01x\n", rsp->header.rs_lun);
-			printf("<<   Command    : %02x\n", rsp->header.cmd);
-			printf("<<   Compl Code : 0x%02x\n", rsp->ccode);
-		}
-
-		/* now see if we have oustanding entry in request list */
-		entry = ipmi_req_lookup_entry(rsp->header.rq_seq, rsp->header.cmd);
-		if (entry) {
-			if (verbose > 2)
-				printf("IPMI Request Match found\n");
-			ipmi_req_remove_entry(rsp->header.rq_seq, rsp->header.cmd);
-		} else {
-			if (verbose)
-				printf("WARNING: IPMI Request Match NOT FOUND!\n");
-			rsp = intf->ll_recv(intf, RECV_TIMEOUT);
-			continue;
-		}			
-
-		break;
-	}
-
-	/* shift response data to start of array */
-	if (rsp && rsp->data_len > x) {
-		rsp->data_len -= x + 1;
-		memmove(rsp->data, rsp->data + x, rsp->data_len);
-		memset(rsp->data + rsp->data_len, 0, BUF_SIZE - rsp->data_len);
-	}
-
-	return rsp;
-}
-
-/*
- * IPMI LAN Request Message Format
- * +--------------------+
- * |  rmcp.ver          | 4 bytes
- * |  rmcp.__reserved   |
- * |  rmcp.seq          |
- * |  rmcp.class        |
- * +--------------------+
- * |  session.authtype  | 9 bytes
- * |  session.seq       |
- * |  session.id        |
- * +--------------------+
- * | [session.authcode] | 16 bytes (AUTHTYPE != none)
- * +--------------------+
- * |  message length    | 1 byte
- * +--------------------+
- * |  message.rs_addr   | 6 bytes
- * |  message.netfn_lun |
- * |  message.checksum  |
- * |  message.rq_addr   |
- * |  message.rq_seq    |
- * |  message.cmd       |
- * +--------------------+
- * | [request data]     | data_len bytes
- * +--------------------+
- * |  checksum          | 1 byte
- * +--------------------+
- */
-static struct ipmi_req_entry *
-ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_req * req)
-{
-	struct rmcp_hdr rmcp = {
-		.ver		= RMCP_VERSION_1,
-		.class		= RMCP_CLASS_IPMI,
-		.seq		= 0xff,
-	};
-	unsigned char * msg;
-	int cs, mp, ap = 0, len = 0, tmp;
-	struct ipmi_req_entry * entry;
-
-	if (curr_seq >= 64)
-		curr_seq = 0;
-
-	entry = malloc(sizeof(struct ipmi_req_entry));
-	memset(entry, 0, sizeof(struct ipmi_req_entry));
-	memcpy(&entry->req, req, sizeof(struct ipmi_req));
-
-	entry->intf = intf;
-	entry->session = &lan_session;
-
-	if (!ipmi_req_entries) {
-		ipmi_req_entries = entry;
-	} else {
-		ipmi_req_entries_tail->next = entry;
-	}
-	ipmi_req_entries_tail = entry;
-	if (verbose > 3)
-		printf("added list entry seq=0x%02x cmd=0x%02x\n",
-		       curr_seq, req->msg.cmd);
-	
-	len = req->msg.data_len + 21;
-	if (lan_session.active && lan_session.authtype)
-		len += 16;
-	msg = malloc(len);
-	memset(msg, 0, len);
-
-	/* rmcp header */
-	memcpy(msg, &rmcp, sizeof(rmcp));
-	len = sizeof(rmcp);
-
-	/* ipmi session header */
-	msg[len++] = lan_session.active ? lan_session.authtype : 0;
-
-	memcpy(msg+len, &lan_session.in_seq, 4);
-	len += 4;
-	memcpy(msg+len, &lan_session.id, 4);
-	len += 4;
-
-	/* ipmi session authcode */
-	if (lan_session.active && lan_session.authtype) {
-		ap = len;
-		memcpy(msg+len, lan_session.authcode, 16);
-		len += 16;
-	}
-
-	/* message length */
-	msg[len++] = req->msg.data_len + 7;
-
-	/* ipmi message header */
-	cs = mp = len;
-	msg[len++] = IPMI_BMC_SLAVE_ADDR;
-	msg[len++] = req->msg.netfn << 2;
-	tmp = len - cs;
-	msg[len++] = ipmi_csum(msg+cs, tmp);
-	cs = len;
-	msg[len++] = IPMI_REMOTE_SWID;
-
-	entry->rq_seq = curr_seq++;
-	msg[len++] = entry->rq_seq << 2;
-	msg[len++] = req->msg.cmd;
-
-	if (verbose > 2) {
-		printf(">> IPMI Request Session Header\n");
-		printf(">>   Authtype   : %s\n", val2str(lan_session.authtype, ipmi_authtype_vals));
-		printf(">>   Sequence   : 0x%08lx\n", lan_session.in_seq);
-		printf(">>   Session ID : 0x%08lx\n", lan_session.id);
-		
-		printf(">> IPMI Request Message Header\n");
-		printf(">>   Rs Addr    : %02x\n", IPMI_BMC_SLAVE_ADDR);
-		printf(">>   NetFn      : %02x\n", req->msg.netfn);
-		printf(">>   Rs LUN     : %01x\n", 0);
-		printf(">>   Rq Addr    : %02x\n", IPMI_REMOTE_SWID);
-		printf(">>   Rq Seq     : %02x\n", entry->rq_seq);
-		printf(">>   Rq Lun     : %01x\n", 0);
-		printf(">>   Command    : %02x\n", req->msg.cmd);
-	}
-
-	/* message data */
-	if (req->msg.data_len) {
-		memcpy(msg+len, req->msg.data, req->msg.data_len);
-		len += req->msg.data_len;
-	}
-
-	/* second checksum */
-	tmp = len - cs;
-	msg[len++] = ipmi_csum(msg+cs, tmp);
-
-	if (lan_session.in_seq) {
-		lan_session.in_seq++;
-		if (!lan_session.in_seq)
-			lan_session.in_seq++;
-	}
-
-	entry->msg_len = len;
-	entry->msg_data = msg;
-
-	return entry;
-}
-
-struct ipmi_rsp *
-ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_req * req)
-{
-	struct ipmi_req_entry * entry;
-	struct ipmi_rsp * rsp;
-
-	entry = ipmi_lan_build_cmd(intf, req);
-	if (!entry) {
-		printf("Aborting send command, unable to build.\n");
-		return NULL;
-	}
-
-	if (intf->ll_send(intf, entry->msg_data, entry->msg_len) < 0) {
-		printf("ipmi_lan_send_cmd failed\n");
-		free(entry->msg_data);
-		return NULL;
-	}
-
-	rsp = ipmi_lan_poll_recv(intf);
-	if (!rsp && intf->ll_send(intf, entry->msg_data, entry->msg_len) < 0) {
-		printf("ipmi_lan_send_cmd failed\n");
-		free(entry->msg_data);
-		return NULL;
-	}
-
-	free(entry->msg_data);
-	entry->msg_len = 0;
-
-	return rsp;
-}
-
-void
-ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-
-	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);
-
-	printf("\n");
-}
-
-/*
- * IPMI Get Channel Authentication Capabilities Command
- */
-static int
-ipmi_get_auth_capabilities_cmd(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char msg_data[2];
-
-	msg_data[0] = IPMI_LAN_CHANNEL_E;
-	msg_data[1] = lan_session.privlvl;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn    = IPMI_NETFN_APP;
-	req.msg.cmd      = 0x38;
-	req.msg.data     = msg_data;
-	req.msg.data_len = 2;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp) {
-		printf("error in Get Auth Capabilities Command\n");
-		return -1;
-	}
-	if (verbose > 2)
-		printbuf(rsp->data, rsp->data_len, "get_auth_capabilities");
-
-	if (rsp->ccode) {
-		printf("Get Auth Capabilities error: %02x\n", rsp->ccode);
-		return -1;
-	}
-
-	if (verbose) {
-		printf("Channel %02x Authentication Capabilities:\n",
-		       rsp->data[0]);
-		printf("  Privilege Level : %s\n",
-		       val2str(req.msg.data[1], ipmi_privlvl_vals));
-		printf("  Auth Types      : ");
-		if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_NONE)
-			printf("NONE ");
-		if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD2)
-			printf("MD2 ");
-		if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_KEY)
-			printf("KEY ");
-		if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_OEM)
-			printf("OEM ");
-		printf("\n");
-		printf("  Per-msg auth    : %sabled\n",
-		       (rsp->data[2] & 1<<4) ? "en" : "dis");
-		printf("  User level auth : %sabled\n",
-		       (rsp->data[2] & 1<<3) ? "en" : "dis");
-		printf("  Non-null users  : %sabled\n",
-		       (rsp->data[2] & 1<<2) ? "en" : "dis");
-		printf("  Null users      : %sabled\n",
-		       (rsp->data[2] & 1<<1) ? "en" : "dis");
-		printf("  Anonymous login : %sabled\n",
-		       (rsp->data[2] & 1<<0) ? "en" : "dis");
-		printf("\n");
-	}
-
-	if (lan_session.password &&
-		 rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_KEY) {
-		lan_session.authtype = IPMI_SESSION_AUTHTYPE_KEY;
-	}
-	else if (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_NONE) {
-		lan_session.authtype = IPMI_SESSION_AUTHTYPE_NONE;
-	}
-	else {
-		printf("No supported authtypes found!\n");
-		return -1;
-	}
-
-	if (verbose)
-		printf("Proceeding with AuthType %s\n",
-		       val2str(lan_session.authtype, ipmi_authtype_vals));
-
-	return 0;
-}
-
-/*
- * IPMI Get Session Challenge Command
- * returns a temporary session ID and 16 byte challenge string
- */
-static int
-ipmi_get_session_challenge_cmd(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char msg_data[17];
-
-	memset(msg_data, 0, 17);
-	msg_data[0] = lan_session.authtype;
-	memcpy(msg_data+1, lan_session.username, 16);
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn		= IPMI_NETFN_APP;
-	req.msg.cmd		= 0x39;
-	req.msg.data		= msg_data;
-	req.msg.data_len	= 17; /* 1 byte for authtype, 16 for user */
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp) {
-		printf("error in Get Session Challenge Command\n");
-		return -1;
-	}
-	if (verbose > 2)
-		printbuf(rsp->data, rsp->data_len, "get_session_challenge");
-
-	if (rsp->ccode) {
-		printf("Get Session Challenge error: ");
-		switch (rsp->ccode) {
-		case 0x81:
-			printf("invalid user name\n");
-			break;
-		case 0x82:
-			printf("null user name not enabled\n");
-			break;
-		default:
-			printf("%02x\n", rsp->ccode);
-		}
-		return -1;
-	}
-
-	memcpy(&lan_session.id, rsp->data, 4);
-	memcpy(lan_session.challenge, rsp->data + 4, 16);
-
-	if (verbose) {
-		printf("Opening Session\n");
-		printf("  Session ID      : %08lx\n",
-		       lan_session.id);
-		printf("  Challenge       : %s\n",
-		       buf2str(lan_session.challenge, 16));
-	}
-
-
-	return 0;
-}
-
-/*
- * IPMI Activate Session Command
- */
-static int
-ipmi_activate_session_cmd(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char msg_data[22];
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_APP;
-	req.msg.cmd = 0x3a;
-
-	msg_data[0] = lan_session.authtype;
-	msg_data[1] = lan_session.privlvl;
-	memcpy(msg_data + 2, lan_session.challenge, 16);
-
-	/* 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) {
-		printf("  Privilege Level : %s\n",
-		       val2str(msg_data[1], ipmi_privlvl_vals));
-		printf("  Auth Type       : %s\n",
-		       val2str(lan_session.authtype, ipmi_authtype_vals));
-		if (lan_session.authtype)
-			printf("  AuthCode        : %s\n",
-			       lan_session.authcode);
-	}
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp) {
-		printf("error in Activate Session Command\n");
-		lan_session.active = 0;
-		return -1;
-	}
-	if (verbose > 2)
-		printbuf(rsp->data, rsp->data_len, "activate_session");
-
-	if (rsp->ccode) {
-		printf("Activate Session error: ");
-		switch (rsp->ccode) {
-		case 0x81:
-			printf("no session slot available\n");
-			break;
-		case 0x82:
-			printf("no slot available for given user - "
-			       "limit reached\n");
-			break;
-		case 0x83:
-			printf("no slot available to support user "
-			       "due to maximum privilege capacity\n");
-			break;
-		case 0x84:
-			printf("session sequence number out of range\n");
-			break;
-		case 0x85:
-			printf("invalid session ID in request\n");
-			break;
-		case 0x86:
-			printf("requested privilege level exceeds limit\n");
-			break;
-		default:
-			printf("%02x\n", rsp->ccode);
-		}
-		return -1;
-	}
-
-	memcpy(&lan_session.id, rsp->data + 1, 4);
-	memcpy(&lan_session.in_seq, rsp->data + 5, 4);
-
-	if (verbose) {
-		printf("\nSession Activated\n");
-		printf("  Auth Type       : %s\n",
-		       val2str(rsp->data[0], ipmi_authtype_vals));
-		printf("  Max Priv Level  : %s\n",
-		       val2str(rsp->data[9], ipmi_privlvl_vals));
-		printf("  Session ID      : %08lx\n", lan_session.id);
-		printf("  Inbound Seq     : %08lx\n", lan_session.in_seq);
-		printf("\n");
-	}
-
-	return 0;
-}
-
-/*
- * IPMI Set Session Privilege Level Command
- */
-static int
-ipmi_set_session_privlvl_cmd(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn		= IPMI_NETFN_APP;
-	req.msg.cmd		= 0x3b;
-	req.msg.data		= &lan_session.privlvl;
-	req.msg.data_len	= 1;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp) {
-		printf("error in Set Session Privilege Level Command\n");
-		return -1;
-	}
-	if (verbose > 2)
-		printbuf(rsp->data, rsp->data_len, "set_session_privlvl");
-
-	if (rsp->ccode) {
-		printf("Failed to set session privilege level to %s\n\n",
-		       val2str(lan_session.privlvl, ipmi_privlvl_vals));
-		return -1;
-	}
-	if (verbose)
-		printf("Set Session Privilege Level to %s\n\n",
-		       val2str(rsp->data[0], ipmi_privlvl_vals));
-	return 0;
-}
-
-static int
-impi_close_session_cmd(struct ipmi_intf * intf)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char msg_data[4];
-
-	if (!lan_session.active)
-		return -1;
-
-	memcpy(&msg_data, &lan_session.id, 4);
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn		= IPMI_NETFN_APP;
-	req.msg.cmd		= 0x3c;
-	req.msg.data		= msg_data;
-	req.msg.data_len	= 4;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (!rsp) {
-		printf("error in Close Session Command\n");
-		return -1;
-	}
-	if (verbose > 2)
-		printbuf(rsp->data, rsp->data_len, "close_session");
-
-	if (rsp->ccode == 0x87) {
-		printf("Failed to Close Session: invalid session ID %08lx\n",
-		       lan_session.id);
-		return -1;
-	}
-	if (rsp->ccode) {
-		printf("Failed to Close Session: %x\n", rsp->ccode);
-		return -1;
-	}
-
-	if (verbose)
-		printf("\nClosed Session %08lx\n\n", lan_session.id);
-
-	return 0;
-}
-
-/*
- * IPMI LAN Session Activation (IPMI spec v1.5 section 12.9)
- *
- * 1. send "RMCP Presence Ping" message, response message will
- *    indicate whether the platform supports IPMI
- * 2. send "Get Channel Authentication Capabilities" command
- *    with AUTHTYPE = none, response packet will contain information
- *    about supported challenge/response authentication types
- * 3. send "Get Session Challenge" command with AUTHTYPE = none
- *    and indicate the authentication type in the message, response
- *    packet will contain challenge string and temporary session ID.
- * 4. send "Activate Session" command, authenticated with AUTHTYPE
- *    sent in previous message.  Also sends the initial value for
- *    the outbound sequence number for BMC.
- * 5. BMC returns response confirming session activation and
- *    session ID for this session and initial inbound sequence.
- */
-static int
-ipmi_lan_activate_session(struct ipmi_intf * intf)
-{
-	int rc;
-
-	rc = ipmi_ping(intf);
-	if (rc <= 0) {
-		printf("IPMI not supported!\n");
-		return -1;
-	}
-
-	lan_session.privlvl = IPMI_SESSION_PRIV_ADMIN;
-
-	rc = ipmi_get_auth_capabilities_cmd(intf);
-	if (rc < 0)
-		return -1;
-
-	rc = ipmi_get_session_challenge_cmd(intf);
-	if (rc < 0)
-		return -1;
-
-	rc = ipmi_activate_session_cmd(intf);
-	if (rc < 0)
-		return -1;
-
-	rc = ipmi_set_session_privlvl_cmd(intf);
-	if (rc < 0)
-		return -1;
-
-	/* channel 0xE will query current channel */
-	ipmi_get_channel_info(intf, IPMI_LAN_CHANNEL_E);
-
-	return 0;
-}
-
-void ipmi_lan_close(struct ipmi_intf * intf)
-{
-	impi_close_session_cmd(intf);
-	close(intf->fd);
-	ipmi_req_clear_entries();
-}
-
-int ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * password)
-{
-	int rc;
-	struct sigaction act;
-
-	if (!intf)
-		return -1;
-
-	if (!hostname) {
-		printf("No hostname specified!\n");
-		return -1;
-	}
-
-	memset(&lan_session, 0, sizeof(lan_session));
-	curr_seq = 0;
-
-	if (password) {
-		lan_session.password = 1;
-		memcpy(lan_session.authcode, password, strlen(password));
-	}
-
-	/* open port to BMC */
-	memset(&intf->addr, 0, sizeof(struct sockaddr_in));
-	intf->addr.sin_family = AF_INET;
-	intf->addr.sin_port = htons(port);
-
-	rc = inet_pton(AF_INET, hostname, &intf->addr.sin_addr);
-	if (rc <= 0) {
-		struct hostent *host = gethostbyname(hostname);
-		if (!host) {
-			herror("address lookup failed");
-			return -1;
-		}
-		intf->addr.sin_family = host->h_addrtype;
-		memcpy(&intf->addr.sin_addr, host->h_addr, host->h_length);
-	}
-
-	if (verbose)
-		printf("IPMI LAN host %s port %d\n",
-		       hostname, ntohs(intf->addr.sin_port));
-
-	intf->fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-	if (intf->fd < 0) {
-		perror("socket failed");
-		return -1;
-	}
-
-	/* connect to UDP socket so we get async errors */
-	rc = connect(intf->fd, (struct sockaddr *)&intf->addr, sizeof(intf->addr));
-	if (rc < 0) {
-		perror("connect failed");
-		intf->close(intf);
-		return -1;
-	}
-
-	/* setup alarm handler */
-	act.sa_handler = query_alarm;
-	act.sa_flags = 0;
-	if (!sigemptyset(&act.sa_mask) && sigaction(SIGALRM, &act, NULL) < 0) {
-		perror("alarm signal");
-		intf->close(intf);
-		return -1;
-	}
-
-	/* try to open session */
-	rc = ipmi_lan_activate_session(intf);
-	if (rc < 0) {
-		intf->close(intf);
-		return -1;
-	}
-
-	return intf->fd;
-}
-
diff --git a/ipmitool/lib/ipmi_sdr.c b/ipmitool/lib/ipmi_sdr.c
index e9416eb..8a9bb9f 100644
--- a/ipmitool/lib/ipmi_sdr.c
+++ b/ipmitool/lib/ipmi_sdr.c
@@ -86,9 +86,6 @@ ipmi_sdr_get_sensor_reading(struct ipmi_intf * intf, unsigned char sensor)
 
 	rsp = intf->sendrecv(intf, &req);
 
-	if (!rsp || rsp->ccode)
-		return NULL;
-
 	return rsp;
 }
 
@@ -343,7 +340,7 @@ ipmi_sdr_print_sensors(struct ipmi_intf * intf, int do_unit)
 	struct sdr_get_rs * header;
 	struct sdr_record_full_sensor * sensor;
 
-	int next = 0, i = 0, total;
+	int next = 0, i = 0, total, validread;
 	unsigned short reservation;
 	float val;
 	char sval[16], unitstr[16];
@@ -386,6 +383,7 @@ ipmi_sdr_print_sensors(struct ipmi_intf * intf, int do_unit)
 		printf("SDR reserveration ID %04x\n", reservation);
 
 	while (next < total) {
+		validread = 1;
 		i = 0;
 
 		header = ipmi_sdr_get_header(intf, reservation, next);
@@ -421,14 +419,21 @@ ipmi_sdr_print_sensors(struct ipmi_intf * intf, int do_unit)
 
 		rsp = ipmi_sdr_get_sensor_reading(intf, sensor->keys.sensor_num);
 		if (!rsp || rsp->ccode) {
-			printf("error reading sensor\n");
-			continue;
+			if (rsp && rsp->ccode == 0xcb) {
+				/* sensor not found */
+				val = 0.0;
+				validread = 0;
+			} else {
+				printf("Error reading sensor: %s\n",
+				       val2str(rsp->ccode, completion_code_vals));
+				continue;
+			}
+		} else {
+			/* convert RAW reading into units */
+			val = rsp->data[0] ? sdr_convert_sensor_reading(sensor, rsp->data[0]) : 0;
 		}
 
-		/* convert RAW reading into units */
-		val = rsp->data[0] ? sdr_convert_sensor_reading(sensor, rsp->data[0]) : 0;
-
-		if (do_unit) {
+		if (do_unit && validread) {
 			memset(unitstr, 0, sizeof(unitstr));
 			/* determine units with possible modifiers */
 			switch (sensor->unit.modifier) {
@@ -462,12 +467,24 @@ ipmi_sdr_print_sensors(struct ipmi_intf * intf, int do_unit)
 				       sensor->id_code ? desc : NULL);
 
 			memset(sval, 0, sizeof(sval));
-			i += snprintf(sval, sizeof(sval), "%.*f",
-				     (val==(int)val) ? 0 : 3, val);
+			if (validread) {
+				i += snprintf(sval, sizeof(sval), "%.*f",
+					      (val==(int)val) ? 0 : 3, val);
+			} else {
+				i += snprintf(sval, sizeof(sval), "no reading");
+				i--;
+			}
 			printf("%s", sval);
 
-			if (do_unit)
-				printf(" %s", unitstr);
+			if (csv_output)
+			    	printf(",");
+
+			if (validread) {
+				if (!csv_output)
+					printf(" ");
+				if (do_unit)
+					printf("%s", unitstr);
+			}
 
 			if (csv_output)
 				printf(",");
@@ -487,8 +504,11 @@ ipmi_sdr_print_sensors(struct ipmi_intf * intf, int do_unit)
 			printf("Entity  | %d.%d (%s)\n",
 			       sensor->entity.id, sensor->entity.instance,
 			       val2str(sensor->entity.id, entity_id_vals));
-			printf("Reading | %.*f %s\n",
-			       (val==(int)val) ? 0 : 3, val, unitstr);
+			if (validread)
+				printf("Reading | %.*f %s\n",
+				       (val==(int)val) ? 0 : 3, val, unitstr);
+			else
+				printf("Reading | not present\n");
 			printf("Status  | %s\n",
 			       ipmi_sdr_get_status(rsp->data[2]));
 			printf("\n");
diff --git a/ipmitool/lib/ipmi_sel.c b/ipmitool/lib/ipmi_sel.c
index aa55456..f7fd42b 100644
--- a/ipmitool/lib/ipmi_sel.c
+++ b/ipmitool/lib/ipmi_sel.c
@@ -83,40 +83,19 @@ ipmi_get_event_type(unsigned char code)
 static const char *
 ipmi_get_event_desc(struct sel_event_record * rec)
 {
-	int class;
-	unsigned char offset = 0;
-	unsigned char code = 0;
+	unsigned char code, offset;
 	struct ipmi_event_sensor_types *evt;
 
-	class = ipmi_get_event_class(rec->event_type);
-	if (class < 0)
-		return "Invalid Class";
-
-	switch (class) {
-	case IPMI_EVENT_CLASS_DISCRETE:
-		if (rec->event_type == 0x6f)
-			evt = sensor_specific_types;
-		else
-			evt = generic_event_types;
-		code = rec->sensor_type;
-		break;
-	case IPMI_EVENT_CLASS_DIGITAL:
-		evt = generic_event_types;
+	if (rec->event_type == 0x6f) {
+		evt = sensor_specific_types;
 		code = rec->sensor_type;
-		break;
-	case IPMI_EVENT_CLASS_THRESHOLD:
+	} else {
 		evt = generic_event_types;
-		code = 0x01;
-		break;
-	default:
-		return "Unknown Class";
+		code = rec->event_type;
 	}
 
 	offset = rec->event_data[0] & 0xf;
 
-	if (verbose > 2)
-		printf("offset: 0x%02x\n", offset);
-
 	while (evt->type) {
 		if (evt->code == code && evt->offset == offset)
 			return evt->desc;
@@ -347,6 +326,24 @@ ipmi_sel_list_entries(struct ipmi_intf * intf)
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = 0x40;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp || rsp->ccode) {
+		printf("Error%x in 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]) {
+		printf("SEL has no entries\n");
+		return;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
 	req.msg.cmd = 0x42;	/* reserve SEL */
 
 	rsp = intf->sendrecv(intf, &req);
diff --git a/ipmitool/main.c b/ipmitool/main.c
deleted file mode 100644
index bcab27a..0000000
--- a/ipmitool/main.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * 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 <fcntl.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include <helper.h>
-#include <ipmi.h>
-
-#include <ipmi_dev.h>
-#include <ipmi_lan.h>
-
-#include <ipmi_sdr.h>
-#include <ipmi_sel.h>
-#include <ipmi_fru.h>
-#include <ipmi_chassis.h>
-
-int csv_output = 0;
-extern int verbose;
-
-void usage(void)
-{
-	printf("ipmitool version %s\n", VERSION);
-	printf("\n");
-	printf("usage: ipmitool [options...] <command>\n");
-	printf("\n");
-	printf("       -h            this help\n");
-	printf("       -V            Show version information\n");
-	printf("       -v            verbose (can use multiple times)\n");
-	printf("       -c            CSV output suitable for parsing\n");
-	printf("       -I intf       Inteface: lan, dev\n");
-	printf("       -H hostname   Remote host name for LAN interface\n");
-	printf("       -P password   Power commands: down, up, cycle, reset, pulse, soft\n");
-	printf("\n");
-	exit(1);
-}
-
-int ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	struct ipmi_rsp * rsp;
-	struct ipmi_req req;
-	unsigned char netfn, cmd;
-	int i;
-	unsigned char data[32];
-
-	if (argc < 2 || !strncmp(argv[0], "help", 4)) {
-		printf("RAW Commands:  raw <netfn> <cmd> [data]\n");
-		return -1;
-	}
-
-	netfn = strtod(argv[0], NULL);
-	cmd = strtod(argv[1], NULL);
-
-	memset(data, 0, sizeof(data));
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = netfn;
-	req.msg.cmd = cmd;
-	req.msg.data = data;
-
-	for (i=2; i<argc; i++) {
-		unsigned char val = strtod(argv[i], NULL);
-		req.msg.data[i-2] = val;
-		req.msg.data_len++;
-	}
-	if (req.msg.data_len) {
-		for (i=0; i<req.msg.data_len; i++) {
-			if (((i%16) == 0) && (i != 0))
-				printf("\n");
-			printf(" %2.2x", req.msg.data[i]);
-		}
-		printf("\n");
-	}
-
-	printf("RAW REQ (netfn=0x%x cmd=0x%x data_len=%d)\n",
-	       req.msg.netfn, req.msg.cmd, req.msg.data_len);
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (!rsp || rsp->ccode) {
-		printf("Error:%x sending RAW command\n",
-		       rsp ? rsp->ccode : 0);
-		return -1;
-	}
-
-	printf("RAW RSP (%d bytes)\n", rsp->data_len);
-
-	for (i=0; i<rsp->data_len; i++) {
-		if (((i%16) == 0) && (i != 0))
-			printf("\n");
-		printf(" %2.2x", rsp->data[i]);
-	}
-	printf("\n");
-
-	return 0;
-}
-
-int main(int argc, char ** argv)
-{
-	int (*submain)(struct ipmi_intf *, int, char **);
-	struct ipmi_intf * intf = NULL;
-	char * hostname = NULL, * password = NULL;
-	int argflag, rc=0, port = 623;
-
-	while ((argflag = getopt(argc, (char **)argv, "hVvcI:H:P:p:")) != -1)
-	{
-		switch (argflag) {
-		case 'h':
-			usage();
-			break;
-		case 'V':
-			printf("ipmitool version %s\n", VERSION);
-			exit(EXIT_SUCCESS);
-			break;
-		case 'v':
-			verbose++;
-			break;
-		case 'c':
-			csv_output = 1;
-			break;
-		case 'I':
-			if (!strncmp(optarg, "lan", 3))
-				intf = &ipmi_lan_intf;
-			else if (!strncmp(optarg, "dev", 3))
-				intf = &ipmi_dev_intf;
-			break;
-		case 'H':
-			hostname = strdup(optarg);
-			break;
-		case 'P':
-			password = strdup(optarg);
-			break;
-		case 'p':
-			port = atoi(optarg);
-			break;
-		default:
-			usage();
-		}
-	}
-
-	if (argc-optind <= 0) {
-		printf("No command provided!\n");
-		usage();
-	}
-
-	if (!intf) {
-		printf("No interface specified!\n");
-		usage();
-	}
-
-	if (!strncmp(argv[optind], "help", 4)) {
-		printf("Commands:  chassis, fru, lan, sdr, sel\n");
-		goto out_free;
-	}
-	else if (!strncmp(argv[optind], "chassis", 7)) {
-		submain = ipmi_chassis_main;
-	}
-	else if (!strncmp(argv[optind], "fru", 3)) {
-		submain = ipmi_fru_main;
-	}
-	else if (!strncmp(argv[optind], "lan", 3)) {
-		submain = ipmi_lan_main;
-	}
-	else if (!strncmp(argv[optind], "sdr", 3)) {
-		submain = ipmi_sdr_main;
-	}
-	else if (!strncmp(argv[optind], "sel", 3)) {
-		submain = ipmi_sel_main;
-	}
-	else if (!strncmp(argv[optind], "raw", 3)) {
-		submain = ipmi_raw_main;
-	}
-	else if (!strncmp(argv[optind], "chaninfo", 8)) {
-		if (argc-optind-1 > 0) {
-			unsigned char c = strtod(argv[optind+1], NULL);
-			if (intf->open(intf, hostname, port, password) < 0)
-				goto out_free;
-			verbose++;
-			ipmi_get_channel_info(intf, c);
-			verbose--;
-			goto out_close;
-		}
-		else {
-			printf("chaninfo <channel>\n");
-			goto out_free;
-		}
-	}
-	else {
-		printf("Invalid comand: %s\n", argv[optind]);
-		rc = -1;
-		goto out_free;
-	}
-
-	if (!submain)
-		goto out_free;
-
-	if (intf->open) {
-		rc = intf->open(intf, hostname, port, password);
-		if (rc < 0) {
-			printf("unable to open interface\n");
-			goto out_free;
-		}
-	}
-
-	rc = submain(intf, argc-optind-1, &(argv[optind+1]));
-
- out_close:
-	if (intf->close)
-		intf->close(intf);
-
- out_free:
-	if (hostname)
-		free(hostname);
-	if (password)
-		free(password);
-
-	if (!rc)
-		exit(EXIT_SUCCESS);
-	else
-		exit(EXIT_FAILURE);
-}
diff --git a/ipmitool/src/bmcautoconf.sh b/ipmitool/src/bmcautoconf.sh
index 6c9e052..46d18db 100755
--- a/ipmitool/src/bmcautoconf.sh
+++ b/ipmitool/src/bmcautoconf.sh
@@ -129,7 +129,7 @@ fi
 
 # Default Route MAC Address
 # (ping it first to populate arp table)
-$PING -q -c1 >/dev/null 2>&1
+$PING -q -c1 $DEF_ROUTE_IP >/dev/null 2>&1
 DEF_ROUTE_MAC=$( $ARP -an -i $IFACE | grep "$DEF_ROUTE_IP[^0-9]" | awk '{ print $4 }' )
 if [ X$DEF_ROUTE_MAC = X ]; then
     echo "Unable to determine default route MAC address"
diff --git a/ipmitool/src/ipmievd.c b/ipmitool/src/ipmievd.c
index 63f94a7..cf6c503 100644
--- a/ipmitool/src/ipmievd.c
+++ b/ipmitool/src/ipmievd.c
@@ -205,7 +205,7 @@ int main(int argc, char ** argv)
 		printf("Connecting to OpenIPMI device.\n");
 
 	/* open connection to openipmi device */
-	r = intf->open(intf, NULL, 0, NULL);
+	r = intf->open(intf, NULL, 0, NULL, NULL);
 	if (r < 0) {
 		printf("ERROR: Unable to open OpenIPMI device\n");
 		exit(EXIT_FAILURE);
diff --git a/ipmitool/src/ipmitool.c b/ipmitool/src/ipmitool.c
index fbb6d03..8633978 100644
--- a/ipmitool/src/ipmitool.c
+++ b/ipmitool/src/ipmitool.c
@@ -226,14 +226,14 @@ int main(int argc, char ** argv)
 {
 	int (*submain)(struct ipmi_intf *, int, char **);
 	struct ipmi_intf * intf = NULL;
-	char * hostname = NULL, * password = NULL;
+	char * hostname = NULL, * password = NULL, * username = NULL;
 	int argflag, i, rc=0, port = 623, pedantic = 0;
 	char intfname[32];
 
 	if (ipmi_intf_init() < 0)
 		exit(EXIT_FAILURE);
 
-	while ((argflag = getopt(argc, (char **)argv, "hVvcgI:H:P:p:")) != -1)
+	while ((argflag = getopt(argc, (char **)argv, "hVvcgI:H:P:U:p:")) != -1)
 	{
 		switch (argflag) {
 		case 'h':
@@ -267,6 +267,9 @@ int main(int argc, char ** argv)
 		case 'P':
 			password = strdup(optarg);
 			break;
+		case 'U':
+			username = strdup(optarg);
+			break;
 		case 'p':
 			port = atoi(optarg);
 			break;
@@ -292,7 +295,7 @@ int main(int argc, char ** argv)
 		goto out_free;
 	}
 	else if (!strncmp(argv[optind], "event", 5)) {
-		if (intf->open(intf, hostname, port, password) < 0)
+		if (intf->open(intf, hostname, port, username, password) < 0)
 			goto out_free;
 		ipmi_send_platform_event(intf);
 		goto out_close;
@@ -324,7 +327,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);
-			rc = intf->open(intf, hostname, port, password);
+			rc = intf->open(intf, hostname, port, username, password);
 			if (rc < 0)
 				goto out_free;
 			ipmi_get_user_access(intf, c, 1);
@@ -338,7 +341,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);
-			rc = intf->open(intf, hostname, port, password);
+			rc = intf->open(intf, hostname, port, username, password);
 			if (rc < 0)
 				goto out_free;
 			verbose++;
@@ -361,7 +364,7 @@ int main(int argc, char ** argv)
 		goto out_free;
 
 	if (intf->open) {
-		rc = intf->open(intf, hostname, port, password);
+		rc = intf->open(intf, hostname, port, username, password);
 		if (rc < 0)
 			goto out_free;
 	}
@@ -377,6 +380,8 @@ int main(int argc, char ** argv)
  out_free:
 	if (hostname)
 		free(hostname);
+	if (username)
+		free(username);
 	if (password)
 		free(password);
 
diff --git a/ipmitool/src/plugins/lan/Makefile.am b/ipmitool/src/plugins/lan/Makefile.am
index 74466da..5523647 100644
--- a/ipmitool/src/plugins/lan/Makefile.am
+++ b/ipmitool/src/plugins/lan/Makefile.am
@@ -38,7 +38,9 @@ plugindir = $(pluginpath)
 
 INCLUDES = -I$(top_srcdir)/include
 
-intf_lan_la_LDFLAGS = -module -avoid-version
-plugin_LTLIBRARIES = intf_lan.la
-intf_lan_la_SOURCES = lan.c lan.h asf.h rmcp.h md5.c md5.h
+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
 
diff --git a/ipmitool/src/plugins/lan/lan.c b/ipmitool/src/plugins/lan/lan.c
index a53e6b2..8ef7c2e 100644
--- a/ipmitool/src/plugins/lan/lan.c
+++ b/ipmitool/src/plugins/lan/lan.c
@@ -83,6 +83,7 @@ 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" },
@@ -101,7 +102,7 @@ const struct valstr ipmi_authtype_vals[] = {
 	{ IPMI_SESSION_AUTHTYPE_OEM,	"OEM" },
 	{ 0,				NULL },
 };
-
+#endif
 static const struct valstr ipmi_channel_protocol_vals[] = {
 	{ 0x00, "reserved" },
 	{ 0x01, "IPMB-1.0" },
@@ -716,6 +717,7 @@ 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)
 {
@@ -810,6 +812,7 @@ ipmi_get_channel_info(struct ipmi_intf * intf, unsigned char channel)
 		break;
 	}
 }
+#endif
 
 /*
  * IPMI Get Channel Authentication Capabilities Command
@@ -1192,7 +1195,7 @@ void ipmi_lan_close(struct ipmi_intf * intf)
 	ipmi_req_clear_entries();
 }
 
-int ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * password)
+int ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * username, char * password)
 {
 	int rc;
 	struct sigaction act;
@@ -1211,6 +1214,10 @@ int ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * pas
 	memset(&lan_session, 0, sizeof(lan_session));
 	curr_seq = 0;
 
+	if (username) {
+		memcpy(lan_session.username, username, strlen(username));
+	}
+
 	if (password) {
 		lan_session.password = 1;
 		memcpy(lan_session.authcode, password, strlen(password));
diff --git a/ipmitool/src/plugins/lan/lan.h b/ipmitool/src/plugins/lan/lan.h
index f57b0ef..540fee8 100644
--- a/ipmitool/src/plugins/lan/lan.h
+++ b/ipmitool/src/plugins/lan/lan.h
@@ -63,7 +63,7 @@ unsigned char * ipmi_auth_md5(unsigned char * data, int data_len);
 unsigned char ipmi_csum(unsigned char * d, int s);
 
 struct ipmi_rs * ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req);
-int  ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * password);
+int  ipmi_lan_open(struct ipmi_intf * intf, char * hostname, int port, char * username, char * password);
 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);
diff --git a/ipmitool/src/plugins/open/Makefile.am b/ipmitool/src/plugins/open/Makefile.am
index f821f26..59dd297 100644
--- a/ipmitool/src/plugins/open/Makefile.am
+++ b/ipmitool/src/plugins/open/Makefile.am
@@ -38,6 +38,9 @@ plugindir = $(pluginpath)
 
 INCLUDES = -I$(top_srcdir)/include
 
-intf_open_la_LDFLAGS = -module -avoid-version
-plugin_LTLIBRARIES = intf_open.la
-intf_open_la_SOURCES = open.c open.h
+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
+
diff --git a/ipmitool/src/plugins/open/open.c b/ipmitool/src/plugins/open/open.c
index a684f05..d90a601 100644
--- a/ipmitool/src/plugins/open/open.c
+++ b/ipmitool/src/plugins/open/open.c
@@ -66,7 +66,7 @@ void ipmi_openipmi_close(struct ipmi_intf * intf)
 		close(intf->fd);
 }
 
-int ipmi_openipmi_open(struct ipmi_intf * intf, char * dev, int __unused1, char * __unused2)
+int ipmi_openipmi_open(struct ipmi_intf * intf, char * dev, int __unused1, char * __unused2, char * __unused3)
 {
 	int i = 0;
 
diff --git a/ipmitool/src/plugins/open/open.h b/ipmitool/src/plugins/open/open.h
index 7870b7a..377a318 100644
--- a/ipmitool/src/plugins/open/open.h
+++ b/ipmitool/src/plugins/open/open.h
@@ -42,7 +42,7 @@
 #define OPENIPMI_DEV "/dev/ipmi0"
 
 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);
+int ipmi_openipmi_open(struct ipmi_intf * intf, char * dev, int __unused1, char * __unused2, char * __unused3);
 void ipmi_openipmi_close(struct ipmi_intf * intf);
 
 #endif