Release Version 1.8.16

Update configure.ac and ChangeLog to 1.8.16.

AUTHORS

@@ -2,3 +2,4 @@ Duncan Laurie <duncan@iceblink.org>
 Fredrik Öhrn <ohrn@chl.chalmers.se>
 Jon Cassorla <jon.cassorla@newisys.com>
 Jeremy Ellington <jeremy@jeremye.net>
+Petter Reinholdtsen <pere@hungry.com>

ChangeLog

@@ -1,4 +1,217 @@
-version 1.8.13rc0 2013-08-09
+version 1.8.16 2015-11-22
+	* Add _ipmi_get_channel_access() and _ipmi_get_channel_info()
+	* Add _ipmi_get_user_access() and _ipmi_set_user_access()
+	* Add _ipmi_get_user_name()
+	* Add _ipmi_set_channel_access() function
+	* Add _ipmi_set_user_password() function
+	* Add limits check in get_cmdline_macaddr()
+	* Change expression in ipmi_pef_get_info() in order to silence Coverity
+	* Change expression in ipmi_pef_list_policies() in order to silence Coverity
+	* Code cleanup in ipmi_user_main()
+	* Create ask_password() and re-use code
+	* Delete dead code from ipmi_sunoem_echo() - CID#1261338
+	* Don't output pidfile before parsing command line arguments
+	* Don't use tmp variable since it's not necessary in ipmi_user_test()
+	* Fix 'user help' output
+	* Fix Assign instead of compare in KfwumGetDeviceInfo() - CID#1149034
+	* Fix Identical code for different branches in ipmi_tsol_main() -
+	  CID#1261346
+	* Fix big parameter passed by value in ipmi_sel_oem_match() - CID#1261347
+	* Fix dead code in ipmi_firewall_reset() - CID#1261342
+	* Fix eval logic in ipmi_user_priv()
+	* Fix file descriptor leak in ipmi_exec_main() - CID#1149040
+	* Fix identical code for diff branches in DellOEM - CID#1261326
+	* Fix memory leak in get_supermicro_evt_desc()
+	* Fix memory leak in ipmi_ek_display_board_info_area() - CID#1149051
+	* Fix missing return in ipmi_kontronoem_main() - CID#1261317
+	* Fix of previous commit - memset() expects pointer
+	* Fix out-of-bound-reads in get_supermicro_evt_desc()
+	* Fix resource leak in fru_area_print_board() - CDI#1149048
+	* Fix resource leak in fru_area_print_chassis() - CID#1149047
+	* Fix resource leak in fru_area_print_product() - CID#1149046
+	* Fix resource leak in ipmi_kontron_set_serial_number() - CID#1149041
+	* Fix typo vlan->VLAN in ipmi_lan_set_vlan_id() and
+	  ipmi_lan_set_vlan_priority()
+	* Fix uninitialized struct in ipmi_fru_upg_ekeying() - CID#1149065
+	* Fix user input validation in Channel and User sub-commands
+	* Fix wrong size argument in ipmi_sdr_list_cache_fromfile() - CID#1149056
+	* Fix/remove pointer cast in _ipmi_set_user_access()
+	* Hook functions in ipmi_user to _ipmi_set_user_password()
+	* Hook ipmi_get_channel_info() to _ipmi_get_*()
+	* Hook ipmi_get_channel_medium() to new _ipmi_get_*() functions
+	* Hook ipmi_lan_set_password() to _ipmi_set_user_password()
+	* Hook ipmi_print_user_list() and friends to _ipmi_* functions
+	* Hook ipmi_set_alert_enable() to _ipmi_*()
+	* Hook ipmi_set_user_access() to _ipmi_set_user_access()
+	* Hook ipmi_user_priv() to _ipmi_set_user_access()
+	* ID:307 - Intel I82751 super pass through mode fixup
+	* ID:355 - Fix compiler warnings for Dummy Interface
+	* ID:380 - raw commands override retry and timeout values
+	* ID:319 - Interface safe re-open
+	* ID:320 - Add VITA 46.11 support
+	* ID:333 - Set read timeout to 15s in OpenIPMI interface
+	* ID:336 - ipmitool does not fall back to IPv4 for IPMI v2 / RMCP+ sessions
+	* ID:343 - Print actual sensor thresholds in 'sensors' comand
+	* ID:343 - Remove AC_FUNC_MALLOC
+	* ID:344 - Fix HPM.2 long message support
+	* ID:345 - Do not do several close session retries when catching SIGINT
+	* ID:346 - lib/ipmi_sdradd.c ipmi_sdr_read_record has a file descriptor leak
+	* ID:347 - Incorrect reserved channel number
+	* ID:348 - Add support for the "System Firmware Version"
+	* ID:349 - user set password - add option to choose 16/20 byte password
+	* ID:354 - Replace obsolete u_int with uint32_t in dimm_spd.c
+	* ID:354 - Replace obsolete u_int[0-9]+_t with standardized types in Free
+	  iface
+	* ID:354 - forcefully switch to C99 and more strict CFLAGS
+	* ID:354 - replace/drop caddr_t in IMB
+	* ID:354 - struct member h_addr has been replaced
+	* ID:354 - uint8_t >= 0 is always true, don't test it
+	* ID:355 - Fix Enumeration value not handled in ipmi_get_event_desc()
+	* ID:355 - Fix ``ISO C forbids omitting the middle term of a ?: expression''
+	* ID:355 - Fix ``obsolete use of designated initializer with ¿:¿'' warning
+	* ID:355 - Fix comparison of unsigned expression
+	* ID:355 - Fix compiler warnings
+	* ID:355 - Fix compiler warnings in dimm_spd.c
+	* ID:355 - Fix couple compiler warnings in ipmi_lanp.h
+	* ID:355 - Fix formatting warning in get_cmdline_ipaddr()
+	* ID:355 - Fix zero-length format string warning in
+	  get_supermicro_evt_desc()
+	* ID:355 - Remove defined but unused variable in _set_command_enables()
+	* ID:355 - remove unused variables from ipmi_dcmi.c
+	* ID:357 - out-of-bound access in DDR4 code ID:356 -  DIMM4 Die Count is
+	  unreachable
+	* ID:357 - out-of-bound access in DDR4 code
+	* ID:358 - check data length in else branch of ipmi_spd_print()
+	* ID:361 - Add a OEM IANA information
+	* ID:363 - Node Manager feature patch.
+	* ID:363 - fix Coverity issues in NM implementation
+	* ID:364 - Fix for serial-basic interface bridging
+	* ID:365 - Fix for ipmitool crash when using serial-terminal interface
+	* ID:366 - Properly clean LAN and LAN+ interfaces on close
+	* ID:367 - Fix building of non-bridged LAN interface commands
+	* ID:368 - Fix handling of bridging-related parameters
+	* ID:369 - Fix lanplus interface bridging and response matching
+	* ID:370 - add anonymous union support in CFLAGS for older gcc
+	* ID:371 - add ericsson oem
+	* ID:373 - Fix compilation of IMB on Windows
+	* ID:374 - Check/set LED Duration correctly
+	* ID:376 - Add means to configure "Bad Password Threshold"
+	* ID:381 - Script to log installation status as SEL events
+	* ID:382 - Fix memcpy() params in HpmFwupgActionUploadFirmware()
+	* ID:383 - Fix compile-time error in src/plugins/lan/lan.c
+	* ID:384 - Fix compilation under cygwin64
+	* ID:388 - Fix Error message always printed if BMC does not support VITA
+	* ID:388 - Handle ccode 0xCC as well in VITA discovery
+	* ID:388 - Turn all messages into LOG_INFO in VITA discovery
+	* ID:389 - Add on of Advantech IANA number
+	* ID:390 - Support for new Communication Interface (USB Medium)
+	* ID:391 - changing data_len from 17 to 16 according to ipmi spec 22.29,
+	  first byte is completion code
+	* ID:392 - _ipmi_get_user_name() work-around for some BMCs
+	* ID:393 - ipmitool man page addition for Node Manager support.
+	* ID:394 - close fp if isn't NULL and set it NULL afterwards in USB plugin
+	* ID:394 - plugins/usb: Fix probe for SCSI devices
+	* ID:395 - Fix fru string without resizing it
+	* ID:396 - Fixed invalid length check in picmg led cap command.
+	* ID:397 - Fixed picmg policy set command.
+	* ID:398 - Fixed channel setaccess command.
+	* ID:399 - Fixed channel getciphers command.
+	* ID:401 - Fixed 30 second delay when activating SOL on 'dumb' Intel MACs.
+	* ID:402 - Misguiding error print-out when using some 'lan' commands.
+	* Init user_access_t struct in ipmi_user_priv()
+	* Make user User Privilege Limit is within range
+	* Node Manager Feature, correct 1268194 missing break.
+	* Output pidfile only in verbose mode
+	* Print error message to STDERR in ipmi_channel.c
+	* Re-work 'channel getaccess' and 'channel setaccess'
+	* Re-work ccode eval in ipmi_get_channel_medium()
+	* Remove commented-out code in ipmi_picmg_clk_set() - CID#1261339
+	* Remove dead code - rsp can't be NULL at this point - CID#1149005
+	* Remove dead code in fru_area_print_board() - CID#1149001
+	* Remove dead code in fru_area_print_chassis() - CID#1149000
+	* Remove dead code in fru_area_print_product() - CID#1148999
+	* Remove dead(duplicate) code from ipmi_sol_main() - CID#1148996
+	* Remove get_channel_access_rsp and get_channel_info_rsp structs
+	* Remove ipmi_user_set_password()
+	* Remove length checks in get_supermicro_evt_desc()
+	* Remove redundant user-input conversion from ipmi_sel_delete()
+	* Remove trailing white-spaces in ipmi_user.c
+	* Remove trailing white-spaces in ipmi_user.c
+	* Remove trailing white-spaces in src/plugins/dummy/dummy.c
+	* Remove unused variable from ipmi_get_channel_cipher_suites()
+	* Replace deprecated bzero() with memset()
+	* Replace s6_addr16 with s6_addr since Mac OS X does not have it
+	* Rewrite ipmi_set_channel_access()
+	* Split ipmi_user_main() into smaller functions
+	* ipmi_print_user_summary() to utilize _ipmi_get_user_access()
+	* ipmitool delloem: ipmitool delloem extension always return success - fix
+	  it
+
+version 1.8.15 2014-11-24
+	* ID: 340 - ipmitool sol session improperly closes on packet retry
+	* ID: 277 - support for hostnames longer than 64 chars
+	* ID: 313 - ipmitool doesn't support hostname long than 64 symbols
+	* ID: 277 - Minor issue with ipmi_intf_session_set_hostname()
+	* ID: 247 - 'sensor thresh' help output is wrong
+	* ID: 324 - conflicting declaration write_fru_area()
+	* ID: 337 - Add support for 13G Dell PowerEdge
+	* ID: 325 - DDR4 DIMM Decoding Logic
+	* ID: 328 - HPM.2 fixes
+	* ID: 329 - hpm.1 upgrade fixes
+	* ID: 103 - picmg discover messages should be DEBUG, not INFO
+	* ID: 331 - Passwords provided in file (-f option) truncated on space
+	* ID: 318 - ipmi_tsol.c: fix buffer overflow
+	* ID: 306 - "fru print" command prints the FRU #0 twice
+	* ID: 305 - HPM.1 deferred activation support fixup
+	* ID: 317 - ipmi_fwum.c: fix typo
+	* ID: 315 - buildsystem: configure.in is deprecated
+	* ID: 316 - Directory debian is outdated
+	* ID: 103 - 'lib/ipmi_ekanalyzer.c' needs a re-work
+	* ID: 46 - SEL OEM record corner case
+
+version 1.8.14 2014-05-05
+	* ID: 299 - openipmi plugin writes zero to wrong byte
+	* ID: 301 - Add OS/Hypervisor installation status events
+	* ID: 298 - fix LANplus retry
+	* ID: 295 - inform user if SOL session disconnected
+	* ID: 297 - don't print-out SEL entry if ID not present
+	* ID: 296 - Fix PSD size decoding
+	* ID: 293 - Use of uninitialized variable in ipmi_main()
+	* ID: 278 - Error in sol looptest
+	* ID: 290 - ipmi_sol.c needs a clean-up
+	* ID: 85 - Supermicro memory ECC error display
+	* ID: 290 - ipmi_sol.c needs a clean-up
+	* ID: 286 - Open session retries hit assert in ipmi_lanplus_send_payload
+	* ID: 285 - Fix SEGV in ipmi_lanplus_open_session
+	* ID: 284 - Fix SEGV in ipmi_main
+	* ID: 283 - ipmi_intf_socket_connect fails with IPv4 hosts
+	* ID: 46 -  ipmi_fwum needs some re-work
+	* ID: 50 - ipmi_hpmfwupg needs a clean up
+	* ID: 279 - ipmitool sdr list broken
+	* ID: 44 - dummy interface support - fake-ipmistack project
+	* ID: 48 - Remove hard-coded FRU inventory access length restriction
+	* ID: 276 - HPM.1 upgrade combined patch
+	* ID: 90 - Add options to chassis bootparam set bootflag
+	* ID: 292 -Properly handle plugin non-zero target adddress with -t
+	* Numerous Fixes based on running Coverity
+	* Use TIOCFLUSH if TCFLSH is missing to get the serial plugin building on
+	  Hurd.
+	* Disable imb and open plugins by default on Hurd.  The platform lack
+	  the required kernel support.
+	* Change serial plugin to only try to disable the IUCLC serial line flag on
+	  platforms supporting it.  Fixes build problem on Hurd and FreeBSD.
+	* PA: 83 -  Revised IPv6 patch
+	* FR: 24 -  Exchange OS Name Hostname BMC URL during startup
+	* ID: 304 - Incorect byteswap in SOL maximum payload
+	* ID: 303 - Fix build error in HPM.2 code
+	* ID: 300 - new sunoem functionality
+	* ID: 144 - Fix 'dcmi power set_limit action <value>'
+	* ID: 302 - HPM.2 long message support
+	* ID: 309 - Add new SEL entries for ipmi 2.0 rev 1.1
+	* ID: 280 - man page cleanup
+	* ID: 311 - man page update for new sunoem commands
+
+version 1.8.13 2013-09-09
 	* ID: 3611905 - Direct Serial Basic/Terminal Mode Interface drivers
 	* ID: 3577766 - configure's knobs and switches don't work
 	* ID: 3611253 - do not override OS-default values for interfaces
@@ -126,6 +339,7 @@ version 1.8.13rc0 2013-08-09
 	* ID: 99 - 'lib/ipmi_sel.c' - possible int *flow
 	* ID: 222 - 'lib/ipmi_sdr.c' - a typo 'Not Reading' -> 'No Reading'
 	* ID: 35 - Script to setup redirection of SNMP to/from BMC
+	* ID: 273 - Reduce SOL Input buffer size by SOL header size
 
 
 version 1.8.12 released 2012-08-09

Makefile.am

@@ -31,9 +31,7 @@
 DOCDIR = $(datadir)/doc/$(PACKAGE)
 DOCLIST = $(top_srcdir)/README $(top_srcdir)/COPYING $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog
 
-EXTRA_DIST = $(DOCLIST) \
-	debian/changelog debian/control debian/copyright \
-	debian/dirs debian/docs debian/rules
+EXTRA_DIST = $(DOCLIST)
 
 AUTOMAKE_OPTIONS = dist-bzip2
 

README

@@ -410,3 +410,5 @@ http://www.intel.com/design/servers/ipmi/spec.htm
 OpenIPMI project: Linux IPMI kernel driver and userland library
 http://openipmi.sourceforge.net
 
+IPMItool commit archive
+https://lists.sourceforge.net/lists/listinfo/ipmitool-cvs

configure.ac

@@ -3,7 +3,7 @@ dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([ipmitool], [1.8.13rc0-cvs])
+AM_INIT_AUTOMAKE([ipmitool], [1.8.16-cvs])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
@@ -26,19 +26,20 @@ AC_C_CONST
 AC_C_INLINE
 AC_C_BIGENDIAN
 
-AC_FUNC_MALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([alarm gethostbyname socket select])
+AC_CHECK_FUNCS([alarm gethostbyname getaddrinfo getifaddrs socket select])
 AC_CHECK_FUNCS([memmove memset strchr strdup strerror])
 AC_CHECK_FUNCS([getpassphrase])
 
-CFLAGS="$CFLAGS -fno-strict-aliasing -Wreturn-type"
+CFLAGS="$CFLAGS -Wall -Wextra -std=c99 -pedantic -Wformat -Wformat-nonliteral"
 
 AM_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
 
 AC_SEARCH_LIBS([gethostbyname], [nsl])
+AC_SEARCH_LIBS([getaddrinfo], [nsl])
+AC_SEARCH_LIBS([getifaddrs], [nsl])
 AC_SEARCH_LIBS([socket], [socket], [],
 	[AC_CHECK_LIB([nsl], [socket],
 		[LIBS="$LIBS -lsocket -lnsl"], [], [-lsocket])])
@@ -58,8 +59,10 @@ dnl
 xenable_intf_bmc=no
 xenable_intf_imb=yes
 xenable_intf_open=yes
+xenable_intf_usb=yes
 xenable_intf_lipmi=yes
 #xenable_intf_serial=yes
+xenable_intf_dummy=no
 xenable_all_options=yes
 xenable_ipmishell=yes
 
@@ -106,6 +109,11 @@ solaris*)
 	xenable_intf_bmc=no
 	xenable_intf_open=no
 	;;
+gnu*)
+	# disable the linux and solaris-specific interfaces on Hurd
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	;;
 esac
 
 AC_SUBST(ARCH, $host_cpu)
@@ -123,6 +131,24 @@ if test "x$xenable_all_options" = "xyes" || test "x$xenable_solaris_opt" = "xyes
 	AC_DEFINE(ENABLE_ALL_OPTIONS, [1], [Define to 1 to enable all command line options.])
 fi
 
+dnl Determine anonymous union/structure support in GCC
+AC_TRY_COMPILE([
+#include <stdio.h>
+	], [
+	struct test {
+		union {
+			int a;
+			unsigned int b;
+		};
+	} test;
+
+	printf("a is %d", test.a);
+        ], ac_need_fms_extension=no, ac_need_fms_extension=yes)
+if test "x$ac_need_fms_extension" = "xyes"; then
+       CFLAGS="$CFLAGS -fms-extensions"
+       AC_SUBST(CFLAGS)
+fi
+
 dnl check for OpenSSL functionality
 AC_ARG_ENABLE([internal-md5],
 	[AC_HELP_STRING([--enable-internal-md5],
@@ -172,6 +198,22 @@ if test "x$xenable_intf_lan" = "xyes"; then
 	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lan/libintf_lan.la"
 fi
 
+dnl enable IPMI USB interface
+AC_ARG_ENABLE([intf-usb],
+	[AC_HELP_STRING([--enable-intf-usb],
+			[enable IPMI USB interface [default=yes]])],
+		[xenable_intf_usb=$enableval],
+		[xenable_intf_usb=yes])
+if test "x$xenable_intf_usb" = "xstatic" || test "x$xenable_intf_usb" = "xplugin"; then
+   xenable_intf_usb=yes
+fi
+if test "x$xenable_intf_usb" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_USB, [1], [Define to 1 to enable USB interface.])
+	AC_SUBST(INTF_USB, [usb])
+	AC_SUBST(INTF_USB_LIB, [libintf_usb.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB usb/libintf_usb.la"
+fi
+
 dnl enable IPMIv2.0 RMCP+ LAN interface
 AC_ARG_ENABLE([intf-lanplus],
 	[AC_HELP_STRING([--enable-intf-lanplus],
@@ -503,6 +545,18 @@ if test "x$xenable_intf_bmc" = "xyes"; then
 	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB bmc/libintf_bmc.la"
 fi
 
+dnl enable Dummy interface for testing
+AC_ARG_ENABLE([intf-dummy],
+	[AC_HELP_STRING([--enable-intf-dummy],
+			[enable Dummy(test) interface [default=no]])],
+	[xenable_intf_dummy=$enableval], [xenable_intf_dummy=no])
+if test "x$xenable_intf_dummy" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_DUMMY, [1], [Define to 1 to enable Dummy interface.])
+	AC_SUBST(INTF_DUMMY, [dummy])
+	AC_SUBST(INTF_DUMMY_LIB, [libintf_dummy.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB dummy/libintf_dummy.la"
+fi
+
 AC_SUBST(IPMITOOL_INTF_LIB)
 
 if test "x$xenable_ipmishell" = "xyes"; then
@@ -601,8 +655,10 @@ AC_CONFIG_FILES([Makefile
 		src/plugins/free/Makefile
 		src/plugins/imb/Makefile
 		src/plugins/bmc/Makefile
+		src/plugins/usb/Makefile
 		src/plugins/lipmi/Makefile
-		src/plugins/serial/Makefile])
+		src/plugins/serial/Makefile
+		src/plugins/dummy/Makefile])
 
 AC_OUTPUT
 
@@ -616,8 +672,10 @@ AC_MSG_RESULT([  open    : $xenable_intf_open])
 AC_MSG_RESULT([  free    : $xenable_intf_free])
 AC_MSG_RESULT([  imb     : $xenable_intf_imb])
 AC_MSG_RESULT([  bmc     : $xenable_intf_bmc])
+AC_MSG_RESULT([  usb     : $xenable_intf_usb])
 AC_MSG_RESULT([  lipmi   : $xenable_intf_lipmi])
 AC_MSG_RESULT([  serial  : $xenable_intf_serial])
+AC_MSG_RESULT([  dummy   : $xenable_intf_dummy])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Extra tools])
 AC_MSG_RESULT([  ipmievd   : yes])

contrib/Makefile.am

@@ -34,6 +34,8 @@ dist_pkgdata_DATA = oem_ibm_sel_map
 
 EXTRA_DIST = README \
 	bmclanconf ipmi.init.basic ipmi.init.redhat \
+	exchange-bmc-os-info.init.redhat exchange-bmc-os-info.service.redhat \
+	exchange-bmc-os-info.sysconf log_bmc.sh\
 	ipmievd.init.redhat ipmievd.init.suse ipmievd.init.debian \
 	collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh \
 	bmc-snmp-proxy bmc-snmp-proxy.service bmc-snmp-proxy.sysconf

contrib/bmc-snmp-proxy

@@ -174,7 +174,7 @@ bmc_alert_dest()
 	# Pick the first active LAN channel
         for CHANNEL in `seq 1 14`
         do
-                [ $(${IPMI_TOOL} -I open channel info ${CHANNEL} 2>/dev/null \
+                [ $(${IPMITOOL} -I open channel info ${CHANNEL} 2>/dev/null \
                         | grep -q "802\.3") ] || break
         done
 

contrib/exchange-bmc-os-info.init.redhat

@@ -0,0 +1,326 @@
+#!/bin/sh
+#############################################################################
+#
+# exchange-bmc-os-info: Set OS and BMC (Baseboard Management Controller)
+#			 parameters during system startup.
+#
+# version:	0.72
+#
+# Authors:	Charles Rose <charles_rose@dell.com>
+#		Jordan Hargrave <jordan_hargrave@dell.com>
+#
+# Description:  Script to set OS information in the BMC; fetch BMC IP/URL
+#		and set in the OS for use by other scripts/user.
+#
+#		BMC IP and URL are made available in /var/run/bmc-info
+#
+#		Example to launch BMC web-interface:
+#		# . /var/run/bmc-info
+#		# xdg-open $BMC_URL
+#
+#		See here for details:
+#		https://fedoraproject.org/wiki/Features/AgentFreeManagement
+#
+# OEM Specific: OEM specific ipmi commands go in:
+#		'oem_set_os_version' and 'oem_get_bmc_url'
+#############################################################################
+#
+# chkconfig: 345 99 00
+# description: Set OS name, hostname in BMC; make BMC IP/URL available in OS
+# processname: exchange-bmc-os-info
+# config:      /etc/sysconfig/exchange-bmc-os-info
+#
+### BEGIN INIT INFO
+# Provides:          exchange-bmc-os-info
+# Required-Start:    ipmi
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
+
+
+#############################################################################
+# GLOBALS
+#############################################################################
+CONFIGFILE=/etc/sysconfig/exchange-bmc-os-info
+IPMI_TOOL=/usr/bin/ipmitool
+BMC_INFO=/var/run/bmc-info
+
+# BMC Manufacturer ID used in 'oem_set_os_version' and 'oem_get_bmc_url'
+DELL="674"
+#OTHER_OEM="123"
+
+# Defaults for ${CONFIGFILE}
+SET_OS_INFO="yes"
+RESET_OS_INFO="no"
+SET_BMC_INFO="yes"
+
+# getsysinfo and setsysinfo commands
+IPMI_SET_SYSINFO="${IPMI_TOOL} mc setsysinfo"
+IPMI_GET_SYSINFO="${IPMI_TOOL} mc getsysinfo"
+#############################################################################
+SCRIPT_NAME=$(basename $0)
+
+# source config
+[ -r ${CONFIGFILE} ] && . ${CONFIGFILE}
+
+RETVAL=0
+
+if [ -f /bin/gettext.sh ]; then
+	GETTEXT=1
+	. /bin/gettext.sh
+	OUTPUT="eval_gettext"
+else
+	GETTEXT=0
+	OUTPUT="echo"
+fi
+
+#############################################################################
+# Get Vendor ID of BMC for use in 'oem_set_os_version' and 'oem_get_bmc_url'
+#
+get_bmc_vendor_id()
+{
+	BMC_VENDOR=$(${IPMI_TOOL} mc info 2>/dev/null | \
+		sed -n "s#^Manufacturer ID.*: ##p")
+	[ -z "${BMC_VENDOR}" ] && RETVAL=4
+}
+
+check_ipmitool()
+{
+	if [ -x ${IPMI_TOOL} ]; then
+	# v1.8.12 plus patches are required for set/getsysinfo support
+	# http://sourceforge.net/mailarchive/message.php?msg_id=29647222
+		[ ! ${IPMI_GET_SYSINFO} >/dev/null 2>&1 ] && \
+			RETVAL=3
+	else
+		RETVAL=2
+	fi
+}
+
+bmc_exists()
+{
+	check_ipmitool
+	[ $RETVAL -eq 0 ] && get_bmc_vendor_id
+	return $RETVAL
+}
+#############################################################################
+
+get_os_info()
+{
+	OS_HOSTNAME=$(hostname)
+	KERNEL_VERSION=$(uname -r -m)
+
+	if  [ -e /etc/lsb-release ] ; then
+		. /etc/lsb-release
+		NAME=${DISTRIB_ID}
+		VERSION="${DISTRIB_RELEASE} ${DISTRIB_CODENAME}"
+	fi
+
+	# we prefer systemd's /etc/os-release over other sources
+	[ -e /etc/os-release ] && . /etc/os-release
+
+	OS_NAME=${NAME}
+	OS_VERSION="${VERSION} kernel ${KERNEL_VERSION}"
+}
+
+oem_set_os_version()
+{
+	# OS Version setting is not standard yet
+	# we need per vendor oem commands
+	case "${BMC_VENDOR}" in
+		$DELL) ${IPMI_SET_SYSINFO} delloem_os_version \
+				"${OS_VERSION}" > /dev/null 2>&1
+			return $?
+			;;
+# Add OEM specific commands.
+# Example:
+#		$OTHER_OEM) ${IPMI_SET_SYSINFO} otheroem_os_version \
+#				"${OS_VERSION}" > /dev/null 2>&1
+#			return $?
+#			;;
+		*) 	return 0
+			;;
+	esac
+}
+
+set_os_info()
+{
+	# Set and reset OS info in the BMC
+	if [ "$1" = "reset" ]; then
+		OS_NAME=""
+		OS_HOSTNAME=""
+		OS_VERSION=""
+	fi
+
+	${IPMI_SET_SYSINFO} os_name "${OS_NAME}" >/dev/null 2>&1 \
+		|| RETVAL=6
+	${IPMI_SET_SYSINFO} primary_os_name "${OS_NAME}" >/dev/null 2>&1 \
+		|| RETVAL=6
+	${IPMI_SET_SYSINFO} system_name "${OS_HOSTNAME}" >/dev/null 2>&1 \
+		|| RETVAL=6
+	oem_set_os_version || RETVAL=6
+}
+
+#############################################################################
+valid_url()
+{
+	url="(https?|http)://[a-z0-9-]+(\.[a-z0-9-]+)+([/?].*)?"
+	printf -- "%s" "${TMP_URL}"| grep -Eq "^${url}"
+	return $?
+}
+
+oem_get_bmc_url()
+{
+	# BMC URL is not standard yet
+	# we need per vendor oem commands
+	case "$BMC_VENDOR" in
+		$DELL)	TMP_URL=$(${IPMI_GET_SYSINFO} delloem_url 2> /dev/null)
+				;;
+# Add OEM specific commands
+# Example:
+#		$OTHER_OEM)
+#			TMP_URL=$(${IPMI_GET_SYSINFO} otheroem_url 2> /dev/null)
+#				;;
+		*)  TMP_URL=""	;;
+	esac
+
+	valid_url && BMC_URL=${TMP_URL} || BMC_URL=""
+}
+
+valid_ip()
+{
+	#Thanks to mkyong.com
+	octet="([01]?[[:digit:]][[:digit:]]?|2[0-4][[:digit:]]|25[0-5])"
+
+	printf -- "%s" "${TMP_IPv4}"| grep -Eq "^${octet}\\.${octet}\\.${octet}\\.${octet}$"
+	return $?
+}
+
+get_bmc_ip()
+{
+	#Thanks to http://ingvar.blog.redpill-linpro.com
+	for CHANNEL in `seq 1 14`
+	do
+		[ $(${IPMI_TOOL} lan print ${CHANNEL} 2>/dev/null \
+			| grep -q "^Set") ] || break
+	done
+
+	# Get BMC_IPv4 and BMC_URL from BMC
+	TMP_IPv4=$(${IPMI_TOOL} lan print ${CHANNEL} 2>/dev/null \
+			| sed -n "s#^IP Address  .*: ##p")
+
+	valid_ip && BMC_IPv4=${TMP_IPv4} || BMC_IPv4=""
+}
+
+get_bmc_info()
+{
+	get_bmc_ip
+	if [ -z "${BMC_IPv4}" ] || [ "${BMC_IPv4}" = "0.0.0.0" ]; then
+		BMC_IPv4=""
+		RETVAL=5
+	else
+		# URL makes sense only if there is an IP
+		oem_get_bmc_url
+	fi
+}
+
+set_bmc_info()
+{
+	if [ ! $(touch "${BMC_INFO}" && chmod 600 "${BMC_INFO}") ]; then
+		printf "BMC_IPv4=%s\n" "${BMC_IPv4}" > "${BMC_INFO}"
+		[ -n "${BMC_URL}" ] && \
+			printf "BMC_URL=%s\n" "${BMC_URL}" >> "${BMC_INFO}"
+	else
+		RETVAL=5
+	fi
+}
+
+unset_bmc_info()
+{
+	[ -f ${BMC_INFO} ] && rm -f ${BMC_INFO} > /dev/null 2>&1
+}
+
+#############################################################################
+start()
+{
+	if bmc_exists; then
+		[ "${SET_OS_INFO}" = "yes" ] && \
+			get_os_info && set_os_info
+
+		if [ "${SET_BMC_INFO}" = "yes" ]; then
+			get_bmc_info
+			if [ ${RETVAL} -eq 0 ]; then
+				set_bmc_info
+			fi
+		fi
+	fi
+}
+
+#############################################################################
+stop()
+{
+	if bmc_exists; then
+		# reset OS info while system reboots
+		# aids with debugging OS boot-up issues
+		if [ "${RESET_OS_INFO}" = "yes" ]; then
+			set_os_info reset
+		fi
+		unset_bmc_info
+	fi
+}
+
+#############################################################################
+restart()
+{
+	stop
+	[ $RETVAL -eq 0 ] && start
+}
+
+#############################################################################
+status()
+{
+	[ -r ${BMC_INFO} ] && \
+		grep -q "BMC_IPv4" "${BMC_INFO}" >/dev/null 1>&2 && \
+			BMC_STATUS="ok" || BMC_STATUS="inactive"
+	${OUTPUT} "${SCRIPT_NAME}: ${BMC_STATUS}" 1>&2
+	[ ${GETTEXT} -eq 1 ] && echo
+}
+
+#############################################################################
+usage()
+{
+	${OUTPUT} "Usage: ${SCRIPT_NAME} {start|stop|restart|status}" 1>&2
+	[ ${GETTEXT} -eq 1 ] && echo
+	RETVAL=1
+}
+
+#############################################################################
+# MAIN
+#############################################################################
+case "$1" in
+	start) start ;;
+	stop)  stop ;;
+	restart) restart ;;
+	status)	status ;;
+	*) usage ;;
+esac
+
+case "$RETVAL" in
+	0|1) ;;
+	2) ${OUTPUT} "${SCRIPT_NAME}: ipmitool(1) not found." 1>&2 ;;
+	3) ${OUTPUT} "${SCRIPT_NAME}: this version of ipmitool does not support getsysinfo." 1>&2 ;;
+	4) ${OUTPUT} "${SCRIPT_NAME}: failed to communicate with BMC." 1>&2 ;;
+	5) ${OUTPUT} "${SCRIPT_NAME}: failed to set OS information in BMC." 1>&2 ;;
+	6) ${OUTPUT} "${SCRIPT_NAME}: failed to get BMC information." 1>&2 ;;
+	*) ${OUTPUT} "${SCRIPT_NAME}: unexpected error." 1>&2 ;;
+esac
+
+if [ ${RETVAL} -gt 1 ]; then
+	${OUTPUT} " Return code: ${RETVAL}" 1>&2
+	[ ${GETTEXT} -eq 1 ] && echo
+fi
+
+
+exit ${RETVAL}
+
+#############################################################################
+# end of file
+#############################################################################

contrib/exchange-bmc-os-info.service.redhat

@@ -0,0 +1,13 @@
+[Unit]
+Description=Exchange Information between BMC and OS
+After=ipmi.service network.target
+Requires=ipmi.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/libexec/exchange-bmc-os-info start
+ExecStop=/usr/libexec/exchange-bmc-os-info stop
+
+[Install]
+WantedBy=multi-user.target

contrib/exchange-bmc-os-info.sysconf

@@ -0,0 +1,26 @@
+# exchange-bmc-os-info
+#
+# Config file to control Exchange of information between
+# the OS and Service Processor/Baseboard Management Controller (BMC)
+#
+# See here for details
+#    https://fedoraproject.org/wiki/Features/AgentFreeManagement
+
+### Set OS Info in BMC/Service Processor ###
+# Name: SET_OS_INFO
+# Description: Set OS Name, Version and Hostname in the Service Processor (BMC)
+# Default: yes
+SET_OS_INFO="yes"
+
+### Reset OS Info in BMC/Service Processor ###
+# Name: RESET_OS_INFO
+# Description: Reset OS Name, Version and Hostname in the Service Processor (BMC).
+# 		Useful when the OS Name/Hostname should be empty on reboot
+# Default: no
+RESET_OS_INFO="no"
+
+### Set BMC/Service Processor Info in OS ###
+# Name; SET_BMC_INFO
+# Description: Set IP Address and URL of Service Processor/BMC in /run/bmc-info
+# Default: yes
+SET_BMC_INFO="yes"

contrib/log_bmc.sh

@@ -0,0 +1,88 @@
+#!/bin/sh
+#############################################################################
+#
+# log_bmc.sh: Add SEL entries to indicate OS Boot/Install status.
+#
+# version:      0.1
+#
+# Authors:      Charles Rose <charles_rose@dell.com>
+#               Jordan Hargrave <jordan_hargrave@dell.com>
+#
+# Description:  Script to log OS boot/install status to the BMC. Primarily
+#		meant for use in automated installs and start up scripts.
+#		Will provide administrators with OS boot/install status in
+#		BMC and aid with debugging.
+#
+#               Example usage:
+#               # ./log_bmc.sh inst_start
+#               # ipmitool sel list
+#		b | 05/07/2014 | 12:07:32 | OS Boot | Installation started
+#
+#               See here for details:
+#               https://fedoraproject.org/wiki/Features/AgentFreeManagement
+#
+#############################################################################
+IPMI_CMD="/usr/bin/ipmitool"
+
+#############################################################################
+# SEL Event types from ipmi_sel.h
+OS_STOP="0x20"
+OS_BOOT="0x1f"
+# SEL Event data from ipmi_sel.h
+GRACEFUL_SHUTDOWN="0x03" # OS Stop/Shutdown: Installation started
+BOOT_COMPLETED="0x01" # OS Boot: Installation started
+INSTALL_STARTED="0x07" # OS Boot: Installation started
+INSTALL_COMPLETED="0x08" # OS Boot: Installation completed
+INSTALL_ABORTED="0x09" # OS Boot: Installation aborted
+INSTALL_FAILED="0x0a" # OS Boot: Installation failed
+
+##########################################################################
+
+# check for ipmi functionality.
+check_ipmi()
+{
+	# ensures presence of ipmitool and /dev/ipmi*
+	${IPMI_CMD} mc info > /dev/null 2>&1
+	[ $? -ne 0 ] && RETVAL=2
+}
+
+# Write out the events to SEL
+ipmi_sel_add()
+{
+	# Refer ipmitool(1) event for details on format.
+	printf "0x04 %s 0x00 0x6f %s 0x00 0x00" ${type} ${status} > \
+		${tmpfile} && \
+		${IPMI_CMD} sel add ${tmpfile} > /dev/null 2>&1
+	[ $? -ne 0 ] && RETVAL=3
+}
+
+### Main
+# Most of the status is for this event type
+tmpfile=$(/usr/bin/mktemp)
+RETVAL=0
+type=${OS_BOOT}
+
+case ${1} in
+	os_shutdown)   type=${OS_STOP}; status=${GRACEFUL_SHUTDOWN} ;;
+	os_boot)       status=${BOOT_COMPLETED} ;;
+	inst_start)    status=${INSTALL_STARTED} ;;
+	inst_complete) status=${INSTALL_COMPLETED} ;;
+	inst_abort)    status=${INSTALL_ABORTED} ;;
+	inst_fail)     status=${INSTALL_FAILED} ;;
+	*)             RETVAL=1 ;;
+esac
+
+[ ${RETVAL} -eq 0 ] && check_ipmi
+[ ${RETVAL} -eq 0 ] && ipmi_sel_add ${status}
+
+case ${RETVAL} in
+	0) ;;
+	1) printf -- %s\\n "Usage: $0 <os_boot|os_shutdown|inst_start|inst_complete|inst_abort|inst_fail>" ;;
+	2) printf -- %s\\n "failed to communicate with BMC." ;;
+	3) printf -- %s\\n "error adding ipmi sel entry." ;;
+esac
+
+[ -f ${tmpfile} ] && rm -f ${tmpfile} > /dev/null 2>&1
+
+exit ${RETVAL}
+### End

doc/ipmitool.1

@@ -154,9 +154,6 @@ Set the local IPMB address.  The local address defaults to 0x20
 or is auto discovered on PICMG platforms when -m is not specified.
 There should be no need to change the local address for normal operation.
 .TP 
-\fB\-M\fR <\fIaddress\fP>
-Set transit local address for bridge request. (dual bridge)
-.TP 
 \fB\-N\fR <\fIsec\fP>
 Specify nr. of seconds between retransmissions of lan/lanplus messages.
 Defaults are 2 seconds for lan and 1 second for lanplus interfaces.
@@ -294,6 +291,7 @@ Commands:
         kontronoem   Manage Kontron OEM Extensions
         lan          Configure LAN Channels
         mc           Management Controller status and global enables
+        nm           Node Manager
         pef          Configure Platform Event Filtering (PEF)
         picmg        Run a PICMG/ATA extended command
         power        Shortcut to chassis power commands
@@ -1924,6 +1922,27 @@ ADMIN, issue the following command:
 
 > ipmitool \-I \fIinterface\fR lan set \fIchannel\fR cipher_privs uaXXXXXXXXXXXXX
 
+.TP
+
+\fIbad_pass_thresh\fP <\fBthresh_num\fR> <\fB1|0\fR> <\fBreset_interval\fR> <\fBlockout_interval\fR>
+.br
+
+Sets the Bad Password Threshold.
+
+<\fBthresh_num\fR> If non-zero, this value determines the number of sequential bad passwords
+that will be allowed to be entered for the identified user before the user is automatically
+disabled from access on the channel.
+
+<\fB1|0\fR> 1 = generate a Session Audit sensor "Invalid password disable" event message.
+0 = do not generate an event message when the user is disabled.
+
+<\fBreset_interval\fR> Attempt Count Reset Interval. The interval, in tens of seconds, for
+which the accumulated count of bad password attempts is retained before being automatically
+reset to zero.
+
+<\fBlockout_interval\fR> User Lockout Interval. The interval, in tens of seconds, that the user
+will remain disabled after being disabled because the Bad Password Threshold number was reached.
+
 .RE
 .TP
 \fIalert\fP \fIprint\fP [<\fBchannel\fR>] [<\fBalert destination\fR>]
@@ -2309,14 +2328,16 @@ Get boot parameter. Currently supported values for <\fBparam #\fR> are:
 .br 
 
 .TP 
-\fIset\fP <\fBoption\fR> [\fBvalue ...\fR]
+\fIset\fP <\fBdevice\fR> [<\fIoptions\fP=\fBhelp,...\fR>]
 .br 
 
-Set boot parameter.
+Set boot device parameter used for next boot.  Various options may be used
+to change when the the next boot device is cleared.
+Run \fI"options=help"\fP for a list of available bootparam set device options.
 
 .RS
 .TP 
-Currently supported values for \fB<option>\fR are:
+Currently supported bootparam \fBdevice\fR settings are:
 .TP 
 \fIforce_pxe\fP
 .br 
@@ -2349,9 +2370,306 @@ Force boot from CD/DVD
 Force boot into BIOS setup
 
 .RE
+.RS
+.TP 
+Currently supported bootparam \fBoptions\fR settings are associated with BMC Boot Valid Bit Clearing and are as follows:   Any option can be prefixed with "no-" to invert the sense of the operation.
+.TP 
+\fIPEF\fP
+.br 
+
+Clear valid bit on reset/power cycle caused by PEF
+.TP 
+\fItimeout\fP
+.br 
+
+Automatically clear boot flag valid bit if Chassis Control command is
+not received within 60 seconds.
+.TP 
+\fIwatchdog\fP
+.br 
+
+Clear valid bit on reset/power cycle caused by watchdog timeout
+.TP 
+\fIreset\fP
+.br 
+
+Clear valid bit on push button reset / soft-reset
+.TP 
+\fIpower\fP
+.br 
+
+Clear valid bit on power up via power push button or wake event
+
 .RE
 .RE
 .RE
+.RE
+.TP
+\fInm\fP
+.RS
+.TP
+\fIalert\fP
+.RS
+.TP
+\fIclear dest\fP <\fBdest\fR>
+.br
+
+Clear the Node Manager Alert lan destination.
+
+.RE
+.RS
+.TP
+\fIget\fP
+.br
+Get the Node Manager Alert settings.
+
+.RE
+.RS
+.TP
+\fIset chan\fP <\fBchan\fR> \fIdest\fP <\fBdest\fR> \fIstring\fP <\fBstring\fR>
+.br
+
+Set the Node Manager alert channel, lan destination, and alert string number.
+
+.RE
+.TP
+\fIcapability\fP
+.br
+
+Obtain the Node Manager power control capabilities and ranges.
+
+.TP
+\fIcontrol\fP
+.RS
+.TP
+\fIenable\fP|\fIdisable \fP
+.RS
+.TP
+\fIglobal\fP
+.br
+
+Enable/disable all policies for all domains.
+.TP
+\fIper_domain\fP <platform|CPU|Memory>
+.br
+
+Enable/disable all policies of the specified domain.
+.TP
+\fIper_policy\fP <0-7>
+.br
+
+Enable/disable the policy for the specified domain/policy combination.
+.RE
+.RE
+.TP
+\fIdiscover\fP
+.br
+
+Discover Node Manager presence as well as the Node Manager version, revision, and patch number.
+
+.TP
+\fIpolicy\fP
+.RS
+.TP
+\fIadd\fP
+.RS
+.TP
+\fIpower\fP <watts> \fIpolicy_id\fP <0-7> [\fIcorrection\fP auto|soft|hard] \fItrig_lim\fP <seconds> \fIstats\fP <seconds> [\fIdomain\fP <platform|CPU|Memory>] \fIenable\fP|\fIdisable\fP
+.br
+
+Add a new power policy, or overwrite an existing policy.
+The \fIcorrection\fP parameter is the agressiveness of frequency limiting, default is auto.
+The \fItrig_lim\fP is the correction time limit and must be at least 6000 and not greater than 65535.
+The \fIstats\fP setting is the averaging period in seconds and ranges from 1-65535.
+If domain is not supplied a default of platform is used.
+
+
+.TP
+\fIinlet\fP <temp> \fIpolicy_id\fP <0-7> [\fIcorrection\fP auto|soft|hard] \fItrig_lim\fP <seconds> \fIstats\fP <seconds> [\fIdomain\fP <platform|CPU|Memory>] \fIenable\fP|\fIdisable\fP
+.br
+
+Add a new inlet temp policy, or overwrite an existing policy.
+The \fIcorrection\fP parameter is the agressiveness of frequency limiting, default is auto.
+The \fItrig_lim\fP is the correction time limit and must be at least 6000 and not greater than 65535.
+The \fIstats\fP setting is the averaging period in seconds and ranges from 1-65535.
+If domain is not supplied a default of platform is used.
+
+
+.RE
+.TP
+\fIget\fP \fIpolicy_id\fP <0-7>
+.br
+
+Get a previously stored policy.
+.TP
+\fIlimiting\fP
+.br
+
+Report policy number if any policy is limiting power.
+.TP
+\fIremove\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Remove a policy. If domain is not supplied a default of platform is used.
+.RE
+.TP
+\fIpower\fP \fImin\fP <minimum> \fImax\fP <maximum> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Configure Node Manager power minumum and maximum power draw limits.
+The \fImin\fP and \fImax\fP values must be in the range of 0-65535.
+If domain is not supplied a default of platform is used.
+
+.RE
+.RS
+.TP
+\fIreset\fP
+.RS
+.TP
+\fIcomm\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager communication statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIglobal\fI 
+.br
+
+Reset Node Manager global statistics.
+
+.TP
+\fImemory\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager memory throttling statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIper_policy\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager per policy statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIrequests\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager unhandled requests statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIresponse\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager response time statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIthrottling\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager throttling statistics.
+If domain is not supplied a default of platform is used.
+
+.RE
+.TP
+\fIstatistics\fP
+.RS
+.TP
+\fIcomm_fail\fP
+.br
+
+Report Node Manager communication failure statistics.
+
+.TP
+\fIcpu_throttling\fP
+.br
+
+Report Node Manager cpu throttling statistics.
+
+.TP
+\fImem_throttling\fP
+.br
+
+Report Node Manager memory throttling statistics.
+
+.TP
+\fIpolicy_power\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Report Node Manager per policy power statistics (policy must be a power limit type policy).
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIpolicy_temps\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Report Node Manager per policy temp statistics (policy must be an inlet temp limit policy).
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIpolicy_throt\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Report Node Manager per policy throttling statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIrequests\fP
+.br
+
+Report Node Manager unhandled requests statistics.
+
+.TP
+\fIresponse\fP
+.br
+
+Report Node Manager response time statistics.
+
+.RE
+.TP
+\fIsuspend\fP
+.RS
+.TP
+\fIget\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Get Node Manager policy suspend periods.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIset\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>] <start> <stop> <repeat>
+.br
+
+Set Node Manager policy suspend periods.
+If domain is not supplied a default of platform is used.
+The <start> and <stop> values must be in the range of 0-239, which is the number of minutes past midnight divided by 6.
+The <repeat> value is the daily recurrence pattern. Bit 0 is repeat every Monday, bit 1 is repeat every Tuesday, on through bit 6 for Sunday.
+
+.RE
+.TP
+\fIthreshold\fP
+.RS
+.TP
+\fIget\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Get Node Manager policy Alert Threshold settings.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIset\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>] \fIthresh_array\fP
+.br
+
+Set Node Manager policy Alert Threshold values.
+If domain is not supplied a default of platform is used.
+The \fIthresh_array\fP is 1, 2, or 3 integers that set three alert threshold settings. The setting type is a power or temperature value which must match the type of policy.
+
+.RE
+.RE
+
 .TP 
 \fIpef\fP
 .RS
@@ -2942,10 +3260,19 @@ number.  The default is 1.
 This command may be used to read SPD (Serial Presence Detect) data using the 
 I2C Master Write\-Read IPMI command.
 
-.TP 
+.TP
 \fIsunoem\fP
 .RS
-.TP 
+.TP
+\fIcli\fP [<\fBcommand string\fR> ...]
+.br
+
+Execute the service processor command line interface commands.
+Without any command string, an interactive session is started
+in the service processor command line environ ment.  If a
+command string is specified, the command string is executed
+on the service processor and the connection is closed.
+.TP
 \fIled\fP
 .RS
 
@@ -2954,65 +3281,139 @@ on a Sun Microsystems server.  Use 'sdr list generic' to get a
 list of devices that are controllable LEDs.  The \fIledtype\fP
 parameter is optional and not necessary to provide on the command
 line unless it is required by hardware.
-.TP 
+.TP
 \fIget\fP <\fBsensorid\fR> [<\fBledtype\fR>]
 
 Get status of a particular LED described by a Generic Device Locator
 record in the SDR.  A sensorid of \fIall\fP will get the status
 of all available LEDS.
-.TP 
+.TP
 \fIset\fP <\fBsensorid\fR> <\fBledmode\fR> [<\fBledtype\fR>]
 
 Set status of a particular LED described by a Generic Device Locator
 record in the SDR.  A sensorid of \fIall\fP will set the status
 of all available LEDS to the specified \fIledmode\fP and \fIledtype\fP.
-.TP 
+.TP
 LED Mode is required for set operations:
-.br 
+.br
 \fIOFF\fP         Off
-.br 
+.br
 \fION\fP          Steady On
-.br 
+.br
 \fISTANDBY\fP     100ms on 2900ms off blink rate
-.br 
+.br
 \fISLOW\fP        1HZ blink rate
-.br 
+.br
 \fIFAST\fP        4HZ blink rate
-.TP 
+.TP
 LED Type is optional:
-.br 
+.br
 \fIOK2RM\fP       Ok to Remove
-.br 
+.br
 \fISERVICE\fP     Service Required
-.br 
+.br
 \fIACT\fP         Activity
-.br 
+.br
 \fILOCATE\fP      Locate
 
 .RE
-.TP 
-\fIfan\fP \fIspeed\fP <0-100>
+.TP
+\fInacname\fP <\fBipmi name\fR>
+.br
 
-Set system fan speed (PWM duty cycle).
-.RS
-.TP 
+Return the full NAC name of a target identified by ipmi name.
+.TP
+\fIping\fP <\fBcount\fR> [<\fBq\fR>]
+.br
+
+Send and receive count packets. Each packet is 64 bytes.
+
+q - Quiet. Displays output only at the start and end of the process.
+.TP
+\fIgetval\fP <\fBproperty name\fR>
+.br
+
+Returns value of specified ILOM property.
+.TP
+\fIsetval\fP <\fBproperty name\fR> <\fBproperty value\fR> [<\fBtimeout\fR>]
+.br
+
+Sets value of ILOM  property. If timeout is not specified, the
+default value is 5 seconds. NOTE: setval must be executed locally on host!
+.TP
 \fIsshkey\fP
 .RS
-.TP 
+.TP
 \fIset\fP <\fBuserid\fR> <\fBkeyfile\fR>
 
 This command will allow you to specify an SSH key to use for a particular
-user on the Service Processor.  This key will be used for CLI logins to
-the SP and not for IPMI sessions.  View available users and their userids
+user on the Service Processor. This key will be used for CLI logins to
+the SP and not for IPMI sessions. View available users and their userids
 with the 'user list' command.
-.TP 
+.TP
 \fIdel\fP <\fBuserid\fR>
 
 This command will delete the SSH key for a specified userid.
 .RE
+.TP
+\fIversion\fP
+.br
+
+Display the version of ILOM firmware.
+.TP
+\fIgetfile\fP <\fBfile identifier\fR> <\fBdestination file name\fR>
+.br
+
+This command will return various files from service processor and store them
+in specified destination file. Note that some files may not be present or
+be supported by your SP.
+.br
+
+.RS
+File identifiers:
+.RS
+.br
+\fISSH_PUBKEYS\fP
+.br
+\fIDIAG_PASSED\fP
+.br
+\fIDIAG_FAILED\fP
+.br
+\fIDIAG_END_TIME\fP
+.br
+\fIDIAG_INVENTORY\fP
+.br
+\fIDIAG_TEST_LOG\fP
+.br
+\fIDIAG_START_TIME\fP
+.br
+\fIDIAG_UEFI_LOG\fP
+.br
+\fIDIAG_TEST_LOG\fP
+.br
+\fIDIAG_LAST_LOG\fP
+.br
+\fIDIAG_LAST_CMD\fP
 .RE
 .RE
 
+.TP
+\fIgetbehavior\fP <\fBfeature identifier\fR>
+.br
+
+This command will test if various ILOM features are enabled.
+.br
+
+.RS
+Feature identifiers:
+.RS
+.br
+\fISUPPORTS_SIGNED_PACKAGES\fP
+.br
+\fIREQUIRES_SIGNED_PACKAGES\fP
+.RE
+.RE
+.RE
 .TP
 \fItsol\fP
 .RS

include/ipmitool/Makefile.am

@@ -30,7 +30,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_HEADERS = log.h bswap.h helper.h ipmi.h ipmi_cc.h ipmi_intf.h \
+noinst_HEADERS = log.h bswap.h hpm2.h helper.h ipmi.h ipmi_cc.h ipmi_intf.h \
 	ipmi_chassis.h ipmi_entity.h ipmi_fru.h ipmi_hpmfwupg.h ipmi_lanp.h \
 	ipmi_sdr.h ipmi_sel.h ipmi_sol.h ipmi_mc.h ipmi_raw.h \
 	ipmi_channel.h ipmi_sensor.h ipmi_event.h ipmi_session.h \
@@ -38,5 +38,5 @@ noinst_HEADERS = log.h bswap.h helper.h ipmi.h ipmi_cc.h ipmi_intf.h \
 	ipmi_oem.h ipmi_sdradd.h ipmi_isol.h ipmi_sunoem.h ipmi_picmg.h \
 	ipmi_fwum.h ipmi_main.h ipmi_tsol.h ipmi_firewall.h \
 	ipmi_kontronoem.h ipmi_ekanalyzer.h ipmi_gendev.h ipmi_ime.h \
-	ipmi_delloem.h ipmi_dcmi.h
+	ipmi_delloem.h ipmi_dcmi.h ipmi_vita.h
 

include/ipmitool/helper.h

@@ -83,9 +83,12 @@ int str2ushort(const char * str, uint16_t * ushrt_ptr);
 int str2char(const char * str, int8_t * chr_ptr);
 int str2uchar(const char * str, uint8_t * uchr_ptr);
 
+int eval_ccode(const int ccode);
+
 int is_fru_id(const char *argv_ptr, uint8_t *fru_id_ptr);
 int is_ipmi_channel_num(const char *argv_ptr, uint8_t *channel_ptr);
 int is_ipmi_user_id(const char *argv_ptr, uint8_t *ipmi_uid_ptr);
+int is_ipmi_user_priv_limit(const char *argv_ptr, uint8_t *ipmi_priv_limit_ptr);
 
 uint16_t str2val(const char * str, const struct valstr * vs);
 void print_valstr(const struct valstr * vs, const char * title, int loglevel);
@@ -99,6 +102,7 @@ void printbuf(const uint8_t * buf, int len, const char * desc);
 uint8_t ipmi_csum(uint8_t * d, int s);
 FILE * ipmi_open_file(const char * file, int rw);
 void ipmi_start_daemon(struct ipmi_intf *intf);
+uint16_t ipmi_get_oem_id(struct ipmi_intf *intf);
 
 #define ipmi_open_file_read(file)	ipmi_open_file(file, 0)
 #define ipmi_open_file_write(file)	ipmi_open_file(file, 1)

include/ipmitool/hpm2.h

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2012 Pigeon Point Systems.  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 Pigeon Point Systems nor 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.
+ * PIGEON POINT SYSTEMS ("PPS") 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
+ * PPS 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 PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdint.h>
+#include <ipmitool/ipmi_intf.h>
+
+/* Global HPM.2 defines */
+#define HPM2_REVISION		0x01
+#define HPM3_REVISION		0x01
+#define HPM2_LAN_PARAMS_REV	0x01
+#define HPM2_SOL_PARAMS_REV	0x01
+#define HPM3_LAN_PARAMS_REV	0x01
+/* IPMI defines parameter revision as
+ * MSN = present revision,
+ * LSN = oldest revision parameter is
+ * backward compatible with. */
+#define LAN_PARAM_REV(x, y)	((x) << 4 | (y) & 0xF)
+
+/* HPM.2 capabilities */
+#define HPM2_CAPS_SOL_EXTENSION		0x01
+#define HPM2_CAPS_PACKET_TRACE		0x02
+#define HPM2_CAPS_EXT_MANAGEMENT	0x04
+#define HPM2_CAPS_VERSION_SENSOR	0x08
+#define HPM2_CAPS_DYNAMIC_SESSIONS	0x10
+
+#if HAVE_PRAGMA_PACK
+# pragma pack(push, 1)
+#endif
+
+/* HPM.2 LAN attach capabilities */
+struct hpm2_lan_attach_capabilities {
+	uint8_t hpm2_revision_id;
+	uint16_t lan_channel_mask;
+	uint8_t hpm2_caps;
+	uint8_t hpm2_lan_params_start;
+	uint8_t hpm2_lan_params_rev;
+	uint8_t hpm2_sol_params_start;
+	uint8_t hpm2_sol_params_rev;
+} ATTRIBUTE_PACKING;
+
+/* HPM.2 LAN channel capabilities */
+struct hpm2_lan_channel_capabilities {
+	uint8_t capabilities;
+	uint8_t attach_type;
+	uint8_t bandwidth_class;
+	uint16_t max_inbound_pld_size;
+	uint16_t max_outbound_pld_size;
+} ATTRIBUTE_PACKING;
+
+#if HAVE_PRAGMA_PACK
+# pragma pack(pop)
+#endif
+
+/* HPM.2 command assignments */
+#define HPM2_GET_LAN_ATTACH_CAPABILITIES	0x3E
+
+extern int hpm2_get_capabilities(struct ipmi_intf * intf,
+		struct hpm2_lan_attach_capabilities * caps);
+extern int hpm2_get_lan_channel_capabilities(struct ipmi_intf * intf,
+		uint8_t hpm2_lan_params_start,
+		struct hpm2_lan_channel_capabilities * caps);
+extern int hpm2_detect_max_payload_size(struct ipmi_intf * intf);

include/ipmitool/ipmi.h

@@ -260,6 +260,7 @@ typedef enum IPMI_OEM {
      IPMI_OEM_HITACHI_116 = 116,
      IPMI_OEM_NEC        = 119,
      IPMI_OEM_TOSHIBA    = 186,
+     IPMI_OEM_ERICSSON   = 193,
      IPMI_OEM_INTEL      = 343,
      IPMI_OEM_TATUNG     = 373,
      IPMI_OEM_HITACHI_399 = 399,
@@ -269,7 +270,9 @@ typedef enum IPMI_OEM {
      IPMI_OEM_BROADCOM   = 4413,
      IPMI_OEM_MAGNUM     = 5593,
      IPMI_OEM_TYAN       = 6653,
+     IPMI_OEM_QUANTA     = 7244,
      IPMI_OEM_NEWISYS    = 9237,
+     IPMI_OEM_ADVANTECH  = 10297,
      IPMI_OEM_FUJITSU_SIEMENS = 10368,
      IPMI_OEM_AVOCENT    = 10418,
      IPMI_OEM_PEPPERCON  = 10437,
@@ -281,7 +284,8 @@ typedef enum IPMI_OEM {
      IPMI_OEM_KONTRON    = 15000,
      IPMI_OEM_PPS        = 16394,
      IPMI_OEM_AMI        = 20974,
-     IPMI_OEM_NOKIA_SIEMENS_NETWORKS = 28458
+     IPMI_OEM_NOKIA_SIEMENS_NETWORKS = 28458,
+     IPMI_OEM_SUPERMICRO_47488 = 47488
 } IPMI_OEM;
 
 extern const struct valstr completion_code_vals[];

include/ipmitool/ipmi_channel.h

@@ -40,6 +40,7 @@
 
 
 #define IPMI_GET_CHANNEL_AUTH_CAP      0x38
+#define IPMI_SET_CHANNEL_ACCESS        0x40
 #define IPMI_GET_CHANNEL_ACCESS        0x41
 #define IPMI_GET_CHANNEL_INFO          0x42
 #define IPMI_SET_USER_ACCESS           0x43
@@ -49,6 +50,32 @@
 #define IPMI_SET_USER_PASSWORD         0x47
 #define IPMI_GET_CHANNEL_CIPHER_SUITES 0x54
 
+/* These are for channel_info_t.session_support */
+#define IPMI_CHANNEL_SESSION_LESS 0x00
+#define IPMI_CHANNEL_SESSION_SINGLE 0x40
+#define IPMI_CHANNEL_SESSION_MULTI 0x80
+#define IPMI_CHANNEL_SESSION_BASED 0xC0
+
+/* (22.24) Get Channel Info */
+struct channel_info_t {
+	uint8_t channel;
+	uint8_t medium;
+	uint8_t protocol;
+	uint8_t session_support;
+	uint8_t active_sessions;
+	uint8_t vendor_id[3];
+	uint8_t aux_info[2];
+};
+
+/* (22.23) Get Channel Access */
+struct channel_access_t {
+	uint8_t access_mode;
+	uint8_t alerting;
+	uint8_t channel;
+	uint8_t per_message_auth;
+	uint8_t privilege_limit;
+	uint8_t user_level_auth;
+};
 
 /*
  * The Get Authentication Capabilities response structure
@@ -101,153 +128,12 @@ struct get_channel_auth_cap_rsp {
 #pragma pack(0)
 #endif
 
-
-
-/*
- * The Get Channel Info response structure
- * From table 22-29 of the IPMI v2.0 spec
- */
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(1)
-#endif
-struct get_channel_info_rsp {
-#if WORDS_BIGENDIAN
-	uint8_t __reserved1       : 4; 
-	uint8_t channel_number    : 4; /* channel number */
-#else
-	uint8_t channel_number    : 4; /* channel number */
-	uint8_t __reserved1       : 4; 
-#endif
-#if WORDS_BIGENDIAN
-	uint8_t __reserved2       : 1;
-	uint8_t channel_medium    : 7; /* Channel medium type per table 6-3 */
-#else
-	uint8_t channel_medium    : 7; /* Channel medium type per table 6-3 */
-	uint8_t __reserved2       : 1;
-#endif
-#if WORDS_BIGENDIAN
-	uint8_t __reserved3       : 3;
-	uint8_t channel_protocol  : 5; /* Channel protocol per table 6-2 */
-#else
-	uint8_t channel_protocol  : 5; /* Channel protocol per table 6-2 */
-	uint8_t __reserved3       : 3;
-#endif
-#if WORDS_BIGENDIAN
-	uint8_t session_support   : 2; /* Description of session support */
-	uint8_t active_sessions   : 6; /* Count of active sessions */
-#else
-	uint8_t active_sessions   : 6; /* Count of active sessions */
-	uint8_t session_support   : 2; /* Description of session support */
-#endif
-	uint8_t vendor_id[3]; /* For OEM that specified the protocol */
-	uint8_t aux_info[2];  /* Not used*/
-} ATTRIBUTE_PACKING;
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(0)
-#endif
-
-
-
-/*
- * The Get Channel Access response structure
- * From table 22-28 of the IPMI v2.0 spec
- */
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(1)
-#endif
-struct get_channel_access_rsp {
-#if WORDS_BIGENDIAN
-	uint8_t __reserved1        : 2;
-	uint8_t alerting           : 1;
-	uint8_t per_message_auth   : 1;
-	uint8_t user_level_auth    : 1;
-	uint8_t access_mode        : 3;
-#else
-	uint8_t access_mode        : 3;
-	uint8_t user_level_auth    : 1;
-	uint8_t per_message_auth   : 1;
-	uint8_t alerting           : 1;
-	uint8_t __reserved1        : 2;
-#endif
-#if WORDS_BIGENDIAN
-	uint8_t __reserved2        : 4;
-	uint8_t channel_priv_limit : 4; /* Channel privilege level limit */
-#else
-	uint8_t channel_priv_limit : 4; /* Channel privilege level limit */
-	uint8_t __reserved2        : 4;
-#endif
-} ATTRIBUTE_PACKING;
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(0)
-#endif
-
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(1)
-#endif
-struct get_user_access_rsp {
-#if WORDS_BIGENDIAN
-	uint8_t __reserved1        : 2;
-	uint8_t max_user_ids       : 6;
-	uint8_t __reserved2        : 2;
-	uint8_t enabled_user_ids   : 6;
-	uint8_t __reserved3        : 2;
-	uint8_t fixed_user_ids     : 6;
-	uint8_t __reserved4        : 1;
-	uint8_t callin_callback    : 1;
-	uint8_t link_auth          : 1;
-	uint8_t ipmi_messaging     : 1;
-	uint8_t privilege_limit    : 4;
-#else
-	uint8_t max_user_ids       : 6;
-	uint8_t __reserved1        : 2;
-	uint8_t enabled_user_ids   : 6;
-	uint8_t __reserved2        : 2;
-	uint8_t fixed_user_ids     : 6;
-	uint8_t __reserved3        : 2;
-	uint8_t privilege_limit    : 4;
-	uint8_t ipmi_messaging     : 1;
-	uint8_t link_auth          : 1;
-	uint8_t callin_callback    : 1;
-	uint8_t __reserved4        : 1;
-#endif
-} ATTRIBUTE_PACKING;
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(0)
-#endif
-
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(1)
-#endif
-struct set_user_access_data {
-#if WORDS_BIGENDIAN
-	uint8_t change_bits        : 1;
-	uint8_t callin_callback    : 1;
-	uint8_t link_auth          : 1;
-	uint8_t ipmi_messaging     : 1;
-	uint8_t channel            : 4;
-	uint8_t __reserved1        : 2;
-	uint8_t user_id            : 6;
-	uint8_t __reserved2        : 4;
-	uint8_t privilege_limit    : 4;
-	uint8_t __reserved3        : 4;
-	uint8_t session_limit      : 4;
-#else
-	uint8_t channel            : 4;
-	uint8_t ipmi_messaging     : 1;
-	uint8_t link_auth          : 1;
-	uint8_t callin_callback    : 1;
-	uint8_t change_bits        : 1;
-	uint8_t user_id            : 6;
-	uint8_t __reserved1        : 2;
-	uint8_t privilege_limit    : 4;
-	uint8_t __reserved2        : 4;
-	uint8_t session_limit      : 4;
-	uint8_t __reserved3        : 4;
-#endif
-} ATTRIBUTE_PACKING;
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(0)
-#endif
+int _ipmi_get_channel_access(struct ipmi_intf *intf,
+		struct channel_access_t *channel_access,
+		uint8_t get_volatile_settings);
+int _ipmi_set_channel_access(struct ipmi_intf *intf,
+		struct channel_access_t channel_access, uint8_t access_option,
+		uint8_t privilege_option);
 
 uint8_t ipmi_get_channel_medium(struct ipmi_intf * intf, uint8_t channel);
 uint8_t ipmi_current_channel_medium(struct ipmi_intf * intf);

include/ipmitool/ipmi_dcmi.h

@@ -52,6 +52,53 @@
 #define GOOD_PWR_GLIMIT_CCODE(ccode) ((ccode = ((ccode == 0x80) ? 0 : ccode)))
 #define GOOD_ASSET_TAG_CCODE(ccode) ((ccode = (((ccode == 0x80) || (ccode == 0x81) || (ccode == 0x82) || (ccode == 0x83)) ? 0 : ccode)))
 
+/* External Node Manager Configuration and Control Commands per spec 2.0 */
+
+#define IPMI_NM_POLICY_CTL     0xC0
+#define IPMI_NM_SET_POLICY     0xC1
+#define IPMI_NM_GET_POLICY     0xC2
+#define IPMI_NM_SET_ALERT_TH   0xC3
+#define IPMI_NM_GET_ALERT_TH   0xC4
+#define IPMI_NM_SET_SUSPEND    0xC5
+#define IPMI_NM_GET_SUSPEND    0xC6
+#define IPMI_NM_RESET_STATS    0xC7
+#define IPMI_NM_GET_STATS      0xC8
+#define IPMI_NM_GET_CAP        0xC9
+#define IPMI_NM_GET_VERSION    0xCA
+#define IPMI_NM_SET_POWER      0xCB
+#define IPMI_NM_SET_ALERT_DS   0xCE
+#define IPMI_NM_GET_ALERT_DS   0xCF
+#define IPMI_NM_LIMITING       0xF2
+
+/* Node Manager Policy Control Flags */
+#define IPMI_NM_GLOBAL_ENABLE  0x01
+#define IPMI_NM_DOMAIN_ENABLE  0x02
+#define IPMI_NM_PER_POLICY_ENABLE  0x04
+
+/* Node Manager Set Policy Enable */
+#define IPMI_NM_POLICY_ENABLE  0x10
+
+/* Node Manager Policy Trigger Codes */
+#define IPMI_NM_NO_POLICY_TRIG 0x00
+#define IPMI_NM_TEMP_TRIGGER   0x01
+#define IPMI_NM_NO_READ_TRIG   0x02
+#define IPMI_NM_RESET_TRIGGER  0x03
+#define IPMI_NM_BOOT_TRIGGER   0x04
+
+/* Policy Exception Actions flags */
+#define IPMI_NM_POLICY_ALERT  0x01
+#define IPMI_NM_POLICY_SHUT   0x02
+
+/* Power Correction codes for Policy action */
+#define IPMI_NM_PWR_AUTO_CORR 0x00
+#define IPMI_NM_PWR_SOFT_CORR 0x01
+#define IPMI_NM_PWR_AGGR_CORR 0x02
+
+/* Set Threshold message size */
+#define IPMI_NM_SET_THRESH_LEN 12
+
+/* Number of Suspend Periods */
+#define IPMI_NM_SUSPEND_PERIOD_MAX 5
 
 struct dcmi_cmd {
     uint16_t val;
@@ -126,4 +173,98 @@ struct thermal_limit {
 
 int ipmi_dcmi_main(struct ipmi_intf * intf, int argc, char ** argv);
 
+/* Node Manager discover command */
+struct nm_discover {
+    uint8_t intel_id[3]; /* Always returns 000157 */
+    uint8_t nm_version;
+    uint8_t ipmi_version;
+    uint8_t patch_version;
+    uint8_t major_rev;
+    uint8_t minor_rev;
+} __attribute__ ((packed));
+
+/* Node Manager get capabilites command */
+struct nm_capability {
+    uint8_t  intel_id[3];
+    uint8_t  max_settings;
+    uint16_t max_value; /* max power/thermal/time after reset */
+    uint16_t min_value; /* min ""                             */
+    uint32_t min_corr;  /* min correction time inmillesecs */
+    uint32_t max_corr;
+    uint16_t min_stats;
+    uint16_t max_stats;
+    uint8_t  scope;
+} __attribute__ ((packed));
+
+/* Node Manager get statistics command */
+struct nm_statistics {
+    uint8_t  intel_id[3];
+    uint16_t curr_value;
+    uint16_t min_value;
+    uint16_t max_value;
+    uint16_t ave_value;
+    uint32_t time_stamp;
+    uint32_t stat_period;
+    uint8_t  id_state;
+} __attribute__ ((packed));
+
+/* Node Manager set policy */
+struct nm_policy {
+    uint8_t  intel_id[3];
+    uint8_t  domain;       /* 0:3 are domain, 4 = Policy enabled */
+    uint8_t  policy_id;
+    uint8_t  policy_type;  /* 0:3 trigger type 4 = action 5:6 correction */
+    uint8_t  policy_exception;   /* exception actions */
+    uint16_t policy_limits;
+    uint32_t corr_time;
+    uint16_t trigger_limit;
+    uint16_t stats_period;
+} __attribute__ ((packed));
+
+/* Node Maager get policy */
+struct nm_get_policy {
+    uint8_t  intel_id[3];
+    uint8_t  domain;       /* 0:3 are domain, 4 = Policy enabled */
+    uint8_t  policy_type;  /* 0:3 trigger type 4 = action 5:6 correction */
+    uint8_t  policy_exception;   /* exception actions */
+    uint16_t policy_limits;
+    uint32_t corr_time;
+    uint16_t trigger_limit;
+    uint16_t stats_period;
+} __attribute__ ((packed));
+
+/* Node Manager set alert destination */
+struct nm_set_alert {
+    uint8_t  intel_id[3];
+    uint8_t  chan;           /* 0:3 BMC chan, 4:6 reserved, bit 7=0 register alert reciever =1 invalidate */
+    uint8_t  dest;           /* lan destination */
+    uint8_t  string;         /* alert string selector  */
+} __attribute__ ((packed));
+
+/* Node Manager set alert threshold */
+struct nm_thresh {
+    uint8_t  intel_id[3];
+    uint8_t  domain;       /* 0:3 are domain, 4 = Policy enabled */
+    uint8_t  policy_id;
+    uint8_t  count;
+    uint16_t thresholds[3];
+} __attribute__ ((packed));
+
+/* Node Manager suspend period struct */
+struct nm_period {
+    uint8_t  start;
+    uint8_t  stop;
+    uint8_t  repeat;
+} __attribute__ ((packed));
+
+/* Node Manager set suspend period */
+struct nm_suspend {
+    uint8_t  intel_id[3];
+    uint8_t  domain;       /* 0:3 are domain, 4 = Policy enabled */
+    uint8_t  policy_id;
+    uint8_t  count;
+    struct nm_period period[IPMI_NM_SUSPEND_PERIOD_MAX];
+} __attribute__ ((packed));
+
+int ipmi_nm_main(struct ipmi_intf * intf, int argc, char ** argv);
 #endif /*IPMI_DCMI_H*/

include/ipmitool/ipmi_delloem.h

@@ -72,6 +72,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define	IDRAC_11G					1
 #define	IDRAC_12G					2
+#define	IDRAC_13G					3
 // Return Error code for license
 #define	LICENSE_NOT_SUPPORTED		0x6F
 #define	VFL_NOT_LICENSED			0x33
@@ -184,6 +185,9 @@ typedef struct _lcd_mode
 #define IMC_IDRAC_12G_MONOLITHIC 	(uint8_t) (0x10)
 #define IMC_IDRAC_12G_MODULAR 		(uint8_t) (0x11)
 
+#define IMC_IDRAC_13G_MONOLITHIC 	(uint8_t) (0x20)
+#define IMC_IDRAC_13G_MODULAR 		(uint8_t) (0x21)
+#define IMC_IDRAC_13G_DCS			(uint8_t) (0x22)
 
 
 typedef struct

include/ipmitool/ipmi_fru.h

@@ -63,6 +63,8 @@ enum {
 struct fru_info {
 	uint16_t size;
 	uint8_t access:1;
+	uint8_t max_read_size;
+	uint8_t max_write_size;
 };
 
 #ifdef HAVE_PRAGMA_PACK
@@ -70,13 +72,16 @@ struct fru_info {
 #endif
 struct fru_header {
 	uint8_t version;
-	struct {
-		uint8_t internal;
-		uint8_t chassis;
-		uint8_t board;
-		uint8_t product;
-		uint8_t multi;
-	} offset;
+	union {
+		struct {
+			uint8_t internal;
+			uint8_t chassis;
+			uint8_t board;
+			uint8_t product;
+			uint8_t multi;
+		} offset;
+		uint8_t offsets[5];
+	};
 	uint8_t pad;
 	uint8_t checksum;
 }ATTRIBUTE_PACKING;
@@ -598,6 +603,20 @@ static const char * chassis_type_desc[] __attribute__((unused)) = {
 	    "AdvancedTCA", "Blade", "Blade Enclosure"
 };
 
+typedef struct ipmi_fru_bloc {
+	struct ipmi_fru_bloc * next;
+	uint16_t start;
+	uint16_t size;
+	uint8_t  blocId[32];
+} t_ipmi_fru_bloc;
+
+static const char *section_id[4] = {
+	"Internal Use Section",
+	"Chassis Section",
+	"Board Section",
+	"Product Section"
+};
+
 int ipmi_fru_main(struct ipmi_intf *intf, int argc, char **argv);
 int ipmi_fru_print(struct ipmi_intf *intf, struct sdr_record_fru_locator *fru);
 

include/ipmitool/ipmi_fwum.h

@@ -0,0 +1,243 @@
+/*
+ * 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.
+ */
+
+#ifndef IPMI_KFWUM_H
+# define IPMI_KFWUM_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+
+/* KFWUM Version */
+# define VER_MAJOR        1
+# define VER_MINOR        3
+/* Minimum size (IPMB/IOL/old protocol) */
+# define KFWUM_SMALL_BUFFER     32
+/* Maximum size on KCS interface */
+# define KFWUM_BIG_BUFFER       32
+# define MAX_BUFFER_SIZE          1024*16
+
+/* 3 address + 1 size + 1 checksum + 1 command */
+# define KFWUM_OLD_CMD_OVERHEAD 6
+/* 1 sequence + 1 size + 1 checksum + 1 command */
+# define KFWUM_NEW_CMD_OVERHEAD 4
+# define KFWUM_PAGE_SIZE        256
+
+# define FWUM_SAVE_FIRMWARE_NO_RESPONSE_LIMIT 6
+# define FWUM_MAX_UPLOAD_RETRY 6
+
+# define TRACE_LOG_CHUNK_COUNT 7
+# define TRACE_LOG_CHUNK_SIZE  7
+# define TRACE_LOG_ATT_COUNT   3
+
+# define IN_FIRMWARE_INFO_OFFSET_LOCATION           0x5a0
+# define IN_FIRMWARE_INFO_SIZE                      20
+# define IN_FIRMWARE_INFO_OFFSET_FILE_SIZE          0
+# define IN_FIRMWARE_INFO_OFFSET_CHECKSUM           4
+# define IN_FIRMWARE_INFO_OFFSET_BOARD_ID           6
+# define IN_FIRMWARE_INFO_OFFSET_DEVICE_ID          8
+# define IN_FIRMWARE_INFO_OFFSET_TABLE_VERSION      9
+# define IN_FIRMWARE_INFO_OFFSET_IMPLEMENT_REV      10
+# define IN_FIRMWARE_INFO_OFFSET_VER_MAJOROR      11
+# define IN_FIRMWARE_INFO_OFFSET_VER_MINORSUB     12
+# define IN_FIRMWARE_INFO_OFFSET_SDR_REV            13
+# define IN_FIRMWARE_INFO_OFFSET_IANA0              14
+# define IN_FIRMWARE_INFO_OFFSET_IANA1              15
+# define IN_FIRMWARE_INFO_OFFSET_IANA2              16
+
+# define KWUM_GET_BYTE_AT_OFFSET(pBuffer,os)            pBuffer[os]
+
+int ipmi_fwum_main(struct ipmi_intf *, int, char **);
+
+typedef enum eKFWUM_BoardList
+{
+	KFWUM_BOARD_KONTRON_UNKNOWN = 0,
+	KFWUM_BOARD_KONTRON_5002 = 5002,
+} tKFWUM_BoardList;
+
+typedef struct sKFWUM_BoardInfo
+{
+	tKFWUM_BoardList boardId;
+	IPMI_OEM  iana;
+} tKFWUM_BoardInfo;
+
+typedef enum eKFWUM_DownloadType
+{
+	KFWUM_DOWNLOAD_TYPE_ADDRESS = 0,
+	KFWUM_DOWNLOAD_TYPE_SEQUENCE,
+} tKFWUM_DownloadType;
+
+typedef enum eKFWUM_DownloadBuffferType
+{
+	KFWUM_SMALL_BUFFER_TYPE = 0,
+	KFUMW_BIG_BUFFER_TYPE
+} tKFWUM_DownloadBuffferType;
+
+typedef struct sKFWUM_InFirmwareInfo
+{
+	unsigned long   fileSize;
+	unsigned short  checksum;
+	unsigned short  sumToRemoveFromChecksum;
+	/* Since the checksum is added in the bin
+	 * after the checksum is calculated, we
+	 * need to remove the each byte value.  This
+	 * byte will contain the addition of both bytes
+	 */
+	tKFWUM_BoardList boardId;
+	unsigned char   deviceId;
+	unsigned char   tableVers;
+	unsigned char   implRev;
+	unsigned char   versMajor;
+	unsigned char   versMinor;
+	unsigned char   versSubMinor;
+	unsigned char   sdrRev;
+	IPMI_OEM iana;
+} tKFWUM_InFirmwareInfo;
+
+typedef struct sKFWUM_SaveFirmwareInfo
+{
+	tKFWUM_DownloadType downloadType;
+	unsigned char       bufferSize;
+	unsigned char       overheadSize;
+} tKFWUM_SaveFirmwareInfo;
+
+/* COMMANDS */
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumGetInfoResp {
+	unsigned char protocolRevision;
+	unsigned char controllerDeviceId;
+	struct {
+		unsigned char mode:1;
+		unsigned char seqAdd:1;
+		unsigned char res : 6;
+	} byte;
+	unsigned char firmRev1;
+	unsigned char firmRev2;
+	unsigned char numBank;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumGetStatusResp {
+	unsigned char bankState;
+	unsigned char firmLengthLSB;
+	unsigned char firmLengthMid;
+	unsigned char firmLengthMSB;
+	unsigned char firmRev1;
+	unsigned char firmRev2;
+	unsigned char firmRev3;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumManualRollbackReq {
+	unsigned char type;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumStartFirmwareDownloadReq {
+	unsigned char lengthLSB;
+	unsigned char lengthMid;
+	unsigned char lengthMSB;
+	unsigned char paddingLSB;
+	unsigned char paddingMSB;
+	unsigned char useSequence;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumStartFirmwareDownloadResp {
+	unsigned char bank;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumSaveFirmwareAddressReq
+{
+	unsigned char addressLSB;
+	unsigned char addressMid;
+	unsigned char addressMSB;
+	unsigned char numBytes;
+	unsigned char txBuf[KFWUM_SMALL_BUFFER-KFWUM_OLD_CMD_OVERHEAD];
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumSaveFirmwareSequenceReq
+{
+	unsigned char sequenceNumber;
+	unsigned char txBuf[KFWUM_BIG_BUFFER];
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumFinishFirmwareDownloadReq {
+	unsigned char versionMaj;
+	unsigned char versionMinSub;
+	unsigned char versionSdr;
+	unsigned char reserved;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+#endif /* IPMI_KFWUM_H */

include/ipmitool/ipmi_hpmfwupg.h

@@ -0,0 +1,809 @@
+/*
+ * 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.
+ */
+
+#ifndef IPMI_HPMFWUPG_H
+#define IPMI_HPMFWUPG_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+
+int ipmi_hpmfwupg_main(struct ipmi_intf *, int, char **);
+
+/* Agent version */
+#define HPMFWUPG_VERSION_MAJOR    1
+#define HPMFWUPG_VERSION_MINOR    0
+#define HPMFWUPG_VERSION_SUBMINOR 9
+
+/* HPM.1 FIRMWARE UPGRADE COMMANDS (part of PICMG) */
+#define HPMFWUPG_GET_TARGET_UPG_CAPABILITIES 0x2E
+#define HPMFWUPG_GET_COMPONENT_PROPERTIES    0x2F
+#define HPMFWUPG_ABORT_UPGRADE               0x30
+#define HPMFWUPG_INITIATE_UPGRADE_ACTION     0x31
+#define HPMFWUPG_UPLOAD_FIRMWARE_BLOCK       0x32
+#define HPMFWUPG_FINISH_FIRMWARE_UPLOAD      0x33
+#define HPMFWUPG_GET_UPGRADE_STATUS          0x34
+#define HPMFWUPG_ACTIVATE_FIRMWARE           0x35
+#define HPMFWUPG_QUERY_SELFTEST_RESULT       0x36
+#define HPMFWUPG_QUERY_ROLLBACK_STATUS       0x37
+#define HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK    0x38
+
+/*  HPM.1 SPECIFIC COMPLETION CODES */
+#define HPMFWUPG_ROLLBACK_COMPLETED   0x00
+#define HPMFWUPG_COMMAND_IN_PROGRESS  0x80
+#define HPMFWUPG_NOT_SUPPORTED        0x81
+#define HPMFWUPG_SIZE_MISMATCH        0x81
+#define HPMFWUPG_ROLLBACK_FAILURE     0x81
+#define HPMFWUPG_INV_COMP_MASK        0x81
+#define HPMFWUPG__ABORT_FAILURE       0x81
+#define HPMFWUPG_INV_COMP_ID          0x82
+#define HPMFWUPG_INT_CHECKSUM_ERROR   0x82
+#define HPMFWUPG_INV_UPLOAD_MODE      0x82
+#define HPMFWUPG_ROLLBACK_OVERRIDE    0x82
+#define HPMFWUPG_INV_COMP_PROP        0x83
+#define HPMFWUPG_FW_MISMATCH          0x83
+#define HPMFWUPG_ROLLBACK_DENIED      0x83
+
+/*
+ * This error code is used as a temporary PATCH to
+ * the latest Open ipmi driver.  This PATCH
+ * will be removed once a new Open IPMI driver is released.
+ * (Buggy version = 39)
+ */
+#define ENABLE_OPENIPMI_V39_PATCH
+
+#ifdef ENABLE_OPENIPMI_V39_PATCH
+# define RETRY_COUNT_MAX 3
+static int errorCount;
+# define HPMFWUPG_IS_RETRYABLE(error)                                          \
+ ((((error==0x83)||(error==0x82)||(error==0x80)) && (errorCount++<RETRY_COUNT_MAX))?TRUE:FALSE)
+#else
+# define HPMFWUPG_IS_RETRYABLE(error) FALSE
+#endif
+
+/* HPM FIRMWARE UPGRADE GENERAL DEFINITIONS */
+#define HPMFWUPG_PICMG_IDENTIFIER         0
+#define HPMFWUPG_VERSION_SIZE             6
+#define HPMFWUPG_DESC_STRING_LENGTH       12
+#define HPMFWUPG_DEFAULT_INACCESS_TIMEOUT 60 /* sec */
+#define HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT  60 /* sec */
+#define HPMFWUPG_MD5_SIGNATURE_LENGTH     16
+
+/* Component IDs */
+typedef enum eHpmfwupgComponentId {
+	HPMFWUPG_COMPONENT_ID_0 = 0,
+	HPMFWUPG_COMPONENT_ID_1,
+	HPMFWUPG_COMPONENT_ID_2,
+	HPMFWUPG_COMPONENT_ID_3,
+	HPMFWUPG_COMPONENT_ID_4,
+	HPMFWUPG_COMPONENT_ID_5,
+	HPMFWUPG_COMPONENT_ID_6,
+	HPMFWUPG_COMPONENT_ID_7,
+	HPMFWUPG_COMPONENT_ID_MAX
+} tHpmfwupgComponentId;
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgComponentBitMask {
+	union {
+		unsigned char byte;
+		struct {
+#ifdef WORDS_BIGENDIAN
+			unsigned char component7 : 1;
+			unsigned char component6 : 1;
+			unsigned char component5 : 1;
+			unsigned char component4 : 1;
+			unsigned char component3 : 1;
+			unsigned char component2 : 1;
+			unsigned char component1 : 1;
+			unsigned char component0 : 1;
+#else
+			unsigned char component0 : 1;
+			unsigned char component1 : 1;
+			unsigned char component2 : 1;
+			unsigned char component3 : 1;
+			unsigned char component4 : 1;
+			unsigned char component5 : 1;
+			unsigned char component6 : 1;
+			unsigned char component7 : 1;
+#endif
+		} ATTRIBUTE_PACKING bitField;
+	} ATTRIBUTE_PACKING ComponentBits;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+
+static const int HPMFWUPG_SUCCESS = 0;
+static const int HPMFWUPG_ERROR = -1;
+/* Upload firmware specific error codes */
+static const int HPMFWUPG_UPLOAD_BLOCK_LENGTH = 1;
+static const int HPMFWUPG_UPLOAD_RETRY = 2;
+
+
+/* TARGET UPGRADE CAPABILITIES DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetTargetUpgCapabilitiesReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetTargetUpgCapabilitiesResp {
+	unsigned char picmgId;
+	unsigned char hpmVersion;
+	union {
+		unsigned char byte;
+		struct {
+#if WORDS_BIGENDIAN
+			unsigned char fwUpgUndesirable    : 1;
+			unsigned char autRollbackOverride : 1;
+			unsigned char ipmcDegradedDurinUpg: 1;
+			unsigned char deferActivation     : 1;
+			unsigned char servAffectDuringUpg : 1;
+			unsigned char manualRollback      : 1;
+			unsigned char autRollback         : 1;
+			unsigned char ipmcSelftestCap     : 1;
+#else
+			unsigned char ipmcSelftestCap     : 1;
+			unsigned char autRollback         : 1;
+			unsigned char manualRollback      : 1;
+			unsigned char servAffectDuringUpg : 1;
+			unsigned char deferActivation     : 1;
+			unsigned char ipmcDegradedDurinUpg: 1;
+			unsigned char autRollbackOverride : 1;
+			unsigned char fwUpgUndesirable    : 1;
+#endif
+		} ATTRIBUTE_PACKING bitField;
+	} ATTRIBUTE_PACKING GlobalCapabilities;
+	unsigned char upgradeTimeout;
+	unsigned char selftestTimeout;
+	unsigned char rollbackTimeout;
+	unsigned char inaccessTimeout;
+	struct HpmfwupgComponentBitMask componentsPresent;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetTargetUpgCapabilitiesCtx {
+	struct HpmfwupgGetTargetUpgCapabilitiesReq req;
+	struct HpmfwupgGetTargetUpgCapabilitiesResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* COMPONENT PROPERTIES DEFINITIONS */
+typedef enum eHpmfwupgCompPropertiesSelect {
+	HPMFWUPG_COMP_GEN_PROPERTIES = 0,
+	HPMFWUPG_COMP_CURRENT_VERSION,
+	HPMFWUPG_COMP_DESCRIPTION_STRING,
+	HPMFWUPG_COMP_ROLLBACK_FIRMWARE_VERSION,
+	HPMFWUPG_COMP_DEFERRED_FIRMWARE_VERSION,
+	HPMFWUPG_COMP_RESERVED,
+	HPMFWUPG_COMP_OEM_PROPERTIES = 192
+} tHpmfwupgCompPropertiesSelect;
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetComponentPropertiesReq {
+	unsigned char picmgId;
+	unsigned char componentId;
+	unsigned char selector;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetGeneralPropResp {
+	unsigned char picmgId;
+	union {
+		unsigned char byte;
+		struct {
+#if WORDS_BIGENDIAN
+			unsigned char reserved           : 2;
+			unsigned char payloadColdReset   : 1;
+			unsigned char deferredActivation : 1;
+			unsigned char comparisonSupport  : 1;
+			unsigned char preparationSupport : 1;
+			unsigned char rollbackBackup     : 2;
+#else
+			unsigned char rollbackBackup     : 2;
+			unsigned char preparationSupport : 1;
+			unsigned char comparisonSupport  : 1;
+			unsigned char deferredActivation : 1;
+			unsigned char payloadColdReset   : 1;
+			unsigned char reserved           : 2;
+#endif
+		} ATTRIBUTE_PACKING bitfield;
+	} ATTRIBUTE_PACKING GeneralCompProperties;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetCurrentVersionResp {
+	unsigned char picmgId;
+	unsigned char currentVersion[HPMFWUPG_VERSION_SIZE];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetDescStringResp {
+	unsigned char picmgId;
+	char descString[HPMFWUPG_DESC_STRING_LENGTH];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetRollbackFwVersionResp {
+	unsigned char picmgId;
+	unsigned char rollbackFwVersion[HPMFWUPG_VERSION_SIZE];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetDeferredFwVersionResp {
+	unsigned char picmgId;
+	unsigned char deferredFwVersion[HPMFWUPG_VERSION_SIZE];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* GetComponentProperties - OEM properties (192) */
+#define HPMFWUPG_OEM_LENGTH 4
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetOemProperties {
+	unsigned char picmgId;
+	unsigned char oemRspData[HPMFWUPG_OEM_LENGTH];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetComponentPropertiesResp {
+	union {
+		struct HpmfwupgGetGeneralPropResp       generalPropResp;
+		struct HpmfwupgGetCurrentVersionResp    currentVersionResp;
+		struct HpmfwupgGetDescStringResp        descStringResp;
+		struct HpmfwupgGetRollbackFwVersionResp rollbackFwVersionResp;
+		struct HpmfwupgGetDeferredFwVersionResp deferredFwVersionResp;
+		struct HpmfwupgGetOemProperties         oemProperties;
+	} ATTRIBUTE_PACKING Response;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetComponentPropertiesCtx {
+	struct HpmfwupgGetComponentPropertiesReq  req;
+	struct HpmfwupgGetComponentPropertiesResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/*  ABORT UPGRADE DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgAbortUpgradeReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgAbortUpgradeResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgAbortUpgradeCtx {
+	struct HpmfwupgAbortUpgradeReq  req;
+	struct HpmfwupgAbortUpgradeResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* UPGRADE ACTIONS DEFINITIONS */
+typedef enum eHpmfwupgUpgradeAction {
+	HPMFWUPG_UPGRADE_ACTION_BACKUP = 0,
+	HPMFWUPG_UPGRADE_ACTION_PREPARE,
+	HPMFWUPG_UPGRADE_ACTION_UPGRADE,
+	HPMFWUPG_UPGRADE_ACTION_COMPARE,
+	HPMFWUPG_UPGRADE_ACTION_INVALID = 0xff
+}  tHpmfwupgUpgradeAction;
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgInitiateUpgradeActionReq {
+	unsigned char picmgId;
+	struct HpmfwupgComponentBitMask componentsMask;
+	unsigned char upgradeAction;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgInitiateUpgradeActionResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgInitiateUpgradeActionCtx {
+	struct HpmfwupgInitiateUpgradeActionReq  req;
+	struct HpmfwupgInitiateUpgradeActionResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* UPLOAD FIRMWARE BLOCK DEFINITIONS */
+#define HPMFWUPG_SEND_DATA_COUNT_KCS   30
+#define HPMFWUPG_SEND_DATA_COUNT_LAN   25
+#define HPMFWUPG_SEND_DATA_COUNT_IPMB  26
+#define HPMFWUPG_SEND_DATA_COUNT_IPMBL 26
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgUploadFirmwareBlockReq {
+	unsigned char picmgId;
+	unsigned char blockNumber;
+	unsigned char data[0];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgUploadFirmwareBlockResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgUploadFirmwareBlockCtx {
+	struct HpmfwupgUploadFirmwareBlockReq * req;
+	struct HpmfwupgUploadFirmwareBlockResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* FINISH FIRMWARE UPLOAD DEFINITIONS */
+#define HPMFWUPG_IMAGE_SIZE_BYTE_COUNT 4
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgFinishFirmwareUploadReq {
+	unsigned char picmgId;
+	unsigned char componentId;
+	unsigned char imageLength[HPMFWUPG_IMAGE_SIZE_BYTE_COUNT];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgFinishFirmwareUploadResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgFinishFirmwareUploadCtx {
+	struct HpmfwupgFinishFirmwareUploadReq  req;
+	struct HpmfwupgFinishFirmwareUploadResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* ACTIVATE FW DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgActivateFirmwareReq {
+	unsigned char picmgId;
+	unsigned char rollback_override;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgActivateFirmwareResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgActivateFirmwareCtx {
+	struct HpmfwupgActivateFirmwareReq  req;
+	struct HpmfwupgActivateFirmwareResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* GET UPGRADE STATUS DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetUpgradeStatusReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetUpgradeStatusResp {
+	unsigned char picmgId;
+	unsigned char cmdInProcess;
+	unsigned char lastCmdCompCode;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetUpgradeStatusCtx {
+	struct HpmfwupgGetUpgradeStatusReq  req;
+	struct HpmfwupgGetUpgradeStatusResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* MANUAL FW ROLLBACK DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgManualFirmwareRollbackReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgManualFirmwareRollbackResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+struct HpmfwupgManualFirmwareRollbackCtx {
+	struct HpmfwupgManualFirmwareRollbackReq  req;
+	struct HpmfwupgManualFirmwareRollbackResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* QUERY ROLLBACK STATUS DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgQueryRollbackStatusReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgQueryRollbackStatusResp {
+	unsigned char picmgId;
+	struct HpmfwupgComponentBitMask rollbackComp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgQueryRollbackStatusCtx {
+	struct HpmfwupgQueryRollbackStatusReq  req;
+	struct HpmfwupgQueryRollbackStatusResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* QUERY SELF TEST RESULT DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct  HpmfwupgQuerySelftestResultReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct  HpmfwupgQuerySelftestResultResp {
+	unsigned char picmgId;
+	unsigned char result1;
+	unsigned char result2;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgQuerySelftestResultCtx {
+	struct HpmfwupgQuerySelftestResultReq  req;
+	struct HpmfwupgQuerySelftestResultResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* HPM.1 IMAGE DEFINITIONS */
+#define HPMFWUPG_HEADER_SIGNATURE_LENGTH 8
+#define HPMFWUPG_MANUFATURER_ID_LENGTH   3
+#define HPMFWUPG_PRODUCT_ID_LENGTH       2
+#define HPMFWUPG_TIME_LENGTH             4
+#define HPMFWUPG_TIMEOUT_LENGTH          1
+#define HPMFWUPG_COMP_REVISION_LENGTH    2
+#define HPMFWUPG_FIRM_REVISION_LENGTH    6
+#define HPMFWUPG_IMAGE_HEADER_VERSION    0
+#define HPMFWUPG_IMAGE_SIGNATURE "PICMGFWU"
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct HpmfwupgImageHeader {
+	char           signature[HPMFWUPG_HEADER_SIGNATURE_LENGTH];
+	unsigned char  formatVersion;
+	unsigned char  deviceId;
+	unsigned char  manId[HPMFWUPG_MANUFATURER_ID_LENGTH];
+	unsigned char  prodId[HPMFWUPG_PRODUCT_ID_LENGTH];
+	unsigned char  time[HPMFWUPG_TIME_LENGTH];
+	union {
+		struct {
+#if WORDS_BIGENDIAN
+			unsigned char imageSelfTest   : 1;
+			unsigned char autRollback     : 1;
+			unsigned char manRollback     : 1;
+			unsigned char servAffected    : 1;
+			unsigned char reserved        : 4;
+#else
+			unsigned char reserved        : 4;
+			unsigned char servAffected    : 1;
+			unsigned char manRollback     : 1;
+			unsigned char autRollback     : 1;
+			unsigned char imageSelfTest   : 1;
+#endif
+		} ATTRIBUTE_PACKING bitField;
+		unsigned char byte;
+	}ATTRIBUTE_PACKING imageCapabilities;
+	struct HpmfwupgComponentBitMask components;
+	unsigned char  selfTestTimeout;
+	unsigned char  rollbackTimeout;
+	unsigned char  inaccessTimeout;
+	unsigned char  compRevision[HPMFWUPG_COMP_REVISION_LENGTH];
+	unsigned char  firmRevision[HPMFWUPG_FIRM_REVISION_LENGTH];
+	unsigned short oemDataLength;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#define HPMFWUPG_DESCRIPTION_LENGTH   21
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgActionRecord {
+	unsigned char  actionType;
+	struct HpmfwupgComponentBitMask components;
+	unsigned char  checksum;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#define HPMFWUPG_FIRMWARE_SIZE_LENGTH 4
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgFirmwareImage {
+	unsigned char version[HPMFWUPG_FIRM_REVISION_LENGTH];
+	char          desc[HPMFWUPG_DESCRIPTION_LENGTH];
+	unsigned char length[HPMFWUPG_FIRMWARE_SIZE_LENGTH];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgUpgradeCtx {
+	struct HpmfwupgComponentBitMask compUpdateMask;
+	unsigned int   imageSize;
+	unsigned char* pImageData;
+	unsigned char  componentId;
+	struct HpmfwupgGetTargetUpgCapabilitiesResp targetCap;
+	struct HpmfwupgGetGeneralPropResp genCompProp[HPMFWUPG_COMPONENT_ID_MAX];
+	struct ipm_devid_rsp devId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+typedef enum eHpmfwupgActionType {
+	HPMFWUPG_ACTION_BACKUP_COMPONENTS = 0,
+	HPMFWUPG_ACTION_PREPARE_COMPONENTS,
+	HPMFWUPG_ACTION_UPLOAD_FIRMWARE,
+	HPMFWUPG_ACTION_RESERVED = 0xFF
+} tHpmfwupgActionType;
+
+/* FUNCTIONS PROTOTYPES */
+#define HPMFWUPG_MAJORMINOR_VERSION_SIZE        2
+
+/* Options added for user to check the version and to view both the FILE and
+ * TARGET Version
+ */
+#define VIEW_MODE                     0x01
+#define DEBUG_MODE                    0x02
+#define FORCE_MODE                    0x04
+#define COMPARE_MODE                  0x08
+
+typedef struct _VERSIONINFO {
+	unsigned char componentId;
+	unsigned char targetMajor;
+	unsigned char targetMinor;
+	unsigned char targetAux[4];
+	unsigned char rollbackMajor;
+	unsigned char rollbackMinor;
+	unsigned char rollbackAux[4];
+	unsigned char deferredMajor;
+	unsigned char deferredMinor;
+	unsigned char deferredAux[4];
+	unsigned char imageMajor;
+	unsigned char imageMinor;
+	unsigned char imageAux[4];
+	unsigned char coldResetRequired;
+	unsigned char rollbackSupported;
+	unsigned char deferredActivationSupported;
+	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+}VERSIONINFO, *PVERSIONINFO;
+
+VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+
+#define TARGET_VER (0x01)
+#define ROLLBACK_VER (0x02)
+#define IMAGE_VER (0x04)
+
+#endif /* IPMI_KFWUM_H */

include/ipmitool/ipmi_intf.h

@@ -62,34 +62,42 @@ enum LANPLUS_SESSION_STATE {
 #define IPMI_SIK_BUFFER_SIZE      20
 #define IPMI_KG_BUFFER_SIZE       21 /* key plus null byte */
 
-struct ipmi_session {
-	uint8_t hostname[64];
+struct ipmi_session_params {
+	char * hostname;
 	uint8_t username[17];
-	uint8_t authcode[IPMI_AUTHCODE_BUFFER_SIZE + 1];
-	uint8_t challenge[16];
-	uint8_t authtype;
+	uint8_t authcode_set[IPMI_AUTHCODE_BUFFER_SIZE + 1];
 	uint8_t authtype_set;
-#define IPMI_AUTHSTATUS_PER_MSG_DISABLED	0x10
-#define IPMI_AUTHSTATUS_PER_USER_DISABLED	0x08
-#define IPMI_AUTHSTATUS_NONNULL_USERS_ENABLED	0x04
-#define IPMI_AUTHSTATUS_NULL_USERS_ENABLED	0x02
-#define IPMI_AUTHSTATUS_ANONYMOUS_USERS_ENABLED	0x01
-	uint8_t authstatus;
-	uint8_t authextra;
 	uint8_t privlvl;
 	uint8_t cipher_suite_id;
 	char sol_escape_char;
 	int password;
 	int port;
-	int active;
 	int retry;
+	uint32_t timeout;
+	uint8_t kg[IPMI_KG_BUFFER_SIZE];   /* BMC key */
+	uint8_t lookupbit;
+};
 
+#define IPMI_AUTHSTATUS_PER_MSG_DISABLED	0x10
+#define IPMI_AUTHSTATUS_PER_USER_DISABLED	0x08
+#define IPMI_AUTHSTATUS_NONNULL_USERS_ENABLED	0x04
+#define IPMI_AUTHSTATUS_NULL_USERS_ENABLED	0x02
+#define IPMI_AUTHSTATUS_ANONYMOUS_USERS_ENABLED	0x01
+
+struct ipmi_session {
+	int active;
 	uint32_t session_id;
 	uint32_t in_seq;
 	uint32_t out_seq;
+
+	uint8_t authcode[IPMI_AUTHCODE_BUFFER_SIZE + 1];
+	uint8_t challenge[16];
+	uint8_t authtype;
+	uint8_t authstatus;
+	uint8_t authextra;
 	uint32_t timeout;
 
-	struct sockaddr_in addr;
+	struct sockaddr_storage addr;
 	socklen_t addrlen;
 
 	/*
@@ -106,7 +114,6 @@ struct ipmi_session {
 		uint8_t integrity_alg;
 		uint8_t crypt_alg;
 		uint8_t max_priv_level;
-		uint8_t lookupbit;
 
 		uint32_t console_id;
 		uint32_t bmc_id;
@@ -167,8 +174,11 @@ struct ipmi_intf {
 	int abort;
 	int noanswer;
 	int picmg_avail;
+	int vita_avail;
 	IPMI_OEM manufacturer_id;
+	int ai_family;
 
+	struct ipmi_session_params ssn_params;
 	struct ipmi_session * session;
 	struct ipmi_oem_handle * oem;
 	struct ipmi_cmd * cmdlist;
@@ -179,7 +189,8 @@ struct ipmi_intf {
 	uint8_t target_channel;
 	uint32_t transit_addr;
 	uint8_t transit_channel;
-	uint8_t channel_buf_size;
+	uint16_t max_request_data_size;
+	uint16_t max_response_data_size;
 
 	uint8_t devnum;
 
@@ -192,6 +203,8 @@ struct ipmi_intf {
 	struct ipmi_rs *(*send_sol)(struct ipmi_intf * intf, struct ipmi_v2_payload * payload);
 	int (*keepalive)(struct ipmi_intf * intf);
 	int (*set_my_addr)(struct ipmi_intf * intf, uint8_t addr);
+	void (*set_max_request_data_size)(struct ipmi_intf * intf, uint16_t size);
+	void (*set_max_response_data_size)(struct ipmi_intf * intf, uint16_t size);
 };
 
 struct ipmi_intf * ipmi_intf_load(char * name);
@@ -209,6 +222,10 @@ void ipmi_intf_session_set_port(struct ipmi_intf * intf, int port);
 void ipmi_intf_session_set_authtype(struct ipmi_intf * intf, uint8_t authtype);
 void ipmi_intf_session_set_timeout(struct ipmi_intf * intf, uint32_t timeout);
 void ipmi_intf_session_set_retry(struct ipmi_intf * intf, int retry);
+void ipmi_intf_session_cleanup(struct ipmi_intf *intf);
 void ipmi_cleanup(struct ipmi_intf * intf);
 
+#if defined(IPMI_INTF_LAN) || defined (IPMI_INTF_LANPLUS)
+int  ipmi_intf_socket_connect(struct ipmi_intf * intf);
+#endif
 #endif /* IPMI_INTF_H */

include/ipmitool/ipmi_lanp.h

@@ -76,6 +76,8 @@ enum {
 	IPMI_LANP_RMCP_CIPHER_SUPPORT,
 	IPMI_LANP_RMCP_CIPHERS,
 	IPMI_LANP_RMCP_PRIV_LEVELS,
+	IPMI_LANP_VLAN_TAGS,
+	IPMI_LANP_BAD_PASS_THRESH,
 	IPMI_LANP_OEM_ALERT_STRING=96,
 	IPMI_LANP_ALERT_RETRY=97,
 	IPMI_LANP_UTC_OFFSET=98,
@@ -92,38 +94,39 @@ static struct lan_param {
 	uint8_t * data;
 	int data_len;
 } ipmi_lan_params[] __attribute__((unused)) = {
-	{ IPMI_LANP_SET_IN_PROGRESS,	1,	"Set in Progress"	},
-	{ IPMI_LANP_AUTH_TYPE,		1,	"Auth Type Support"	},
-	{ 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"		}, /* 5 */
-	{ 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"	}, /* 10 */
-	{ 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"	}, /* 15 */
-	{ IPMI_LANP_SNMP_STRING,	18,	"SNMP 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_VLAN_ID,		2,	"802.1q VLAN ID"        }, /* 20 */
-	{ IPMI_LANP_VLAN_PRIORITY,	1,	"802.1q VLAN Priority"  },
-	{ IPMI_LANP_RMCP_CIPHER_SUPPORT,1,	"RMCP+ Cipher Suite Count" },
-	{ IPMI_LANP_RMCP_CIPHERS,	16,	"RMCP+ Cipher Suites"   },
-	{ IPMI_LANP_RMCP_PRIV_LEVELS,	9,	"Cipher Suite Priv Max"	},
-	{ IPMI_LANP_OEM_ALERT_STRING,	28,	"OEM Alert String"	}, /* 25 */
-	{ 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"		}, /* 30 */
-	{ IPMI_LANP_CHAN_ACCESS_MODE,	2,	"Channel Access Mode"	},
+	{ IPMI_LANP_SET_IN_PROGRESS,	1,	"Set in Progress", NULL, 0 },
+	{ IPMI_LANP_AUTH_TYPE,		1,	"Auth Type Support", NULL, 0 },
+	{ IPMI_LANP_AUTH_TYPE_ENABLE,	5,	"Auth Type Enable", NULL, 0	},
+	{ IPMI_LANP_IP_ADDR,		4,	"IP Address", NULL, 0 },
+	{ IPMI_LANP_IP_ADDR_SRC,	1,	"IP Address Source", NULL, 0 },
+	{ IPMI_LANP_MAC_ADDR,		6,	"MAC Address", NULL, 0 }, /* 5 */
+	{ IPMI_LANP_SUBNET_MASK,	4,	"Subnet Mask", NULL, 0 },
+	{ IPMI_LANP_IP_HEADER,		3,	"IP Header", NULL, 0 },
+	{ IPMI_LANP_PRI_RMCP_PORT,	2,	"Primary RMCP Port", NULL, 0 },
+	{ IPMI_LANP_SEC_RMCP_PORT,	2,	"Secondary RMCP Port", NULL, 0 },
+	{ IPMI_LANP_BMC_ARP,		1,	"BMC ARP Control", NULL, 0}, /* 10 */
+	{ IPMI_LANP_GRAT_ARP,		1,	"Gratituous ARP Intrvl", NULL, 0 },
+	{ IPMI_LANP_DEF_GATEWAY_IP,	4,	"Default Gateway IP", NULL, 0 },
+	{ IPMI_LANP_DEF_GATEWAY_MAC,	6,	"Default Gateway MAC", NULL, 0 },
+	{ IPMI_LANP_BAK_GATEWAY_IP,	4,	"Backup Gateway IP", NULL, 0 },
+	{ IPMI_LANP_BAK_GATEWAY_MAC,	6,	"Backup Gateway MAC", NULL, 0 }, /* 15 */
+	{ IPMI_LANP_SNMP_STRING,	18,	"SNMP Community String", NULL, 0 },
+	{ IPMI_LANP_NUM_DEST,		1,	"Number of Destinations", NULL, 0 },
+	{ IPMI_LANP_DEST_TYPE,		4,	"Destination Type", NULL, 0 },
+	{ IPMI_LANP_DEST_ADDR,		13,	"Destination Addresses", NULL, 0 },
+	{ IPMI_LANP_VLAN_ID,		2,	"802.1q VLAN ID", NULL, 0 }, /* 20 */
+	{ IPMI_LANP_VLAN_PRIORITY,	1,	"802.1q VLAN Priority", NULL, 0 },
+	{ IPMI_LANP_RMCP_CIPHER_SUPPORT,1,	"RMCP+ Cipher Suite Count", NULL, 0 },
+	{ IPMI_LANP_RMCP_CIPHERS,	16,	"RMCP+ Cipher Suites", NULL, 0 },
+	{ IPMI_LANP_RMCP_PRIV_LEVELS,	9,	"Cipher Suite Priv Max", NULL, 0 },
+	{ IPMI_LANP_BAD_PASS_THRESH,	6,	"Bad Password Threshold", NULL, 0 },
+	{ IPMI_LANP_OEM_ALERT_STRING,	28,	"OEM Alert String", NULL, 0 }, /* 25 */
+	{ IPMI_LANP_ALERT_RETRY,	1,	"Alert Retry Algorithm", NULL, 0 },
+	{ IPMI_LANP_UTC_OFFSET,		3,	"UTC Offset", NULL, 0 },
+	{ IPMI_LANP_DHCP_SERVER_IP,	4,	"DHCP Server IP", NULL, 0 },
+	{ IPMI_LANP_DHCP_SERVER_MAC,	6,	"DHDP Server MAC", NULL, 0},
+	{ IPMI_LANP_DHCP_ENABLE,	1,	"DHCP Enable", NULL, 0 }, /* 30 */
+	{ IPMI_LANP_CHAN_ACCESS_MODE,	2,	"Channel Access Mode", NULL, 0 },
 	{ -1 }
 };
 

include/ipmitool/ipmi_mc.h

@@ -157,6 +157,9 @@ struct ipm_get_watchdog_rsp {
 #define IPMI_SYSINFO_SET0_SIZE             14
 #define IPMI_SYSINFO_SETN_SIZE             16
 
+/* System Information "Parameter selector" values: */
+#define IPMI_SYSINFO_SET_STATE		0x00
+#define IPMI_SYSINFO_SYSTEM_FW_VERSION	0x01
 #define IPMI_SYSINFO_HOSTNAME		0x02
 #define IPMI_SYSINFO_PRIMARY_OS_NAME	0x03
 #define IPMI_SYSINFO_OS_NAME		0x04

include/ipmitool/ipmi_sdr.h

@@ -102,8 +102,6 @@ enum {
 #define GET_SENSOR_EVENT_STATUS	0x2b
 #define GET_SENSOR_READING	0x2d
 #define GET_SENSOR_TYPE		0x2f
-#define GET_SENSOR_READING      0x2d
-#define GET_SENSOR_TYPE         0x2f
 
 #ifdef HAVE_PRAGMA_PACK
 #pragma pack(1)

include/ipmitool/ipmi_sel.h

@@ -107,6 +107,7 @@ struct standard_spec_sel_rec{
 #define	SENSOR_TYPE_OEM_NFATAL_ERROR	0xC2
 #define	SENSOR_TYPE_OEM_FATAL_ERROR	0xC3
 #define SENSOR_TYPE_TXT_CMD_ERROR	0x20
+#define SENSOR_TYPE_SUPERMICRO_OEM 0xD0
 /* End of Macro for DELL Specific */
 #define SEL_OEM_TS_DATA_LEN		6
 #define SEL_OEM_NOTS_DATA_LEN		13
@@ -326,6 +327,8 @@ static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unu
 	{ 0x07, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Disabled" },
 	{ 0x07, 0x09, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Terminator presence detected" },
 	{ 0x07, 0x0a, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Throttled" },
+	{ 0x07, 0x0b, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Uncorrectable machine check exception" },
+	{ 0x07, 0x0c, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Processor", "Correctable machine check error" },
 
 	{ 0x08, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Presence detected" },
 	{ 0x08, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Failure detected" },
@@ -336,7 +339,10 @@ static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unu
 	{ 0x08, 0x06, 0x00, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Config Error: Vendor Mismatch" },
 	{ 0x08, 0x06, 0x01, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Config Error: Revision Mismatch" },
 	{ 0x08, 0x06, 0x02, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Config Error: Processor Missing" },
+	{ 0x08, 0x06, 0x03, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Config Error: Power Supply Rating Mismatch" },
+	{ 0x08, 0x06, 0x04, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Config Error: Voltage Rating Mismatch" },
 	{ 0x08, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Config Error" },
+	{ 0x08, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Supply", "Power Supply Inactive" },
 
 	{ 0x09, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Power off/down" },
 	{ 0x09, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Power Unit", "Power cycle" },
@@ -360,6 +366,7 @@ static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unu
 	{ 0x0c, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Configuration Error" },
 	{ 0x0c, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Spare" },
 	{ 0x0c, 0x09, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Throttled" },
+	{ 0x0c, 0x0a, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Memory", "Critical Overtemperature" },
 
 	{ 0x0d, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Drive Slot", "Drive Present" },
 	{ 0x0d, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Drive Slot", "Drive Fault" },
@@ -479,6 +486,7 @@ static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unu
 	{ 0x13, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Uncorrectable error" },
 	{ 0x13, 0x09, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Fatal NMI" },
 	{ 0x13, 0x0a, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Fatal Error" },
+	{ 0x13, 0x0b, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Critical Interrupt", "Bus Degraded" },
 
 	{ 0x14, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Button", "Power Button pressed" },
 	{ 0x14, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Button", "Sleep Button pressed" },
@@ -491,6 +499,7 @@ static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unu
 	{ 0x17, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Add-in Card", NULL },
 	{ 0x18, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Chassis", NULL },
 	{ 0x19, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Chip Set", NULL },
+	{ 0x19, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Chip Set", "Thermal Trip" },
 	{ 0x1a, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Other FRU", NULL },
 
 	{ 0x1b, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "Cable/Interconnect", "Connected" },
@@ -520,6 +529,10 @@ static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unu
 	{ 0x1f, 0x04, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "CD-ROM boot completed" },
 	{ 0x1f, 0x05, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "ROM boot completed" },
 	{ 0x1f, 0x06, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "boot completed - device not specified" },
+	{ 0x1f, 0x07, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "Installation started" },
+	{ 0x1f, 0x08, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "Installation completed" },
+	{ 0x1f, 0x09, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "Installation aborted" },
+	{ 0x1f, 0x0a, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Boot", "Installation failed" },
 
 	{ 0x20, 0x00, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Stop/Shutdown", "Error during system startup" },
 	{ 0x20, 0x01, 0xff, IPMI_EVENT_CLASS_DISCRETE, "OS Stop/Shutdown", "Run-time critical stop" },
@@ -676,6 +689,56 @@ static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unu
 	{ 0x00, 0x00, 0x00, 0x00, NULL, NULL },
 };
 
+static uint16_t supermicro_x9dal[] = {
+		0x0635, 0xFFFF
+};
+
+static uint16_t supermicro_x9db[] = {
+		0x0733, 0x0722, 0x0703, 0x0721, 0x0716, 0x0637, 0xFFFF
+};
+
+static uint16_t supermicro_x9sb[] = {
+		0x0651, 0xFFFF
+};
+
+static uint16_t supermicro_x9[] = {
+		0x0635, 0x0733, 0x0722, 0x0703, 0x0721, 0x0716, 0x0637, 0x0651, 0xFFFF
+};
+
+static uint16_t supermicro_b8[] = {
+		0x000A, 0x061c, 0x0620, 0x0101, 0x061f, 0x0612, 0x061e, 0xFFFF
+};
+
+static uint16_t supermicro_h8[] = {
+		0xa111, 0x0408, 0x0811, 0x1411, 0x0911, 0x1211, 0x1011, 0xcd11, 0x1111, 0xbe11, 0xce11, 0xbd11,
+		0xbc11, 0xa911, 0xaa11, 0xbd11, 0xcb11, 0xad11, 0xa811, 0xac11, 0xaf11, 0xa511, 0xa011, 0x1611,
+		0x2511, 0xbf11, 0x1511, 0x2211, 0x2411, 0x1911, 0xab11, 0xd011, 0xae11, 0xca11, 0x0409, 0xa211,
+		0xa311, 0x1311, 0xba11, 0xa711, 0xd111, 0x1711, 0xcf11, 0x2011, 0x1811, 0xFFFF
+};
+
+static uint16_t supermicro_p8[] = {
+		0x6480, 0x7380, 0x6280, 0x7480, 0x5980, 0xFFFF
+};
+
+static uint16_t supermicro_x8[] = {
+		0xa880, 0x0403, 0x0100, 0x0601, 0x0001, 0x0404, 0x0606, 0x0608, 0x0632, 0x0400, 0x0401, 0x0006,
+		0x040a, 0xf280, 0x060f, 0x0609, 0x0008, 0x0613, 0x061b, 0x0007, 0x0600, 0x060c, 0x060d, 0x0614,
+		0x060c, 0x0003, 0x040b, 0x0621, 0x0610, 0x0638, 0xf380, 0x060b, 0x040d, 0x0605, 0x062d, 0x060e,
+		0x061a, 0xf580, 0x062e, 0x0009, 0xFFFF
+};
+
+static uint16_t supermicro_X8[] = {
+		0x000A, 0x061c, 0x0620, 0x0101, 0x061f, 0x0612, 0x061e, 0xa111, 0x0408, 0x0811, 0x1411, 0x0911,
+		0x1211, 0x1011, 0xcd11, 0x1111, 0xbe11, 0xce11, 0xbd11, 0xbc11, 0xa911, 0xaa11, 0xbd11, 0xcb11,
+		0xad11, 0xa811, 0xac11, 0xaf11, 0xa511, 0xa011, 0x1611, 0x2511, 0xbf11, 0x1511, 0x2211, 0x2411,
+		0x1911, 0xab11, 0xd011, 0xae11, 0xca11, 0x0409, 0xa211, 0xa311, 0x1311, 0xba11, 0xa711, 0xd111,
+		0x1711, 0xcf11, 0x2011, 0x1811, 0x6480, 0x7380, 0x6280, 0x7480, 0x5980, 0xa880, 0x0403, 0x0100,
+		0x0601, 0x0001, 0x0404, 0x0606, 0x0608, 0x0632, 0x0400, 0x0401, 0x0006, 0x040a, 0xf280, 0x060f,
+		0x0609, 0x0008, 0x0613, 0x061b, 0x0007, 0x0600, 0x060c, 0x060d, 0x0614, 0x060c, 0x0003, 0x040b,
+		0x0621, 0x0610, 0x0638, 0xf380, 0x060b, 0x040d, 0x0605, 0x062d, 0x060e, 0x061a, 0xf580, 0x062e,
+		0x0009, 0xFFFF
+};
+
 int ipmi_sel_main(struct ipmi_intf *, int, char **);
 void ipmi_sel_print_std_entry(struct ipmi_intf * intf, struct sel_event_record * evt);
 void ipmi_sel_print_std_entry_verbose(struct ipmi_intf * intf, struct sel_event_record * evt);

include/ipmitool/ipmi_sunoem.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -39,19 +39,35 @@
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_sdr.h>
 
-#define IPMI_NETFN_SUNOEM		0x2e
+#define IPMI_NETFN_SUNOEM				0x2e
 
-#define IPMI_SUNOEM_SET_SSH_KEY		0x01
-#define IPMI_SUNOEM_DEL_SSH_KEY		0x02
-#define IPMI_SUNOEM_GET_HEALTH_STATUS	0x10
-#define IPMI_SUNOEM_SET_FAN_SPEED	0x20
-#define IPMI_SUNOEM_LED_GET		0x21
-#define IPMI_SUNOEM_LED_SET		0x22
+#define IPMI_SUNOEM_SET_SSH_KEY				0x01
+#define IPMI_SUNOEM_DEL_SSH_KEY				0x02
+#define IPMI_SUNOEM_GET_HEALTH_STATUS			0x10
+#define IPMI_SUNOEM_CLI					0x19
+#define IPMI_SUNOEM_SET_FAN_SPEED			0x20
+#define IPMI_SUNOEM_LED_GET				0x21
+#define IPMI_SUNOEM_LED_SET				0x22
+#define IPMI_SUNOEM_ECHO				0x23
+#define IPMI_SUNOEM_VERSION				0x24
+#define IPMI_SUNOEM_NACNAME				0x29
+#define IPMI_SUNOEM_GETVAL				0x2A
+#define IPMI_SUNOEM_SETVAL				0x2C
+#define IPMI_SUNOEM_SENSOR_SET				0x3A
+#define IPMI_SUNOEM_SET_FAN_MODE			0x41
+#define IPMI_SUNOEM_CORE_TUNNEL                         0x44
+
+/*
+ * Error codes of sunoem functions
+ */
+typedef enum {
+	SUNOEM_EC_SUCCESS            = 0,
+	SUNOEM_EC_INVALID_ARG        = 1,
+	SUNOEM_EC_BMC_NOT_RESPONDING = 2,
+	SUNOEM_EC_BMC_CCODE_NONZERO  = 3
+} sunoem_ec_t;
 
 int ipmi_sunoem_main(struct ipmi_intf *, int, char **);
 
-struct ipmi_rs * sunoem_led_get(struct ipmi_intf * intf, struct sdr_record_generic_locator * dev, int ledtype);
-struct ipmi_rs * sunoem_led_set(struct ipmi_intf * intf, struct sdr_record_generic_locator * dev, int ledtype, int ledmode);
-
 #endif /*IPMI_SUNOEM_H*/
 

include/ipmitool/ipmi_user.h

@@ -38,58 +38,46 @@
 #endif
 #include <ipmitool/ipmi.h>
 
+#define IPMI_PASSWORD_DISABLE_USER  0x00
+#define IPMI_PASSWORD_ENABLE_USER   0x01
+#define IPMI_PASSWORD_SET_PASSWORD  0x02
+#define IPMI_PASSWORD_TEST_PASSWORD 0x03
 
-/*
- * The GET USER ACCESS response from table 22-32 of the IPMI v2.0 spec
- */
-struct user_access_rsp {
-#if WORDS_BIGENDIAN
-	uint8_t __reserved1 : 2;
-	uint8_t maximum_ids : 6;
-#else
-	uint8_t maximum_ids : 6;
-	uint8_t __reserved1 : 2;
-#endif
-
-#if WORDS_BIGENDIAN
-	uint8_t __reserved2        : 2;
-	uint8_t enabled_user_count : 6;
-#else
-	uint8_t enabled_user_count : 6;
-	uint8_t __reserved2        : 2;
-#endif
-
-#if WORDS_BIGENDIAN
-	uint8_t __reserved3      : 2;
-	uint8_t fixed_name_count : 6;
-#else
-	uint8_t fixed_name_count : 6;
-	uint8_t __reserved3      : 2;
-#endif
-
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(1)
-#endif
-#if WORDS_BIGENDIAN
-	uint8_t __reserved4             : 1;
-	uint8_t no_callin_access        : 1;
-	uint8_t link_auth_access        : 1;
-	uint8_t ipmi_messaging_access   : 1;
-	uint8_t channel_privilege_limit : 4;
-#else
-	uint8_t channel_privilege_limit : 4;
-	uint8_t ipmi_messaging_access   : 1;
-	uint8_t link_auth_access        : 1;
-	uint8_t no_callin_access        : 1;
-	uint8_t __reserved4             : 1;
-#endif
-} ATTRIBUTE_PACKING;
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(0)
-#endif
+#define IPMI_USER_ENABLE_UNSPECIFIED 0x00
+#define IPMI_USER_ENABLE_ENABLED 0x40
+#define IPMI_USER_ENABLE_DISABLED 0x80
+#define IPMI_USER_ENABLE_RESERVED 0xC0
 
+/* (22.27) Get and (22.26) Set User Access */
+struct user_access_t {
+	uint8_t callin_callback;
+	uint8_t channel;
+	uint8_t enabled_user_ids;
+	uint8_t enable_status;
+	uint8_t fixed_user_ids;
+	uint8_t ipmi_messaging;
+	uint8_t link_auth;
+	uint8_t max_user_ids;
+	uint8_t privilege_limit;
+	uint8_t session_limit;
+	uint8_t user_id;
+};
 
+/* (22.29) Get User Name */
+struct user_name_t {
+	uint8_t user_id;
+	uint8_t user_name[17];
+};
 
 int ipmi_user_main(struct ipmi_intf *, int, char **);
+int _ipmi_get_user_access(struct ipmi_intf *intf,
+		struct user_access_t *user_access_rsp);
+int _ipmi_get_user_name(struct ipmi_intf *intf, struct user_name_t *user_name);
+int _ipmi_set_user_access(struct ipmi_intf *intf,
+		struct user_access_t *user_access_req,
+		uint8_t change_priv_limit_only);
+int _ipmi_set_user_password(struct ipmi_intf *intf,
+		uint8_t user_id, uint8_t operation,
+		const char *password, uint8_t is_twenty_byte);
 
 #endif /* IPMI_USER_H */

include/ipmitool/ipmi_vita.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Pigeon Point Systems. All right reserved
+ */
+
+#ifndef _IPMI_VITA_H_
+#define _IPMI_VITA_H_
+
+/* VITA 46.11 commands */
+#define VITA_GET_VSO_CAPABILITIES_CMD		0x00
+#define VITA_FRU_CONTROL_CMD			0x04
+#define VITA_GET_FRU_LED_PROPERTIES_CMD		0x05
+#define VITA_GET_LED_COLOR_CAPABILITIES_CMD	0x06
+#define VITA_SET_FRU_LED_STATE_CMD		0x07
+#define VITA_GET_FRU_LED_STATE_CMD		0x08
+#define VITA_SET_FRU_STATE_POLICY_BITS_CMD	0x0A
+#define VITA_GET_FRU_STATE_POLICY_BITS_CMD	0x0B
+#define VITA_SET_FRU_ACTIVATION_CMD		0x0C
+#define VITA_GET_FRU_ADDRESS_INFO_CMD		0x40
+
+/* VITA 46.11 site types */
+#define VITA_FRONT_VPX_MODULE		0x00
+#define VITA_POWER_ENTRY		0x01
+#define VITA_CHASSIS_FRU		0x02
+#define VITA_DEDICATED_CHMC		0x03
+#define VITA_FAN_TRAY			0x04
+#define VITA_FAN_TRAY_FILTER		0x05
+#define VITA_ALARM_PANEL		0x06
+#define VITA_XMC			0x07
+#define VITA_VPX_RTM			0x09
+#define VITA_FRONT_VME_MODULE		0x0A
+#define VITA_FRONT_VXS_MODULE		0x0B
+#define VITA_POWER_SUPPLY		0x0C
+#define VITA_FRONT_VITA62_MODULE	0x0D
+#define VITA_71_MODULE			0x0E
+#define VITA_FMC			0x0F
+
+
+#define GROUP_EXT_VITA		0x03
+
+extern uint8_t
+vita_discover(struct ipmi_intf *intf);
+
+extern uint8_t
+ipmi_vita_ipmb_address(struct ipmi_intf *intf);
+
+extern int
+ipmi_vita_main(struct ipmi_intf * intf, int argc, char ** argv);
+
+#endif /* _IPMI_VITA_H_ */

ipmitool/debian/README.Debian

@@ -1,5 +0,0 @@
-For more information about setting up your Debian system with IPMI
-please see the excellent howto by Tim Small:
-
-http://buttersideup.com/docs/howto/IPMI_on_Debian.html
-

ipmitool/debian/changelog

@@ -1,324 +0,0 @@
-version (1.8.11) unstable; urgency=low
-  * Fix new GCC compilation issues in regards to Packing
-  * Fix Tracker bug #1642710 - ipmi_kcs_drv being loaded/unloaded
-       for 2.4 kernel instead of ipmi_si_drv driver module
-  * New -y option added to allow specification of kg keys with
-       non-printable characters
-  * New -K option added to allow kgkey settings via environmental
-       variable IPMI_KGKEY
-  * Generic device support added for EEPROM with SDR Type 10h (gendev)
-  * Fix to lan-bridging for a double-bridging crash and to fix
-       an issue with bridging multiple concurrent requests and
-       erroneous handling of raw Send Message
-  * Lanplus fix for commands like 'sensor list' without the -t option
-       causing wrong double bridged requests of a sensor is located
-       on another satellite controller
-  * Fix lan and lanplus request list entry removal bugs
-  * Fix non-working issue when trying to send a bridge message with
-       Cipher 3
-  * Change bridge message handling to reuse command ipmi_lan_poll_recv
-  * Added PICMG 2.0 and 2.3 support
-  * Fix PICMG (ATCA) extension verification and reversal of BCD encoded
-       values for "major" and "minor" fields
-  * Add IANA support for Pigeon Point
-  * Add OEM SW/FW Record identification
-  * Fix to include I2C and LUN addresses so sensors are correctly managed
-  * Patch ID 1990560 to get readings from non-linear analog sensors
-  * Add support for SOL payload status command
-  * SOL set parameter range checking added
-  * Fixed SOL activate options usage 
-  * Fixed crashes when parsing 'sol payload' and 'tsol' cmds (#216967)
-  * Added retries to SOL keepalive
-  * Fixed wrong mask values for Front Panel disable/enable status
-  * Add support to access fru internal use area
-  * Add support for new PICMG 3.0 R3.0 (March 24, 2008) to allow
-       blocks of data within the FRU storage area to be write
-       protected.
-  * Fix node reporting in GUID; Tracker bug #2339675
-  * Fix watchdog use/action print strings
-  * Fix endian bug in SDR add from file; Tracker bug #2075258
-  * Fix crash when dumping SDRs in a file and there's an error
-       getting an SDR; improve algorithm for optimal packet size
-  * Fix occasional SDR dump segfault; #1793076
-  * Allow ipmitool sel delete to accept hex list entry numbers
-  * Fix SEL total space reporting.
-  * Fix for garbage sensor threshold values reported when none 
-       returned.  Tracker Bug #863748
-  * ipmievd change to Monitor %used in SEL buffer and log warnings when
-       the buffer is 80% and 100% full
-
- -- Petter Reinholdtsen <pere@debian.org>  Wed, 25 Feb 2009 09:44:31 +0200
-
-ipmitool (1.8.10) unstable; urgency=low
-
-  * New upstream version.
-  * Patch to allow Debian package builds from cvs.
-
- -- Petter Reinholdtsen <pere@debian.org>  Fri,  8 Aug 2008 09:44:31 +0200
-
-ipmitool (1.8.7-2) unstable; urgency=low
-
-  * Fix typo in init.d/ipmievd. (Closes: #361309)
-
- -- Petter Reinholdtsen <pere@debian.org>  Sat,  8 Apr 2006 06:44:31 +0200
-
-ipmitool (1.8.7-1) unstable; urgency=low
-
-  * New upstream version.
-    - Dropped nuclear clause from the copyright.  Updated debian/copyright
-      to reflect this.
-    - ipmievd now store pid in /var/run/ipmievd.pid.  Adjust init.d
-      script to use it.
-  * Rename /etc/default/ipmievd variable IPMIEVD_OPTS is renamed to
-    IPMIEVD_OPTIONS to stay compatible with upstream and other
-    distributions.  Add backwards compatibility code with a warning to
-    the users of the old variable.
-
- -- Petter Reinholdtsen <pere@debian.org>  Sun, 26 Mar 2006 21:11:08 +0200
-
-ipmitool (1.8.6-2) unstable; urgency=low
-
-  * Add ia64 as an supported arch. (Closes: #355930)
-
- -- Petter Reinholdtsen <pere@debian.org>  Fri, 10 Mar 2006 23:34:50 +0100
-
-ipmitool (1.8.6-1) unstable; urgency=low
-
-  * New upstream version.
-    - Avoid crashing when setting lan IP address. (Closes: #351205)
-  * Avoid changing history by reverding upstream change
-    to email addresses in debian/changelog.
-  * Correct typo in control file: Suggest -> Suggests.  Thanks
-    to Philipp Matthias Hahn for the report.
-  * Add init.d/ipmievd script.  Based on script from Elmar Hoffmann,
-    slightly modified to use lsb-base functions. Added dependency on
-    lsb-base.  (Closes: #345994)
-
- -- Petter Reinholdtsen <pere@debian.org>  Sun, 26 Feb 2006 10:31:14 +0100
-
-ipmitool (1.8.2-2) unstable; urgency=low
-
-  * Add build-dependency on 'libreadline5-dev | libreadline-dev' to make
-    sure all archs get readline support. (Closes: #326341)
-  * Add build-dependency on libssl-dev to enable SSL support on
-    all archs.
-  * Updated Standards-Version to 3.6.2.1. (No updates required)
-
- -- Petter Reinholdtsen <pere@debian.org>  Sat,  3 Sep 2005 19:18:51 +0200
-
-ipmitool (1.8.2-1) unstable; urgency=low
-
-  * New upstream release.
-    -  Fix FRU reading for large (>255 bytes) areas.
-    -  Overhaul to ipmievd to support SEL polling in addition to OpenIPMI.
-    -  Fix LAN parameter segfault when no Ciphers supported by
-       BMC. (Closes: #306806)
-    -  Fix IPMIv2 support on Intel v2 BMCs (use -o intelplus).
-    -  Separate option parsing code from main ipmitool source file.
-    -  Add raw I2C support with IPMI Master Read-Write command.
-    -  Add support for new 'sdr elist' extended output format.
-    -  Add support for listing sensors by type with 'sdr type' command.
-    -  Add support for new 'sel elist' extended output format that
-       cross-references events with sensors.
-    -  Add support for sending dynamically generated platform events
-       based on existing sensor information.
-    -  New '-S' argument to read local SDR cache created with 'sdr dump'.
-    -  Updated manpage for ipmitool and ipmievd. (Closes: #306894)
-  * Correct the upstream URL in debian/changelog to the current one.
-  * Suggest package openipmi. (Closes: #305629)
-  * Add debian/watch file to detect new source versions.
-
- -- Petter Reinholdtsen <pere@debian.org>  Sun,  5 Jun 2005 10:29:18 +0200
-
-ipmitool (1.8.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Install ipmievd into /usr/sbin/.
-
- -- Petter Reinholdtsen <pere@debian.org>  Thu,  7 Apr 2005 01:18:44 +0200
-
-ipmitool (1.8.0-1) unstable; urgency=low
-
-  * Initial upload into Debian, based on the upstream build
-    rules. (Closes: #299924)
-  * Convert debian/changelog to UTF-8.
-  * Change section from 'contrib' to 'utils'.
-  * Build-depend on debhelper (>> 4.0.0) to match the rules file.
-  * Set Standards-version to 3.6.1.
-  * Make sure binary dependency is properly generated.
-  * Add long description, copied from the project README.
-  * Drop useless provides 'ipmitool', as the package is called 'ipmitool'.
-  * Don't install the COPYING file, as the license text already is
-    included in debian/copyright.
-  * Remove unused parts of the rules file.
-  * Correct clean target in rules file, to use 'distclean' and remove
-    configure-stamp not bogus config-stamp.
-
- -- Petter Reinholdtsen <pere@debian.org>  Sun,  3 Apr 2005 20:52:02 +0200
-
-ipmitool (1.8.0) unstable; urgency=low
-
-  * Fix IPMIv2.0 issues
-  * Fix chassis boot parameter support
-  * Add support for linear sensors
-
- -- Duncan Laurie <duncan@iceblink.org>  Wed, Mar 16 2005 17:08:12 -0700
-
-ipmitool (1.7.1) unstable; urgency=low
-
-  * Update bmc plugin to work with new Solaris bmc driver (new ioctl
-    for interface detection and new STREAMS message-based interface).
-
- -- Seth Goldberg <sethmeisterg@hotmail.com>  Mon, Mar 7 2005 18:03:00 -0800
-
-ipmitool (1.7.0) unstable; urgency=low
-
-  * Propogate errors correctly so exit status will be useful
-  * More consistent display of errors including completion code text
-  * Errors and debug is send to stderr now
-  * New "sel get" command that will print details about SEL entry
-    and corresponding SDR records as well as FRUs via entity association
-  * Improved event generator, now supports reading events from text file
-  * New "-o oemtype" option for specifying OEM boards
-    exsting types are "supermicro" and "intelwv2"
-  * New PEF subsystem
-  * New "bmc" plugin for Solaris 10 x86
-  * Many bugfixes and contributed patches
-
- -- Duncan Laurie <duncan@iceblink.org>  Fri, Jan 7 2005 19:58:22 -0700
-
-ipmitool (1.6.2) unstable; urgency=low
-
-  * Support for Supermicro BMC OEM authentication method
-
- -- Duncan Laurie <duncan@iceblink.org>  Mon, 16 Nov 2004 08:20:01 -0700
-
-ipmitool (1.6.1) unstable; urgency=low
-
-  * Fix minor problem with LAN parameter setting
-
- -- Duncan Laurie <duncan@iceblink.org>  Wed, 29 Sep 2004 11:19:17 -0700
-
-ipmitool (1.6.0) unstable; urgency=low
-
-  * Add a README
-  * Add support for IPMIv2 and Serial-over-LAN from Newisys
-  * Add Solaris x86 lipmi interface
-  * Add support for building Solaris packages
-  * Add support for building RPMs as non-root user
-  * Fix segfault when doing "sel list" (from Matthew Braithwaite)
-  * Fix "chassis identify" on some BMCs (from ebrower@sourceforge)
-  * Add "bmc info" and related output (from ebrower@sourceforge)
-  * new "shell" and "exec" commands
-  * lots of other contributed patches
-
- -- Duncan Laurie <duncan@iceblink.org>  Thu, 9 Sep 2004 21:39:37 -0700
-
-ipmitool (1.5.9) unstable; urgency=low
-
-  * Add ability to get a particular sensor by name
-  * Add ability to set a particular sensor threshold
-  * Add support for displaying V2 channel authentication levels
-  * Add README for rrdtool scripts in contrib directory
-  * Improve lan interface retry handling
-  * Support prompting for password or reading from environment
-  * Move chaninfo command into channel subcommand
-  * Fix reservation ID handling when two sessions open to BMC
-  * Fix reading of large FRU data
-  * Add configure option for changing binary to ipmiadm for Solaris
-  * Fix compile problem on Solaris 8
-
- -- Duncan Laurie <duncan@iceblink.org>  Sat, 27 Mar 2004 00:11:37 -0700
-
-ipmitool (1.5.8) unstable; urgency=low
-
-  * Enable static compilation of interfaces
-  * Fix types to be 64-bit safe
-  * Fix compilation problems on Solaris
-  * Fix multiple big-endian problems for Solaris/SPARC
-  * Fix channel access to save settings to NVRAM
-  * Set channel privilege limit to ADMIN during "access on"
-  * Enable gratuitous ARP in bmcautoconf.sh
-  * Add support for Linux kernel panic messages in SEL output
-  * Add support for type 3 SDR records
-
- -- Duncan Laurie <duncan@iceblink.org>  Tue, 27 Jan 2004 16:23:25 -0700
-
-ipmitool (1.5.7) unstable; urgency=low
-
-  * add IPMIv1.5 eratta fixes
-  * additions to FRU printing and FRU multirecords
-  * better handling of SDR printing
-  * contrib scripts for creating rrdtool graphs
-
- -- Duncan Laurie <duncan@iceblink.org>  Mon,  5 Jan 2004 17:29:50 -0700
-
-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@iceblink.org>  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@iceblink.org>  Tue, 25 Nov 2003 15:10:48 -0700
-
-ipmitool (1.5.4) unstable; urgency=low
-
-  * Put interface plugin API into library
-  * Fix ipmievd
-
- -- Duncan Laurie <duncan@iceblink.org>  Fri, 14 Nov 2003 15:16:34 -0700
-
-ipmitool (1.5.3) unstable; urgency=low
-
-  * Add -g option to work with grizzly bmc
-
- -- Duncan Laurie <duncan@iceblink.org>  Mon,  3 Nov 2003 18:04:07 -0700
-
-ipmitool (1.5.2) unstable; urgency=low
-
-  * add support for setting gratuitous arp interval 
-
- -- Duncan Laurie <duncan@iceblink.org>  Fri, 24 Oct 2003 11:00:00 -0700
-
-ipmitool (1.5.1) unstable; urgency=low
-
-  * better SEL support
-  * fix display bug in SDR list
-
- -- Duncan Laurie <duncan@iceblink.org>  Wed,  8 Oct 2003 17:28:51 -0700
-
-ipmitool (1.5.0) unstable; urgency=low
-
-  * more robust UDP packet handling
-  * add Intel IMB driver support
-  * use autoconf/automake/libtool
-
- -- Duncan Laurie <duncan@iceblink.org>  Fri,  5 Sep 2003 11:57:32 -0700
-
-ipmitool (1.2-1) unstable; urgency=low
-
-  * New command line option parsing
-  * More chassis commands supported
-
- -- Duncan Laurie <duncan@iceblink.org>  Wed,  2 Apr 2003 17:44:17 -0700
-
-ipmitool (1.1-1) unstable; urgency=low
-
-  * Minor fixes.
-
- -- Duncan Laurie <duncan@iceblink.org>  Tue,  1 Apr 2003 14:31:10 -0700
-
-ipmitool (1.0-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Duncan Laurie <duncan@iceblink.org>  Sun, 30 Mar 2003 21:30:46 -0700
-

ipmitool/debian/control

@@ -1,28 +0,0 @@
-Source: ipmitool
-Section: utils
-Priority: optional
-Maintainer: Petter Reinholdtsen <pere@debian.org>
-Uploaders: Duncan Laurie <duncan@iceblink.org>
-Build-Depends: debhelper (>> 4.0.0), libreadline5-dev | libreadline-dev, libssl-dev, autoconf, automake1.9 | automake, autotools-dev, libtool
-Standards-Version: 3.6.2.1
-
-Package: ipmitool
-Architecture: i386 amd64 ia64
-Depends: ${shlibs:Depends}, lsb-base
-Suggests: openipmi
-Description: utility for IPMI control with kernel driver or LAN interface
- A utility for managing and configuring devices that support the
- Intelligent Platform Management Interface.  IPMI is an open standard
- for monitoring, logging, recovery, inventory, and control of hardware
- that is implemented independent of the main CPU, BIOS, and OS.  The
- service processor (or Baseboard Management Controller, BMC) is the
- brain behind platform management and its primary purpose is to handle
- the autonomous sensor monitoring and event logging features.
- .
- The ipmitool program provides a simple command-line interface to this
- BMC.  It features the ability to read the sensor data repository
- (SDR) and print sensor values, display the contents of the System
- Event Log (SEL), print Field Replaceable Unit (FRU) inventory
- information, read and set LAN configuration parameters, and perform
- remote chassis power control.
-

ipmitool/debian/copyright

@@ -1,36 +0,0 @@
-This package was debianized by Duncan Laurie before
-2003-11-18 17:55:21 +0100.
-
-It was downloaded from <URL:http://ipmitool.sourceforge.net/>
-
-Upstream Author: Duncan Laurie <duncan@iceblink.org>
-  
-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.

ipmitool/debian/dirs

@@ -1,4 +0,0 @@
-usr/bin
-usr/sbin
-usr/share/ipmitool
-usr/share/doc/ipmitool

ipmitool/debian/docs

@@ -1,2 +0,0 @@
-README
-AUTHORS

ipmitool/debian/ipmitool.ipmievd.init

@@ -1,99 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          ipmievd
-# Required-Start:    $local_fs $remote_fs $syslog
-# Required-Stop:     $local_fs $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      S 0 1 6
-# Short-Description: IPMI event daemon
-# Description:       ipmievd  is a daemon which will listen for events
-#                    from the BMC that are being sent to the SEL and
-#                    also log those messages to syslog.
-### END INIT INFO
-#
-# Author:	Elmar Hoffmann <elho@elho.net>
-# Licence:      This script is public domain using the same
-#               licence as ipmitool itself.
-# Modified by:  Petter Reinholdtsen
-
-set -e
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="IPMI event daemon"
-NAME=ipmievd
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-. /etc/default/rcS
-
-# Options used by ipmievd.
-#
-# "open" uses the asynchronous event notification from the OpenIPMI
-# kernel driver, "sel" uses active polling of the contents of the SEL
-# for new events.
-#
-# Need to force 'daemon' mode, to make sure messages are sent to
-# syslog and the program forks into the background.
-#
-# Se ipmievd(8) for more info.
-IPMIEVD_OPTIONS="open daemon"
-
-# Read config file if it is present.
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Backwards compatibility with version 1.8.6-2 and 1.8.6-1.  The
-# variable was renamed to be compatible with upstream, SuSe and RedHat.
-if [ -n "$IPMIEVD_OPTS" ]; then
-    echo "warning: /etc/default/$NAME variable IPMIEVD_OPTS should be renamed to IPMIEVD_OPTIONS"
-    IPMIEVD_OPTIONS="$IPMIEVD_OPTS"
-fi
-
-#
-#	Function that starts the daemon/service.
-#
-d_start() {
-	start-stop-daemon --start --quiet --exec $DAEMON -- $IPMIEVD_OPTIONS
-}
-
-#
-#	Function that stops the daemon/service.
-#
-d_stop() {
-	start-stop-daemon --stop --quiet --name $NAME --exec $DAEMON
-}
-
-CODE=0
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_begin_msg "Starting $DESC" "$NAME"
-	d_start || CODE=$?
-	[ "$VERBOSE" != no ] && log_end_msg $CODE
-	exit $CODE
-	;;
-  stop)
-	log_begin_msg "Stopping $DESC" "$NAME"
-	d_stop || CODE=$?
-	log_end_msg $CODE
-	exit $CODE
-	;;
-  restart|force-reload)
-	log_begin_msg "Restarting $DESC" "$NAME"
-	d_stop || true
-	sleep 1
-	d_start || CODE=$?
-	log_end_msg $CODE
-	exit $CODE
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0

ipmitool/debian/rules

@@ -1,118 +0,0 @@
-#!/usr/bin/make -f
-
-#export DH_VERBOSE=1
-export DH_COMPAT=4
-export DH_OPTIONS
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	./bootstrap
-
-	./configure --prefix=/usr \
-		    --with-kerneldir \
-		    --mandir=/usr/share/man
-	touch configure-stamp
-
-#Architecture 
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp 
-
-# Add here commands to compile the arch part of the package.
-	$(MAKE)
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp 
-
-# Add here commands to compile the indep part of the package.
-#$(MAKE) doc
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
-
-# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
-	dh_clean
-
-install: install-arch #install-indep
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-
-# Add here commands to install the indep part of the package into
-# debian/<package>-doc.
-#INSTALLDOC#
-#	$(MAKE) install-doc DESTDIR=$(CURDIR)/debian/tmp/ipmitool-doc
-#	dh_movefiles -i
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -a
-	dh_installdirs -a
-
-# Add here commands to install the arch part of the package into 
-# debian/tmp.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/ipmitool
-
-	# No need to have two copies of the license text in the package.
-	$(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/COPYING
-
-	# Move upstream changelog to correct filename.
-	mv $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog \
-	  $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/changelog
-
-	# Compress to avoid lintian warning.  Not sure why dh_compress
-	# isn't fixing this.
-	gzip -9 $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/changelog
-
-#	dh_movefiles -a
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-multi
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs 
-	dh_installinit --name ipmievd
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch #binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
-

ipmitool/debian/watch

@@ -1,6 +0,0 @@
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site          Directory               Pattern                 Version Script
-version=2
-http://heanet.dl.sourceforge.net/sourceforge/ipmitool/ipmitool-(.*).tar.bz2
-# debian uupdate

ipmitool/include/ipmitool/ipmi_fwum.h

@@ -1,42 +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.
- */
-
-#ifndef IPMI_KFWUM_H
-#define IPMI_KFWUM_H
-
-#include <inttypes.h>
-#include <ipmitool/ipmi.h>
-
-
-int ipmi_fwum_main(struct ipmi_intf *, int, char **);
-
-#endif /* IPMI_KFWUM_H */

ipmitool/include/ipmitool/ipmi_hpmfwupg.h

@@ -1,41 +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.
- */
-
-#ifndef IPMI_HPMFWUPG_H
-#define IPMI_HPMFWUPG_H
-
-#include <inttypes.h>
-#include <ipmitool/ipmi.h>
-
-int ipmi_hpmfwupg_main(struct ipmi_intf *, int, char **);
-
-#endif /* IPMI_KFWUM_H */

ipmitool/lib/ipmi_channel.c

@@ -1,903 +0,0 @@
-/* -*-mode: C; indent-tabs-mode: t; -*-
- * 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.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <ipmitool/ipmi.h>
-#include <ipmitool/ipmi_intf.h>
-#include <ipmitool/helper.h>
-#include <ipmitool/log.h>
-#include <ipmitool/ipmi_lanp.h>
-#include <ipmitool/ipmi_channel.h>
-#include <ipmitool/ipmi_strings.h>
-#include <ipmitool/ipmi_constants.h>
-
-extern int csv_output;
-extern int verbose;
-
-void printf_channel_usage (void);
-
-/**
- * ipmi_1_5_authtypes
- *
- * Create a string describing the supported authentication types as 
- * specificed by the parameter n
- */
-static const char *
-ipmi_1_5_authtypes(uint8_t n)
-{
-	uint32_t i;
-	static char supportedTypes[128];
-
-	bzero(supportedTypes, 128);
-
-	for (i = 0; ipmi_authtype_vals[i].val != 0; i++) {
-		if (n & ipmi_authtype_vals[i].val) {
-			strcat(supportedTypes, ipmi_authtype_vals[i].str);
-			strcat(supportedTypes, " ");
-		}
-	}
-
-	return supportedTypes;
-}
-
-
-
-/**
- * ipmi_get_channel_auth_cap
- *
- * return 0 on success
- *        -1 on failure
- */
-int
-ipmi_get_channel_auth_cap(struct ipmi_intf * intf,
-			  uint8_t channel,
-			  uint8_t priv)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	struct get_channel_auth_cap_rsp auth_cap;
-	uint8_t msg_data[2];
-
-	msg_data[0] = channel | 0x80; // Ask for IPMI v2 data as well
-	msg_data[1] = priv;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn    = IPMI_NETFN_APP;            // 0x06
-	req.msg.cmd      = IPMI_GET_CHANNEL_AUTH_CAP; // 0x38
-	req.msg.data     = msg_data;
-	req.msg.data_len = 2;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if ((rsp == NULL) || (rsp->ccode > 0))	{
-		/*
-		 * It's very possible that this failed because we asked for IPMI v2 data
-		 * Ask again, without requesting IPMI v2 data
-		 */
-		msg_data[0] &= 0x7F;
-		
-		rsp = intf->sendrecv(intf, &req);
-		if (rsp == NULL) {
-			lprintf(LOG_ERR, "Unable to Get Channel Authentication Capabilities");
-			return -1;
-		}
-		if (rsp->ccode > 0) {
-			lprintf(LOG_ERR, "Get Channel Authentication Capabilities failed: %s",
-				val2str(rsp->ccode, completion_code_vals));
-			return -1;
-		}
-	}
-
-	memcpy(&auth_cap, rsp->data, sizeof(struct get_channel_auth_cap_rsp));
-
-	printf("Channel number             : %d\n",
-		   auth_cap.channel_number);
-	printf("IPMI v1.5  auth types      : %s\n",
-		   ipmi_1_5_authtypes(auth_cap.enabled_auth_types));
-
-	if (auth_cap.v20_data_available)
-		printf("KG status                  : %s\n",
-			   (auth_cap.kg_status) ? "non-zero" : "default (all zeroes)");
-
-	printf("Per message authentication : %sabled\n",
-		   (auth_cap.per_message_auth) ? "dis" : "en");
-	printf("User level authentication  : %sabled\n",
-		   (auth_cap.user_level_auth) ? "dis" : "en");
-
-	printf("Non-null user names exist  : %s\n",
-		   (auth_cap.non_null_usernames) ? "yes" : "no");
-	printf("Null user names exist      : %s\n",
-		   (auth_cap.null_usernames) ? "yes" : "no");
-	printf("Anonymous login enabled    : %s\n",
-		   (auth_cap.anon_login_enabled) ? "yes" : "no");
-
-	if (auth_cap.v20_data_available) {
-		printf("Channel supports IPMI v1.5 : %s\n",
-			   (auth_cap.ipmiv15_support) ? "yes" : "no");
-		printf("Channel supports IPMI v2.0 : %s\n",
-			   (auth_cap.ipmiv20_support) ? "yes" : "no");
-	}
-
-	/*
-	 * If there is support for an OEM authentication type, there is some
-	 * information.
-	 */
-	if (auth_cap.enabled_auth_types & IPMI_1_5_AUTH_TYPE_BIT_OEM) {
-		printf("IANA Number for OEM        : %d\n",
-			   auth_cap.oem_id[0]      | 
-			   auth_cap.oem_id[1] << 8 | 
-			   auth_cap.oem_id[2] << 16);
-		printf("OEM Auxiliary Data         : 0x%x\n",
-			   auth_cap.oem_aux_data);
-	}
-
-	return 0;
-}
-
-
-
-/**
- * ipmi_get_channel_info
- *
- * returns 0 on success
- *         -1 on failure
- *
- */
-int
-ipmi_get_channel_info(struct ipmi_intf * intf, uint8_t channel)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	uint8_t rqdata[2];
-	uint8_t medium;
-	struct get_channel_info_rsp   channel_info;
-	struct get_channel_access_rsp channel_access;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_APP;        // 0x06
-	req.msg.cmd   = IPMI_GET_CHANNEL_INFO; // 0x42
-	req.msg.data = &channel;
-	req.msg.data_len = 1;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Unable to Get Channel Info");
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Get Channel Info failed: %s",
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	memcpy(&channel_info, rsp->data, sizeof(struct get_channel_info_rsp));
-
-	printf("Channel 0x%x info:\n", channel_info.channel_number);
-
-	printf("  Channel Medium Type   : %s\n",
-		   val2str(channel_info.channel_medium, ipmi_channel_medium_vals));
-
-	printf("  Channel Protocol Type : %s\n",
-		   val2str(channel_info.channel_protocol, ipmi_channel_protocol_vals));
-
-	printf("  Session Support       : ");
-	switch (channel_info.session_support) {
-		case 0x0:
-			printf("session-less\n");
-			break;
-		case 0x1:
-			printf("single-session\n");
-			break;
-		case 0x2:
-			printf("multi-session\n");
-			break;
-		case 0x3:
-		default:
-			printf("session-based\n");
-			break;
-	}
-
-	printf("  Active Session Count  : %d\n",
-		   channel_info.active_sessions);
-
-	printf("  Protocol Vendor ID    : %d\n",
-		   channel_info.vendor_id[0]      |
-		   channel_info.vendor_id[1] << 8 |
-		   channel_info.vendor_id[2] << 16);
-
-
-	/* only proceed if this is LAN channel */
-	medium = ipmi_get_channel_medium(intf, channel);
-	if (medium != IPMI_CHANNEL_MEDIUM_LAN &&
-	    medium != IPMI_CHANNEL_MEDIUM_LAN_OTHER) {
-		return 0;
-	}
-
-	memset(&req, 0, sizeof(req));
-	rqdata[0] = channel & 0xf;
-
-	/* get volatile settings */
-
-	rqdata[1] = 0x80; /* 0x80=active */
-	req.msg.netfn = IPMI_NETFN_APP;          // 0x06
-	req.msg.cmd   = IPMI_GET_CHANNEL_ACCESS; // 0x41
-	req.msg.data = rqdata;
-	req.msg.data_len = 2;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Unable to Get Channel Access (volatile)");
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Get Channel Access (volatile) failed: %s",
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	memcpy(&channel_access, rsp->data, sizeof(struct get_channel_access_rsp));
-
-
-	printf("  Volatile(active) Settings\n");
-	printf("    Alerting            : %sabled\n",
-		   (channel_access.alerting) ? "dis" : "en");
-	printf("    Per-message Auth    : %sabled\n",
-		   (channel_access.per_message_auth) ? "dis" : "en");
-	printf("    User Level Auth     : %sabled\n",
-		   (channel_access.user_level_auth) ? "dis" : "en");
-
-	printf("    Access Mode         : ");
-	switch (channel_access.access_mode) {
-		case 0:
-			printf("disabled\n");
-			break;
-		case 1:
-			printf("pre-boot only\n");
-			break;
-		case 2:
-			printf("always available\n");
-			break;
-		case 3:
-			printf("shared\n");
-			break;
-		default:
-			printf("unknown\n");
-			break;
-	}
-
-	/* get non-volatile settings */
-
-	rqdata[1] = 0x40; /* 0x40=non-volatile */
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Unable to Get Channel Access (non-volatile)");
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Get Channel Access (non-volatile) failed: %s",
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	memcpy(&channel_access, rsp->data, sizeof(struct get_channel_access_rsp));
-
-	printf("  Non-Volatile Settings\n");
-	printf("    Alerting            : %sabled\n",
-		   (channel_access.alerting) ? "dis" : "en");
-	printf("    Per-message Auth    : %sabled\n",
-		   (channel_access.per_message_auth) ? "dis" : "en");
-	printf("    User Level Auth     : %sabled\n",
-		   (channel_access.user_level_auth) ? "dis" : "en");
-
-	printf("    Access Mode         : ");
-	switch (channel_access.access_mode) {
-		case 0:
-			printf("disabled\n");
-			break;
-		case 1:
-			printf("pre-boot only\n");
-			break;
-		case 2:
-			printf("always available\n");
-			break;
-		case 3:
-			printf("shared\n");
-			break;
-		default:
-			printf("unknown\n");
-			break;
-	}
-
-	return 0;
-}
-
-static int
-ipmi_get_user_access(struct ipmi_intf * intf, uint8_t channel, uint8_t userid)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req1, req2;
-	uint8_t rqdata[2];
-	struct get_user_access_rsp user_access;
-	int curr_uid, max_uid = 0, init = 1;
-
-	curr_uid = userid ? : 1;
-
-	memset(&req1, 0, sizeof(req1));
-	req1.msg.netfn = IPMI_NETFN_APP;
-	req1.msg.cmd = IPMI_GET_USER_ACCESS;
-	req1.msg.data = rqdata;
-	req1.msg.data_len = 2;
-
-	memset(&req2, 0, sizeof(req2));
-	req2.msg.netfn = IPMI_NETFN_APP;
-	req2.msg.cmd = IPMI_GET_USER_NAME;
-	req2.msg.data = rqdata;
-	req2.msg.data_len = 1;
-
-	do
-	{
-		rqdata[0] = channel & 0xf;
-		rqdata[1] = curr_uid & 0x3f;
-
-		rsp = intf->sendrecv(intf, &req1);
-		if (rsp == NULL) {
-			lprintf(LOG_ERR, "Unable to Get User Access (channel %d id %d)",
-				rqdata[0], rqdata[1]);
-			return -1;
-		}
-		if (rsp->ccode > 0) {
-			lprintf(LOG_ERR, "Get User Access (channel %d id %d) failed: %s",
-				rqdata[0], rqdata[1],
-				val2str(rsp->ccode, completion_code_vals));
-			return -1;
-		}
-
-		memcpy(&user_access, rsp->data, sizeof(struct get_user_access_rsp));
-
-		rqdata[0] = curr_uid & 0x3f;
-
-		rsp = intf->sendrecv(intf, &req2);
-		if (rsp == NULL) {
-			lprintf(LOG_ERR, "Unable to Get User Name (id %d)", rqdata[0]);
-			return -1;
-		}
-		if (rsp->ccode > 0) {
-			lprintf(LOG_ERR, "Get User Name (id %d) failed: %s",
-				rqdata[0], val2str(rsp->ccode, completion_code_vals));
-			return -1;
-		}
-
-		if (init) {
-			printf("Maximum User IDs     : %d\n", user_access.max_user_ids);
-			printf("Enabled User IDs     : %d\n", user_access.enabled_user_ids);
-			max_uid = user_access.max_user_ids;
-			init = 0;
-		}
-
-		printf("\n");
-		printf("User ID              : %d\n", curr_uid);
-		printf("User Name            : %s\n", rsp->data);
-		printf("Fixed Name           : %s\n",
-		       (curr_uid <= user_access.fixed_user_ids) ? "Yes" : "No");
-		printf("Access Available     : %s\n",
-		       (user_access.callin_callback) ? "callback" : "call-in / callback");
-		printf("Link Authentication  : %sabled\n",
-		       (user_access.link_auth) ? "en" : "dis");
-		printf("IPMI Messaging       : %sabled\n",
-		       (user_access.ipmi_messaging) ? "en" : "dis");
-		printf("Privilege Level      : %s\n",
-		       val2str(user_access.privilege_limit, ipmi_privlvl_vals));
-
-		curr_uid ++;
-
-	} while (!userid && curr_uid <= max_uid);
-
-	return 0;
-}
-
-static int
-ipmi_set_user_access(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	uint8_t channel, privilege_limit, userid;
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	uint8_t rqdata[2];
-	struct get_user_access_rsp user_access;
-	struct set_user_access_data set_access;
-	int i;
-
-	if ((argc < 3) || (strncmp(argv[0], "help", 4) == 0)) {
-		printf_channel_usage();
-		return 0;
-	}
-
-	if (str2uchar(argv[0], &channel) != 0) {
-		lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[0]);
-		return (-1);
-	}
-	if (str2uchar(argv[1], &userid) != 0) {
-		lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[1]);
-		return (-1);
-	}
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_APP;
-	req.msg.cmd = IPMI_GET_USER_ACCESS;
-	req.msg.data = rqdata;
-	req.msg.data_len = 2;
-
-	rqdata[0] = channel & 0xf;
-	rqdata[1] = userid & 0x3f;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Unable to Get User Access (channel %d id %d)",
-			rqdata[0], rqdata[1]);
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Get User Access (channel %d id %d) failed: %s",
-			rqdata[0], rqdata[1],
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	memcpy(&user_access, rsp->data, sizeof(struct get_user_access_rsp));
-
-	memset(&set_access, 0, sizeof(set_access));
-	set_access.change_bits = 1;
-	set_access.callin_callback = user_access.callin_callback;
-	set_access.link_auth = user_access.link_auth;
-	set_access.ipmi_messaging = user_access.ipmi_messaging;
-	set_access.channel = channel;
-	set_access.user_id = userid;
-	set_access.privilege_limit = user_access.privilege_limit;
-	set_access.session_limit = 0;
-
-	for (i = 2; i < argc; i ++)
-	{
-		if (strncmp(argv[i], "callin=", 7) == 0) {
-			set_access.callin_callback = !(strncmp (argv[i]+7, "off", 3));
-		}
-		else if (strncmp(argv[i], "link=", 5) == 0) {
-			set_access.link_auth = strncmp (argv[i]+5, "off", 3);
-		}
-		else if (strncmp(argv[i], "ipmi=", 5) == 0) {
-			set_access.ipmi_messaging = strncmp (argv[i]+5, "off", 3);
-		}
-		else if (strncmp(argv[i], "privilege=", 10) == 0) {
-			if (str2uchar(argv[i]+10, &privilege_limit) != 0) {
-				lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[i]+10);
-				return (-1);
-			}
-			set_access.privilege_limit = privilege_limit;
-		}
-		else {
-			printf ("Invalid option: %s\n", argv [i]);
-			return -1;
-		}
-	}
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_APP;
-	req.msg.cmd = IPMI_SET_USER_ACCESS;
-	req.msg.data = (uint8_t *) &set_access;
-	req.msg.data_len = 4;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Unable to Set User Access (channel %d id %d)",
-			set_access.channel, set_access.user_id);
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Set User Access (channel %d id %d) failed: %s",
-			set_access.channel, set_access.user_id,
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	return 0;
-}
-
-
-static const char *
-iana_string(uint32_t iana)
-{
-	static char s[10];
-
-	if (iana)
-	{
-		sprintf(s, "%06x", iana);
-		return s;
-	}
-	else
-		return "N/A";
-}
-
-
-static int
-ipmi_get_channel_cipher_suites(struct ipmi_intf * intf,
-			       const char * payload_type,
-			       uint8_t channel)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-
-	uint8_t  oem_record;
-	uint8_t  rqdata[3];
-	uint32_t iana;
-	uint8_t  auth_alg, integrity_alg, crypt_alg;
-	uint8_t  cipher_suite_id;
-	uint8_t  list_index = 0;
-	uint8_t  cipher_suite_data[1024]; // 0x40 sets * 16 bytes per set
-	uint16_t offset = 0;
-	uint16_t cipher_suite_data_length = 0; // how much was returned, total
-
-	memset(cipher_suite_data, 0, sizeof(cipher_suite_data));
-	
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_APP;                 // 0x06
-	req.msg.cmd   = IPMI_GET_CHANNEL_CIPHER_SUITES; // 0x54
-	req.msg.data = rqdata;
-	req.msg.data_len = 3;
-
-	rqdata[0] = channel;
-	rqdata[1] = ((strncmp(payload_type, "ipmi", 4) == 0)? 0: 1);
-	rqdata[2] = 0x80; // Always ask for cipher suite format
-
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-
-	// Grab the returned channel number once.  We assume it's the same
-	// in future calls.
-	if (rsp->data_len >= 1)
-		channel = rsp->data[0];
-		
-	while ((rsp->data_len > 1) && (rsp->data_len == 17) && (list_index < 0x3F))
-	{
-		//
-		// We got back cipher suite data -- store it.
-		//printf("copying data to offset %d\n", offset);
-		//printbuf(rsp->data + 1, rsp->data_len - 1, "this is the data");
-		memcpy(cipher_suite_data + offset, rsp->data + 1, rsp->data_len - 1);
-		offset += rsp->data_len - 1;
-		
-		//
-		// Increment our list for the next call
-		//
-		++list_index;
-		rqdata[2] =  (rqdata[2] & 0x80) + list_index; 
-
-		rsp = intf->sendrecv(intf, &req);
-		if (rsp == NULL) {
-			lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
-			return -1;
-		}
-		if (rsp->ccode > 0) {
-			lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
-					val2str(rsp->ccode, completion_code_vals));
-			return -1;
-		}
-	}
-
-	/* Copy last chunk */
-	if(rsp->data_len > 1)
-	{
-		//
-		// We got back cipher suite data -- store it.
-		//printf("copying data to offset %d\n", offset);
-		//printbuf(rsp->data + 1, rsp->data_len - 1, "this is the data");
-		memcpy(cipher_suite_data + offset, rsp->data + 1, rsp->data_len - 1);
-		offset += rsp->data_len - 1;
-	}
-
-	//
-	// We can chomp on all our data now.
-	//
-	cipher_suite_data_length = offset;
-	offset = 0;
-
-	if (! csv_output)
-		printf("ID   IANA    Auth Alg        Integrity Alg   Confidentiality Alg\n");
-	
-	while (offset < cipher_suite_data_length)
-	{
-		if (cipher_suite_data[offset++] == 0xC0)
-		{
-			oem_record = 0; // standard type
-			iana       = 0;
-
-			// Verify that we have at least a full record left
-			if ((cipher_suite_data_length - offset) < 4) // id + 3 algs
-			{
-				lprintf(LOG_ERR, "Incomplete data record in cipher suite data");
-				return -1;
-			}
-			
-			cipher_suite_id = cipher_suite_data[offset++];
-				
-		}
-		else if (cipher_suite_data[offset++] == 0xC1)
-		{
-			oem_record = 1; // OEM record type    
-
-			// Verify that we have at least a full record left
-			if ((cipher_suite_data_length - offset) < 4) // id + iana + 3 algs
-			{
-				lprintf(LOG_ERR, "Incomplete data record in cipher suite data");
-				return -1;
-			}
-
-			cipher_suite_id = cipher_suite_data[offset++];
-
-			//
-			// Grab the IANA
-			//
-			iana =
-				cipher_suite_data[offset]            | 
-				(cipher_suite_data[offset + 1] << 8) | 
-				(cipher_suite_data[offset + 2] << 16);
-			offset += 3;
-		}
-		else
-		{
-			lprintf(LOG_ERR, "Bad start of record byte in cipher suite data");
-			return -1;
-		}
-
-		//
-		// Grab the algorithms for this cipher suite.  I guess we can't be
-		// sure of what order they'll come in.  Also, I suppose we default
-		// to the NONE algorithm if one were absent.  This part of the spec is
-		// poorly written -- I have read the errata document.  For now, I'm only
-		// allowing one algorithm per type (auth, integrity, crypt) because I
-		// don't I understand how it could be otherwise.
-		//
-		auth_alg      = IPMI_AUTH_RAKP_NONE;
-		integrity_alg = IPMI_INTEGRITY_NONE;
-		crypt_alg     = IPMI_CRYPT_NONE;
-		
-		while (((cipher_suite_data[offset] & 0xC0) != 0xC0) &&
-			   ((cipher_suite_data_length - offset) > 0))
-		{
-			switch (cipher_suite_data[offset] & 0xC0)
-			{
-			case 0x00:
-				// Authentication algorithm specifier
-				auth_alg = cipher_suite_data[offset++] & 0x3F;
-				break;
-			case 0x40:
-				// Interity algorithm specifier
-				integrity_alg = cipher_suite_data[offset++] & 0x3F;
-				break;
-			case 0x80:
-				// Confidentiality algorithm specifier
-				crypt_alg = cipher_suite_data[offset++] & 0x3F;
-				break;
-			}
-		}
-
-
-		//
-		// We have everything we need to spit out a cipher suite record
-		//
-		printf((csv_output? "%d,%s,%s,%s,%s\n" :
-			"%-4d %-7s %-15s %-15s %-15s\n"),
-		       cipher_suite_id,
-		       iana_string(iana),
-		       val2str(auth_alg, ipmi_auth_algorithms),
-		       val2str(integrity_alg, ipmi_integrity_algorithms),
-		       val2str(crypt_alg, ipmi_encryption_algorithms));
-	}
-	
-	
-	return 0;
-}
-
-
-
-uint8_t
-ipmi_get_channel_medium(struct ipmi_intf * intf, uint8_t channel)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	struct get_channel_info_rsp info;
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn = IPMI_NETFN_APP;
-	req.msg.cmd = IPMI_GET_CHANNEL_INFO;
-	req.msg.data = &channel;
-	req.msg.data_len = 1;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Get Channel Info command failed");
-		return 0;
-	}
-	if (rsp->ccode > 0) {
-		if (rsp->ccode == 0xcc)
-			return IPMI_CHANNEL_MEDIUM_RESERVED;
-		lprintf(LOG_INFO, "Get Channel Info command failed: %s",
-		       val2str(rsp->ccode, completion_code_vals));
-		return IPMI_CHANNEL_MEDIUM_RESERVED;
-	}
-
-	memcpy(&info, rsp->data, sizeof(struct get_channel_info_rsp));
-
-	lprintf(LOG_DEBUG, "Channel type: %s",
-		val2str(info.channel_medium, ipmi_channel_medium_vals));
-
-	return info.channel_medium;
-}
-
-uint8_t
-ipmi_current_channel_medium(struct ipmi_intf * intf)
-{
-	return ipmi_get_channel_medium(intf, 0xE);
-}
-
-void
-printf_channel_usage()
-{
-	lprintf(LOG_NOTICE, "Channel Commands: authcap   <channel number> <max privilege>");
-	lprintf(LOG_NOTICE, "                  getaccess <channel number> [user id]");
-	lprintf(LOG_NOTICE, "                  setaccess <channel number> "
-		"<user id> [callin=on|off] [ipmi=on|off] [link=on|off] [privilege=level]");
-	lprintf(LOG_NOTICE, "                  info      [channel number]");
-	lprintf(LOG_NOTICE, "                  getciphers <ipmi | sol> [channel]\n");
-	lprintf(LOG_NOTICE, "Possible privilege levels are:");
-	lprintf(LOG_NOTICE, "   1   Callback level");
-	lprintf(LOG_NOTICE, "   2   User level");
-	lprintf(LOG_NOTICE, "   3   Operator level");
-	lprintf(LOG_NOTICE, "   4   Administrator level");
-	lprintf(LOG_NOTICE, "   5   OEM Proprietary level");
-	lprintf(LOG_NOTICE, "  15   No access");
-}
-
-
-int
-ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	int retval = 0;
-	uint8_t channel, priv = 0;
-
-	if ((argc == 0) || (strncmp(argv[0], "help", 4) == 0))
-	{
-		printf_channel_usage();
-	}
-	else if (strncmp(argv[0], "authcap", 7) == 0)
-	{
-		if (argc != 3) {
-			printf_channel_usage();
-			return (-1);
-		} else {
-			if (str2uchar(argv[1], &channel) != 0) {
-				lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[1]);
-				return (-1);
-			}
-			if (str2uchar(argv[2], &priv) != 0) {
-				lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[2]);
-				return (-1);
-			}
-			retval = ipmi_get_channel_auth_cap(intf, channel, priv);
-		}
-	}
-	else if (strncmp(argv[0], "getaccess", 10) == 0)
-	{
-		if ((argc < 2) || (argc > 3))
-			printf_channel_usage();
-		else {
-			uint8_t ch = 0;
-			uint8_t id = 0;
-			if (str2uchar(argv[1], &ch) != 0) {
-				lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[1]);
-				return (-1);
-			}
-			if (argc == 3) {
-				if (str2uchar(argv[2], &id) != 0) {
-					lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[2]);
-					return (-1);
-				}
-			}
-			retval = ipmi_get_user_access(intf, ch, id);
-		}
-	}
-	else if (strncmp(argv[0], "setaccess", 9) == 0)
-	{
-		retval = ipmi_set_user_access(intf, argc-1, &(argv[1]));
-	}
-	else if (strncmp(argv[0], "info", 4) == 0)
-	{
-		if (argc > 2)
-			printf_channel_usage();
-		else {
-			uint8_t ch = 0xe;
-			if (argc == 2) {
-				if (str2uchar(argv[1], &ch) != 0) {
-					lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[1]);
-					return (-1);
-				}
-			}
-			retval = ipmi_get_channel_info(intf, ch);
-		}
-	}
-
-	// it channel getciphers <ipmi | sol> [channel] 
-	else if (strncmp(argv[0], "getciphers", 10) == 0)
-	{
-		if ((argc < 2) || (argc > 3)  ||
-		    (strncmp(argv[1], "ipmi", 4) && strncmp(argv[1], "sol",  3)))
-			printf_channel_usage();
-		else
-		{
-			uint8_t ch = 0xe;
-			if (argc == 3) {
-				if (str2uchar(argv[2], &ch) != 0) {
-					lprintf(LOG_ERR, "Numeric value expected, but '%s' given.", argv[2]);
-					return (-1);
-				}
-			}
-			retval = ipmi_get_channel_cipher_suites(intf,
-								argv[1], // ipmi | sol
-								ch);
-		}
-	}
-	else
-	{
-		printf("Invalid CHANNEL command: %s\n", argv[0]);
-		printf_channel_usage();
-		retval = -1;
-	}
-
-	return retval;
-}

ipmitool/lib/ipmi_kontronoem.c

@@ -1,806 +0,0 @@
-/*
- * Copyright (c) 2004 Kontron Canada, Inc.  All Rights Reserved.
- *
- * Base on code from
- * 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.
- */
-
-/*
- * Tue Mar 7 14:36:12 2006
- * <stephane.filion@ca.kontron.com>
- *
- * This code implements an Kontron OEM proprietary commands.
- */
-
-
-#include <string.h>
-#include <ipmitool/helper.h>
-#include <ipmitool/ipmi.h>
-#include <ipmitool/ipmi_intf.h>
-#include <ipmitool/ipmi_fru.h>
-
-
-extern int verbose;
-extern int read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, 
-                         uint8_t id, uint32_t offset, uint32_t length, 
-                         uint8_t *frubuf);
-extern int write_fru_area(struct ipmi_intf * intf, struct fru_info *fru, 
-                          unsigned char id, unsigned int soffset,  
-                          unsigned int doffset,  unsigned int length, 
-                          unsigned char *pFrubuf);
-
-extern char * get_fru_area_str(uint8_t * data, uint32_t * offset);
-
-
-
-static void ipmi_kontron_help(void);
-static int ipmi_kontron_set_serial_number(struct ipmi_intf * intf);
-static int ipmi_kontron_set_mfg_date (struct ipmi_intf * intf);
-
-static void ipmi_kontron_nextboot_help(void);
-static int ipmi_kontron_nextboot_set(struct ipmi_intf * intf,
-                                     int argc, char **argv);
-
-static int ipmi_kontronoem_send_set_large_buffer(struct ipmi_intf * intf,
-                                                 unsigned char channel,
-                                                 unsigned char size);
-
-int
-ipmi_kontronoem_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-   int rc = 0;
-
-   if (argc == 0)
-      ipmi_kontron_help();
-   else if (strncmp(argv[0], "help", 4) == 0)
-      ipmi_kontron_help();
-
-   else if (!strncmp(argv[0], "setsn", 5))
-   {
-      if(argc >= 1)
-      {
-         if(ipmi_kontron_set_serial_number(intf) > 0)
-         {
-            printf("FRU serial number setted successfully\n");
-         }
-         else
-         {
-            printf("FRU serial number set failed\n");
-         }
-      }
-      else
-      {
-         printf("fru setsn\n");
-      }
-   }
-   else if (!strncmp(argv[0], "setmfgdate", 5))
-   {
-      if(argc >= 1)
-      {
-         if(ipmi_kontron_set_mfg_date(intf) > 0)
-         {
-            printf("FRU manufacturing date setted successfully\n");
-         }
-         else
-         {
-            printf("FRU manufacturing date set failed\n");
-         }      
-      }
-      else
-      {
-         printf("fru setmfgdate\n");
-      }
-   }
-   else if (!strncmp(argv[0], "nextboot", sizeof("nextboot")-1))
-   {
-      if (argc > 1)
-      {
-         if ((rc = ipmi_kontron_nextboot_set(intf, argc-1, argv+1)) == 0)
-         {
-            printf("Nextboot set successfully\n");
-         }
-         else
-         {
-            printf("Nextboot set failed\n");
-         }      
-      }
-      else
-      {
-         ipmi_kontron_nextboot_help();
-      }
-   }
-
-   else 
-   {
-      printf("Invalid Kontron command: %s", argv[0]);
-      ipmi_kontron_help();
-      rc = -1;
-   }
-
-   return rc;
-}
-
-
-static void ipmi_kontron_help(void)
-{
-   printf("Kontron Commands:  setsn setmfgdate nextboot\n");
-}   
-
-
-int ipmi_kontronoem_set_large_buffer(struct ipmi_intf * intf, unsigned char size)
-{
-   uint8_t error_occurs = 0;
-   uint32_t prev_target_addr = intf->target_addr ;
-
-   if ( intf->target_addr > 0  && (intf->target_addr != intf->my_addr) )
-   {
-      intf->target_addr = intf->my_addr;
-
-       printf("Set local big buffer\n");
-       if(ipmi_kontronoem_send_set_large_buffer( intf, 0x0e, size ) == 0)
-       {
-          printf("Set local big buffer:success\n");
-       }
-       else
-       {
-          error_occurs = 1;
-       }
-
-       if (error_occurs == 0)
-       {
-          if(ipmi_kontronoem_send_set_large_buffer( intf, 0x00, size ) == 0)
-          {
-             printf("IPMB was set\n");
-          }
-          else
-          {
-             /* Revert back the previous set large buffer */
-             error_occurs = 1;
-             ipmi_kontronoem_send_set_large_buffer( intf, 0x0e, 0 );
-          }
-       }
-
-      /* Restore target address */
-       intf->target_addr = prev_target_addr;
-   }
-
-   if (error_occurs == 0)
-   {
-      if(ipmi_kontronoem_send_set_large_buffer( intf, 0x0e, size ) == 0)
-      {
-         //printf("Set remote big buffer\n");
-      }
-      else
-      {
-         if ( intf->target_addr > 0  && (intf->target_addr != intf->my_addr) )
-         {
-            /* Error occurs revert back the previous set large buffer*/
-            intf->target_addr = intf->my_addr;
-
-            //ipmi_kontronoem_send_set_large_buffer( intf, 0x00, 0 );
-            ipmi_kontronoem_send_set_large_buffer( intf, 0x0e, 0 );
-
-            intf->target_addr = prev_target_addr;
-         }
-      }
-   }
-   return error_occurs;
-}
-
-
-int ipmi_kontronoem_send_set_large_buffer(struct ipmi_intf * intf, unsigned char channel,unsigned char size)
-{
-   struct ipmi_rs *rsp;
-   struct ipmi_rq req;
-   uint8_t msg_data[2];
-   int i;
-   
-   memset(msg_data, 0, sizeof(msg_data));
-   msg_data[0] = channel/*0x0e*/;   // Currently running interface
-   msg_data[1] = size;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn = 0x3E; /* OEM NetFn */
-   req.msg.cmd = 0x82;   /* Set Channel Buffer Length - OEM */
-   req.msg.data = msg_data;
-   req.msg.data_len = 2;
-   
-   req.msg.lun = 0x00;
-      
-   rsp = intf->sendrecv(intf, &req);
-   if (rsp == NULL) 
-   {
-      printf("Cannot send large buffer command\n");
-      return(-1);
-   }
-   if (rsp->ccode > 0) 
-   {
-      printf("Invalid length for the selected interface (%s) %d\n", 
-               val2str(rsp->ccode, completion_code_vals), rsp->ccode);
-      return(-1);
-   }
-   return 0;
-}
-
-
-/* ipmi_fru_set_serial_number -  Set the Serial Number in FRU
- *
- * @intf:		ipmi interface
- * @id:		fru id
- *
- * returns -1 on error
- * returns 1 if successful
- */
-static int
-ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
-{
-   struct ipmi_rs *rsp;
-   struct ipmi_rq req;
-   struct fru_info fru;
-   struct fru_header header;
-   uint8_t msg_data[4];
-   char *sn;
-   uint8_t sn_size, checksum;
-   uint8_t  *fru_data;
-   char *fru_area;
-   uint32_t fru_data_offset, fru_data_offset_tmp, board_sec_len, prod_sec_len, i;
-   
-   sn = NULL;
-   fru_data = NULL;
-   
-   memset(msg_data, 0, 4);
-   msg_data[0] = 0xb4;
-   msg_data[1] = 0x90;
-   msg_data[2] = 0x91;
-   msg_data[3] = 0x8b;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn = 0x3E;
-   req.msg.cmd = 0x0C;
-   req.msg.data = msg_data;
-   req.msg.data_len = 4;
-   
-   
-   /* Set Lun, necessary for this oem command */
-   req.msg.lun = 0x03;
-
-      
-   rsp = intf->sendrecv(intf, &req);
-   if (rsp == NULL) 
-   {
-      printf(" Device not present (No Response)\n");
-      return -11;
-   }
-   
-   if (rsp->ccode > 0) 
-   {
-      printf(" This option is not implemented for this board\n");
-      return -1;
-   }
-  
-   sn_size = rsp->data_len;
-   
-   sn = malloc(sn_size + 1);
-   
-   if(sn == NULL)
-   {
-      printf("Out of memory!");
-      return -1;
-   }
-
-   memset(sn, 0, sn_size + 1);
-   memcpy(sn, rsp->data, sn_size);
-   
-   if(verbose >= 1)
-   {
-      printf("Original serial number is : [%s]\n", sn);
-   }
-   
-      
-
-   memset(msg_data, 0, 4);
-   msg_data[0] = 0;
-   
-   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 == NULL) {
-      printf(" Device not present (No Response)\n");
-      free(sn);
-      sn = NULL;
-      return -1;
-   }
-   if (rsp->ccode > 0) {
-      printf(" Device not present (%s)\n",
-         val2str(rsp->ccode, completion_code_vals));
-      free(sn);
-      sn = NULL;
-      return(-1);
-   }
-
-   fru.size = (rsp->data[1] << 8) | rsp->data[0];
-   fru.access = rsp->data[2] & 0x1;
-
-   if (fru.size < 1) {
-      printf(" Invalid FRU size %d", fru.size);
-      free(sn);
-      sn = NULL;
-      return -1;
-   }
- 
-   /*
-    * retrieve the FRU header
-    */
-   msg_data[0] = 0;
-   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 == NULL) 
-   {
-      printf(" Device not present (No Response)\n");
-      free(sn);
-      sn = NULL;
-      return(-1);
-   }
-   if (rsp->ccode > 0) 
-   {
-      printf(" Device not present (%s)\n",
-             val2str(rsp->ccode, completion_code_vals));
-      free(sn);
-      sn = NULL;
-      return(-1);
-   }
-
-   if (verbose > 1)
-      printbuf(rsp->data, rsp->data_len, "FRU DATA");
-
-   memcpy(&header, rsp->data + 1, 8);
-
-   if (header.version != 1) 
-   {
-      printf(" Unknown FRU header version 0x%02x",
-         header.version);
-      free(sn);
-      sn = NULL;
-      return(-1);
-   }   
-   
-   /* Set the Board Section */
-   board_sec_len =   (header.offset.product * 8) - (header.offset.board * 8);
-
-
-   fru_data = malloc( fru.size);
-
-   if(fru_data == NULL)
-   {
-      printf("Out of memory!");
-      free(sn);
-      sn = NULL;
-      return(-1);
-   }
-
-   memset(fru_data, 0, fru.size); 
-   if(read_fru_area(intf ,&fru ,0 ,(header.offset.board * 8) ,board_sec_len , fru_data) < 0)
-   {
-      free(sn);
-      sn = NULL;
-      free(fru_data);
-      fru_data = NULL;
-      return(-1);
-   }
-   
-   /*Position at Board Manufacturer*/
-   fru_data_offset = (header.offset.board * 8) + 6;
-   fru_area = get_fru_area_str(fru_data, &fru_data_offset);
-
-   /*Position at Board Product Name*/
-   fru_area = get_fru_area_str(fru_data, &fru_data_offset);
-
-   fru_data_offset_tmp = fru_data_offset;
-   
-   /*Position at Serial Number*/
-   fru_area = get_fru_area_str(fru_data, &fru_data_offset_tmp);
-
-   fru_data_offset ++;
-
-   if(strlen(fru_area) != sn_size)
-   {
-      printf("The length of the serial number in the FRU Board Area is wrong.\n");
-      free(sn);
-      sn = NULL;
-      free(fru_data);
-      fru_data = NULL;
-      return(-1);
-   }
-   
-   /* Copy the new serial number in the board section saved in memory*/
-   memcpy(fru_data + fru_data_offset, sn, sn_size);
-   
-   checksum = 0;
-   /* Calculate Header Checksum */
-   for( i = (header.offset.board * 8); i < (((header.offset.board * 8)+board_sec_len) - 2) ; i ++ )
-   {
-      checksum += fru_data[i];
-   }
-   checksum = (~checksum) + 1;
-
-
-   fru_data[(header.offset.board * 8)+board_sec_len - 1] = checksum;
-   
-   /* Write the new FRU Board section */
-   if(write_fru_area(intf, &fru, 0, (header.offset.board * 8), (header.offset.board * 8), board_sec_len, fru_data) < 0)
-   {
-      free(sn);
-      sn = NULL;
-      free(fru_data);
-      fru_data = NULL;
-      return(-1);
-   }
-   
-   /* Set the Product Section */
-   prod_sec_len =   (header.offset.multi * 8) - (header.offset.product * 8);
-
-   if(read_fru_area(intf ,&fru ,0 ,(header.offset.product * 8) ,prod_sec_len , fru_data) < 0)
-   {
-      free(sn);
-      sn = NULL;
-      free(fru_data);
-      fru_data = NULL;
-      return(-1);
-   }
-   
-   /*Position at Product Manufacturer*/
-   fru_data_offset = (header.offset.product * 8) + 3;
-   fru_area = get_fru_area_str(fru_data, &fru_data_offset);
-
-   /*Position at Product Name*/
-   fru_area = get_fru_area_str(fru_data, &fru_data_offset);
-   
-   /*Position at Product Part*/
-   fru_area = get_fru_area_str(fru_data, &fru_data_offset);
-   
-   /*Position at Product Version*/
-   fru_area = get_fru_area_str(fru_data, &fru_data_offset);
-   
-   
-
-   fru_data_offset_tmp = fru_data_offset;
-   
-   /*Position at Serial Number*/
-   fru_area = get_fru_area_str(fru_data, &fru_data_offset_tmp);
-
-   fru_data_offset ++;
-
-   if(strlen(fru_area) != sn_size)
-   {
-      free(sn);
-      sn = NULL;
-      free(fru_data);
-      fru_data = NULL;
-      printf("The length of the serial number in the FRU Product Area is wrong.\n");
-      return(-1);
-      
-   }
-   
-   /* Copy the new serial number in the product section saved in memory*/
-   memcpy(fru_data + fru_data_offset, sn, sn_size);
-   
-   checksum = 0;
-   /* Calculate Header Checksum */
-   for( i = (header.offset.product * 8); i < (((header.offset.product * 8)+prod_sec_len) - 2) ; i ++ )
-   {
-      checksum += fru_data[i];
-   }
-   checksum = (~checksum) + 1;
-
-
-   fru_data[(header.offset.product * 8)+prod_sec_len - 1] = checksum;
-   
-   /* Write the new FRU Board section */
-   if(write_fru_area(intf, &fru, 0, (header.offset.product * 8), (header.offset.product * 8), prod_sec_len, fru_data) < 0)
-   {
-      free(sn);
-      sn = NULL;
-      free(fru_data);
-      fru_data = NULL;
-      return -1;
-   }   
-   
-   free(sn);
-   sn = NULL;
-   free(fru_data);
-   fru_data = NULL;
-
-   return(1);
-
-}
-
-
-/* ipmi_fru_set_mfg_date -  Set the Manufacturing Date in FRU
- *
- * @intf:		ipmi interface
- * @id:		fru id
- *
- * returns -1 on error
- * returns 1 if successful
- */
-static int
-ipmi_kontron_set_mfg_date (struct ipmi_intf * intf)
-{
-   struct ipmi_rs *rsp;
-   struct ipmi_rq req;
-   struct fru_info fru;
-   struct fru_header header;
-   uint8_t msg_data[4];
-   uint8_t mfg_date[3];
-   
-   uint32_t board_sec_len, i;
-   uint8_t *fru_data, checksum;
-
-      
-   
-   
-   memset(msg_data, 0, 4);
-   msg_data[0] = 0xb4;
-   msg_data[1] = 0x90;
-   msg_data[2] = 0x91;
-   msg_data[3] = 0x8b;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn = 0x3E;
-   req.msg.cmd = 0x0E;
-   req.msg.data = msg_data;
-   req.msg.data_len = 4;
-   
-   /* Set Lun temporary, necessary for this oem command */
-   req.msg.lun = 0x03;
-      
-   rsp = intf->sendrecv(intf, &req);
-   if (rsp == NULL) 
-   {
-      printf("Device not present (No Response)\n");
-      return(-1);
-   }
-   
-   if (rsp->ccode > 0) 
-   {
-      printf("This option is not implemented for this board\n");
-      return(-1);
-   }
-     
-   if(rsp->data_len != 3)
-   {
-      printf("Invalid response for the Manufacturing date\n");
-      return(-1);
-   }  
-   
-   memset(mfg_date, 0, 3);
-   memcpy(mfg_date, rsp->data, 3);
-
-   memset(msg_data, 0, 4);
-   msg_data[0] = 0;
-   
-   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 == NULL) {
-      printf(" Device not present (No Response)\n");
-      return(-1);
-   }
-   if (rsp->ccode > 0) {
-      printf(" Device not present (%s)\n",
-         val2str(rsp->ccode, completion_code_vals));
-      return(-1);
-   }
-
-   fru.size = (rsp->data[1] << 8) | rsp->data[0];
-   fru.access = rsp->data[2] & 0x1;
-
-   if (fru.size < 1) {
-      printf(" Invalid FRU size %d", fru.size);
-      return(-1);
-   }
- 
-   /*
-    * retrieve the FRU header
-    */
-   msg_data[0] = 0;
-   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 == NULL) 
-   {
-      printf(" Device not present (No Response)\n");
-      return(-1);
-   }
-   if (rsp->ccode > 0) 
-   {
-      printf(" Device not present (%s)\n",
-             val2str(rsp->ccode, completion_code_vals));
-      return(-1);
-   }
-
-   if (verbose > 1)
-      printbuf(rsp->data, rsp->data_len, "FRU DATA");
-
-   memcpy(&header, rsp->data + 1, 8);
-
-   if (header.version != 1) 
-   {
-      printf(" Unknown FRU header version 0x%02x",
-         header.version);
-      return(-1);
-   } 
-   
-   
-   board_sec_len =   (header.offset.product * 8) - (header.offset.board * 8);
-   
-   fru_data = malloc( fru.size);
-   
-   if(fru_data == NULL)
-   {
-      printf("Out of memory!");
-      return(-1);
-   }
-   
-   memset(fru_data, 0, fru.size); 
-   if(read_fru_area(intf ,&fru ,0 ,(header.offset.board * 8) ,board_sec_len , fru_data) < 0)
-   {
-      free(fru_data);
-      fru_data = NULL;
-      return(-1);
-   }
-   
-   /* Copy the new manufacturing date in the board section saved in memory*/
-   memcpy(fru_data + (header.offset.board * 8) + 3, mfg_date, 3);
-   
-   checksum = 0;
-   /* Calculate Header Checksum */
-   for( i = (header.offset.board * 8); i < (((header.offset.board * 8)+board_sec_len) - 2) ; i ++ )
-   {
-      checksum += fru_data[i];
-   }
-   checksum = (~checksum) + 1;
-
-   fru_data[(header.offset.board * 8)+board_sec_len - 1] = checksum;
-   
-   /* Write the new FRU Board section */
-   if(write_fru_area(intf, &fru, 0, (header.offset.board * 8), (header.offset.board * 8), board_sec_len, fru_data) < 0)
-   {
-      free(fru_data);
-      fru_data = NULL;
-      return(-1);
-   }
-
-   free(fru_data);
-   fru_data = NULL;
-   return(1);
-}
-
-
-static char *bootdev[] = {"BIOS", "FDD", "HDD", "CDROM", "network", 0};
-
-static void
-ipmi_kontron_nextboot_help(void)
-{
-   int i;
-   printf("nextboot <device>\n"
-          "Supported devices:\n");
-   for (i = 0; bootdev[i] != 0; i++) {
-       printf("- %s\n", bootdev[i]);
-   }
-}
-
-/* ipmi_kontron_next_boot_set - Select the next boot order on CP6012
- *
- * @intf:		ipmi interface
- * @id:		fru id
- *
- * returns -1 on error
- * returns 1 if successful
- */
-static int
-ipmi_kontron_nextboot_set(struct ipmi_intf * intf, int argc, char **argv)
-{
-   struct ipmi_rs *rsp;
-   struct ipmi_rq req;
-   uint8_t msg_data[8];
-   int i;
-   
-   memset(msg_data, 0, sizeof(msg_data));
-   msg_data[0] = 0xb4;
-   msg_data[1] = 0x90;
-   msg_data[2] = 0x91;
-   msg_data[3] = 0x8b;
-   msg_data[4] = 0x9d;
-   msg_data[5] = 0xFF;
-   msg_data[6] = 0xFF; /* any */
-
-   for (i = 0; bootdev[i] != 0; i++) {
-       if (strcmp(argv[0], bootdev[i]) == 0) {
-           msg_data[5] = i;
-           break;
-       }
-   }
-
-   /* Invalid device selected? */
-   if (msg_data[5] == 0xFF) {
-       printf("Unknown boot device: %s\n", argv[0]);
-       return -1;
-   }
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn = 0x3E;
-   req.msg.cmd = 0x02;
-   req.msg.data = msg_data;
-   req.msg.data_len = 7;
-   
-   /* Set Lun temporary, necessary for this oem command */
-   req.msg.lun = 0x03;
-      
-   rsp = intf->sendrecv(intf, &req);
-   if (rsp == NULL) 
-   {
-      printf("Device not present (No Response)\n");
-      return(-1);
-   }
-   if (rsp->ccode > 0) {
-      printf("Device not present (%s)\n",
-         val2str(rsp->ccode, completion_code_vals));
-      return(-1);
-   }
-   return 0;
-}
- 

ipmitool/lib/ipmi_sunoem.c

@@ -1,859 +0,0 @@
-/*
- * Copyright (c) 2005 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.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-#include <ctype.h>
-
-#include <ipmitool/ipmi.h>
-#include <ipmitool/ipmi_intf.h>
-#include <ipmitool/helper.h>
-#include <ipmitool/log.h>
-#include <ipmitool/ipmi_sel.h>
-#include <ipmitool/ipmi_sdr.h>
-#include <ipmitool/ipmi_strings.h>
-#include <ipmitool/ipmi_channel.h>
-#include <ipmitool/ipmi_sunoem.h>
-#include <ipmitool/ipmi_raw.h>
-
-static const struct valstr sunoem_led_type_vals[] = {
-	{ 0, "OK2RM" },
-	{ 1, "SERVICE" },
-	{ 2, "ACT" },
-	{ 3, "LOCATE" },
-	{ 0xFF, NULL },
-};
-
-static const struct valstr sunoem_led_mode_vals[] = {
-	{ 0, "OFF" },
-	{ 1, "ON" },
-	{ 2, "STANDBY" },
-	{ 3, "SLOW" },
-	{ 4, "FAST" },
-	{ 0xFF, NULL },
-};
-static const struct valstr sunoem_led_mode_optvals[] = {
-	{ 0, "STEADY_OFF" },
-	{ 1, "STEADY_ON" },
-	{ 2, "STANDBY_BLINK" },
-	{ 3, "SLOW_BLINK" },
-	{ 4, "FAST_BLINK" },
-	{ 0xFF, NULL },
-};
-
-int is_sbcmd = 0;
-
-static void
-ipmi_sunoem_usage(void)
-{
-	lprintf(LOG_NOTICE, "usage: sunoem <command> [option...]");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "   fan speed <0-100>");
-	lprintf(LOG_NOTICE, "      Set system fan speed (PWM duty cycle)");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "   sshkey set <userid> <id_rsa.pub>");
-	lprintf(LOG_NOTICE, "      Set ssh key for a userid into authorized_keys,");
-	lprintf(LOG_NOTICE, "      view users with 'user list' command.");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "   sshkey del <userid>");
-	lprintf(LOG_NOTICE, "      Delete ssh key for userid from authorized_keys,");
-	lprintf(LOG_NOTICE, "      view users with 'user list' command.");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "   led get <sensorid> [ledtype]");
-	lprintf(LOG_NOTICE,
-			"      Read status of LED found in Generic Device Locator.");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "   led set <sensorid> <ledmode> [ledtype]");
-	lprintf(LOG_NOTICE,
-			"      Set mode of LED found in Generic Device Locator.");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "   sbled get <sensorid> [ledtype]");
-	lprintf(LOG_NOTICE,
-			"      Read status of LED found in Generic Device Locator");
-	lprintf(LOG_NOTICE, "      for Sun Blade Modular Systems.");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "   sbled set <sensorid> <ledmode> [ledtype]");
-	lprintf(LOG_NOTICE, "      Set mode of LED found in Generic Device Locator");
-	lprintf(LOG_NOTICE, "      for Sun Blade Modular Systems.");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE,
-			"      Use 'sdr list generic' command to get list of Generic");
-	lprintf(LOG_NOTICE, "      Devices that are controllable LEDs.");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "      Required SIS LED Mode:");
-	lprintf(LOG_NOTICE, "         OFF          Off");
-	lprintf(LOG_NOTICE, "         ON           Steady On");
-	lprintf(LOG_NOTICE, "         STANDBY      100ms on 2900ms off blink rate");
-	lprintf(LOG_NOTICE, "         SLOW         1HZ blink rate");
-	lprintf(LOG_NOTICE, "         FAST         4HZ blink rate");
-	lprintf(LOG_NOTICE, "");
-	lprintf(LOG_NOTICE, "      Optional SIS LED Type:");
-	lprintf(LOG_NOTICE, "         OK2RM        OK to Remove");
-	lprintf(LOG_NOTICE, "         SERVICE      Service Required");
-	lprintf(LOG_NOTICE, "         ACT          Activity");
-	lprintf(LOG_NOTICE, "         LOCATE       Locate");
-	lprintf(LOG_NOTICE, "");
-}
-
-/* 
- * IPMI Request Data: 1 byte
- *
- * [byte 0]  FanSpeed    Fan speed as percentage
- */
-static int
-ipmi_sunoem_fan_speed(struct ipmi_intf * intf, uint8_t speed)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-
-	/* 
-	 * sunoem fan speed <percent>
-	 */
-
-	if (speed > 100) {
-		lprintf(LOG_NOTICE, "Invalid fan speed: %d", speed);
-		return -1;
-	}
-
-	req.msg.netfn = IPMI_NETFN_SUNOEM;
-	req.msg.cmd = IPMI_SUNOEM_SET_FAN_SPEED;
-	req.msg.data = &speed;
-	req.msg.data_len = 1;
-		
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Sun OEM Set Fan Speed command failed");
-		return -1;
-	}
-	else if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Sun OEM Set Fan Speed command failed: %s",
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	printf("Set Fan speed to %d%%\n", speed);
-
-	return 0;
-}
-
-static void
-__sdr_list_empty(struct sdr_record_list * head)
-{
-	struct sdr_record_list * e, * f;
-	for (e = head; e != NULL; e = f) {
-		f = e->next;
-		free(e);
-		e = NULL;
-	}
-	head = NULL;
-}
-
-static void
-led_print(const char * name, uint8_t state)
-{
-	if (csv_output)
-		printf("%s,%s\n", name, val2str(state, sunoem_led_mode_vals));
-	else
-		printf("%-16s | %s\n", name, val2str(state, sunoem_led_mode_vals));
-}
-
-struct ipmi_rs *
-sunoem_led_get(struct ipmi_intf * intf,
-		 struct sdr_record_generic_locator * dev,
-		 int ledtype)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	uint8_t rqdata[7];
-	int rqdata_len = 5;
-
-	if (dev == NULL)
-		return NULL;
-
-	rqdata[0] = dev->dev_slave_addr;
-	if (ledtype == 0xFF)
-		rqdata[1] = dev->oem;
-	else
-		rqdata[1] = ledtype;
-	rqdata[2] = dev->dev_access_addr;
-	rqdata[3] = dev->oem;
-	if (is_sbcmd) {
-		rqdata[4] = dev->entity.id;
-		rqdata[5] = dev->entity.instance;
-		rqdata[6] = 0;
-		rqdata_len = 7;
-	}
-	else {
-		rqdata[4] = 0;
-	}
-
-	req.msg.netfn = IPMI_NETFN_SUNOEM;
-	req.msg.cmd = IPMI_SUNOEM_LED_GET;
-	req.msg.lun = dev->lun;
-	req.msg.data = rqdata;
-	req.msg.data_len = rqdata_len;
-		
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Sun OEM Get LED command failed");
-		return NULL;
-	}
-	else if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Sun OEM Get LED command failed: %s",
-			val2str(rsp->ccode, completion_code_vals));
-		return NULL;
-	}
-
-	return rsp;
-}
-
-struct ipmi_rs *
-sunoem_led_set(struct ipmi_intf * intf,
-		 struct sdr_record_generic_locator * dev,
-		 int ledtype, int ledmode)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	uint8_t rqdata[9];
-	int rqdata_len = 7;
-
-	if (dev == NULL)
-		return NULL;
-
-	rqdata[0] = dev->dev_slave_addr;
-	if (ledtype == 0xFF)
-		rqdata[1] = dev->oem;
-	else
-		rqdata[1] = ledtype;
-	rqdata[2] = dev->dev_access_addr;
-	rqdata[3] = dev->oem;
-	rqdata[4] = ledmode;
-	if (is_sbcmd) {
-		rqdata[5] = dev->entity.id;
-		rqdata[6] = dev->entity.instance;
-		rqdata[7] = 0;
-		rqdata[8] = 0;
-		rqdata_len = 9;
-	}
-	else {
-		rqdata[5] = 0;
-		rqdata[6] = 0;
-	}
-
-	req.msg.netfn = IPMI_NETFN_SUNOEM;
-	req.msg.cmd = IPMI_SUNOEM_LED_SET;
-	req.msg.lun = dev->lun;
-	req.msg.data = rqdata;
-	req.msg.data_len = rqdata_len;
-		
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Sun OEM Set LED command failed");
-		return NULL;
-	}
-	else if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Sun OEM Set LED command failed: %s",
-			val2str(rsp->ccode, completion_code_vals));
-		return NULL;
-	}
-
-	return rsp;
-}
-
-static void
-sunoem_led_get_byentity(struct ipmi_intf * intf, uint8_t entity_id,
-			  uint8_t entity_inst, int ledtype)
-{
-	struct ipmi_rs * rsp;
-	struct sdr_record_list *elist, *e;
-	struct entity_id entity;
-
-	if (entity_id == 0)
-		return;
-
-	/* lookup sdrs with this entity */
-	memset(&entity, 0, sizeof(struct entity_id));
-	entity.id = entity_id;
-	entity.instance = entity_inst;
-
-	elist = ipmi_sdr_find_sdr_byentity(intf, &entity);
-
-	/* for each generic sensor set its led state */
-	for (e = elist; e != NULL; e = e->next) {
-		if (e->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR)
-			continue;
-		rsp = sunoem_led_get(intf, e->record.genloc, ledtype);
-		if (rsp && rsp->data_len == 1) {
-			led_print((const char *)e->record.genloc->id_string, rsp->data[0]);
-		}
-	}
-
-	__sdr_list_empty(elist);
-}
-
-static void
-sunoem_led_set_byentity(struct ipmi_intf * intf, uint8_t entity_id,
-			  uint8_t entity_inst, int ledtype, int ledmode)
-{
-	struct ipmi_rs * rsp;
-	struct sdr_record_list *elist, *e;
-	struct entity_id entity;
-
-	if (entity_id == 0)
-		return;
-
-	/* lookup sdrs with this entity */
-	memset(&entity, 0, sizeof(struct entity_id));
-	entity.id = entity_id;
-	entity.instance = entity_inst;
-
-	elist = ipmi_sdr_find_sdr_byentity(intf, &entity);
-
-	/* for each generic sensor set its led state */
-	for (e = elist; e != NULL; e = e->next) {
-		if (e->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR)
-			continue;
-		rsp = sunoem_led_set(intf, e->record.genloc, ledtype, ledmode);
-		if (rsp && rsp->data_len == 0) {
-			led_print((const char *)e->record.genloc->id_string, ledmode);
-		}
-	}
-
-	__sdr_list_empty(elist);
-}
-
-/* 
- * IPMI Request Data: 5 bytes
- *
- * [byte 0]  devAddr     Value from the "Device Slave Address" field in
- *                       LED's Generic Device Locator record in the SDR
- * [byte 1]  led         LED Type: OK2RM, ACT, LOCATE, SERVICE
- * [byte 2]  ctrlrAddr   Controller address; value from the "Device
- *                       Access Address" field, 0x20 if the LED is local
- * [byte 3]  hwInfo      The OEM field from the SDR record
- * [byte 4]  force       1 = directly access the device
- *                       0 = go thru its controller
- *                       Ignored if LED is local
- * 
- * The format below is for Sun Blade Modular systems only
- * [byte 4]  entityID    The entityID field from the SDR record
- * [byte 5]  entityIns   The entityIns field from the SDR record
- * [byte 6]  force       1 = directly access the device
- *                       0 = go thru its controller
- *                       Ignored if LED is local
- */
-static int
-ipmi_sunoem_led_get(struct ipmi_intf * intf,  int argc, char ** argv)
-{
-	struct ipmi_rs * rsp;
-	struct sdr_record_list *sdr;
-	struct sdr_record_list *alist, *a;
-	struct sdr_record_entity_assoc *assoc;
-	int ledtype = 0xFF;
-	int i;
-
-	/* 
-	 * sunoem led/sbled get <id> [type]
-	 */
-
-	if (argc < 1 || strncmp(argv[0], "help", 4) == 0) {
-		ipmi_sunoem_usage();
-		return 0;
-	}
-
-	if (argc > 1) {
-		ledtype = str2val(argv[1], sunoem_led_type_vals);
-		if (ledtype == 0xFF) 
-			lprintf(LOG_ERR, "Unknow ledtype, will use data from the SDR oem field");
-	}
-
-	if (strncasecmp(argv[0], "all", 3) == 0) {
-		/* do all generic sensors */
-		alist = ipmi_sdr_find_sdr_bytype(intf,
-				SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR);
-		for (a = alist; a != NULL; a = a->next) {
-			if (a->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR)
-				continue;
-			if (a->record.genloc->entity.logical)
-				continue;
-			rsp = sunoem_led_get(intf, a->record.genloc, ledtype);
-			if (rsp && rsp->data_len == 1) {
-				led_print((const char *)a->record.genloc->id_string, rsp->data[0]);
-			}
-		}
-		__sdr_list_empty(alist);
-		return 0;
-	}
-
-	/* look up generic device locator record in SDR */
-	sdr = ipmi_sdr_find_sdr_byid(intf, argv[0]);
-
-	if (sdr == NULL) {
-		lprintf(LOG_ERR, "No Sensor Data Record found for %s", argv[0]);
-		return -1;
-	}
-
-	if (sdr->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR) {
-		lprintf(LOG_ERR, "Invalid SDR type %d", sdr->type);
-		return -1;
-	}
-
-	if (!sdr->record.genloc->entity.logical) {
-		/*
-		 * handle physical entity
-		 */
-		rsp = sunoem_led_get(intf, sdr->record.genloc, ledtype);
-		if (rsp && rsp->data_len == 1) {
-			led_print((const char *)sdr->record.genloc->id_string, rsp->data[0]);
-		}
-		return 0;
-	}
-
-	/* 
-	 * handle logical entity for LED grouping
-	 */
-
-	lprintf(LOG_INFO, "LED %s is logical device", argv[0]);
-
-	/* get entity assoc records */
-	alist = ipmi_sdr_find_sdr_bytype(intf, SDR_RECORD_TYPE_ENTITY_ASSOC);
-	for (a = alist; a != NULL; a = a->next) {
-		if (a->type != SDR_RECORD_TYPE_ENTITY_ASSOC)
-			continue;
-		assoc = a->record.entassoc;
-		if (assoc == NULL)
-			continue;
-
-		/* check that the entity id/instance matches our generic record */
-		if (assoc->entity.id != sdr->record.genloc->entity.id ||
-		    assoc->entity.instance != sdr->record.genloc->entity.instance)
-			continue;
-
-		if (assoc->flags.isrange) {
-			/*
-			 * handle ranged entity associations
-			 *
-			 * the test for non-zero entity id is handled in
-			 * sunoem_led_get_byentity()
-			 */
-
-			/* first range set - id 1 and 2 must be equal */
-			if (assoc->entity_id_1 == assoc->entity_id_2)
-				for (i = assoc->entity_inst_1; i <= assoc->entity_inst_2; i++)
-					sunoem_led_get_byentity(intf, assoc->entity_id_1, i, ledtype);
-
-			/* second range set - id 3 and 4 must be equal */
-			if (assoc->entity_id_3 == assoc->entity_id_4)
-				for (i = assoc->entity_inst_3; i <= assoc->entity_inst_4; i++)
-					sunoem_led_get_byentity(intf, assoc->entity_id_3, i, ledtype);
-		}
-		else {
-			/*
-			 * handle entity list
-			 */
-			sunoem_led_get_byentity(intf, assoc->entity_id_1,
-						assoc->entity_inst_1, ledtype);
-			sunoem_led_get_byentity(intf, assoc->entity_id_2,
-						assoc->entity_inst_2, ledtype);
-			sunoem_led_get_byentity(intf, assoc->entity_id_3,
-						assoc->entity_inst_3, ledtype);
-			sunoem_led_get_byentity(intf, assoc->entity_id_4,
-						assoc->entity_inst_4, ledtype);
-		}
-	}
-
-	__sdr_list_empty(alist);
-
-	return 0;
-}
-
-/* 
- * IPMI Request Data: 7 bytes
- *
- * [byte 0]  devAddr     Value from the "Device Slave Address" field in
- *                       LED's Generic Device Locator record in the SDR
- * [byte 1]  led         LED Type: OK2RM, ACT, LOCATE, SERVICE
- * [byte 2]  ctrlrAddr   Controller address; value from the "Device
- *                       Access Address" field, 0x20 if the LED is local
- * [byte 3]  hwInfo      The OEM field from the SDR record
- * [byte 4]  mode        LED Mode: OFF, ON, STANDBY, SLOW, FAST
- * [byte 5]  force       TRUE - directly access the device
- *                       FALSE - go thru its controller
- *                       Ignored if LED is local
- * [byte 6]  role        Used by BMC for authorization purposes
- *
- * The format below is for Sun Blade Modular systems only
- * [byte 5]  entityID    The entityID field from the SDR record
- * [byte 6]  entityIns   The entityIns field from the SDR record
- * [byte 7]  force       TRUE - directly access the device
- *                       FALSE - go thru its controller
- *                       Ignored if LED is local
- * [byte 8]  role        Used by BMC for authorization purposes
- *
- *
- * IPMI Response Data: 1 byte
- * 
- * [byte 0]  mode     LED Mode: OFF, ON, STANDBY, SLOW, FAST
- */
-
-static int
-ipmi_sunoem_led_set(struct ipmi_intf * intf,  int argc, char ** argv)
-{
-	struct ipmi_rs * rsp;
-	struct sdr_record_list *sdr;
-	struct sdr_record_list *alist, *a;
-	struct sdr_record_entity_assoc *assoc;
-	int ledmode;
-	int ledtype = 0xFF;
-	int i;
-
-	/* 
-	 * sunoem led/sbled set <id> <mode> [type]
-	 */
-
-	if (argc < 2 || strncmp(argv[0], "help", 4) == 0) {
-		ipmi_sunoem_usage();
-		return 0;
-	}
-
-	ledmode = str2val(argv[1], sunoem_led_mode_vals);
-	if (ledmode == 0xFF) {
-		ledmode = str2val(argv[1], sunoem_led_mode_optvals);
-		if (ledmode == 0xFF) {
-			lprintf(LOG_NOTICE, "Invalid LED Mode: %s", argv[1]);
-			return -1;
-		}
-	}
-
-	if (argc > 3) {
-		ledtype = str2val(argv[2], sunoem_led_type_vals);
-		if (ledtype == 0xFF) 
-			lprintf(LOG_ERR, "Unknow ledtype, will use data from the SDR oem field");
-	}
-
-	if (strncasecmp(argv[0], "all", 3) == 0) {
-		/* do all generic sensors */
-		alist = ipmi_sdr_find_sdr_bytype(intf,
-				SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR);
-		for (a = alist; a != NULL; a = a->next) {
-			if (a->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR)
-				continue;
-			if (a->record.genloc->entity.logical)
-				continue;
-			rsp = sunoem_led_set(intf, a->record.genloc, ledtype, ledmode);
-			if (rsp && rsp->ccode == 0) {
-				led_print((const char *)a->record.genloc->id_string, ledmode);
-			}
-		}
-		__sdr_list_empty(alist);
-		return 0;
-	}
-
-	/* look up generic device locator records in SDR */
-	sdr = ipmi_sdr_find_sdr_byid(intf, argv[0]);
-
-	if (sdr == NULL) {
-		lprintf(LOG_ERR, "No Sensor Data Record found for %s",
-			argv[0]);
-		return -1;
-	}
-
-	if (sdr->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR) {
-		lprintf(LOG_ERR, "Invalid SDR type %d", sdr->type);
-		return -1;
-	}
-
-	if (!sdr->record.genloc->entity.logical) {
-		/*
-		 * handle physical entity
-		 */
-		rsp = sunoem_led_set(intf, sdr->record.genloc, ledtype, ledmode);
-		if (rsp && rsp->ccode == 0) {
-			led_print(argv[0], ledmode);
-		}
-		return 0;
-	}
-
-	/* 
-	 * handle logical entity for LED grouping
-	 */
-
-	lprintf(LOG_INFO, "LED %s is logical device", argv[0]);
-
-	/* get entity assoc records */
-	alist = ipmi_sdr_find_sdr_bytype(intf, SDR_RECORD_TYPE_ENTITY_ASSOC);
-	for (a = alist; a != NULL; a = a->next) {
-		if (a->type != SDR_RECORD_TYPE_ENTITY_ASSOC)
-			continue;
-		assoc = a->record.entassoc;
-		if (assoc == NULL)
-			continue;
-
-		/* check that the entity id/instance matches our generic record */
-		if (assoc->entity.id != sdr->record.genloc->entity.id ||
-		    assoc->entity.instance != sdr->record.genloc->entity.instance)
-			continue;
-
-		if (assoc->flags.isrange) {
-			/*
-			 * handle ranged entity associations
-			 *
-			 * the test for non-zero entity id is handled in
-			 * sunoem_led_get_byentity()
-			 */
-
-			/* first range set - id 1 and 2 must be equal */
-			if (assoc->entity_id_1 == assoc->entity_id_2)
-				for (i = assoc->entity_inst_1; i <= assoc->entity_inst_2; i++)
-					sunoem_led_set_byentity(intf, assoc->entity_id_1, i, ledtype,
-							ledmode);
-
-			/* second range set - id 3 and 4 must be equal */
-			if (assoc->entity_id_3 == assoc->entity_id_4)
-				for (i = assoc->entity_inst_3; i <= assoc->entity_inst_4; i++)
-					sunoem_led_set_byentity(intf, assoc->entity_id_3, i, ledtype,
-							ledmode);
-		}
-		else {
-			/*
-			 * handle entity list
-			 */
-			sunoem_led_set_byentity(intf, assoc->entity_id_1,
-						assoc->entity_inst_1, ledtype, ledmode);
-			sunoem_led_set_byentity(intf, assoc->entity_id_2,
-						assoc->entity_inst_2, ledtype, ledmode);
-			sunoem_led_set_byentity(intf, assoc->entity_id_3,
-						assoc->entity_inst_3, ledtype, ledmode);
-			sunoem_led_set_byentity(intf, assoc->entity_id_4,
-						assoc->entity_inst_4, ledtype, ledmode);
-		}
-	}
-
-	__sdr_list_empty(alist);
-
-	return 0;
-}
-
-static int
-ipmi_sunoem_sshkey_del(struct ipmi_intf * intf, uint8_t uid)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-
-	memset(&req, 0, sizeof(struct ipmi_rq));
-	req.msg.netfn = IPMI_NETFN_SUNOEM;
-	req.msg.cmd = IPMI_SUNOEM_DEL_SSH_KEY;
-	req.msg.data = &uid;
-	req.msg.data_len = 1;
-
-	rsp = intf->sendrecv(intf, &req);
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Unable to delete ssh key for UID %d", uid);
-		return -1;
-	}
-	else if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Unable to delete ssh key for UID %d: %s", uid,
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	printf("Deleted SSH key for user id %d\n", uid);
-	return 0;
-}
-
-#define SSHKEY_BLOCK_SIZE	64
-static int
-ipmi_sunoem_sshkey_set(struct ipmi_intf * intf, uint8_t uid, char * ifile)
-{
-	struct ipmi_rs * rsp;
-	struct ipmi_rq req;
-	FILE * fp;
-	int count;
-	uint16_t i_size, r, size;
-	uint8_t wbuf[SSHKEY_BLOCK_SIZE + 3];
-
-	if (ifile == NULL) {
-		lprintf(LOG_ERR, "Invalid or misisng input filename");
-		return -1;
-	}
-
-	fp = ipmi_open_file_read(ifile);
-	if (fp == NULL) {
-		lprintf(LOG_ERR, "Unable to open file %s for reading", ifile);
-		return -1;
-	}
-
-	printf("Setting SSH key for user id %d...", uid);
-
-	memset(&req, 0, sizeof(struct ipmi_rq));
-	req.msg.netfn = IPMI_NETFN_SUNOEM;
-	req.msg.cmd = IPMI_SUNOEM_SET_SSH_KEY;
-	req.msg.data = wbuf;
-
-	fseek(fp, 0, SEEK_END);
-	size = ftell(fp);
-	fseek(fp, 0, SEEK_SET);
-
-	for (r = 0; r < size; r += i_size) {
-		i_size = size - r;
-		if (i_size > SSHKEY_BLOCK_SIZE)
-			i_size = SSHKEY_BLOCK_SIZE;
-
-		memset(wbuf, 0, SSHKEY_BLOCK_SIZE);
-		if (-1 == fseek(fp, r, SEEK_SET)) {
-			lprintf(LOG_ERR, "Seek error %s. %s", ifile, strerror(errno));
-			return -1;
-		}
-		count = fread(wbuf+3, 1, i_size, fp);
-		if (count != i_size) {
-			lprintf(LOG_ERR, "Unable to read %d bytes from file %s", i_size, ifile);
-			fclose(fp);
-			return -1;
-		}
-
-		printf(".");
-		fflush(stdout);
-
-		wbuf[0] = uid;
-		if ((r + SSHKEY_BLOCK_SIZE) >= size)
-			wbuf[1] = 0xff;
-		else
-			wbuf[1] = (uint8_t)(r / SSHKEY_BLOCK_SIZE);
-		wbuf[2] = i_size;
-		req.msg.data_len = i_size + 3;
-
-		rsp = intf->sendrecv(intf, &req);
-		if (rsp == NULL) {
-			lprintf(LOG_ERR, "Unable to set ssh key for UID %d", uid);
-			break;
-		}
-	}
-
-	printf("done\n");
-
-	fclose(fp);
-	return 0;
-}
-
-
-int
-ipmi_sunoem_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	int rc = (-1);
-
-	if (argc == 0 || strncmp(argv[0], "help", 4) == 0) {
-		ipmi_sunoem_usage();
-		return 0;
-	}
-
-	if (strncmp(argv[0], "fan", 3) == 0) {
-		if (argc == 3 && strncmp(argv[1], "speed", 5) == 0) {
-			uint8_t pct = 0;
-			if (str2uchar(argv[2], &pct) != 0 || pct > 100) {
-				lprintf(LOG_ERR, "Fan speed is limited to range <0..100>.");
-				return (-1);
-			}
-			rc = ipmi_sunoem_fan_speed(intf, pct);
-		}
-		else {
-			ipmi_sunoem_usage();
-			return (-1);
-		}
-	}
-	else if ((strncmp(argv[0], "led", 3) == 0)
-			|| (strncmp(argv[0], "sbled", 5) == 0)) {
-		if (argc < 2) {
-			ipmi_sunoem_usage();
-			return (-1);
-		}
-		if (strncmp(argv[0], "sbled", 5) == 0) {
-			is_sbcmd = 1;
-		}
-		if (strncmp(argv[1], "get", 3) == 0) {
-			if (argc < 3) {
-				char * arg[] = { "all" };
-				rc = ipmi_sunoem_led_get(intf, 1, arg);
-			}
-			else {
-				rc = ipmi_sunoem_led_get(intf, argc-2, &(argv[2]));
-			}
-		}
-		else if (strncmp(argv[1], "set", 3) == 0) {
-			if (argc < 4) {
-				ipmi_sunoem_usage();
-				return (-1);
-			}
-			rc = ipmi_sunoem_led_set(intf, argc-2, &(argv[2]));
-		}
-		else {
-			ipmi_sunoem_usage();
-			return (-1);
-		}
-	}
-	else if (strncmp(argv[0], "sshkey", 6) == 0) {
-		uint8_t uid = 0;
-		if (argc < 3) {
-			ipmi_sunoem_usage();
-			return (-1);
-		}
-
-		if (str2uchar(argv[2], &uid) != 0 || uid < 1 || uid > 63) {
-			lprintf(LOG_ERR, "User ID is limited to range <1..63>.");
-			return (-1);
-		}
-
-		if (strncmp(argv[1], "del", 3) == 0) {
-			rc = ipmi_sunoem_sshkey_del(intf, uid);
-		}
-		else if (argc == 4 && strncmp(argv[1], "set", 3) == 0) {
-			rc = ipmi_sunoem_sshkey_set(intf, uid, argv[3]);
-		}
-		else {
-			ipmi_sunoem_usage();
-			return (-1);
-		}
-	}
-	else {
-		ipmi_sunoem_usage();
-		return (-1);
-	}
-
-	return rc;
-}

ipmitool/lib/ipmi_user.c

@@ -1,836 +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.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/select.h>
-#include <sys/time.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include <ipmitool/helper.h>
-#include <ipmitool/log.h>
-#include <ipmitool/ipmi.h>
-#include <ipmitool/ipmi_intf.h>
-#include <ipmitool/ipmi_user.h>
-#include <ipmitool/ipmi_constants.h>
-#include <ipmitool/ipmi_strings.h>
-#include <ipmitool/bswap.h>
-
-
-extern int verbose;
-extern int csv_output;
-
-
-#define IPMI_PASSWORD_DISABLE_USER  0x00
-#define IPMI_PASSWORD_ENABLE_USER   0x01
-#define IPMI_PASSWORD_SET_PASSWORD  0x02
-#define IPMI_PASSWORD_TEST_PASSWORD 0x03
-
-/*
- * ipmi_get_user_access
- *
- * param intf		[in]
- * param channel_number [in]
- * param user_id	[in]
- * param user_access	[out]
- *
- * return 0 on succes
- *	  1 on failure
- */
-static int
-ipmi_get_user_access(
-		     struct ipmi_intf *intf,
-		     uint8_t channel_number,
-		     uint8_t user_id,
-		     struct user_access_rsp *user_access)
-{
-	struct ipmi_rs	     * rsp;
-	struct ipmi_rq	       req;
-	uint8_t	       msg_data[2];
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn    = IPMI_NETFN_APP;	     /* 0x06 */
-	req.msg.cmd	     = IPMI_GET_USER_ACCESS; /* 0x44 */
-	req.msg.data     = msg_data;
-	req.msg.data_len = 2;
-
-
-	/* The channel number will remain constant throughout this function */
-	msg_data[0] = channel_number;
-	msg_data[1] = user_id;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Get User Access command failed "
-			"(channel %d, user %d)", channel_number, user_id);
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Get User Access command failed "
-			"(channel %d, user %d): %s", channel_number, user_id,
-			val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	memcpy(user_access,
-	       rsp->data,
-	       sizeof(struct user_access_rsp));
-
-	return 0;
-}
-
-
-
-/*
- * ipmi_get_user_name
- *
- * param intf		[in]
- * param channel_number [in]
- * param user_id	[in]
- * param user_name	[out]
- *
- * return 0 on succes
- *	  1 on failure
- */
-static int
-ipmi_get_user_name(
-		   struct ipmi_intf *intf,
-		   uint8_t user_id,
-		   char	*user_name)
-{
-	struct ipmi_rs	     * rsp;
-	struct ipmi_rq	       req;
-	uint8_t	       msg_data[1];
-
-	memset(user_name, 0, 17);
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn    = IPMI_NETFN_APP;     /* 0x06 */
-	req.msg.cmd      = IPMI_GET_USER_NAME; /* 0x45 */
-	req.msg.data     = msg_data;
-	req.msg.data_len = 1;
-
-	msg_data[0] = user_id;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Get User Name command failed (user %d)",
-			user_id);
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		if (rsp->ccode == 0xcc)
-			return 0;
-		lprintf(LOG_ERR, "Get User Name command failed (user %d): %s",
-			user_id, val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	memcpy(user_name, rsp->data, 16);
-
-	return 0;
-}
-
-
-
-
-static void
-dump_user_access(
-		 uint8_t		  user_id,
-		 const		   char * user_name,
-		 struct user_access_rsp * user_access)
-{
-	static int printed_header = 0;
-
-	if (! printed_header)
-	{
-		printf("ID  Name	     Callin  Link Auth	IPMI Msg   "
-		       "Channel Priv Limit\n");
-		printed_header = 1;
-	}
-
-	printf("%-4d%-17s%-8s%-11s%-11s%-s\n",
-	       user_id,
-	       user_name,
-	       user_access->no_callin_access? "false": "true ",
-	       user_access->link_auth_access? "true ": "false",
-	       user_access->ipmi_messaging_access? "true ": "false",
-	       val2str(user_access->channel_privilege_limit,
-		       ipmi_privlvl_vals));
-}
-
-
-
-static void
-dump_user_access_csv(
-		     uint8_t user_id,
-		     const char *user_name,
-		     struct user_access_rsp *user_access)
-{
-	printf("%d,%s,%s,%s,%s,%s\n",
-	       user_id,
-	       user_name,
-	       user_access->no_callin_access? "false": "true",
-	       user_access->link_auth_access? "true": "false",
-	       user_access->ipmi_messaging_access? "true": "false",
-	       val2str(user_access->channel_privilege_limit,
-		       ipmi_privlvl_vals));
-}
-
-static int
-ipmi_print_user_list(
-		     struct ipmi_intf *intf,
-		     uint8_t channel_number)
-{
-	/* This is where you were! */
-	char user_name[17];
-	struct user_access_rsp  user_access;
-	uint8_t current_user_id = 1;
-
-
-	do
-	{
-		if (ipmi_get_user_access(intf,
-					 channel_number,
-					 current_user_id,
-					 &user_access))
-			return -1;
-
-
-		if (ipmi_get_user_name(intf,
-				       current_user_id,
-				       user_name))
-			return -1;
-
-		if ((current_user_id == 0)	      ||
-		    user_access.link_auth_access      ||
-		    user_access.ipmi_messaging_access ||
-		    strcmp("", user_name))
-		{
-			if (csv_output)
-				dump_user_access_csv(current_user_id,
-						     user_name, &user_access);
-			else
-				dump_user_access(current_user_id,
-						 user_name,
-						 &user_access);
-		}
-
-
-		++current_user_id;
-	} while((current_user_id <= user_access.maximum_ids) &&
-			(current_user_id <= IPMI_UID_MAX)); /* Absolute maximum allowed by spec */
-
-
-	return 0;
-}
-
-
-
-static int
-ipmi_print_user_summary(
-			struct ipmi_intf * intf,
-			uint8_t	   channel_number)
-{
-	struct user_access_rsp     user_access;
-
-	if (ipmi_get_user_access(intf,
-				 channel_number,
-				 1,
-				 &user_access))
-		return -1;
-
-	if (csv_output)
-	{
-		printf("%d,%d,%d\n",
-		       user_access.maximum_ids,
-		       user_access.enabled_user_count,
-		       user_access.fixed_name_count);
-	}
-	else
-	{
-		printf("Maximum IDs	    : %d\n",
-		       user_access.maximum_ids);
-		printf("Enabled User Count  : %d\n",
-		       user_access.enabled_user_count);
-		printf("Fixed Name Count    : %d\n",
-		       user_access.fixed_name_count);
-	}
-
-	return 0;
-}
-
-
-
-/*
- * ipmi_user_set_username
- */
-static int
-ipmi_user_set_username(
-		       struct ipmi_intf *intf,
-		       uint8_t user_id,
-		       const char *name)
-{
-	struct ipmi_rs	     * rsp;
-	struct ipmi_rq	       req;
-	uint8_t	       msg_data[17];
-
-	/*
-	 * Ensure there is space for the name in the request message buffer
-	 */
-	if (strlen(name) >= sizeof(msg_data)) {
-		return -1;
-	}
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn    = IPMI_NETFN_APP;	     /* 0x06 */
-	req.msg.cmd	     = IPMI_SET_USER_NAME;   /* 0x45 */
-	req.msg.data     = msg_data;
-	req.msg.data_len = sizeof(msg_data);
-	memset(msg_data, 0, sizeof(msg_data));
-
-	/* The channel number will remain constant throughout this function */
-	msg_data[0] = user_id;
-	strncpy((char *)(msg_data + 1), name, strlen(name));
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Set User Name command failed (user %d, name %s)",
-			user_id, name);
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Set User Name command failed (user %d, name %s): %s",
-			user_id, name, val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	return 0;
-}
-
-static int
-ipmi_user_set_userpriv(
-		       struct ipmi_intf *intf,
-		       uint8_t channel,
-		       uint8_t user_id,
-		       const unsigned char privLevel)
-{
-	struct ipmi_rs *rsp;
-	struct ipmi_rq req;
-	uint8_t msg_data[4] = {0, 0, 0, 0};
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn    = IPMI_NETFN_APP;         /* 0x06 */
-	req.msg.cmd      = IPMI_SET_USER_ACCESS;   /* 0x43 */
-	req.msg.data     = msg_data;
-	req.msg.data_len = 4;
-
-	/* The channel number will remain constant throughout this function */
-	msg_data[0] = (channel   & 0x0f);
-	msg_data[1] = (user_id   & 0x3f);
-	msg_data[2] = (privLevel & 0x0f);
-	msg_data[3] = 0;
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (rsp == NULL)
-	{
-		lprintf(LOG_ERR, "Set Privilege Level command failed (user %d)",
-			user_id);
-		return -1;
-	}
-	if (rsp->ccode > 0)
-	{
-		lprintf(LOG_ERR, "Set Privilege Level command failed (user %d): %s",
-			user_id, val2str(rsp->ccode, completion_code_vals));
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
- * ipmi_user_set_password
- *
- * This function is responsible for 4 things
- * Enabling/Disabling users
- * Setting/Testing passwords
- */
-static int
-ipmi_user_set_password(
-		       struct ipmi_intf * intf,
-		       uint8_t user_id,
-		       uint8_t operation,
-		       const char *password,
-		       int is_twenty_byte_password)
-{
-	struct ipmi_rs	     * rsp;
-	struct ipmi_rq	       req;
-	uint8_t	               msg_data[22];
-
-	int password_length = (is_twenty_byte_password? 20 : 16);
-
-	memset(&req, 0, sizeof(req));
-	req.msg.netfn    = IPMI_NETFN_APP;	    /* 0x06 */
-	req.msg.cmd	 = IPMI_SET_USER_PASSWORD;  /* 0x47 */
-	req.msg.data     = msg_data;
-	req.msg.data_len = password_length + 2;
-
-
-	/* The channel number will remain constant throughout this function */
-	msg_data[0] = user_id;
-
-	if (is_twenty_byte_password)
-		msg_data[0] |= 0x80;
-
-	msg_data[1] = operation;
-
-	memset(msg_data + 2, 0, password_length);
-
-	if (password != NULL)
-		strncpy((char *)(msg_data + 2), password, password_length);
-
-	rsp = intf->sendrecv(intf, &req);
-
-	if (rsp == NULL) {
-		lprintf(LOG_ERR, "Set User Password command failed (user %d)",
-			user_id);
-		return -1;
-	}
-	if (rsp->ccode > 0) {
-		lprintf(LOG_ERR, "Set User Password command failed (user %d): %s",
-			user_id, val2str(rsp->ccode, completion_code_vals));
-		return rsp->ccode;
-	}
-
-	return 0;
-}
-
-
-
-/*
- * ipmi_user_test_password
- *
- * Call ipmi_user_set_password, and interpret the result
- */
-static int
-ipmi_user_test_password(
-			struct ipmi_intf * intf,
-			uint8_t      user_id,
-			const char       * password,
-			int                is_twenty_byte_password)
-{
-	int ret;
-
-	ret = ipmi_user_set_password(intf,
-				     user_id,
-				     IPMI_PASSWORD_TEST_PASSWORD,
-				     password,
-				     is_twenty_byte_password);
-
-	switch (ret) {
-	case 0:
-		printf("Success\n");
-		break;
-	case 0x80:
-		printf("Failure: password incorrect\n");
-		break;
-	case 0x81:
-		printf("Failure: wrong password size\n");
-		break;
-	default:
-		printf("Unknown error\n");
-	}
-
-	return ((ret == 0) ? 0 : -1);
-}
-
-
-/*
- * print_user_usage
- */
-static void
-print_user_usage(void)
-{
-	lprintf(LOG_NOTICE, "User Commands:");
-	lprintf(LOG_NOTICE, "		   summary      [<channel number>]");
-	lprintf(LOG_NOTICE, "		   list         [<channel number>]");
-	lprintf(LOG_NOTICE, "		   set name     <user id> <username>");
-	lprintf(LOG_NOTICE, "		   set password <user id> [<password>]");
-	lprintf(LOG_NOTICE, "		   disable      <user id>");
-	lprintf(LOG_NOTICE, "		   enable       <user id>");
-	lprintf(LOG_NOTICE,
-			"		   priv         <user id> <privilege level> [<channel number>]");
-	lprintf(LOG_NOTICE, "		   test         <user id> <16|20> [<password]>\n");
-}
-
-
-const char *
-ipmi_user_build_password_prompt(uint8_t user_id)
-{
-	static char prompt[128];
-	memset(prompt, 0, 128);
-	snprintf(prompt, 128, "Password for user %d: ", user_id);
-	return prompt;
-}
-
-
-/*
- * ipmi_user_main
- *
- * Upon entry to this function argv should contain our arguments
- * specific to this subcommand
- */
-int
-ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-	int retval = 0;
-
-	/*
-	 * Help
-	 */
-	if (argc == 0 || strncmp(argv[0], "help", 4) == 0)
-	{
-		print_user_usage();
-	}
-
-	/*
-	 * Summary
-	 */
-	else if (strncmp(argv[0], "summary", 7) == 0)
-	{
-		uint8_t channel;
-
-		if (argc == 1)
-			channel = 0x0E; /* Ask about the current channel */
-		else if (argc == 2)
-		{
-			if (str2uchar(argv[1], &channel) != 0)
-			{
-				lprintf(LOG_ERR, "Invalid channel: %s", argv[1]);
-				return (-1);
-			}
-		}
-		else
-		{
-			print_user_usage();
-			return -1;
-		}
-
-		retval = ipmi_print_user_summary(intf, channel);
-	}
-
-
-	/*
-	 * List
-	 */
-	else if (strncmp(argv[0], "list", 4) == 0)
-	{
-		uint8_t channel;
-
-		if (argc == 1)
-			channel = 0x0E; /* Ask about the current channel */
-		else if (argc == 2)
-		{
-			if (str2uchar(argv[1], &channel) != 0)
-			{
-				lprintf(LOG_ERR, "Invalid channel: %s", argv[1]);
-				return (-1);
-			}
-		}
-		else
-		{
-			print_user_usage();
-			return -1;
-		}
-
-		retval = ipmi_print_user_list(intf, channel);
-	}
-
-
-
-	/*
-	 * Test
-	 */
-	else if (strncmp(argv[0], "test", 4) == 0)
-	{
-		// a little irritating, isn't it
-		if (argc == 3 || argc == 4)
-		{
-			char * password = NULL;
-			int password_length = 0;
-			uint8_t user_id = 0;
-			if (is_ipmi_user_id(argv[1], &user_id)) {
-				return (-1);
-			}
-			if (str2int(argv[2], &password_length) != 0
-					|| (password_length != 16 && password_length != 20)) {
-				lprintf(LOG_ERR,
-						"Given password length '%s' is invalid.",
-						argv[2]);
-				lprintf(LOG_ERR, "Expected value is either 16 or 20.");
-				return (-1);
-			}
-
-			if (argc == 3)
-			{
-				/* We need to prompt for a password */
-
-				char * tmp;
-				const char * password_prompt =
-					ipmi_user_build_password_prompt(user_id);
-# ifdef HAVE_GETPASSPHRASE
-				tmp = getpassphrase (password_prompt);
-# else
-				tmp = (char*)getpass (password_prompt);
-# endif
-				if (tmp != NULL) {
-					password = strdup(tmp);
-					tmp = NULL;
-				}
-				if (password == NULL) {
-					lprintf(LOG_ERR, "ipmitool: malloc failure");
-					return -1;
-				}
-			}
-			else {
-				password = strdup(argv[3]);
-			}
-
-
-			retval = ipmi_user_test_password(intf,
-							 user_id,
-							 password,
-							 password_length == 20);
-			if (password != NULL) {
-				free(password);
-				password = NULL;
-			}
-		}
-		else
-		{
-			print_user_usage();
-			return -1;
-		}
-	}
-
-	/*
-	 * Set
-	 */
-	else if (strncmp(argv[0], "set", 3) == 0)
-	{
-		/*
-		 * Set Password
-		 */
-		if ((argc >= 3) &&
-		    (strncmp("password", argv[1], 8) == 0))
-		{
-			char * password = NULL;
-			uint8_t user_id = 0;
-			if (is_ipmi_user_id(argv[2], &user_id)) {
-				return (-1);
-			}
-
-			if (argc == 3)
-			{
-				/* We need to prompt for a password */
-				char * tmp;
-				const char * password_prompt =
-					ipmi_user_build_password_prompt(user_id);
-# ifdef HAVE_GETPASSPHRASE
-				tmp = getpassphrase (password_prompt);
-# else
-				tmp = (char*)getpass (password_prompt);
-# endif
-				if (tmp != NULL) {
-					password = strdup(tmp);
-					tmp = NULL;
-				}
-				if (password == NULL) {
-					lprintf(LOG_ERR, "ipmitool: malloc failure");
-					return -1;
-				}
-# ifdef HAVE_GETPASSPHRASE
-				tmp = getpassphrase (password_prompt);
-# else
-				tmp = (char*)getpass (password_prompt);
-# endif
-				if (tmp == NULL) {
-					lprintf(LOG_ERR, "ipmitool: malloc failure");
-					return (-1);
-				}
-				if (strlen(password) != strlen(tmp)
-						|| strncmp(password, tmp, strlen(tmp))) {
-					lprintf(LOG_ERR, "Passwords do not match.");
-					free(password);
-					password = NULL;
-					return -1;
-				}
-				tmp = NULL;
-			} else {
-				password = strdup(argv[3]);
-			}
-
-			if (password == NULL) {
-				lprintf(LOG_ERR, "Unable to parse password argument.");
-				return -1;
-			}
-			else if (strlen(password) > 20)
-			{
-				lprintf(LOG_ERR, "Password is too long (> 20 bytes)");
-				return -1;
-			}
-
-			retval = ipmi_user_set_password(intf,
-							user_id,
-							IPMI_PASSWORD_SET_PASSWORD,
-							password,
-							strlen(password) > 16);
-			if (password != NULL) {
-				free(password);
-				password = NULL;
-			}
-		}
-
-		/*
-		 * Set Name
-		 */
-		else if ((argc >= 2) &&
-			 (strncmp("name", argv[1], 4) == 0))
-		{
-			uint8_t user_id = 0;
-			if (argc != 4)
-			{
-				print_user_usage();
-				return -1;
-			}
-			if (is_ipmi_user_id(argv[2], &user_id)) {
-					return (-1);
-			}
-
-			if (strlen(argv[3]) > 16)
-			{
-				lprintf(LOG_ERR, "Username is too long (> 16 bytes)");
-				return -1;
-			}
-
-			retval = ipmi_user_set_username(intf, user_id, argv[3]);
-		}
-		else
-		{
-			print_user_usage();
-			return -1;
-		}
-	}
-
-	else if (strncmp(argv[0], "priv", 4) == 0)
-	{
-		uint8_t user_id;
-		uint8_t priv_level;
-		uint8_t channel = 0x0e; /* Use channel running on */
-
-		if (argc != 3 && argc != 4)
-		{
-			print_user_usage();
-			return -1;
-		}
-
-		if (argc == 4)
-		{
-			if (str2uchar(argv[3], &channel) != 0) 
-			{
-				lprintf(LOG_ERR, "Invalid channel: %s", argv[3]);
-				return (-1);
-			}
-			channel = (channel & 0x0f);
-		}
-		
-		if (str2uchar(argv[2], &priv_level) != 0)
-		{
-			lprintf(LOG_ERR, "Invalid privilege level: %s", argv[2]);
-			return (-1);
-		}
-		priv_level = (priv_level & 0x0f);
-
-		if (is_ipmi_user_id(argv[1], &user_id)) {
-			return (-1);
-		}
-
-		retval = ipmi_user_set_userpriv(intf,channel,user_id,priv_level);
-	}
-
-	/*
-	 * Disable / Enable
-	 */
-	else if ((strncmp(argv[0], "disable", 7) == 0) ||
-		 (strncmp(argv[0], "enable",  6) == 0))
-	{
-		uint8_t user_id;
-		uint8_t operation;
-		char null_password[16]; /* Not used, but required */
-
-		memset(null_password, 0, sizeof(null_password));
-
-		if (argc != 2)
-		{
-			print_user_usage();
-			return -1;
-		}
-
-		if (is_ipmi_user_id(argv[1], &user_id)) {
-			return (-1);
-		}
-
-		operation = (strncmp(argv[0], "disable", 7) == 0) ?
-			IPMI_PASSWORD_DISABLE_USER : IPMI_PASSWORD_ENABLE_USER;
-
-		retval = ipmi_user_set_password(intf,
-						user_id,
-						operation,
-						null_password,
-						0); /* This field is ignored */
-	}
-	else
-	{
-		retval = -1;
-		lprintf(LOG_ERR, "Invalid user command: '%s'\n", argv[0]);
-		print_user_usage();
-	}
-
-	return retval;
-}

ipmitool/src/plugins/ipmi_intf.c

@@ -1,317 +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.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-#include <ipmitool/ipmi_intf.h>
-#include <ipmitool/ipmi.h>
-#include <ipmitool/ipmi_sdr.h>
-#include <ipmitool/log.h>
-
-#ifdef IPMI_INTF_OPEN
-extern struct ipmi_intf ipmi_open_intf;
-#endif
-#ifdef IPMI_INTF_IMB
-extern struct ipmi_intf ipmi_imb_intf;
-#endif
-#ifdef IPMI_INTF_LIPMI
-extern struct ipmi_intf ipmi_lipmi_intf;
-#endif
-#ifdef IPMI_INTF_BMC
-extern struct ipmi_intf ipmi_bmc_intf;
-#endif
-#ifdef IPMI_INTF_LAN
-extern struct ipmi_intf ipmi_lan_intf;
-#endif
-#ifdef IPMI_INTF_LANPLUS
-extern struct ipmi_intf ipmi_lanplus_intf;
-#endif
-#ifdef IPMI_INTF_FREE
-extern struct ipmi_intf ipmi_free_intf;
-#endif
-#ifdef IPMI_INTF_SERIAL
-extern struct ipmi_intf ipmi_serial_term_intf;
-extern struct ipmi_intf ipmi_serial_bm_intf;
-#endif
-
-struct ipmi_intf * ipmi_intf_table[] = {
-#ifdef IPMI_INTF_OPEN
-	&ipmi_open_intf,
-#endif
-#ifdef IPMI_INTF_IMB
-	&ipmi_imb_intf,
-#endif
-#ifdef IPMI_INTF_LIPMI
-	&ipmi_lipmi_intf,
-#endif
-#ifdef IPMI_INTF_BMC
-	&ipmi_bmc_intf,
-#endif
-#ifdef IPMI_INTF_LAN
-	&ipmi_lan_intf,
-#endif
-#ifdef IPMI_INTF_LANPLUS
-	&ipmi_lanplus_intf,
-#endif
-#ifdef IPMI_INTF_FREE
-	&ipmi_free_intf,
-#endif
-#ifdef IPMI_INTF_SERIAL
-	&ipmi_serial_term_intf,
-	&ipmi_serial_bm_intf,
-#endif
-	NULL
-};
-
-/* ipmi_intf_print  -  Print list of interfaces
- *
- * no meaningful return code
- */
-void ipmi_intf_print(struct ipmi_intf_support * intflist)
-{
-	struct ipmi_intf ** intf;
-	struct ipmi_intf_support * sup;
-	int def = 1;
-	int found;
-
-	lprintf(LOG_NOTICE, "Interfaces:");
-
-	for (intf = ipmi_intf_table; intf && *intf; intf++) {
-
-		if (intflist != NULL) {
-			found = 0;
-			for (sup=intflist; sup->name != NULL; sup++) {
-				if (strncmp(sup->name, (*intf)->name, strlen(sup->name)) == 0 &&
-				    strncmp(sup->name, (*intf)->name, strlen((*intf)->name)) == 0 &&
-				    sup->supported == 1)
-					found = 1;
-			}
-			if (found == 0)
-				continue;
-		}
-
-		lprintf(LOG_NOTICE, "\t%-12s  %s %s",
-			(*intf)->name, (*intf)->desc,
-			def ? "[default]" : "");
-		def = 0;
-	}
-	lprintf(LOG_NOTICE, "");
-}
-
-/* ipmi_intf_load  -  Load an interface from the interface table above
- *                    If no interface name is given return first entry
- *
- * @name:	interface name to try and load
- *
- * returns pointer to inteface structure if found
- * returns NULL on error
- */
-struct ipmi_intf * ipmi_intf_load(char * name)
-{
-	struct ipmi_intf ** intf;
-	struct ipmi_intf * i;
-
-	if (name == NULL) {
-		i = ipmi_intf_table[0];
-		if (i->setup != NULL && (i->setup(i) < 0)) {
-			lprintf(LOG_ERR, "Unable to setup "
-				"interface %s", name);
-			return NULL;
-		}
-		return i;
-	}
-
-	for (intf = ipmi_intf_table;
-	     ((intf != NULL) && (*intf != NULL));
-	     intf++) {
-		i = *intf;
-		if (strncmp(name, i->name, strlen(name)) == 0) {
-			if (i->setup != NULL && (i->setup(i) < 0)) {
-				lprintf(LOG_ERR, "Unable to setup "
-					"interface %s", name);
-				return NULL;
-			}
-			return i;
-		}
-	}
-
-	return NULL;
-}
-
-void
-ipmi_intf_session_set_hostname(struct ipmi_intf * intf, char * hostname)
-{
-	if (intf->session == NULL)
-		return;
-
-	memset(intf->session->hostname, 0, 16);
-
-	if (hostname != NULL) {
-		memcpy(intf->session->hostname, hostname,
-		       __min(strlen(hostname), 64));
-	}
-}
-
-void
-ipmi_intf_session_set_username(struct ipmi_intf * intf, char * username)
-{
-	if (intf->session == NULL)
-		return;
-
-	memset(intf->session->username, 0, 17);
-
-	if (username == NULL)
-		return;
-
-	memcpy(intf->session->username, username, __min(strlen(username), 16));
-}
-
-void
-ipmi_intf_session_set_password(struct ipmi_intf * intf, char * password)
-{
-	if (intf->session == NULL)
-		return;
-
-	memset(intf->session->authcode, 0, IPMI_AUTHCODE_BUFFER_SIZE);
-
-	if (password == NULL) {
-		intf->session->password = 0;
-		return;
-	}
-
-	intf->session->password = 1;
-	memcpy(intf->session->authcode, password,
-	       __min(strlen(password), IPMI_AUTHCODE_BUFFER_SIZE));
-}
-
-void
-ipmi_intf_session_set_privlvl(struct ipmi_intf * intf, uint8_t level)
-{
-	if (intf->session == NULL)
-		return;
-
-	intf->session->privlvl = level;
-}
-
-void
-ipmi_intf_session_set_lookupbit(struct ipmi_intf * intf, uint8_t lookupbit)
-{
-	if (intf->session == NULL)
-		return;
-
-	intf->session->v2_data.lookupbit = lookupbit;
-}
-
-void
-ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, uint8_t cipher_suite_id)
-{
-	if (intf->session == NULL)
-		return;
-
-	intf->session->cipher_suite_id = cipher_suite_id;
-}
-
-void
-ipmi_intf_session_set_sol_escape_char(struct ipmi_intf * intf, char sol_escape_char)
-{
-	if (intf->session == NULL)
-		return;
-
-	intf->session->sol_escape_char = sol_escape_char;
-}
-
-void
-ipmi_intf_session_set_kgkey(struct ipmi_intf * intf, char * kgkey)
-{
-	if (intf->session == NULL)
-		return;
-
-	memset(intf->session->v2_data.kg, 0, IPMI_KG_BUFFER_SIZE);
-
-	if (kgkey == NULL)
-		return;
-
-	memcpy(intf->session->v2_data.kg, kgkey, 
-	       __min(strlen(kgkey), IPMI_KG_BUFFER_SIZE));
-}
-
-void
-ipmi_intf_session_set_port(struct ipmi_intf * intf, int port)
-{
-	if (intf->session == NULL)
-		return;
-
-	intf->session->port = port;
-}
-
-void
-ipmi_intf_session_set_authtype(struct ipmi_intf * intf, uint8_t authtype)
-{
-	if (intf->session == NULL)
-		return;
-
-	/* clear password field if authtype NONE specified */
-	if (authtype == IPMI_SESSION_AUTHTYPE_NONE) {
-		memset(intf->session->authcode, 0, IPMI_AUTHCODE_BUFFER_SIZE);
-		intf->session->password = 0;
-	}
-
-	intf->session->authtype_set = authtype;
-}
-
-void
-ipmi_intf_session_set_timeout(struct ipmi_intf * intf, uint32_t timeout)
-{
-	if (intf->session == NULL)
-		return;
-
-	intf->session->timeout = timeout;
-}
-
-void
-ipmi_intf_session_set_retry(struct ipmi_intf * intf, int retry)
-{
-	if (intf->session == NULL)
-		return;
-
-	intf->session->retry = retry;
-}
-
-void
-ipmi_cleanup(struct ipmi_intf * intf)
-{
-	ipmi_sdr_list_empty(intf);
-}

lib/Makefile.am

@@ -39,7 +39,7 @@ libipmitool_la_SOURCES	= helper.c ipmi_sdr.c ipmi_sel.c ipmi_sol.c ipmi_pef.c \
 				  ipmi_oem.c ipmi_isol.c ipmi_sunoem.c ipmi_fwum.c ipmi_picmg.c    \
 				  ipmi_main.c ipmi_tsol.c ipmi_firewall.c ipmi_kontronoem.c        \
 				  ipmi_hpmfwupg.c ipmi_sdradd.c ipmi_ekanalyzer.c ipmi_gendev.c    \
-				  ipmi_ime.c ipmi_delloem.c ipmi_dcmi.c \
+				  ipmi_ime.c ipmi_delloem.c ipmi_dcmi.c hpm2.c ipmi_vita.c \
 				  ../src/plugins/lan/md5.c ../src/plugins/lan/md5.h
 
 libipmitool_la_LDFLAGS		= -export-dynamic

lib/dimm_spd.c

@@ -63,10 +63,11 @@ const struct valstr spd_memtype_vals[] = {
 	{ 0x09, "DDR2 SDRAM FB-DIMM" },
 	{ 0x0A, "DDR2 SDRAM FB-DIMM Probe" },
 	{ 0x0B, "DDR3 SDRAM" },
+	{ 0x0C, "DDR4 SDRAM" },
 	{ 0x00, NULL },
 };
 
-const struct valstr ddr3_density_vals[] = 
+const struct valstr ddr3_density_vals[] =
 {
 	{ 0, "256 Mb" },
 	{ 1, "512 Mb" },
@@ -87,6 +88,8 @@ const struct valstr ddr3_banks_vals[] =
 	{ 0x00, NULL },
 };
 
+
+#define ddr4_ecc_vals ddr3_ecc_vals
 const struct valstr ddr3_ecc_vals[] =
 {
 	{ 0, "0 bits" },
@@ -94,6 +97,62 @@ const struct valstr ddr3_ecc_vals[] =
 	{ 0x00, NULL },
 };
 
+const struct valstr ddr4_density_vals[] =
+{
+	{ 0, "256 Mb" },
+	{ 1, "512 Mb" },
+	{ 2, "1 Gb" },
+	{ 3, "2 Gb" },
+	{ 4, "4 Gb" },
+	{ 5, "8 Gb" },
+	{ 6, "16 Gb" },
+	{ 7, "32 Gb" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_banks_vals[] =
+{
+	{ 0, "2 (4 Banks)" },
+	{ 1, "3 (8 Banks)" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_bank_groups[] =
+{
+	{ 0, "0 (no Bank Groups)" },
+	{ 1, "1 (2 Bank Groups)" },
+	{ 2, "2 (4 Bank Groups)" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_package_type[] =
+{
+	{ 0, "Monolithic DRAM Device" },
+	{ 1, "Non-Monolithic Device" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_technology_type[] =
+{
+	{ 0, "Extended module type, see byte 15" },
+	{ 1, "RDIMM" },
+	{ 2, "UDIMM" },
+	{ 3, "SO-DIMM" },
+	{ 4, "LRDIMM" },
+	{ 5, "Mini-RDIMM" },
+	{ 6, "Mini-UDIMM" },
+	{ 7, "7 - Reserved" },
+	{ 8, "72b-SO-RDIMM" },
+	{ 9, "72b-SO-UDIMM" },
+	{ 10, "10 - Reserved" },
+	{ 11, "11 - Reserved" },
+	{ 12, "16b-SO-DIMM" },
+	{ 13, "32b-SO-DIMM" },
+	{ 14, "14 - Reserved" },
+	{ 15, "No base memory present" },
+	{ 0x00, NULL },
+};
+
 const struct valstr spd_config_vals[] = {
 	{ 0x00, "None" },
 	{ 0x01, "Parity" },
@@ -719,7 +778,8 @@ const struct valstr jedec_id5_vals[] = {
 int
 ipmi_spd_print(uint8_t *spd_data, int len)
 {
-	int size;
+	int k = 0;
+	int ii = 0;
 
 	if (len < 92)
 		return -1; /* we need first 91 bytes to do our thing */
@@ -799,11 +859,109 @@ ipmi_spd_print(uint8_t *spd_data, int len)
 			printf( "%c", *pchPN++ );
 		}
 		printf("\n");
+	} else if (spd_data[2] == 0x0C)	/* DDR4 SDRAM */
+	{
+		int i;
+		int sdram_cap = 0;
+		int pri_bus_width = 0;
+		int sdram_width = 0;
+		int mem_size = 0;
+		int lrank_dimm;
+		uint32_t year;
+		uint32_t week;
+
+		if (len < 348)
+			return -1;
+
+		/* "Logical rank" referes to the individually addressable die
+		 * in a 3DS stack and has no meaning for monolithic or
+		 * multi-load stacked SDRAMs; however, for the purposes of
+		 * calculating the capacity of the module, one should treat
+		 * monolithic and multi-load stack SDRAMs as having one logical
+		 * rank per package rank.
+		 */
+		lrank_dimm = (spd_data[12]>>3&0x3) + 1; /* Number of Package Ranks per DIMM */
+		if ((spd_data[6] & 0x3) == 0x2) { /* 3DS package Type */
+			lrank_dimm *= ((spd_data[6]>>4)&0x3) + 1; /* Die Count */
+		}
+		sdram_cap = ldexp(256,(spd_data[4]&15));
+		pri_bus_width = ldexp(8,(spd_data[13]&7));
+		sdram_width = ldexp(4,(spd_data[12]&7));
+		mem_size = (sdram_cap/8) * (pri_bus_width/sdram_width) * lrank_dimm;
+		printf(" SDRAM Package Type    : %s\n", val2str((spd_data[6]>>7), ddr4_package_type));
+		printf(" Technology            : %s\n", val2str((spd_data[3]&15), ddr4_technology_type));
+		printf(" SDRAM Die Count       : %d\n", ((spd_data[6]>>4) & 3)+1);
+		printf(" SDRAM Capacity        : %d Mb\n", sdram_cap );
+		printf(" Memory Bank Group     : %s\n", val2str((spd_data[4]>>6 & 0x3), ddr4_bank_groups));
+		printf(" Memory Banks          : %s\n", val2str((spd_data[4]>>4 & 0x3), ddr4_banks_vals));
+		printf(" Primary Bus Width     : %d bits\n", pri_bus_width );
+		printf(" SDRAM Device Width    : %d bits\n", sdram_width );
+		printf(" Logical Rank per DIMM : %d\n", lrank_dimm );
+		printf(" Memory size           : %d MB\n", mem_size );
+
+		printf(" Memory Density        : %s\n", val2str(spd_data[4]&15, ddr4_density_vals));
+		printf(" 1.2 V Nominal Op      : %s\n", (((spd_data[11]&3) != 3) ? "No":"Yes" ) );
+		printf(" TBD1 V Nominal Op     : %s\n", (((spd_data[11]>>2&3) != 3) ? "No":"Yes" ) );
+		printf(" TBD2 V Nominal Op     : %s\n", (((spd_data[11]>>4&3) != 3) ? "No":"Yes" ) );
+		printf(" Error Detect/Cor      : %s\n", val2str(spd_data[13]>>3, ddr4_ecc_vals));
+
+		printf(" Manufacturer          : ");
+		switch (spd_data[320]&127)
+		{
+		case	0:
+			printf("%s\n", val2str(spd_data[321], jedec_id1_vals));
+			break;
+
+		case	1:
+			printf("%s\n", val2str(spd_data[321], jedec_id2_vals));
+			break;
+
+		case	2:
+			printf("%s\n", val2str(spd_data[321], jedec_id3_vals));
+			break;
+
+		case	3:
+			printf("%s\n", val2str(spd_data[321], jedec_id4_vals));
+			break;
+
+		case	4:
+			printf("%s\n", val2str(spd_data[321], jedec_id5_vals));
+			break;
+
+		default:
+			printf("%s\n", "JEDEC JEP106 update required");
+
+		}
+
+		year = ((spd_data[323] >> 4) * 10) + (spd_data[323] & 15);
+		week = ((spd_data[324]>>4) * 10) + (spd_data[324] & 15);
+		printf(" Manufacture Date      : year %4d week %2d\n",
+		       2000 + year, week);
+
+		printf(" Serial Number         : %02x%02x%02x%02x\n",
+		spd_data[325], spd_data[326], spd_data[327], spd_data[328]);
+
+		printf(" Part Number           : ");
+		for (i=329; i <= 348; i++)
+		{
+			printf( "%c", spd_data[i]);
+		}
+		printf("\n");
 	}
 	else
 	{
-		size = spd_data[5] * (spd_data[31] << 2);
-		printf(" Memory Size           : %d MB\n", size);
+		if (len < 100) {
+			return (-1);
+		}
+		ii = (spd_data[3] & 0x0f) + (spd_data[4] & 0x0f) - 17;
+		k = ((spd_data[5] & 0x7) + 1) * spd_data[17];
+
+		if(ii > 0 && ii <= 12 && k > 0) {
+			printf(" Memory Size           : %d MB\n", ((1 << ii) * k));
+		} else {
+			printf(" Memory Size    INVALID: %d, %d, %d, %d\n", spd_data[3],
+					spd_data[4], spd_data[5], spd_data[17]);
+		}
 		printf(" Voltage Intf          : %s\n",
 		val2str(spd_data[8], spd_voltage_vals));
 		printf(" Error Detect/Cor      : %s\n",
@@ -860,7 +1018,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
 	struct ipmi_rs * rsp;
 	struct ipmi_rq req;
 	struct fru_info fru;
-	uint8_t spd_data[256], msg_data[4];
+	uint8_t *spd_data, msg_data[4];
 	int len, offset;
 
 	msg_data[0] = id;
@@ -888,11 +1046,20 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
 	lprintf(LOG_DEBUG, "fru.size = %d bytes (accessed by %s)",
 		fru.size, fru.access ? "words" : "bytes");
 
+
 	if (fru.size < 1) {
 		lprintf(LOG_ERR, " Invalid FRU size %d", fru.size);
 		return -1;
 	}
 
+        spd_data = malloc(fru.size);
+
+        if (spd_data == NULL) {
+		printf(" Unable to malloc memory for spd array of size=%d\n",
+		       fru.size);
+		return -1;
+        }
+
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_STORAGE;
 	req.msg.cmd = GET_FRU_DATA;
@@ -900,22 +1067,26 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
 	req.msg.data_len = 4;
 
 	offset = 0;
-	memset(spd_data, 0, 256);
+	memset(spd_data, 0, fru.size);
 	do {
 		msg_data[0] = id;
-		msg_data[1] = offset;
-		msg_data[2] = 0;
+		msg_data[1] = offset & 0xFF;
+		msg_data[2] = offset >> 8;
 		msg_data[3] = FRU_DATA_RQST_SIZE;
 
 		rsp = intf->sendrecv(intf, &req);
 		if (rsp == NULL) {
 			printf(" Device not present (No Response)\n");
+                        free(spd_data);
+                        spd_data = NULL;
 			return -1;
 		}
 		if (rsp->ccode > 0) {
 			printf(" Device not present (%s)\n",
 			       val2str(rsp->ccode, completion_code_vals));
 
+                        free(spd_data);
+                        spd_data = NULL;
 			/* Timeouts are acceptable. No DIMM in the socket */
 			if (rsp->ccode == 0xc3)
 				return 1;
@@ -930,6 +1101,8 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
 
 	/* now print spd info */
 	ipmi_spd_print(spd_data, offset);
+        free(spd_data);
+        spd_data = NULL;
 
 	return 0;
 }