deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-11 11:07:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added --disable-intf-open-dual-bridge configure option to disable dual

Browse Source 
bridge support in open interface. This extension is not compatible with
FreeBSD OpenIPMI implementation (and with mainline OpenIPMI too, as far
as I can tell).
This commit is contained in:
Dmitry Frolov 2007-08-28 09:44:31 +00:00
parent 997ca1fa4d
commit ab18a0e335
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipmitool/ChangeLog
View File

@ -4,6 +4,8 @@ version 1.8.10
"isol setup" command. "isol setup" command.
* Fix bug in ipmi_lan_recv_packet() in lan and lanplus interfaces. * Fix bug in ipmi_lan_recv_packet() in lan and lanplus interfaces.
* Fix bug in "chassis poh" command. * Fix bug in "chassis poh" command.
* Added configure option to disable dual bridge support in open
interface to help compiling on FreeBSD
version 1.8.9 released 2007-03-06 version 1.8.9 released 2007-03-06
* Added initial AMC ekey query operation support * Added initial AMC ekey query operation support

9
ipmitool/configure.in
View File

@ -410,6 +410,15 @@ AC_ARG_ENABLE([file-security],
AC_DEFINE(ENABLE_FILE_SECURITY, [1], [Define to 1 for extra file security.]) AC_DEFINE(ENABLE_FILE_SECURITY, [1], [Define to 1 for extra file security.])
fi], []) fi], [])
dnl Enable OpenIPMI dual bridge extension
AC_ARG_ENABLE([intf-open-dual-bridge],
[AC_HELP_STRING([--enable-intf-open-dual-bridge],
[enable OpenIPMI interface dual bridge support [default=yes]])])
if test "x$enable_intf_open_dual_bridge" != "xno"; then
AC_DEFINE(ENABLE_INTF_OPEN_DUAL_BRIDGE, [1],
[Define to 1 to enable OpenIPMI interface dual bridge support])
fi
dnl Generate files for build dnl Generate files for build
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
doc/Makefile doc/Makefile

2
ipmitool/src/plugins/open/open.c
View File

@ -228,12 +228,14 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
ipmb_addr.lun = req->msg.lun; ipmb_addr.lun = req->msg.lun;
lprintf(LOG_DEBUG, "Sending request to " lprintf(LOG_DEBUG, "Sending request to "
"IPMB target @ 0x%x", intf->target_addr); "IPMB target @ 0x%x", intf->target_addr);
#ifdef ENABLE_INTF_OPEN_DUAL_BRIDGE
if(intf->transit_addr != 0 && if(intf->transit_addr != 0 &&
intf->transit_addr != intf->my_addr) { intf->transit_addr != intf->my_addr) {
ipmb_addr.transit_slave_addr = intf->transit_addr; ipmb_addr.transit_slave_addr = intf->transit_addr;
lprintf(LOG_DEBUG, "Sending through transit " lprintf(LOG_DEBUG, "Sending through transit "
"IPMB target @ 0x%x", intf->transit_addr); "IPMB target @ 0x%x", intf->transit_addr);
} }
#endif
_req.addr = (unsigned char *) &ipmb_addr; _req.addr = (unsigned char *) &ipmb_addr;
_req.addr_len = sizeof(ipmb_addr); _req.addr_len = sizeof(ipmb_addr);
} else { } else {

2
ipmitool/src/plugins/open/open.h
View File

@ -89,8 +89,10 @@ struct ipmi_ipmb_addr {
short channel; short channel;
unsigned char slave_addr; unsigned char slave_addr;
unsigned char lun; unsigned char lun;
#ifdef ENABLE_INTF_OPEN_DUAL_BRIDGE
short transit_channel; short transit_channel;
unsigned char transit_slave_addr; unsigned char transit_slave_addr;
#endif
}; };
#define IPMI_IOC_MAGIC 'i' #define IPMI_IOC_MAGIC 'i'