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

Dmitry Konyshev's 7/23/08 fix for lan driver issue with bridging msgs for IPMI sessions without authentication; allow handling of AMC.0- and uTCA-style bridging

Browse Source
This commit is contained in:
Carol Hebert 2009-01-08 23:32:39 +00:00
parent 653c9b20d5
commit e31ba93a23
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ipmitool/src/plugins/lan/lan.c
View File

@ -575,25 +575,38 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
"bridge command response"); "bridge command response");
} }
/* bridged command: lose extra header */ /* bridged command: lose extra header */
if (rsp->payload.ipmi_response.cmd == 0x34) { if (rsp->payload.ipmi_response.netfn == 7 &&
if (rsp->data_len == 38) { rsp->payload.ipmi_response.cmd == 0x34) {
if (rsp->data_len - x - 1 == 0) {
rsp = !rsp->ccode ? ipmi_lan_recv_packet(intf) : NULL; rsp = !rsp->ccode ? ipmi_lan_recv_packet(intf) : NULL;
if (rsp && !rsp->ccode && if (rsp && !rsp->ccode &&
intf->transit_addr != intf->my_addr && intf->transit_addr != intf->my_addr &&
intf->transit_addr != 0 && intf->transit_addr != 0 &&
(rsp->data[34] >> 2) == entry->rq_seq) { (rsp->data[x - 3] >> 2) == entry->rq_seq) {
/* double bridging: remove the Send Message prologue */ /* double bridging: remove the Send Message prologue */
memmove(rsp->data + 29, rsp->data + 36, memmove(rsp->data + x - 7, rsp->data + x,
rsp->data_len - 36); rsp->data_len - x - 1);
rsp->data[28] -= 8; rsp->data[x - 8] -= 8;
rsp->data_len -= 8; rsp->data_len -= 8;
entry->rq_seq = rsp->data[34] >> 2; entry->rq_seq = rsp->data[x - 3] >> 2;
} }
entry->req.msg.cmd = entry->req.msg.target_cmd; entry->req.msg.cmd = entry->req.msg.target_cmd;
if (rsp == NULL) { if (rsp == NULL) {
ipmi_req_remove_entry(entry->rq_seq, entry->req.msg.cmd); ipmi_req_remove_entry(entry->rq_seq, entry->req.msg.cmd);
} }
continue; continue;
} else {
/* The bridged answer data are inside the incoming packet */
char bridge_cnt =
1 + (intf->transit_addr != intf->my_addr && intf->transit_addr != 0);
memmove(rsp->data + x - 7,
rsp->data + x + 7 * (bridge_cnt - 1),
rsp->data_len - (x + 7 * (bridge_cnt - 1)));
rsp->data[x - 8] -= 8 * bridge_cnt;
rsp->data_len -= 8 * bridge_cnt;
entry->rq_seq = rsp->data[x - 3] >> 2;
entry->req.msg.cmd = entry->req.msg.target_cmd;
continue;
} }
} else { } else {
//x += sizeof(rsp->payload.ipmi_response); //x += sizeof(rsp->payload.ipmi_response);