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

Fix a proplem when using bridged IPMI commands on the lanplus interface (-I

Browse Source 
lanplus with -b -t or -m switches)  resulting in "Close Session command
failure".
This commit is contained in:
Jim Mankovich 2012-02-17 21:49:20 +00:00
parent 6e5043f289
commit 062bd1f9a4
1 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ipmitool/src/plugins/lanplus/lanplus.c
View File

@ -717,47 +717,36 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
if (entry != NULL) {
lprintf(LOG_DEBUG+2, "IPMI Request Match found");
if (
intf->target_addr != intf->my_addr
&&
bridgePossible
&&
rsp->data_len
&&
rsp->payload.ipmi_response.cmd == 0x34
&&
(
rsp->payload.ipmi_response.netfn == 0x06
||
rsp->payload.ipmi_response.netfn == 0x07
)
&&
rsp->payload.ipmi_response.rs_lun == 0
)
if ( intf->target_addr != intf->my_addr &&
bridgePossible &&
rsp->data_len &&
rsp->payload.ipmi_response.cmd == 0x34 &&
(rsp->payload.ipmi_response.netfn == 0x06 ||
rsp->payload.ipmi_response.netfn == 0x07) &&
rsp->payload.ipmi_response.rs_lun == 0 )
{
/* Check completion code */
if (rsp->data[offset-1] == 0)
{
lprintf(LOG_DEBUG, "Bridged command answer,"
" waiting for next answer... ");
ipmi_req_remove_entry(rsp->payload.ipmi_response.rq_seq,
rsp->payload.ipmi_response.cmd);
ipmi_lan_poll_recv(intf);
return;
/* Check completion code */
if (rsp->data[offset-1] == 0)
{
lprintf(LOG_DEBUG, "Bridged command answer,"
" waiting for next answer... ");
ipmi_req_remove_entry(
rsp->payload.ipmi_response.rq_seq,
rsp->payload.ipmi_response.cmd);
return ipmi_lan_poll_recv(intf);
}
else
{
lprintf(LOG_DEBUG, "WARNING: Bridged "
"cmd ccode = 0x%02x",
rsp->data[offset-1]);
}
{
lprintf(LOG_DEBUG, "WARNING: Bridged "
"cmd ccode = 0x%02x",
rsp->data[offset-1]);
}
if (rsp->data_len &&
rsp->payload.ipmi_response.cmd == 0x34) {
memcpy(rsp->data, &rsp->data[offset],(rsp->data_len-offset));
printbuf(
&rsp->data[offset],
rsp->payload.ipmi_response.cmd == 0x34) {
memcpy(rsp->data, &rsp->data[offset],
(rsp->data_len-offset));
printbuf( &rsp->data[offset],
(rsp->data_len-offset),
"bridge command response");
}
@ -2702,6 +2691,7 @@ ipmi_close_session_cmd(struct ipmi_intf * intf)
backupBridgePossible = bridgePossible;
intf->target_addr = IPMI_BMC_SLAVE_ADDR;
bridgePossible = 0;
bmc_session_lsbf = intf->session->v2_data.bmc_id;