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

Increased variable size of timeouts.

Browse Source 
During manual rollback, code now gets target capabilities instead of using a default timeout of 60 seconds.
This commit is contained in:
Marie-Josee Blais 2010-08-10 15:34:00 +00:00
parent 2a180f8038
commit fdf49777b9
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ipmitool/lib/ipmi_hpmfwupg.c
View File

@ -3174,6 +3174,7 @@ int HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf, struct HpmfwupgManual
struct HpmfwupgQueryRollbackStatusCtx resCmd; struct HpmfwupgQueryRollbackStatusCtx resCmd;
printf("Waiting firmware rollback..."); printf("Waiting firmware rollback...");
fflush(stdout); fflush(stdout);
rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, pFwupgCtx); rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, pFwupgCtx);
} }
else if ( rsp->ccode != 0x00 ) else if ( rsp->ccode != 0x00 )
@ -3196,7 +3197,7 @@ int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf, struct HpmfwupgQueryRoll
int rc = HPMFWUPG_SUCCESS; int rc = HPMFWUPG_SUCCESS;
struct ipmi_rs * rsp; struct ipmi_rs * rsp;
struct ipmi_rq req; struct ipmi_rq req;
unsigned char rollbackTimeout = 0; unsigned int rollbackTimeout = 0;
unsigned int timeoutSec1, timeoutSec2; unsigned int timeoutSec1, timeoutSec2;
pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER; pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
@ -3216,7 +3217,18 @@ int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf, struct HpmfwupgQueryRoll
} }
else else
{ {
rollbackTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT; struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
verbose--;
rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
verbose++;
if ( rc == HPMFWUPG_SUCCESS )
{
rollbackTimeout = targetCapCmd.resp.rollbackTimeout *5;
}
else
{
rollbackTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
}
} }
/* Poll rollback status until completion or timeout */ /* Poll rollback status until completion or timeout */
@ -3374,8 +3386,8 @@ struct ipmi_rs * HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req,
struct HpmfwupgUpgradeCtx* pFwupgCtx ) struct HpmfwupgUpgradeCtx* pFwupgCtx )
{ {
struct ipmi_rs * rsp; struct ipmi_rs * rsp;
unsigned char inaccessTimeout = 0, inaccessTimeoutCounter = 0; unsigned int inaccessTimeout = 0, inaccessTimeoutCounter = 0;
unsigned char upgradeTimeout = 0, upgradeTimeoutCounter = 0; unsigned int upgradeTimeout = 0, upgradeTimeoutCounter = 0;
unsigned int timeoutSec1, timeoutSec2; unsigned int timeoutSec1, timeoutSec2;
unsigned char retry = 0; unsigned char retry = 0;
@ -3570,7 +3582,7 @@ struct ipmi_rs * HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req,
int HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx) int HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
{ {
int rc = HPMFWUPG_SUCCESS; int rc = HPMFWUPG_SUCCESS;
unsigned char upgradeTimeout = 0; unsigned int upgradeTimeout = 0;
unsigned int timeoutSec1, timeoutSec2; unsigned int timeoutSec1, timeoutSec2;
struct HpmfwupgGetUpgradeStatusCtx upgStatusCmd; struct HpmfwupgGetUpgradeStatusCtx upgStatusCmd;