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

send errors to stderr using lprintf helper

Browse Source
This commit is contained in:
Duncan Laurie 2005-01-07 22:28:18 +00:00
parent 55969d4a32
commit cfa8f69f97
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ipmitool/lib/ipmi_pef.c
View File

@ -39,6 +39,7 @@
#include <time.h> #include <time.h>
#include <ipmitool/helper.h> #include <ipmitool/helper.h>
#include <ipmitool/log.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
#include <ipmitool/ipmi_pef.h> #include <ipmitool/ipmi_pef.h>
@ -201,7 +202,8 @@ ipmi_pef_msg_exchange(struct ipmi_intf * intf, struct ipmi_rq * req, char * txt)
if (!rsp) if (!rsp)
return(NULL); return(NULL);
if (rsp->ccode) { if (rsp->ccode) {
printf(" **Error %x in '%s' command\n", rsp ? rsp->ccode : 0, txt); lprintf(LOG_ERR, " **Error %x in '%s' command",
rsp ? rsp->ccode : 0, txt);
return(NULL); return(NULL);
} }
if (verbose > 2) if (verbose > 2)
@ -246,7 +248,8 @@ ipmi_pef_get_policy_table(struct ipmi_intf * intf,
rsp = ipmi_pef_msg_exchange(intf, &req, "Alert policy table entry"); rsp = ipmi_pef_msg_exchange(intf, &req, "Alert policy table entry");
if (!rsp if (!rsp
|| i != (rsp->data[1] & PEF_POLICY_TABLE_ID_MASK)) { || i != (rsp->data[1] & PEF_POLICY_TABLE_ID_MASK)) {
printf(" **Error retrieving %s\n", "Alert policy table entry"); lprintf(LOG_ERR, " **Error retrieving %s",
"Alert policy table entry");
free(ptbl); free(ptbl);
ptbl = NULL; ptbl = NULL;
tbl_size = 0; tbl_size = 0;
@ -283,7 +286,8 @@ ipmi_pef_print_lan_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
req.msg.data_len = sizeof(lsel); req.msg.data_len = sizeof(lsel);
rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination count"); rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination count");
if (!rsp) { if (!rsp) {
printf(" **Error retrieving %s\n", "Alert destination count"); lprintf(LOG_ERR, " **Error retrieving %s",
"Alert destination count");
return; return;
} }
tbl_size = (rsp->data[1] & PEF_LAN_DEST_TABLE_SIZE_MASK); tbl_size = (rsp->data[1] & PEF_LAN_DEST_TABLE_SIZE_MASK);
@ -294,7 +298,8 @@ ipmi_pef_print_lan_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
lsel.set = dest; lsel.set = dest;
rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination type"); rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination type");
if (!rsp || rsp->data[1] != lsel.set) { if (!rsp || rsp->data[1] != lsel.set) {
printf(" **Error retrieving %s\n", "Alert destination type"); lprintf(LOG_ERR, " **Error retrieving %s",
"Alert destination type");
return; return;
} }
ptype = (struct pef_lan_cfgparm_dest_type *)&rsp->data[1]; ptype = (struct pef_lan_cfgparm_dest_type *)&rsp->data[1];
@ -308,7 +313,8 @@ ipmi_pef_print_lan_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
lsel.set = 0; lsel.set = 0;
rsp = ipmi_pef_msg_exchange(intf, &req, "PET community"); rsp = ipmi_pef_msg_exchange(intf, &req, "PET community");
if (!rsp) if (!rsp)
printf(" **Error retrieving %s\n", "PET community"); lprintf(LOG_ERR, " **Error retrieving %s",
"PET community");
else { else {
rsp->data[19] = '\0'; rsp->data[19] = '\0';
ipmi_pef_print_str("PET Community", &rsp->data[1]); ipmi_pef_print_str("PET Community", &rsp->data[1]);
@ -321,7 +327,8 @@ ipmi_pef_print_lan_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
lsel.set = dest; lsel.set = dest;
rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination info"); rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination info");
if (!rsp || rsp->data[1] != lsel.set) if (!rsp || rsp->data[1] != lsel.set)
printf(" **Error retrieving %s\n", "Alert destination info"); lprintf(LOG_ERR, " **Error retrieving %s",
"Alert destination info");
else { else {
pinfo = (struct pef_lan_cfgparm_dest_info *)&rsp->data[1]; pinfo = (struct pef_lan_cfgparm_dest_info *)&rsp->data[1];
sprintf(buf, "%u.%u.%u.%u", sprintf(buf, "%u.%u.%u.%u",
@ -368,7 +375,7 @@ ipmi_pef_print_serial_dest_dial(struct ipmi_intf * intf, char * label,
if (!rsp if (!rsp
|| (rsp->data[1] != ssel->id) || (rsp->data[1] != ssel->id)
|| (rsp->data[2] != tmp.block)) { || (rsp->data[2] != tmp.block)) {
printf(" **Error retrieving %s\n", label); lprintf(LOG_ERR, " **Error retrieving %s", label);
return; return;
} }
memcpy(p, &rsp->data[3], BLOCK_SIZE); memcpy(p, &rsp->data[3], BLOCK_SIZE);
@ -410,7 +417,8 @@ ipmi_pef_print_serial_dest_tap(struct ipmi_intf * intf,
tmp.id = PEF_SERIAL_CFGPARM_ID_TAP_ACCT_INFO; tmp.id = PEF_SERIAL_CFGPARM_ID_TAP_ACCT_INFO;
rsp = ipmi_pef_msg_exchange(intf, &req, "TAP account info"); rsp = ipmi_pef_msg_exchange(intf, &req, "TAP account info");
if (!rsp || (rsp->data[1] != tmp.set)) { if (!rsp || (rsp->data[1] != tmp.set)) {
printf(" **Error retrieving %s\n", "TAP account info"); lprintf(LOG_ERR, " **Error retrieving %s",
"TAP account info");
return; return;
} }
dialstr_id = (rsp->data[2] & PEF_SERIAL_TAP_ACCT_INFO_DIAL_STRING_ID_MASK); dialstr_id = (rsp->data[2] & PEF_SERIAL_TAP_ACCT_INFO_DIAL_STRING_ID_MASK);
@ -422,7 +430,8 @@ ipmi_pef_print_serial_dest_tap(struct ipmi_intf * intf,
tmp.set = setting_id; tmp.set = setting_id;
rsp = ipmi_pef_msg_exchange(intf, &req, "TAP service settings"); rsp = ipmi_pef_msg_exchange(intf, &req, "TAP service settings");
if (!rsp || (rsp->data[1] != tmp.set)) { if (!rsp || (rsp->data[1] != tmp.set)) {
printf(" **Error retrieving %s\n", "TAP service settings"); lprintf(LOG_ERR, " **Error retrieving %s",
"TAP service settings");
return; return;
} }
pset = (struct pef_serial_cfgparm_tap_svc_settings *)&rsp->data[1]; pset = (struct pef_serial_cfgparm_tap_svc_settings *)&rsp->data[1];
@ -473,7 +482,8 @@ ipmi_pef_print_serial_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
req.msg.data_len = sizeof(ssel); req.msg.data_len = sizeof(ssel);
rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination count"); rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination count");
if (!rsp) { if (!rsp) {
printf(" **Error retrieving %s\n", "Alert destination count"); lprintf(LOG_ERR, " **Error retrieving %s",
"Alert destination count");
return; return;
} }
tbl_size = (rsp->data[1] & PEF_SERIAL_DEST_TABLE_SIZE_MASK); tbl_size = (rsp->data[1] & PEF_SERIAL_DEST_TABLE_SIZE_MASK);
@ -484,7 +494,8 @@ ipmi_pef_print_serial_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
ssel.set = dest; ssel.set = dest;
rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination info"); rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination info");
if (!rsp || rsp->data[1] != ssel.set) if (!rsp || rsp->data[1] != ssel.set)
printf(" **Error retrieving %s\n", "Alert destination info"); lprintf(LOG_ERR, " **Error retrieving %s",
"Alert destination info");
else { else {
pinfo = (struct pef_serial_cfgparm_dest_info *)rsp->data; pinfo = (struct pef_serial_cfgparm_dest_info *)rsp->data;
wrk = (pinfo->dest_type & PEF_SERIAL_DEST_TYPE_MASK); wrk = (pinfo->dest_type & PEF_SERIAL_DEST_TYPE_MASK);
@ -642,7 +653,8 @@ ipmi_pef_list_entries(struct ipmi_intf * intf)
rsp = ipmi_pef_msg_exchange(intf, &req, "PEF table entry"); rsp = ipmi_pef_msg_exchange(intf, &req, "PEF table entry");
if (!rsp if (!rsp
|| (psel.set != (rsp->data[1] & PEF_FILTER_TABLE_ID_MASK))) { || (psel.set != (rsp->data[1] & PEF_FILTER_TABLE_ID_MASK))) {
printf(" **Error retrieving %s\n", "PEF table entry"); lprintf(LOG_ERR, " **Error retrieving %s",
"PEF table entry");
continue; continue;
} }
pcfg = (struct pef_cfgparm_filter_table_entry *)&rsp->data[1]; pcfg = (struct pef_cfgparm_filter_table_entry *)&rsp->data[1];
@ -692,7 +704,8 @@ ipmi_pef_list_policies(struct ipmi_intf * intf)
ch = (wrk & PEF_POLICY_CHANNEL_MASK) >> PEF_POLICY_CHANNEL_SHIFT; ch = (wrk & PEF_POLICY_CHANNEL_MASK) >> PEF_POLICY_CHANNEL_SHIFT;
rsp = ipmi_pef_msg_exchange(intf, &req, "Channel info"); rsp = ipmi_pef_msg_exchange(intf, &req, "Channel info");
if (!rsp || rsp->data[0] != ch) { if (!rsp || rsp->data[0] != ch) {
printf(" **Error retrieving %s\n", "Channel info"); lprintf(LOG_ERR, " **Error retrieving %s",
"Channel info");
continue; continue;
} }
medium = rsp->data[1]; medium = rsp->data[1];
@ -734,7 +747,8 @@ ipmi_pef_get_status(struct ipmi_intf * intf)
req.msg.cmd = IPMI_CMD_GET_LAST_PROCESSED_EVT_ID; req.msg.cmd = IPMI_CMD_GET_LAST_PROCESSED_EVT_ID;
rsp = ipmi_pef_msg_exchange(intf, &req, "Last S/W processed ID"); rsp = ipmi_pef_msg_exchange(intf, &req, "Last S/W processed ID");
if (!rsp) { if (!rsp) {
printf(" **Error retrieving %s\n", "Last S/W processed ID"); lprintf(LOG_ERR, " **Error retrieving %s",
"Last S/W processed ID");
return; return;
} }
#if WORDS_BIGENDIAN #if WORDS_BIGENDIAN
@ -758,7 +772,8 @@ ipmi_pef_get_status(struct ipmi_intf * intf)
req.msg.data_len = sizeof(psel); req.msg.data_len = sizeof(psel);
rsp = ipmi_pef_msg_exchange(intf, &req, "PEF control"); rsp = ipmi_pef_msg_exchange(intf, &req, "PEF control");
if (!rsp) { if (!rsp) {
printf(" **Error retrieving %s\n", "PEF control"); lprintf(LOG_ERR, " **Error retrieving %s",
"PEF control");
return; return;
} }
ipmi_pef_print_flags(&pef_b2s_control, P_ABLE, rsp->data[1]); ipmi_pef_print_flags(&pef_b2s_control, P_ABLE, rsp->data[1]);
@ -842,10 +857,10 @@ int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_pef_list_entries(intf); ipmi_pef_list_entries(intf);
else { else {
help = 1; help = 1;
printf("Invalid PEF command: '%s'\n\n", argv[0]); lprintf(LOG_ERR, "Invalid PEF command: '%s'\n", argv[0]);
} }
if (help) if (help)
printf("PEF commands: info status policy list\n"); lprintf(LOG_NOTICE, "PEF commands: info status policy list");
else if (!verbose) else if (!verbose)
printf("\n"); printf("\n");
return 0; return 0;