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

- Fix issue with sequence number. (Speed up transfer)

Browse Source
This commit is contained in:
Jean-Michel Audet 2010-04-16 13:50:19 +00:00
parent e1c25a988f
commit 4b230f13d7
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -645,8 +645,8 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
* 7) An Invalid packet (one that doesn't match a request) * 7) An Invalid packet (one that doesn't match a request)
* ------------------------------------------------------------------- * -------------------------------------------------------------------
*/ */
read_session_data(rsp, &offset, intf->session);
read_session_data(rsp, &offset, intf->session);
if (lanplus_has_valid_auth_code(rsp, intf->session) == 0) if (lanplus_has_valid_auth_code(rsp, intf->session) == 0)
{ {
@ -714,17 +714,23 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
/* Are we expecting this packet? */ /* Are we expecting this packet? */
entry = ipmi_req_lookup_entry(rsp->payload.ipmi_response.rq_seq, entry = ipmi_req_lookup_entry(rsp->payload.ipmi_response.rq_seq,
rsp->payload.ipmi_response.cmd); rsp->payload.ipmi_response.cmd);
if (entry != NULL) { if (entry != NULL) {
lprintf(LOG_DEBUG+2, "IPMI Request Match found"); lprintf(LOG_DEBUG+2, "IPMI Request Match found");
if ( if (
intf->target_addr != intf->my_addr intf->target_addr != intf->my_addr
&& &&
bridgePossible bridgePossible
&& &&
rsp->data_len rsp->data_len
&& &&
rsp->payload.ipmi_response.cmd == 0x34 rsp->payload.ipmi_response.cmd == 0x34
) &&
rsp->payload.ipmi_response.netfn == 0x06
&&
rsp->payload.ipmi_response.rs_lun == 0
)
{ {
/* Check completion code */ /* Check completion code */
if (rsp->data[offset-1] == 0) if (rsp->data[offset-1] == 0)
@ -752,6 +758,7 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf)
"bridge command response"); "bridge command response");
} }
} }
ipmi_req_remove_entry(rsp->payload.ipmi_response.rq_seq, ipmi_req_remove_entry(rsp->payload.ipmi_response.rq_seq,
rsp->payload.ipmi_response.cmd); rsp->payload.ipmi_response.cmd);
} else { } else {
@ -1843,7 +1850,8 @@ ipmi_lanplus_build_v2x_msg(
static struct ipmi_rq_entry * static struct ipmi_rq_entry *
ipmi_lanplus_build_v2x_ipmi_cmd( ipmi_lanplus_build_v2x_ipmi_cmd(
struct ipmi_intf * intf, struct ipmi_intf * intf,
struct ipmi_rq * req) struct ipmi_rq * req,
int isRetry)
{ {
struct ipmi_v2_payload v2_payload; struct ipmi_v2_payload v2_payload;
struct ipmi_rq_entry * entry; struct ipmi_rq_entry * entry;
@ -1856,7 +1864,8 @@ ipmi_lanplus_build_v2x_ipmi_cmd(
*/ */
static uint8_t curr_seq = 0; static uint8_t curr_seq = 0;
curr_seq += 1; if( isRetry == 0 )
curr_seq += 1;
if (curr_seq >= 64) if (curr_seq >= 64)
curr_seq = 0; curr_seq = 0;
@ -2092,9 +2101,10 @@ ipmi_lanplus_send_payload(
return NULL; return NULL;
while (try < session->retry) { while (try < session->retry) {
ltime = time(NULL); //ltime = time(NULL);
if (xmit) { if (xmit) {
ltime = time(NULL);
if (payload->payload_type == IPMI_PAYLOAD_TYPE_IPMI) if (payload->payload_type == IPMI_PAYLOAD_TYPE_IPMI)
{ {
@ -2134,8 +2144,10 @@ ipmi_lanplus_send_payload(
} }
else else
{ {
int isRetry = ( try > 0 ? 1 : 0 );
lprintf(LOG_DEBUG+1, "BUILDING A v2 COMMAND"); lprintf(LOG_DEBUG+1, "BUILDING A v2 COMMAND");
entry = ipmi_lanplus_build_v2x_ipmi_cmd(intf, ipmi_request); entry = ipmi_lanplus_build_v2x_ipmi_cmd(intf, ipmi_request, isRetry);
} }
if (entry == NULL) { if (entry == NULL) {
@ -2269,6 +2281,15 @@ ipmi_lanplus_send_payload(
else else
{ {
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;
} }