deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ID: 65 - Fixes for configure.in for cross compilation

Browse Source 
Commit is a re-work of ipmi_ek_display_fru_header_detail() (not limited to) to
get rid off warnings.
This commit is contained in:
Zdenek Styblik 2013-07-24 05:28:53 +00:00
parent 39bcb37d14
commit 4aea72e46f
1 changed files with 172 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
ipmitool/lib/ipmi_ekanalyzer.c
View File

@ -275,7 +275,7 @@ static int ipmi_ek_check_physical_connectivity(
*****************************************************************************/ *****************************************************************************/
static int ipmi_ek_display_fru_header( char * filename ); static int ipmi_ek_display_fru_header( char * filename );
static void ipmi_ek_display_fru_header_detail( char * filename ); static int ipmi_ek_display_fru_header_detail(char * filename);
static void ipmi_ek_display_chassis_info_area( FILE * input_file, long offset ); static void ipmi_ek_display_chassis_info_area( FILE * input_file, long offset );
@ -469,6 +469,7 @@ ipmi_ekanalyzer_main( struct ipmi_intf * intf, int argc, char ** argv )
{ {
int rc = ERROR_STATUS; int rc = ERROR_STATUS;
int file_type[MAX_FILE_NUMBER]; int file_type[MAX_FILE_NUMBER];
int tmp_ret = 0;
char * filename[MAX_FILE_NUMBER]; char * filename[MAX_FILE_NUMBER];
unsigned int argument_offset = 0; unsigned int argument_offset = 0;
unsigned int type_offset = 0; unsigned int type_offset = 0;
@ -509,7 +510,7 @@ ipmi_ekanalyzer_main( struct ipmi_intf * intf, int argc, char ** argv )
if ( rc != ERROR_STATUS ){ if ( rc != ERROR_STATUS ){
/* Display FRU header info in detail record */ /* Display FRU header info in detail record */
ipmi_ek_display_fru_header_detail (filename[type_offset]); tmp_ret = ipmi_ek_display_fru_header_detail(filename[type_offset]);
/* Convert from binary data into multi record structure */ /* Convert from binary data into multi record structure */
rc = ipmi_ekanalyzer_fru_file2structure ( filename[type_offset], rc = ipmi_ekanalyzer_fru_file2structure ( filename[type_offset],
&list_head, &list_record, &list_last ); &list_head, &list_record, &list_last );
@ -2422,46 +2423,57 @@ ipmi_ek_display_fru_header(char * filename)
* Return: None * Return: None
* *
***************************************************************************/ ***************************************************************************/
static void static int
ipmi_ek_display_fru_header_detail(char * filename) ipmi_ek_display_fru_header_detail(char * filename)
{ {
# define FACTOR_OFFSET 8
# define SIZE_MFG_DATE 3
FILE * input_file; FILE * input_file;
size_t file_offset = 0;
struct fru_header header; struct fru_header header;
time_t tval;
int ret = 0;
unsigned char data = 0;
unsigned char lan_code = 0;
unsigned char mfg_date[SIZE_MFG_DATE];
unsigned int board_length = 0;
input_file = fopen(filename, "r"); input_file = fopen(filename, "r");
if (input_file == NULL) { if (input_file == NULL) {
lprintf(LOG_ERR, "file: '%s' is not found", filename); lprintf(LOG_ERR, "File '%s' not found.", filename);
return (-1);
} }
else{ /* The offset in each fru is in multiple of 8 bytes
/* the offset in each fru is in multiple of 8 bytes
* See IPMI Platform Management FRU Information Storage Definition * See IPMI Platform Management FRU Information Storage Definition
* for detail * for detail
*/ */
#define FACTOR_OFFSET 8 ret = fread(&header, sizeof(struct fru_header), 1, input_file);
if ((ret != 1) || ferror(input_file)) {
if ( !feof (input_file) ){ lprintf(LOG_ERR, "Failed to read FRU header!");
fread ( &header, sizeof( struct fru_header ), 1, input_file ); fclose(input_file);
} return (-1);
else{
lprintf(LOG_ERR, "Invalid FRU header!");
} }
/*** Display FRU Internal Use Info ***/ /*** Display FRU Internal Use Info ***/
if (!feof(input_file)) { if (!feof(input_file)) {
unsigned char format_version; unsigned char format_version;
unsigned long len; unsigned long len = 0;
printf("%s\n", EQUAL_LINE_LIMITER); printf("%s\n", EQUAL_LINE_LIMITER);
printf("FRU Internal Use Info\n"); printf("FRU Internal Use Info\n");
printf("%s\n", EQUAL_LINE_LIMITER); printf("%s\n", EQUAL_LINE_LIMITER);
fread ( &format_version, 1, 1, input_file ); ret = fread(&format_version, 1, 1, input_file);
if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid format version!");
fclose(input_file);
return (-1);
}
printf("Format Version: %d\n", (format_version & 0x0f)); printf("Format Version: %d\n", (format_version & 0x0f));
if (header.offset.chassis > 0) { if (header.offset.chassis > 0) {
len = (header.offset.chassis * FACTOR_OFFSET) len = (header.offset.chassis * FACTOR_OFFSET)
- (header.offset.internal * FACTOR_OFFSET); - (header.offset.internal * FACTOR_OFFSET);
} } else {
else{
len = (header.offset.board * FACTOR_OFFSET) len = (header.offset.board * FACTOR_OFFSET)
- (header.offset.internal * FACTOR_OFFSET); - (header.offset.internal * FACTOR_OFFSET);
} }
@ -2469,7 +2481,12 @@ ipmi_ek_display_fru_header_detail( char * filename )
printf("Data dump:\n"); printf("Data dump:\n");
while ((len > 0) && (!feof(input_file))) { while ((len > 0) && (!feof(input_file))) {
unsigned char data; unsigned char data;
fread ( &data, 1, 1, input_file ); ret = fread(&data, 1, 1, input_file);
if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid data!");
fclose(input_file);
return (-1);
}
printf("0x%02x ", data); printf("0x%02x ", data);
len--; len--;
} }
@ -2478,26 +2495,41 @@ ipmi_ek_display_fru_header_detail( char * filename )
/*** Chassis Info Area ***/ /*** Chassis Info Area ***/
if (header.offset.chassis != 0) { if (header.offset.chassis != 0) {
long offset = 0; long offset = 0;
offset = header.offset.chassis * FACTOR_OFFSET; offset = header.offset.chassis * FACTOR_OFFSET;
ipmi_ek_display_chassis_info_area(input_file, offset); ipmi_ek_display_chassis_info_area(input_file, offset);
} }
/*** Display FRU Board Info Area ***/ /*** Display FRU Board Info Area ***/
if (header.offset.board != 0){ while (1) {
fseek ( input_file, (header.offset.board * FACTOR_OFFSET), SEEK_SET); if (header.offset.board == 0) {
if ( !feof(input_file) ){ break;
unsigned char data; }
unsigned int board_length; ret = fseek(input_file,
size_t file_offset = ftell (input_file); (header.offset.board * FACTOR_OFFSET),
SEEK_SET);
if (feof(input_file)) {
break;
}
file_offset = ftell(input_file);
printf("%s\n", EQUAL_LINE_LIMITER); printf("%s\n", EQUAL_LINE_LIMITER);
printf("FRU Board Info Area\n"); printf("FRU Board Info Area\n");
printf("%s\n", EQUAL_LINE_LIMITER); printf("%s\n", EQUAL_LINE_LIMITER);
fread ( &data, 1, 1, input_file ); /* Format version */ ret = fread(&data, 1, 1, input_file); /* Format version */
if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid FRU Format Version!");
fclose(input_file);
return (-1);
}
printf("Format Version: %d\n", (data & 0x0f)); printf("Format Version: %d\n", (data & 0x0f));
if ( !feof(input_file) ){ if (feof(input_file)) {
fread ( &data, 1, 1, input_file ); /* Board Area Length */ break;
}
ret = fread(&data, 1, 1, input_file); /* Board Area Length */
if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid Board Area Length!");
fclose(input_file);
return (-1);
}
board_length = (data * FACTOR_OFFSET); board_length = (data * FACTOR_OFFSET);
printf("Area Length: %d\n", board_length); printf("Area Length: %d\n", board_length);
/* Decrease the length of board area by 1 byte of format version /* Decrease the length of board area by 1 byte of format version
@ -2505,63 +2537,68 @@ ipmi_ek_display_fru_header_detail( char * filename )
* be used to check for additional custom mfg. byte * be used to check for additional custom mfg. byte
*/ */
board_length -= 2; board_length -= 2;
if (feof(input_file)) {
break;
}
ret = fread(&lan_code, 1, 1, input_file); /* Language Code */
if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid Language Code in input");
fclose(input_file);
return (-1);
} }
if ( !feof(input_file) ){
unsigned char lan_code;
fread ( &lan_code, 1, 1, input_file ); /* Language Code */
printf("Language Code: %d\n", lan_code); printf("Language Code: %d\n", lan_code);
board_length--; board_length--;
}
/* Board Mfg Date */ /* Board Mfg Date */
if ( !feof(input_file) ){ if (feof(input_file)) {
#define SIZE_MFG_DATE 3 break;
time_t tval; }
unsigned char mfg_date[SIZE_MFG_DATE];
fread ( mfg_date, SIZE_MFG_DATE, 1, input_file ); ret = fread(mfg_date, SIZE_MFG_DATE, 1, input_file);
tval=((mfg_date[2] << 16) + (mfg_date[1] << 8) + (mfg_date[0])); if (ret != 1) {
lprintf(LOG_ERR, "Invalid Board Data.");
fclose(input_file);
return (-1);
}
tval = ((mfg_date[2] << 16) + (mfg_date[1] << 8)
+ (mfg_date[0]));
tval = tval * 60; tval = tval * 60;
tval = tval + secs_from_1970_1996; tval = tval + secs_from_1970_1996;
printf("Board Mfg Date: %ld, %s", tval, printf("Board Mfg Date: %ld, %s", tval,
asctime(localtime(&tval))); asctime(localtime(&tval)));
board_length -= SIZE_MFG_DATE; board_length -= SIZE_MFG_DATE;
/* Board Mfg */ /* Board Mfg */
file_offset = ipmi_ek_display_board_info_area( file_offset = ipmi_ek_display_board_info_area(
input_file, "Board Manufacture Data", &board_length); input_file, "Board Manufacture Data", &board_length);
fseek (input_file, file_offset, SEEK_SET); ret = fseek(input_file, file_offset, SEEK_SET);
/* Board Product */ /* Board Product */
file_offset = ipmi_ek_display_board_info_area( file_offset = ipmi_ek_display_board_info_area(
input_file, "Board Product Name", &board_length); input_file, "Board Product Name", &board_length);
fseek (input_file, file_offset, SEEK_SET); ret = fseek(input_file, file_offset, SEEK_SET);
/* Board Serial */ /* Board Serial */
file_offset = ipmi_ek_display_board_info_area( file_offset = ipmi_ek_display_board_info_area(
input_file, "Board Serial Number", &board_length); input_file, "Board Serial Number", &board_length);
fseek (input_file, file_offset, SEEK_SET); ret = fseek(input_file, file_offset, SEEK_SET);
/* Board Part */ /* Board Part */
file_offset = ipmi_ek_display_board_info_area( file_offset = ipmi_ek_display_board_info_area(
input_file, "Board Part Number", &board_length); input_file, "Board Part Number", &board_length);
fseek (input_file, file_offset, SEEK_SET); ret = fseek(input_file, file_offset, SEEK_SET);
/* FRU file ID */ /* FRU file ID */
file_offset = ipmi_ek_display_board_info_area( file_offset = ipmi_ek_display_board_info_area(
input_file, "FRU File ID", &board_length); input_file, "FRU File ID", &board_length);
fseek (input_file, file_offset, SEEK_SET); ret = fseek(input_file, file_offset, SEEK_SET);
/* Additional Custom Mfg. */ /* Additional Custom Mfg. */
file_offset = ipmi_ek_display_board_info_area( file_offset = ipmi_ek_display_board_info_area(
input_file, "Custom", &board_length); input_file, "Custom", &board_length);
break;
} }
} /* Product Info Area */
} if (header.offset.product && (!feof(input_file))) {
/*** Product Info Area ***/
if ( header.offset.product ){
if ( !feof(input_file) ){
long offset = 0; long offset = 0;
offset = header.offset.product * FACTOR_OFFSET; offset = header.offset.product * FACTOR_OFFSET;
ipmi_ek_display_product_info_area(input_file, offset); ipmi_ek_display_product_info_area(input_file, offset);
} }
}
fclose(input_file); fclose(input_file);
} return 0;
} }
/************************************************************************** /**************************************************************************