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

ID: 3600910 - make ipmi_lcd_get_platform_model_name() to return int

Browse Source 
Commit changes function ipmi_lcd_get_platform_model_name() to return integer
instead of void to signal potentional problems/issues.

Reported-by: Ales Ledvinka
This commit is contained in:
Zdenek Styblik 2013-02-20 12:17:58 +00:00
parent 4c009309eb
commit 8c91abfa19
1 changed files with 68 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
ipmitool/lib/ipmi_delloem.c
View File

@ -143,8 +143,8 @@ static void usage(void);
/* LCD Function prototypes */ /* LCD Function prototypes */
static int ipmi_delloem_lcd_main (struct ipmi_intf * intf, int argc, char ** argv); static int ipmi_delloem_lcd_main (struct ipmi_intf * intf, int argc, char ** argv);
static void ipmi_lcd_get_platform_model_name (struct ipmi_intf * intf,char* lcdstring, int ipmi_lcd_get_platform_model_name(struct ipmi_intf * intf, char* lcdstring,
uint8_t max_length,uint8_t field_type); uint8_t max_length, uint8_t field_type);
static int ipmi_idracvalidator_command (struct ipmi_intf * intf); static int ipmi_idracvalidator_command (struct ipmi_intf * intf);
static int ipmi_lcd_get_configure_command_wh (struct ipmi_intf * intf); static int ipmi_lcd_get_configure_command_wh (struct ipmi_intf * intf);
static int ipmi_lcd_get_configure_command (struct ipmi_intf * intf,uint8_t *command); static int ipmi_lcd_get_configure_command (struct ipmi_intf * intf,uint8_t *command);
@ -639,72 +639,64 @@ static int ipmi_delloem_lcd_main (struct ipmi_intf * intf, int argc, char ** arg
/***************************************************************** /* ipmi_lcd_get_platform_model_name - This function retrieves the platform model
* Function Name: ipmi_lcd_get_platform_model_name * name, or any other parameter which stores data in the same format
* *
* Description: This function retrieves the platform model name, or any other parameter * @intf: pointer to interface
* which stores data in the same format * @lcdstring: hostname/platform model string(output)
* Input: intf - pointer to interface * @max_length: length of the platform model string
* max_length - length of the platform model string * @field_type: either hostname/platform model
* field_type - either hostname / platform model *
* Output: lcdstring - hostname / platform model string * returns: 0 => success, other value means error
* */
* Return: int
* ipmi_lcd_get_platform_model_name(struct ipmi_intf * intf, char* lcdstring,
******************************************************************/ uint8_t max_length, uint8_t field_type)
static void
ipmi_lcd_get_platform_model_name (struct ipmi_intf * intf,
char* lcdstring,
uint8_t max_length,
uint8_t field_type)
{ {
uint8_t data[4]; uint8_t data[4];
IPMI_DELL_LCD_STRING lcdstringblock; int bytes_copied = 0;
int lcdstring_len = 0; int ii = 0;
int bytes_copied = 0; int lcdstring_len = 0;
int rc; int rc = 0;
IPMI_DELL_LCD_STRING lcdstringblock;
int ii;
for (ii = 0; ii < 4; ii++)
{
int bytes_to_copy;
rc = ipmi_mc_getsysinfo(intf, field_type, ii, 0,
sizeof(lcdstringblock), &lcdstringblock);
if (rc < 0) {
lprintf(LOG_ERR, " Error getting platform model name");
} else if (rc > 0) {
lprintf(LOG_ERR, " Error getting platform model name: %s",
val2str(rc, completion_code_vals));
}
/* first block is different - 14 bytes*/
if (0 == ii) {
lcdstring_len = lcdstringblock.lcd_string.selector_0_string.length;
lcdstring_len = MIN (lcdstring_len,max_length);
bytes_to_copy = MIN(lcdstring_len, IPMI_DELL_LCD_STRING1_SIZE);
memcpy (lcdstring, lcdstringblock.lcd_string.selector_0_string.data, bytes_to_copy);
} else {
int string_offset;
bytes_to_copy = MIN(lcdstring_len - bytes_copied, IPMI_DELL_LCD_STRINGN_SIZE);
if (bytes_to_copy < 1)
break;
string_offset = IPMI_DELL_LCD_STRING1_SIZE + IPMI_DELL_LCD_STRINGN_SIZE * (ii-1);
memcpy (lcdstring+string_offset, lcdstringblock.lcd_string.selector_n_data, bytes_to_copy);
}
bytes_copied += bytes_to_copy;
if (bytes_copied >= lcdstring_len)
break;
}
for (ii = 0; ii < 4; ii++) {
int bytes_to_copy;
rc = ipmi_mc_getsysinfo(intf, field_type, ii, 0, sizeof(lcdstringblock),
&lcdstringblock);
if (rc < 0) {
lprintf(LOG_ERR, " Error getting platform model name");
break;
} else if (rc_tmp > 0) {
lprintf(LOG_ERR, " Error getting platform model name: %s",
val2str(rc, completion_code_vals));
break;
}
/* first block is different - 14 bytes*/
if (ii == 0) {
lcdstring_len = lcdstringblock.lcd_string.selector_0_string.length;
lcdstring_len = MIN(lcdstring_len,max_length);
bytes_to_copy = MIN(lcdstring_len, IPMI_DELL_LCD_STRING1_SIZE);
memcpy(lcdstring, lcdstringblock.lcd_string.selector_0_string.data,
bytes_to_copy);
} else {
int string_offset;
bytes_to_copy = MIN(lcdstring_len - bytes_copied,
IPMI_DELL_LCD_STRINGN_SIZE);
if (bytes_to_copy < 1) {
break;
}
string_offset = IPMI_DELL_LCD_STRING1_SIZE + IPMI_DELL_LCD_STRINGN_SIZE
* (ii-1);
memcpy(lcdstring + string_offset,
lcdstringblock.lcd_string.selector_n_data, bytes_to_copy);
}
bytes_copied += bytes_to_copy;
if (bytes_copied >= lcdstring_len) {
break;
}
}
return rc;
} }
/***************************************************************** /*****************************************************************
@ -1067,12 +1059,12 @@ ipmi_lcd_get_info_wh(struct ipmi_intf * intf)
{ {
char text[IPMI_DELL_LCD_STRING_LENGTH_MAX+1] = {0}; char text[IPMI_DELL_LCD_STRING_LENGTH_MAX+1] = {0};
ipmi_lcd_get_platform_model_name(intf, text, if (ipmi_lcd_get_platform_model_name(intf, text,
IPMI_DELL_LCD_STRING_LENGTH_MAX, IPMI_DELL_LCD_STRING_LENGTH_MAX,
IPMI_DELL_PLATFORM_MODEL_NAME_SELECTOR); IPMI_DELL_PLATFORM_MODEL_NAME_SELECTOR) != 0) {
return (-1);
}
if (text == NULL)
return -1;
printf(" Setting:Model name\n"); printf(" Setting:Model name\n");
printf(" Line 1: %s\n", text); printf(" Line 1: %s\n", text);
} }
@ -1191,8 +1183,11 @@ static int ipmi_lcd_get_info(struct ipmi_intf * intf)
{ {
memset (lcdstring,0,IPMI_DELL_LCD_STRING_LENGTH_MAX+1); memset (lcdstring,0,IPMI_DELL_LCD_STRING_LENGTH_MAX+1);
ipmi_lcd_get_platform_model_name(intf, lcdstring, IPMI_DELL_LCD_STRING_LENGTH_MAX, if (ipmi_lcd_get_platform_model_name(intf, lcdstring,
IPMI_DELL_PLATFORM_MODEL_NAME_SELECTOR); IPMI_DELL_LCD_STRING_LENGTH_MAX,
IPMI_DELL_PLATFORM_MODEL_NAME_SELECTOR) != 0) {
return (-1);
}
printf(" Setting: default\n"); printf(" Setting: default\n");
printf(" Line 1: %s\n", lcdstring); printf(" Line 1: %s\n", lcdstring);