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

- Fix issue with seq number. (Bug causing IOL to be longer)

Browse Source
This commit is contained in:
Jean-Michel Audet 2010-04-16 13:49:30 +00:00
parent 2902422eeb
commit e1c25a988f
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ struct ipmi_intf ipmi_lan_intf = {
}; };
static struct ipmi_rq_entry * static struct ipmi_rq_entry *
ipmi_req_add_entry(struct ipmi_intf * intf, struct ipmi_rq * req) ipmi_req_add_entry(struct ipmi_intf * intf, struct ipmi_rq * req, uint8_t req_seq)
{ {
struct ipmi_rq_entry * e; struct ipmi_rq_entry * e;
@ -119,6 +119,7 @@ ipmi_req_add_entry(struct ipmi_intf * intf, struct ipmi_rq * req)
memcpy(&e->req, req, sizeof(struct ipmi_rq)); memcpy(&e->req, req, sizeof(struct ipmi_rq));
e->intf = intf; e->intf = intf;
e->rq_seq = req_seq;
if (ipmi_req_entries == NULL) if (ipmi_req_entries == NULL)
ipmi_req_entries = e; ipmi_req_entries = e;
@ -664,7 +665,7 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
* +--------------------+ * +--------------------+
*/ */
static struct ipmi_rq_entry * static struct ipmi_rq_entry *
ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_rq * req) ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_rq * req, int isRetry)
{ {
struct rmcp_hdr rmcp = { struct rmcp_hdr rmcp = {
.ver = RMCP_VERSION_1, .ver = RMCP_VERSION_1,
@ -684,10 +685,13 @@ ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
if (our_address == 0) if (our_address == 0)
our_address = IPMI_BMC_SLAVE_ADDR; our_address = IPMI_BMC_SLAVE_ADDR;
if (isRetry == 0)
curr_seq++;
if (curr_seq >= 64) if (curr_seq >= 64)
curr_seq = 0; curr_seq = 0;
entry = ipmi_req_add_entry(intf, req); entry = ipmi_req_add_entry(intf, req, curr_seq);
if (entry == NULL) if (entry == NULL)
return NULL; return NULL;
@ -778,7 +782,7 @@ ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
else if (entry->bridging_level) else if (entry->bridging_level)
msg[len++] = intf->my_addr; msg[len++] = intf->my_addr;
entry->rq_seq = curr_seq++; entry->rq_seq = curr_seq;
msg[len++] = entry->rq_seq << 2; msg[len++] = entry->rq_seq << 2;
msg[len++] = req->msg.cmd; msg[len++] = req->msg.cmd;
@ -852,6 +856,7 @@ ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
struct ipmi_rq_entry * entry; struct ipmi_rq_entry * entry;
struct ipmi_rs * rsp = NULL; struct ipmi_rs * rsp = NULL;
int try = 0; int try = 0;
int isRetry = 0;
lprintf(LOG_DEBUG, "ipmi_lan_send_cmd:opened=[%d], open=[%d]", lprintf(LOG_DEBUG, "ipmi_lan_send_cmd:opened=[%d], open=[%d]",
intf->opened, intf->open); intf->opened, intf->open);
@ -866,7 +871,9 @@ ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
} }
for (;;) { for (;;) {
entry = ipmi_lan_build_cmd(intf, req); isRetry = ( try > 0 ) ? 1 : 0;
entry = ipmi_lan_build_cmd(intf, req, isRetry);
if (entry == NULL) { if (entry == NULL) {
lprintf(LOG_ERR, "Aborting send command, unable to build"); lprintf(LOG_ERR, "Aborting send command, unable to build");
return NULL; return NULL;
@ -889,6 +896,14 @@ ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
usleep(100); usleep(100);
rsp = ipmi_lan_poll_recv(intf); rsp = ipmi_lan_poll_recv(intf);
/* Duplicate Request ccode most likely indicates a response to
a previous retry. Ignore and keep polling. */
if((rsp != NULL) && (rsp->ccode == 0xcf)) {
rsp = NULL;
rsp = ipmi_lan_poll_recv(intf);
}
if (rsp) if (rsp)
break; break;