summaryrefslogtreecommitdiff
path: root/lib/ipmi_sol.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-12-01 12:15:48 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-12-01 12:15:48 +0100
commit55031e72e6c02b4ae63e9052bad1a4b40002ac18 (patch)
treecedb261f63df285e392051805d7e06641c74a4d5 /lib/ipmi_sol.c
parentb32d92e890caac903491116e9d817aa780c0323b (diff)
Imported Upstream version 1.8.15upstream/1.8.15
Diffstat (limited to 'lib/ipmi_sol.c')
-rw-r--r--lib/ipmi_sol.c44
1 files changed, 18 insertions, 26 deletions
diff --git a/lib/ipmi_sol.c b/lib/ipmi_sol.c
index a5b962f..cf58b44 100644
--- a/lib/ipmi_sol.c
+++ b/lib/ipmi_sol.c
@@ -1477,33 +1477,28 @@ static int
ipmi_sol_keepalive_using_sol(struct ipmi_intf * intf)
{
struct ipmi_v2_payload v2_payload;
- struct ipmi_rs * rsp = NULL;
struct timeval end;
- int ret = 0;
-
if (_disable_keepalive)
return 0;
gettimeofday(&end, 0);
if (end.tv_sec - _start_keepalive.tv_sec > SOL_KEEPALIVE_TIMEOUT) {
- memset(&v2_payload, 0, sizeof(v2_payload));
-
- v2_payload.payload.sol_packet.character_count = 0;
-
- rsp = intf->send_sol(intf, &v2_payload);
-
+ memset(&v2_payload, 0, sizeof(v2_payload));
+ v2_payload.payload.sol_packet.character_count = 0;
+ if (intf->send_sol(intf, &v2_payload) == NULL)
+ return -1;
+ /* good return, reset start time */
gettimeofday(&_start_keepalive, 0);
- }
- return ret;
+ }
+ return 0;
}
static int
ipmi_sol_keepalive_using_getdeviceid(struct ipmi_intf * intf)
{
struct timeval end;
- static int ret = 0;
if (_disable_keepalive)
return 0;
@@ -1511,16 +1506,12 @@ ipmi_sol_keepalive_using_getdeviceid(struct ipmi_intf * intf)
gettimeofday(&end, 0);
if (end.tv_sec - _start_keepalive.tv_sec > SOL_KEEPALIVE_TIMEOUT) {
- ret = intf->keepalive(intf);
- if ( (ret!=0) && (_keepalive_retries < SOL_KEEPALIVE_RETRIES) ) {
- ret = 0;
- _keepalive_retries++;
- }
- else if ((ret==0) && (_keepalive_retries > 0))
- _keepalive_retries = 0;
+ if (intf->keepalive(intf) != 0)
+ return -1;
+ /* good return, reset start time */
gettimeofday(&_start_keepalive, 0);
- }
- return ret;
+ }
+ return 0;
}
@@ -1653,14 +1644,15 @@ ipmi_sol_red_pill(struct ipmi_intf * intf, int instance)
else if (FD_ISSET(intf->fd, &read_fds))
{
struct ipmi_rs * rs =intf->recv_sol(intf);
- if (! rs)
- {
- bShouldExit = bBmcClosedSession = 1;
- }
- else
+ if ( rs)
{
output(rs);
}
+ /*
+ * Should recv_sol come back null, the incoming packet was not ours.
+ * Just fall through, the keepalive logic will determine if
+ * the BMC has dropped the session.
+ */
}