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

- Fix a bug with the keepalive functionallity. When keepAlive GetDeviceId is sent and SOL traffic is received in between the answer, the SOL packet is ignore or use as an answer.

Browse Source 
- Change the keepalive function to send empty SOL packet instead of sending the getdeviceid command.
This commit is contained in:
Jean-Michel Audet 2006-11-14 16:08:55 +00:00
parent 3bd95062ba
commit 9f66ac2cd3
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipmitool/lib/ipmi_sol.c
View File

@ -1367,11 +1367,13 @@ processSolUserInput(
return retval; return retval;
} }
static int static int
ipmi_sol_keepalive(struct ipmi_intf * intf) ipmi_sol_keepalive_using_sol(struct ipmi_intf * intf)
{ {
struct ipmi_v2_payload v2_payload;
struct ipmi_rs * rsp = NULL;
struct timeval end; struct timeval end;
int ret = 0; int ret = 0;
if (_disable_keepalive) if (_disable_keepalive)
@ -1380,10 +1382,14 @@ ipmi_sol_keepalive(struct ipmi_intf * intf)
gettimeofday(&end, 0); gettimeofday(&end, 0);
if (end.tv_sec - _start_keepalive.tv_sec > SOL_KEEPALIVE_TIMEOUT) { if (end.tv_sec - _start_keepalive.tv_sec > SOL_KEEPALIVE_TIMEOUT) {
ret = intf->keepalive(intf); memset(&v2_payload, 0, sizeof(v2_payload));
gettimeofday(&_start_keepalive, 0);
}
v2_payload.payload.sol_packet.character_count = 0;
rsp = intf->send_sol(intf, &v2_payload);
gettimeofday(&_start_keepalive, 0);
}
return ret; return ret;
} }
@ -1406,7 +1412,7 @@ ipmi_sol_red_pill(struct ipmi_intf * intf)
buffer = (char*)malloc(buffer_size); buffer = (char*)malloc(buffer_size);
if (buffer == NULL) { if (buffer == NULL) {
lprintf(LOG_ERR, "ipmitool: malloc failure"); lprintf(LOG_ERR, "ipmitool: malloc failure");
return -1; return -1;
} }
@ -1422,7 +1428,7 @@ ipmi_sol_red_pill(struct ipmi_intf * intf)
FD_SET(intf->fd, &read_fds); FD_SET(intf->fd, &read_fds);
/* Send periodic keepalive packet */ /* Send periodic keepalive packet */
keepAliveRet = ipmi_sol_keepalive(intf); keepAliveRet = ipmi_sol_keepalive_using_sol(intf);
if (keepAliveRet != 0) if (keepAliveRet != 0)
{ {
/* no response to keepalive message */ /* no response to keepalive message */