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

Rewrite ipmi_set_channel_access()

Browse Source 
Commit is a rewrite of ipmi_set_channel_access(). Function utilizes _ipmi_*()
functions now in order to avoid code repetition. Other than that, functionality
should remain the same.
This commit is contained in:
Zdenek Styblik 2015-02-03 07:42:10 +01:00
parent 026a8b6fce
commit 11bbf18345
2 changed files with 63 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/ipmitool/ipmi_channel.h
View File

@ -128,6 +128,13 @@ struct get_channel_auth_cap_rsp {
#pragma pack(0) #pragma pack(0)
#endif #endif
int _ipmi_get_channel_access(struct ipmi_intf *intf,
struct channel_access_t *channel_access,
uint8_t get_volatile_settings);
int _ipmi_set_channel_access(struct ipmi_intf *intf,
struct channel_access_t channel_access, uint8_t access_option,
uint8_t privilege_option);
uint8_t ipmi_get_channel_medium(struct ipmi_intf * intf, uint8_t channel); uint8_t ipmi_get_channel_medium(struct ipmi_intf * intf, uint8_t channel);
uint8_t ipmi_current_channel_medium(struct ipmi_intf * intf); uint8_t ipmi_current_channel_medium(struct ipmi_intf * intf);
int ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv); int ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv);

151
lib/ipmi_lanp.c
View File

@ -1007,115 +1007,76 @@ ipmi_set_alert_enable(struct ipmi_intf * intf, uint8_t channel, uint8_t enable)
return 0; return 0;
} }
/* TODO - we already have functions for this elsewere!!! */ /* ipmi_set_channel_access - enable/disable IPMI messaging for given channel and
* set Privilege Level to Administrator.
*
* @channel - IPMI channel
* @enable - whether to enable/disable IPMI messaging for given channel.
*
* returns - 0 on success, (-1) on error
*/
static int static int
ipmi_set_channel_access(struct ipmi_intf * intf, uint8_t channel, uint8_t enable) ipmi_set_channel_access(struct ipmi_intf *intf, uint8_t channel,
uint8_t enable)
{ {
struct ipmi_rs * rsp; struct channel_access_t channel_access;
struct ipmi_rq req; int ccode = 0;
uint8_t rqdata[3]; memset(&channel_access, 0, sizeof(channel_access));
uint8_t byteEnable; channel_access.channel = channel;
/* Get Non-Volatile Channel Access first */
ccode = _ipmi_get_channel_access(intf, &channel_access, 0);
if (eval_ccode(ccode) != 0) {
lprintf(LOG_ERR,
"Unable to Get Channel Access(non-volatile) for channel %d",
channel);
return (-1);
}
memset(&req, 0, sizeof(req)); if (enable != 0) {
channel_access.access_mode = 2;
/* RETREIVE VALUE IN NVRAM */
req.msg.netfn = IPMI_NETFN_APP;
req.msg.cmd = 0x41; /* Get Channel Access Command */
req.msg.data = rqdata;
req.msg.data_len = 2;
memset(rqdata, 0, 2);
rqdata[0] = channel & 0xf;
rqdata[1] = 0x40; /* retreive NV */
rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Unable to Get Channel Access for channel %d", channel);
return -1;
} else if (rsp->ccode > 0) {
lprintf(LOG_ERR, "Set Channel Access for channel %d failed: %s",
channel, val2str(rsp->ccode, completion_code_vals));
return -1;
} else { } else {
byteEnable = *(rsp->data + 0); channel_access.access_mode = 0;
}
channel_access.privilege_limit = 0x04;
ccode = _ipmi_set_channel_access(intf, channel_access, 1, 1);
if (eval_ccode(ccode) != 0) {
lprintf(LOG_ERR,
"Unable to Set Channel Access(non-volatile) for channel %d",
channel);
return (-1);
} }
/* SAVE TO NVRAM */ memset(&channel_access, 0, sizeof(channel_access));
memset(&req, 0, sizeof(req)); channel_access.channel = channel;
/* Get Volatile Channel Access */
req.msg.netfn = IPMI_NETFN_APP; ccode = _ipmi_get_channel_access(intf, &channel_access, 1);
req.msg.cmd = 0x40; /* Set Channel Access Command */ if (eval_ccode(ccode) != 0) {
req.msg.data = rqdata; lprintf(LOG_ERR,
req.msg.data_len = 3; "Unable to Get Channel Access(volatile) for channel %d",
channel);
memset(rqdata, 0, 3); return (-1);
rqdata[0] = channel & 0xf;
rqdata[1] = 0x40 | (byteEnable & 0x38); /* use previously set values */
if (enable != 0)
rqdata[1] |= 0x2; /* set always available if enable is set */
rqdata[2] = 0x44; /* set channel privilege limit to ADMIN */
rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Unable to Set Channel Access for channel %d", channel);
return -1;
} else if (rsp->ccode > 0) {
lprintf(LOG_ERR, "Set Channel Access for channel %d failed: %s",
channel, val2str(rsp->ccode, completion_code_vals));
return -1;
} }
/* RETREIVE VALUE IN NVRAM */ if (enable != 0) {
req.msg.netfn = IPMI_NETFN_APP; channel_access.access_mode = 2;
req.msg.cmd = 0x41; /* Get Channel Access Command */
req.msg.data = rqdata;
req.msg.data_len = 2;
memset(rqdata, 0, 2);
rqdata[0] = channel & 0xf;
rqdata[1] = 0x80; /* retreive NV */
rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Unable to Get Channel Access for channel %d", channel);
return -1;
} else if (rsp->ccode > 0) {
lprintf(LOG_ERR, "Set Channel Access for channel %d failed: %s",
channel, val2str(rsp->ccode, completion_code_vals));
return -1;
} else { } else {
byteEnable = *(rsp->data + 0); channel_access.access_mode = 0;
} }
channel_access.privilege_limit = 0x04;
/* SAVE TO CURRENT */ ccode = _ipmi_set_channel_access(intf, channel_access, 2, 2);
memset(&req, 0, sizeof(req)); if (eval_ccode(ccode) != 0) {
lprintf(LOG_ERR,
req.msg.netfn = IPMI_NETFN_APP; "Unable to Set Channel Access(volatile) for channel %d",
req.msg.cmd = 0x40; /* Set Channel Access Command */ channel);
req.msg.data = rqdata; return (-1);
req.msg.data_len = 3;
memset(rqdata, 0, 3);
rqdata[0] = channel & 0xf;
rqdata[1] = 0x80 | (byteEnable & 0x38); /* use previously set values */
if (enable != 0)
rqdata[1] |= 0x2; /* set always available if enable is set */
rqdata[2] = 0x84; /* set channel privilege limit to ADMIN */
rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Unable to Set Channel Access for channel %d", channel);
return -1;
} else if (rsp->ccode > 0) {
lprintf(LOG_ERR, "Set Channel Access for channel %d failed: %s",
channel, val2str(rsp->ccode, completion_code_vals));
return -1;
} }
/* can't send close session if access off so abort instead */ /* can't send close session if access off so abort instead */
if (enable == 0) if (enable == 0) {
intf->abort = 1; intf->abort = 1;
}
printf("Set Channel Access for channel %d was successful.\n",
channel);
return 0; return 0;
} }