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

send periodic keepalive packet when SOL is active to keep session open

Browse Source
This commit is contained in:
Duncan Laurie 2006-01-17 17:25:23 +00:00
parent 79befbb112
commit 66cb3143dc
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ipmitool/include/ipmitool/ipmi_sol.h
View File

@ -40,6 +40,7 @@
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
#define SOL_ESCAPE_CHARACTER_DEFAULT '~' #define SOL_ESCAPE_CHARACTER_DEFAULT '~'
#define SOL_KEEPALIVE_TIMEOUT 30
#define IPMI_SOL_SERIAL_ALERT_MASK_SUCCEED 0x08 #define IPMI_SOL_SERIAL_ALERT_MASK_SUCCEED 0x08
#define IPMI_SOL_SERIAL_ALERT_MASK_DEFERRED 0x04 #define IPMI_SOL_SERIAL_ALERT_MASK_DEFERRED 0x04

39
ipmitool/lib/ipmi_sol.c
View File

@ -42,6 +42,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h>
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
@ -81,6 +82,7 @@ const struct valstr sol_parameter_vals[] = {
}; };
static struct timeval _start_keepalive;
static struct termios _saved_tio; static struct termios _saved_tio;
static int _in_raw_mode = 0; static int _in_raw_mode = 0;
@ -1251,21 +1253,40 @@ processSolUserInput(
if (! rsp) if (! rsp)
{ {
lprintf(LOG_ERR, "Error sending SOL data"); rsp = intf->send_sol(intf, &v2_payload);
retval = -1; lprintf(LOG_ERR, "Error sending SOL data: RETRY");
if (! rsp)
{
lprintf(LOG_ERR, "Error sending SOL data: FAIL");
retval = -1;
}
} }
/* If the sequence number is set we know we have new data */ /* If the sequence number is set we know we have new data */
else if ((rsp->session.authtype == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) && if (retval == 0)
(rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL) && if ((rsp->session.authtype == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) &&
(rsp->payload.sol_packet.packet_sequence_number)) (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL) &&
output(rsp); (rsp->payload.sol_packet.packet_sequence_number))
output(rsp);
} }
return retval; return retval;
} }
static void
ipmi_sol_keepalive(struct ipmi_intf * intf)
{
struct timeval end;
gettimeofday(&end, 0);
if (end.tv_sec - _start_keepalive.tv_sec > SOL_KEEPALIVE_TIMEOUT) {
intf->keepalive(intf);
gettimeofday(&_start_keepalive, 0);
}
}
/* /*
* ipmi_sol_red_pill * ipmi_sol_red_pill
@ -1289,6 +1310,9 @@ ipmi_sol_red_pill(struct ipmi_intf * intf)
return -1; return -1;
} }
/* Initialize keepalive start time */
gettimeofday(&_start_keepalive, 0);
enter_raw_mode(); enter_raw_mode();
while (! bShouldExit) while (! bShouldExit)
@ -1297,6 +1321,9 @@ ipmi_sol_red_pill(struct ipmi_intf * intf)
FD_SET(0, &read_fds); FD_SET(0, &read_fds);
FD_SET(intf->fd, &read_fds); FD_SET(intf->fd, &read_fds);
/* Send periodic keepalive packet */
ipmi_sol_keepalive(intf);
/* Wait up to half a second */ /* Wait up to half a second */
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 500000; tv.tv_usec = 500000;