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

Reverting commit ``Add support for enabling/disabling PEF policy entries'' as

Browse Source 
there is no ticket/ticket number missing and no code review.
This commit is contained in:
Zdenek Styblik 2013-11-26 04:25:46 +00:00
parent 2ff745286b
commit 0cd8f46c42
2 changed files with 3 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipmitool/doc/ipmitool.1
View File

@ -2374,13 +2374,6 @@ processed by the BMC, etc).
This command lists the PEF policy table entries. Each policy This command lists the PEF policy table entries. Each policy
entry describes an alert destination. A policy set is a entry describes an alert destination. A policy set is a
collection of table entries. PEF alert actions reference policy sets. collection of table entries. PEF alert actions reference policy sets.
.TP
\fIsetpolicy\fP <\fBid\fP> <\fBenable\fP|\fBdisable\fP>
.br
This command enables or disables a PEF policy entry. The
policy ID is the first column from the output of command
\fBipmitool pef policy\fP
.TP .TP
\fIlist\fP \fIlist\fP
.br .br

86
ipmitool/lib/ipmi_pef.c
View File

@ -206,7 +206,7 @@ ipmi_pef_msg_exchange(struct ipmi_intf * intf, struct ipmi_rq * req, char * txt)
static uint8_t static uint8_t
ipmi_pef_get_policy_table(struct ipmi_intf * intf, ipmi_pef_get_policy_table(struct ipmi_intf * intf,
struct pef_cfgparm_policy_table_entry ** table) struct pef_cfgparm_policy_table_entry ** table)
{ /* { /*
// get the PEF policy table: allocate space, fillin, and return its size // get the PEF policy table: allocate space, fillin, and return its size
// NB: the caller must free the returned area (when returned size > 0) // NB: the caller must free the returned area (when returned size > 0)
@ -256,64 +256,6 @@ ipmi_pef_get_policy_table(struct ipmi_intf * intf,
return(tbl_size); return(tbl_size);
} }
#define IPMI_CMD_SET_PEF_CONFIG_PARMS 0x12
struct pef_cfgparm_set_policy_table_entry
{
uint8_t id;
uint8_t sel;
struct pef_policy_entry entry;
} ATTRIBUTE_PACKING;
static int
ipmi_pef_set_policy_table_entry(struct ipmi_intf * intf, int set, struct pef_cfgparm_policy_table_entry *entry)
{
struct ipmi_rs *rsp;
struct ipmi_rq req;
struct pef_cfgparm_set_policy_table_entry psel;
memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_SE;
req.msg.cmd = IPMI_CMD_SET_PEF_CONFIG_PARMS;
req.msg.data = &psel;
req.msg.data_len = sizeof(psel);
memset(&psel, 0, sizeof(psel));
psel.id = PEF_CFGPARM_ID_PEF_ALERT_POLICY_TABLE_ENTRY;
psel.sel = set & 0x3F;
memcpy(&psel.entry, &entry->entry, sizeof(entry->entry));
rsp = ipmi_pef_msg_exchange(intf, &req, "Set Alert policy table entry");
if (!rsp) {
lprintf(LOG_ERR, " **Error setting Alert policy table entry");
return -1;
}
return 0;
}
static void
ipmi_pef_policy_enable(struct ipmi_intf * intf, int set, int enable)
{
struct pef_cfgparm_policy_table_entry * ptbl = NULL;
int tbl_size;
tbl_size = ipmi_pef_get_policy_table(intf, &ptbl);
if (!tbl_size) {
if (ptbl) {
free(ptbl);
}
return;
}
if (set > 0 && set <= tbl_size) {
if (enable)
ptbl[set-1].entry.policy |= PEF_POLICY_ENABLED;
else
ptbl[set-1].entry.policy &= ~PEF_POLICY_ENABLED;
ipmi_pef_set_policy_table_entry(intf, set, &ptbl[set-1]);
} else {
lprintf(LOG_ERR, "Invalid policy index, valid range = (1..%d)", tbl_size);
}
}
static void static void
ipmi_pef_print_lan_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest) ipmi_pef_print_lan_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
{ /* { /*
@ -916,12 +858,6 @@ ipmi_pef_get_info(struct ipmi_intf * intf)
ipmi_pef_print_flags(&pef_b2s_actions, P_SUPP, actions); ipmi_pef_print_flags(&pef_b2s_actions, P_SUPP, actions);
} }
static struct valstr endis[] = {
{ .str = "enable", .val = 0x01 },
{ .str = "disable", .val = 0x00 },
{ .val = -1 },
};
int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv) int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv)
{ /* { /*
// PEF subcommand handling // PEF subcommand handling
@ -937,32 +873,16 @@ int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_pef_get_status(intf); ipmi_pef_get_status(intf);
else if (!strncmp(argv[0], "policy", 6)) else if (!strncmp(argv[0], "policy", 6))
ipmi_pef_list_policies(intf); ipmi_pef_list_policies(intf);
else if (!strncmp(argv[0], "setpolicy", 6)) {
uint16_t set, enable;
set = enable = 0xFFFF;
if (argc > 2) {
str2int(argv[1], &set);
enable = str2val(argv[2], endis);
}
if (set == 0xFFFF || enable == 0xFFFF) {
lprintf(LOG_NOTICE, "setpolicy <policy number> <enable|disable>");
rc = -1;
}
else {
ipmi_pef_policy_enable(intf, set, enable);
}
}
else if (!strncmp(argv[0], "list", 4)) else if (!strncmp(argv[0], "list", 4))
ipmi_pef_list_entries(intf); ipmi_pef_list_entries(intf);
else { else {
help = 1; help = 1;
rc = -1; rc = -1;
lprintf(LOG_ERR, "Invalid PEF command: '%s'\n", argv[0]); lprintf(LOG_ERR, "Invalid PEF command: '%s'\n", argv[0]);
} }
if (help) if (help)
lprintf(LOG_NOTICE, "PEF commands: info status policy setpolicy list"); lprintf(LOG_NOTICE, "PEF commands: info status policy list");
else if (!verbose) else if (!verbose)
printf("\n"); printf("\n");