Index: lib/ipmi_mc.c =================================================================== RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_mc.c,v retrieving revision 1.30 diff -u -r1.30 ipmi_mc.c --- lib/ipmi_mc.c 20 Dec 2012 14:25:18 -0000 1.30 +++ lib/ipmi_mc.c 23 Dec 2012 08:53:28 -0000 @@ -45,7 +45,9 @@ extern int verbose; -static int ipmi_sysinfo_main(struct ipmi_intf *intf, int argc, char ** argv); +static int ipmi_sysinfo_main(struct ipmi_intf *intf, int argc, char ** argv, + int is_set); +static void printf_sysinfo_usage(int full_help); /* ipmi_mc_reset - attempt to reset an MC * @@ -190,20 +192,42 @@ for (bf = mc_enables_bf; bf->name != NULL; bf++) { lprintf(LOG_NOTICE, " %-20s %s", bf->name, bf->desc); } - lprintf(LOG_NOTICE, " getsysinfo argument"); - lprintf(LOG_NOTICE, " setsysinfo argument string"); - lprintf(LOG_NOTICE, " Valid arguments are:"); + printf_sysinfo_usage(0); +} + +static void +printf_sysinfo_usage(int full_help) +{ + if (full_help != 0) + lprintf(LOG_NOTICE, "usage:"); + + lprintf(LOG_NOTICE, " getsysinfo "); + + if (full_help != 0) { + lprintf(LOG_NOTICE, + " Retrieves system info from bmc for given argument"); + } + + lprintf(LOG_NOTICE, " setsysinfo "); + + if (full_help != 0) { + lprintf(LOG_NOTICE, + " Stores system info string for given argument to bmc"); + } + + lprintf(LOG_NOTICE, ""); + lprintf(LOG_NOTICE, " Valid arguments are:"); lprintf(LOG_NOTICE, " primary_os_name Primary operating system name"); lprintf(LOG_NOTICE, " os_name Operating system name"); lprintf(LOG_NOTICE, - " system_name System Name of server (vendor dependent"); + " system_name System Name of server (vendor dependent)"); lprintf(LOG_NOTICE, " delloem_os_version Running version of operating system"); - lprintf(LOG_NOTICE, " delloem_url Url of bmc webserver"); + lprintf(LOG_NOTICE, " delloem_url URL of BMC webserver"); + lprintf(LOG_NOTICE, ""); } - static void print_watchdog_usage(void) { @@ -846,9 +870,11 @@ rc = (-1); } } - else if (strncmp(argv[0], "getsysinfo", 10) == 0 - || strncmp(argv[0], "setsysinfo", 10) == 0) { - rc = ipmi_sysinfo_main(intf, argc, argv); + else if (strncmp(argv[0], "getsysinfo", 10) == 0) { + rc = ipmi_sysinfo_main(intf, argc, argv, 0); + } + else if (strncmp(argv[0], "setsysinfo", 10) == 0) { + rc = ipmi_sysinfo_main(intf, argc, argv, 1); } else { lprintf(LOG_ERR, "Invalid mc/bmc command: %s", argv[0]); @@ -858,75 +884,59 @@ return rc; } - +/* + * sysinfo_param() - function converts sysinfo param to int + * + * @str - user input string + * @maxset - ? + * + * returns (-1) on error + * returns > 0 on success + */ static int -sysinfo_param(struct ipmi_intf *intf, const char *str, int *maxset) +sysinfo_param(const char *str, int *maxset) { + if (!str || !maxset) + return (-1); + *maxset = 4; if (!strcmp(str, "system_name")) return IPMI_SYSINFO_HOSTNAME; - if (!strcmp(str, "primary_os_name")) + else if (!strcmp(str, "primary_os_name")) return IPMI_SYSINFO_PRIMARY_OS_NAME; - if (!strcmp(str, "os_name")) + else if (!strcmp(str, "os_name")) return IPMI_SYSINFO_OS_NAME; - - if (!strcmp(str, "delloem_os_version")) { - *maxset = 4; + else if (!strcmp(str, "delloem_os_version")) return IPMI_SYSINFO_DELL_OS_VERSION; - } - if (!strcmp(str, "delloem_url")) { + else if (!strcmp(str, "delloem_url")) { *maxset = 2; return IPMI_SYSINFO_DELL_URL; } - return strtoul(str, 0, 0); - return -1; -} -static void -ipmi_sysinfo_usage() -{ - lprintf(LOG_NOTICE, "usage:"); - lprintf(LOG_NOTICE, " getsysinfo argument"); - lprintf(LOG_NOTICE, " Retrieves system info from bmc for given argument"); - lprintf(LOG_NOTICE, " setsysinfo argument string"); - lprintf(LOG_NOTICE, - " Stores system info string for given argument to bmc"); - lprintf(LOG_NOTICE, ""); - lprintf(LOG_NOTICE, " Valid arguments are:"); - lprintf(LOG_NOTICE, - " primary_os_name Primary operating system name"); - lprintf(LOG_NOTICE, " os_name Operating system name"); - lprintf(LOG_NOTICE, - " system_name System Name of server (vendor dependent"); - lprintf(LOG_NOTICE, - " delloem_os_version Running version of operating system"); - lprintf(LOG_NOTICE, " delloem_url Url of bmc webserver"); - lprintf(LOG_NOTICE, ""); + return (-1); } -/***************************************************************** - * Function Name: ipmi_getsysinfo - * - * Description: This function processes the IPMI Get System Info command - * Input: intf - ipmi interface - * param - Parameter # (0xC0..0xFF = OEM) - * block/set - Block/Set number of parameter - * len - Length of buffer - * buffer - Pointer to buffer - * Output: - * - * Return: return code 0 - success - * -1 - failure - * other = IPMI ccode +/* + * ipmi_mc_getsysinfo() - function processes the IPMI Get System Info command * - ******************************************************************/ + * @intf - ipmi interface + * @buffer - pointer to buffer + * @len - length of buffer + * @param - Parameter # (0xC0..0xFF = OEM) + * @block - number of block parameters + * @set - number of set parameters + * + * returns (-1) on failure + * returns 0 on success + * returns > 0 IPMI code + */ int -ipmi_getsysinfo(struct ipmi_intf * intf, int param, int block, int set, - int len, void *buffer) +ipmi_mc_getsysinfo(struct ipmi_intf * intf,void *buffer, int len, int param, + int block, int set) { uint8_t data[4]; struct ipmi_rs *rsp = NULL; - struct ipmi_rq req={0}; + struct ipmi_rq req= {0}; memset(buffer, 0, len); memset(data, 0, 4); @@ -953,37 +963,34 @@ * u8 data0[14] */ rsp = intf->sendrecv(intf, &req); - if (rsp != NULL) { - if (rsp->ccode == 0) { - if (len > rsp->data_len) - len = rsp->data_len; - if (len && buffer) - memcpy(buffer, rsp->data, len); - } - return rsp->ccode; + if (rsp == NULL) + return (-1); + + if (rsp->ccode == 0) { + if (len > rsp->data_len) + len = rsp->data_len; + if (len && buffer) + memcpy(buffer, rsp->data, len); } - return -1; + return rsp->ccode; } -/***************************************************************** - * Function Name: ipmi_setsysinfo +/* + * ipmi_mc_setsysinfo() - function processes the IPMI Set System Info command * - * Description: This function processes the IPMI Set System Info command - * Input: intf - ipmi interface - * len - Length of buffer - * buffer - Pointer to buffer - * Output: - * - * Return: return code 0 - success - * -1 - failure - * other = IPMI ccode - * - ******************************************************************/ + * @intf - ipmi interface + * @buffer - pointer to buffer + * @len - length of buffer + * + * returns (-1) on failure + * returns 0 on success + * returns > 0 IPMI code + */ int -ipmi_setsysinfo(struct ipmi_intf * intf, int len, void *buffer) +ipmi_mc_setsysinfo(struct ipmi_intf * intf, void *buffer, int len) { struct ipmi_rs *rsp = NULL; - struct ipmi_rq req={0}; + struct ipmi_rq req= {0}; req.msg.netfn = IPMI_NETFN_APP; req.msg.lun = 0; @@ -1005,41 +1012,41 @@ } static int -ipmi_sysinfo_main(struct ipmi_intf *intf, int argc, char ** argv) +ipmi_sysinfo_main(struct ipmi_intf *intf, int argc, char ** argv, int is_set) { - int param, isset; char *str; unsigned char infostr[256]; unsigned char paramdata[18]; - int pos, set, rc, maxset, len; + int len, maxset, param, pos, rc, set; - /* Is this a setsysinfo or getsysinfo */ - isset = !strncmp(argv[0], "setsysinfo\0",11); - - if (argc == 1 || strcmp(argv[1], "help") == 0 - || argc < (isset ? 3 : 2)) { - ipmi_sysinfo_usage(); + if (argc < 1 || argc < 2 || (is_set == 1 && argc < 3)) { + lprintf(LOG_ERR, "Not enough parameters given."); + printf_sysinfo_usage(1); + return (-1); + } + else if (strcmp(argv[1], "help") == 0) { + printf_sysinfo_usage(1); return 0; } memset(infostr, 0, sizeof(infostr)); /* Get Parameters */ - param = sysinfo_param(intf, argv[1], &maxset); - if (param < 0) { - ipmi_sysinfo_usage(); + if ((param = sysinfo_param(argv[1], &maxset)) < 0) { + lprintf(LOG_ERR, "Invalid mc/bmc %s command: %s", argv[0], argv[1]); + printf_sysinfo_usage(1); return 0; } - rc = 0; - if (isset) { + rc = 0; + if (is_set != 0) { str = argv[2]; set = pos = 0; len = strlen(str); /* first block holds 14 bytes, all others hold 16 */ - if (((len + 2) + 15) / 16 >= maxset) - len = maxset * 16 - 2; + if ((len + 2 + 15) / 16 >= maxset) + len = (maxset * 16) - 2; do { memset(paramdata, 0, sizeof(paramdata)); @@ -1049,24 +1056,25 @@ /* First block is special case */ paramdata[2] = 0; /* ascii encoding */ paramdata[3] = len; /* length */ - strncpy(paramdata+4, str+pos, IPMI_SYSINFO_SET0_SIZE); - pos += IPMI_SYSINFO_SET0_SIZE; - } else { - strncpy(paramdata+2, str+pos, IPMI_SYSINFO_SETN_SIZE); - pos += IPMI_SYSINFO_SETN_SIZE; + strncpy(paramdata + 4, str + pos, IPMI_SYSINFO_SET0_SIZE); + } + else { + strncpy(paramdata + 2, str + pos, IPMI_SYSINFO_SETN_SIZE); } - rc = ipmi_setsysinfo(intf, 18, paramdata); + pos += IPMI_SYSINFO_SET0_SIZE; + rc = ipmi_mc_setsysinfo(intf, paramdata, 18); if (rc) break; set++; } while (pos < len); - } else { + } + else { /* Read blocks of data */ pos = 0; - for (set=0; set 0) { - lprintf(LOG_ERR, "%s %s", argv[0], val2str(rc, completion_code_vals)); + lprintf(LOG_ERR, "%s command failed: %s", argv[0], + val2str(rc, completion_code_vals)); } return rc; } Index: lib/ipmi_delloem.c =================================================================== RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_delloem.c,v retrieving revision 1.19 diff -u -r1.19 ipmi_delloem.c --- lib/ipmi_delloem.c 1 Nov 2012 18:45:31 -0000 1.19 +++ lib/ipmi_delloem.c 23 Dec 2012 08:53:29 -0000 @@ -670,9 +670,8 @@ { int bytes_to_copy; - rc = ipmi_getsysinfo(intf, field_type, ii, 0, - sizeof(lcdstringblock), - &lcdstringblock); + rc = ipmi_mc_getsysinfo(intf, &lcdstringblock, sizeof(lcdstringblock), + field_type, ii, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting platform model name"); } else if (rc > 0) { @@ -726,7 +725,8 @@ int rc; uint8_t data[11]; - rc = ipmi_getsysinfo(intf, IPMI_DELL_IDRAC_VALIDATOR, 2, 0, sizeof(data), data); + rc = ipmi_mc_getsysinfo(intf, data, sizeof(data), IPMI_DELL_IDRAC_VALIDATOR, + 2, 0); if (rc < 0) { /*lprintf(LOG_ERR, " Error getting IMC type"); */ return -1; @@ -774,7 +774,8 @@ uint8_t data[4]; int rc; - rc = ipmi_getsysinfo(intf, IPMI_DELL_LCD_CONFIG_SELECTOR, 0, 0, sizeof(lcd_mode), &lcd_mode); + rc = ipmi_mc_getsysinfo(intf, &lcd_mode, sizeof(lcd_mode), + IPMI_DELL_LCD_CONFIG_SELECTOR, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting LCD configuration"); return -1; @@ -808,7 +809,8 @@ uint8_t data[4]; int rc; - rc = ipmi_getsysinfo(intf, IPMI_DELL_LCD_CONFIG_SELECTOR, 0, 0, sizeof(data), data); + rc = ipmi_mc_getsysinfo(intf, data, sizeof(data), + IPMI_DELL_LCD_CONFIG_SELECTOR, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting LCD configuration"); @@ -854,7 +856,7 @@ data[0] = IPMI_DELL_LCD_CONFIG_SELECTOR; data[1] = command; /* command - custom, default, none */ - rc = ipmi_setsysinfo(intf, 2, data); + rc = ipmi_mc_setsysinfo(intf, data, 2); if (rc < 0) { lprintf(LOG_ERR, " Error setting LCD configuration"); @@ -949,7 +951,7 @@ data[11]=lcd_mode.error_display; } - rc = ipmi_setsysinfo(intf, 13, data); + rc = ipmi_mc_setsysinfo(intf, data, 13); if (rc < 0) { lprintf(LOG_ERR, " Error setting LCD configuration"); @@ -995,7 +997,8 @@ for (ii = 0; ii < 4; ii++) { int bytes_to_copy; - rc = ipmi_getsysinfo(intf, IPMI_DELL_LCD_STRING_SELECTOR, ii, 0, sizeof(lcdstringblock), &lcdstringblock); + rc = ipmi_mc_getsysinfo(intf, &lcdstringblock, sizeof(lcdstringblock), + IPMI_DELL_LCD_STRING_SELECTOR, ii, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting text data"); return -1; @@ -1080,7 +1083,8 @@ else if (lcd_mode.lcdmode == IPMI_DELL_LCD_CONFIG_USER_DEFINED) { printf(" Setting: User defined\n"); - rc = ipmi_getsysinfo(intf, IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0, sizeof(lcd_caps), &lcd_caps); + rc = ipmi_mc_getsysinfo(intf, &lcd_caps, sizeof(lcd_caps), + IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting LCD capabilities."); @@ -1201,7 +1205,8 @@ { printf(" Setting: custom\n"); - rc = ipmi_getsysinfo(intf, IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0, sizeof(lcd_caps), &lcd_caps); + rc = ipmi_mc_getsysinfo(intf, &lcd_caps, sizeof(lcd_caps), + IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting LCD capabilities."); @@ -1248,7 +1253,8 @@ { int rc; - rc = ipmi_getsysinfo(intf, IPMI_DELL_LCD_STATUS_SELECTOR, 0, 0, sizeof(*lcdstatus), lcdstatus); + rc = ipmi_mc_getsysinfo(intf, lcdstatus, sizeof(*lcdstatus), + IPMI_DELL_LCD_STATUS_SELECTOR, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting LCD Status"); @@ -1297,7 +1303,7 @@ int rc; LcdSupported = 0; - rc = ipmi_getsysinfo(intf, IPMI_DELL_LCD_STATUS_SELECTOR, 0, 0, 0, NULL); + rc = ipmi_mc_getsysinfo(intf, NULL, 0, IPMI_DELL_LCD_STATUS_SELECTOR, 0, 0); if (rc == 0) { LcdSupported = 1; } @@ -1525,7 +1531,7 @@ memcpy (data+2, text+bytes_stored, size_of_copy); bytes_stored += size_of_copy; } - rc = ipmi_setsysinfo(intf, 18, data); + rc = ipmi_mc_setsysinfo(intf, data, 18); if (rc < 0) { lprintf(LOG_ERR, " Error setting text data"); rc = -1; @@ -1559,7 +1565,8 @@ int rc = 0; IPMI_DELL_LCD_CAPS lcd_caps; - rc = ipmi_getsysinfo(intf, IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0, sizeof(lcd_caps), &lcd_caps); + rc = ipmi_mc_getsysinfo(intf, &lcd_caps, sizeof(lcd_caps), + IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting LCD capabilities"); @@ -3796,7 +3803,7 @@ int rc; uint8_t *rdata; - rc = ipmi_getsysinfo(intf, 0xeb, 0, 0, sizeof(*pavgpower), pavgpower); + rc = ipmi_mc_getsysinfo(intf, pavgpower, sizeof(*pavgpower), 0xeb, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting average power consumption history data .\n"); @@ -3852,7 +3859,8 @@ uint8_t *rdata; int rc; - rc = ipmi_getsysinfo(intf, 0xEC, 0, 0, sizeof(*pstPeakpower), pstPeakpower); + rc = ipmi_mc_getsysinfo(intf, pstPeakpower, sizeof(*pstPeakpower), + 0xEC, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting peak power consumption history data .\n"); @@ -3916,7 +3924,8 @@ uint8_t *rdata; int rc; - rc = ipmi_getsysinfo(intf, 0xED, 0, 0, sizeof(*pstMinpower), pstMinpower); + rc = ipmi_mc_getsysinfo(intf, pstMinpower, sizeof(*pstMinpower), + 0xED, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting peak power consumption history data .\n"); @@ -4135,7 +4144,8 @@ uint8_t *rdata; int rc; - rc = ipmi_getsysinfo(intf, IPMI_DELL_POWER_CAP, 0, 0, sizeof(*ipmipowercap), ipmipowercap); + rc = ipmi_mc_getsysinfo(intf, ipmipowercap, sizeof(*ipmipowercap), + IPMI_DELL_POWER_CAP, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting power cap .\n"); return -1; @@ -4248,7 +4258,8 @@ return -1; } - rc = ipmi_getsysinfo(intf, IPMI_DELL_POWER_CAP, 0, 0, sizeof(ipmipowercap), &ipmipowercap); + rc = ipmi_mc_getsysinfo(intf, &ipmipowercap, sizeof(ipmipowercap), + IPMI_DELL_POWER_CAP, 0, 0); if (rc < 0) { lprintf(LOG_ERR, " Error getting power cap .\n"); @@ -4340,7 +4351,7 @@ return -1; } - rc = ipmi_setsysinfo(intf, 13, data); + rc = ipmi_mc_setsysinfo(intf, data, 13); if (rc < 0) { lprintf(LOG_ERR, " Error setting power cap"); Index: include/ipmitool/ipmi_mc.h =================================================================== RCS file: /cvsroot/ipmitool/ipmitool/include/ipmitool/ipmi_mc.h,v retrieving revision 1.11 diff -u -r1.11 ipmi_mc.h --- include/ipmitool/ipmi_mc.h 14 Aug 2012 17:32:04 -0000 1.11 +++ include/ipmitool/ipmi_mc.h 23 Dec 2012 08:53:29 -0000 @@ -163,8 +163,8 @@ #define IPMI_SYSINFO_DELL_OS_VERSION 0xe4 #define IPMI_SYSINFO_DELL_URL 0xde -int ipmi_getsysinfo(struct ipmi_intf * intf, int param, int block, int set, - int len, void *buffer); -int ipmi_setsysinfo(struct ipmi_intf * intf, int len, void *buffer); +int ipmi_mc_getsysinfo(struct ipmi_intf * intf, void *buffer, int len, + int param, int block, int set); +int ipmi_mc_setsysinfo(struct ipmi_intf * intf, void *buffer, int len); #endif /*IPMI_MC_H */