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

ID: 3600911 - 'lib/ipmi_fru.c' - retval ipmi_fru_get_adjust_size_from_buffer()

Browse Source 
Commit changes return value of ipmi_fru_get_adjust_size_from_buffer() from void
to int in order to determine whether call was successful or wasn't.
ipmi_fru_upg_ekeying() got re-work as well.

Changes to ipmi_fru_get_adjust_size_from_buffer():
* CHUNK_SIZE removed
* code formatting
* return value void -> int

Changes to ipmi_fru_upg_ekeying():
* check whether pFilename is NULL
* check return values of called functions
* re-work code - return early on error instead of nested if()
* added (error) messages
This commit is contained in:
Zdenek Styblik 2013-03-05 05:00:32 +00:00
parent b6c97d8318
commit 108dc8aa0b
1 changed files with 73 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
ipmitool/lib/ipmi_fru.c
View File

@ -70,7 +70,7 @@ static int ipmi_fru_get_multirec_location_from_fru(struct ipmi_intf * intf, uint
static int ipmi_fru_get_multirec_from_file(char * pFileName, uint8_t * pBufArea, static int ipmi_fru_get_multirec_from_file(char * pFileName, uint8_t * pBufArea,
uint32_t size, uint32_t offset); uint32_t size, uint32_t offset);
static int ipmi_fru_get_multirec_size_from_file(char * pFileName, uint32_t * pSize, uint32_t * pOffset); static int ipmi_fru_get_multirec_size_from_file(char * pFileName, uint32_t * pSize, uint32_t * pOffset);
static void ipmi_fru_get_adjust_size_from_buffer(uint8_t * pBufArea, uint32_t *pSize); int ipmi_fru_get_adjust_size_from_buffer(uint8_t * pBufArea, uint32_t *pSize);
static void ipmi_fru_picmg_ext_print(uint8_t * fru_data, int off, int length); static void ipmi_fru_picmg_ext_print(uint8_t * fru_data, int off, int length);
static int ipmi_fru_set_field_string(struct ipmi_intf * intf, unsigned static int ipmi_fru_set_field_string(struct ipmi_intf * intf, unsigned
@ -3675,58 +3675,61 @@ ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
char * pFileName, char * pFileName,
uint8_t fruId) uint8_t fruId)
{ {
uint16_t retStatus = 0; struct fru_info fruInfo;
uint32_t offFruMultiRec; uint8_t *buf = NULL;
uint32_t offFruMultiRec = 0;
uint32_t fruMultiRecSize = 0; uint32_t fruMultiRecSize = 0;
uint32_t offFileMultiRec = 0; uint32_t offFileMultiRec = 0;
uint32_t fileMultiRecSize = 0; uint32_t fileMultiRecSize = 0;
struct fru_info fruInfo; if (pFileName == NULL) {
uint8_t *buf = NULL; lprintf(LOG_ERR, "File expected, but none given.");
retStatus = ipmi_fru_get_multirec_location_from_fru(intf, fruId, &fruInfo, return (-1);
&offFruMultiRec, }
&fruMultiRecSize); if (ipmi_fru_get_multirec_location_from_fru(intf, fruId, &fruInfo,
&offFruMultiRec, &fruMultiRecSize) != 0) {
lprintf(LOG_ERR, "Failed to get multirec location from FRU.");
return (-1);
}
lprintf(LOG_DEBUG, "FRU Size : %lu\n", fruMultiRecSize); lprintf(LOG_DEBUG, "FRU Size : %lu\n", fruMultiRecSize);
lprintf(LOG_DEBUG, "Multi Rec offset: %lu\n", offFruMultiRec); lprintf(LOG_DEBUG, "Multi Rec offset: %lu\n", offFruMultiRec);
if (ipmi_fru_get_multirec_size_from_file(pFileName, &fileMultiRecSize,
if (retStatus == 0) { &offFileMultiRec) != 0) {
retStatus = lprintf(LOG_ERR, "Failed to get multirec size from file '%s'.", pFileName);
ipmi_fru_get_multirec_size_from_file(pFileName, return (-1);
&fileMultiRecSize,
&offFileMultiRec);
} }
if (retStatus == 0) {
buf = malloc(fileMultiRecSize); buf = malloc(fileMultiRecSize);
if (buf) { if (buf == NULL) {
retStatus = lprintf(LOG_ERR, "ipmitool: malloc failure");
ipmi_fru_get_multirec_from_file(pFileName, buf, return (-1);
fileMultiRecSize,
offFileMultiRec);
} else {
printf("Error allocating memory for multirec buffer\n");
retStatus = -1;
} }
} if (ipmi_fru_get_multirec_from_file(pFileName, buf, fileMultiRecSize,
offFileMultiRec) != 0) {
if(retStatus == 0) lprintf(LOG_ERR, "Failed to get multirec from file '%s'.", pFileName);
{ if (buf != NULL) {
ipmi_fru_get_adjust_size_from_buffer(buf, &fileMultiRecSize);
if (buf)
write_fru_area(intf, &fruInfo, fruId, 0, offFruMultiRec,
fileMultiRecSize, buf);
}
if(retStatus == 0 )
lprintf(LOG_INFO, "Done");
else
lprintf(LOG_ERR, "Failed");
if (buf)
free(buf); free(buf);
}
return retStatus; return (-1);
}
if (ipmi_fru_get_adjust_size_from_buffer(buf, &fileMultiRecSize) != 0) {
lprintf(LOG_ERR, "Failed to adjust size from buffer.");
if (buf != NULL) {
free(buf);
}
return (-1);
}
if (write_fru_area(intf, &fruInfo, fruId, 0, offFruMultiRec,
fileMultiRecSize, buf) != 0) {
lprintf(LOG_ERR, "Failed to write FRU area.");
if (buf != NULL) {
free(buf);
}
return (-1);
}
if (buf != NULL) {
free(buf);
}
lprintf(LOG_INFO, "Done upgrading Ekey.");
return 0;
} }
/* ipmi_fru_upgekey_help - print help text for 'upgEkey' /* ipmi_fru_upgekey_help - print help text for 'upgEkey'
@ -3797,55 +3800,53 @@ ipmi_fru_get_multirec_size_from_file(char * pFileName,
return 0; return 0;
} }
static void int
ipmi_fru_get_adjust_size_from_buffer(uint8_t * fru_data, ipmi_fru_get_adjust_size_from_buffer(uint8_t * fru_data, uint32_t *pSize)
uint32_t *pSize)
{ {
struct fru_multirec_header * head; struct fru_multirec_header * head;
#define CHUNK_SIZE (255 + sizeof(struct fru_multirec_header)) int status = 0;
uint16_t count = 0;
uint16_t status = 0;
uint8_t counter;
uint8_t checksum = 0; uint8_t checksum = 0;
uint8_t counter = 0;
uint16_t count = 0;
do { do {
checksum = 0; checksum = 0;
head = (struct fru_multirec_header *) (fru_data + count); head = (struct fru_multirec_header *) (fru_data + count);
if (verbose) {
if(verbose )
printf("Adding ("); printf("Adding (");
}
for (counter = 0; counter < sizeof(struct fru_multirec_header); counter++) { for (counter = 0; counter < sizeof(struct fru_multirec_header); counter++) {
if(verbose ) if (verbose) {
printf(" %02X", *(fru_data + count + counter)); printf(" %02X", *(fru_data + count + counter));
}
checksum += *(fru_data + count + counter); checksum += *(fru_data + count + counter);
} }
if (verbose) {
if( verbose )
printf(")"); printf(")");
}
if (checksum != 0) { if (checksum != 0) {
printf("Bad checksum in Multi Records\n"); lprintf(LOG_ERR, "Bad checksum in Multi Records");
status = -1; status = (-1);
if (verbose) {
printf("--> FAIL");
} }
else if ( verbose ) } else if (verbose) {
printf("--> OK"); printf("--> OK");
}
if (verbose > 1 && checksum == 0) { if (verbose > 1 && checksum == 0) {
for(counter = 0; counter < head->len; counter++) { for (counter = 0; counter < head->len; counter++) {
printf(" %02X", *(fru_data + count + counter + printf(" %02X", *(fru_data + count + counter
sizeof(struct fru_multirec_header))); + sizeof(struct fru_multirec_header)));
} }
} }
if(verbose ) if (verbose) {
printf("\n"); printf("\n");
}
count += head->len + sizeof (struct fru_multirec_header); count += head->len + sizeof (struct fru_multirec_header);
} while( (!(head->format & 0x80)) && (status == 0)); } while ((!(head->format & 0x80)) && (status == 0));
*pSize = count; *pSize = count;
lprintf(LOG_DEBUG, "Size of multirec: %lu\n", *pSize); lprintf(LOG_DEBUG, "Size of multirec: %lu\n", *pSize);
return status;
} }
static int static int