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

Jan Safranek 1/8/09 patch to add support for sol payload status command

Browse Source
This commit is contained in:
Carol Hebert 2009-01-09 23:22:16 +00:00
parent b7ae2149e9
commit 63eaecf469
2 changed files with 67 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipmitool/doc/ipmitool.1
View File

@ -1875,10 +1875,10 @@ Retrieve information about the Serial\-Over\-LAN configuration on
the specified channel. If no channel is given, it will display the specified channel. If no channel is given, it will display
SOL configuration data for the currently used channel. SOL configuration data for the currently used channel.
.TP .TP
\fIpayload\fP <\fIenable\fP | \fIdisable\fP> <\fBchannel number\fR> <\fBuserid\fR> \fIpayload\fP <\fIenable\fP | \fIdisable\fP | \fIstatus\fP> <\fBchannel number\fR> <\fBuserid\fR>
.br .br
Enable or disable SOL payload for the user on the specified channel. Enable, disable or show status of SOL payload for the user on the specified channel.
.TP .TP
\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>] \fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>]
.br .br

75
ipmitool/lib/ipmi_sol.c
View File

@ -143,6 +143,51 @@ ipmi_sol_payload_access(struct ipmi_intf * intf,
return -1; return -1;
} }
int
ipmi_sol_payload_access_status(struct ipmi_intf * intf,
uint8_t channel,
uint8_t userid)
{
struct ipmi_rq req;
struct ipmi_rs *rsp;
uint8_t data[2];
memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_APP;
req.msg.cmd = IPMI_GET_USER_PAYLOAD_ACCESS;
req.msg.data = data;
req.msg.data_len = sizeof(data);
data[0] = channel & 0xf; /* channel */
data[1] = userid & 0x3f; /* user id */
rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error: Unexpected data length (%d) received",
rsp->data_len);
return -1;
}
switch(rsp->ccode) {
case 0x00:
if (rsp->data_len != 4) {
lprintf(LOG_ERR, "Error parsing SOL payload status for user %d on channel %d",
userid, channel);
return -1;
}
printf("User %d on channel %d is %sabled\n",
userid, channel, (rsp->data[0] & 0x02) ? "en":"dis");
return 0;
default:
lprintf(LOG_ERR, "Error getting SOL payload status for user %d on channel %d: %s",
userid, channel,
val2str(rsp->ccode, completion_code_vals));
return -1;
}
}
/* /*
* ipmi_get_sol_info * ipmi_get_sol_info
@ -1771,7 +1816,7 @@ print_sol_usage(void)
{ {
lprintf(LOG_NOTICE, "SOL Commands: info [<channel number>]"); lprintf(LOG_NOTICE, "SOL Commands: info [<channel number>]");
lprintf(LOG_NOTICE, " set <parameter> <value> [channel]"); lprintf(LOG_NOTICE, " set <parameter> <value> [channel]");
lprintf(LOG_NOTICE, " payload <enable|disable> [channel] [userid]"); lprintf(LOG_NOTICE, " payload <enable|disable|status> [channel] [userid]");
lprintf(LOG_NOTICE, " activate [<usesolforkeepalive|nokeepalive>]"); lprintf(LOG_NOTICE, " activate [<usesolforkeepalive|nokeepalive>]");
lprintf(LOG_NOTICE, " deactivate"); lprintf(LOG_NOTICE, " deactivate");
lprintf(LOG_NOTICE, " looptest [<loop times>] [<loop interval(in ms)>]"); lprintf(LOG_NOTICE, " looptest [<loop times>] [<loop interval(in ms)>]");
@ -1852,15 +1897,7 @@ ipmi_sol_main(struct ipmi_intf * intf, int argc, char ** argv)
return -1; return -1;
} }
if (!strncmp(argv[1], "enable", 6)) if (argc == 1 || argc > 4)
{
enable = 1;
}
else if (!strncmp(argv[1], "disable", 7))
{
enable = 0;
}
else
{ {
print_sol_usage(); print_sol_usage();
return -1; return -1;
@ -1875,6 +1912,24 @@ ipmi_sol_main(struct ipmi_intf * intf, int argc, char ** argv)
userid = (uint8_t)strtol(argv[3], NULL, 0); userid = (uint8_t)strtol(argv[3], NULL, 0);
} }
if (!strncmp(argv[1], "enable", 6))
{
enable = 1;
}
else if (!strncmp(argv[1], "disable", 7))
{
enable = 0;
}
else if (!strncmp(argv[1], "status", 6))
{
return ipmi_sol_payload_access_status(intf, channel, userid);
}
else
{
print_sol_usage();
return -1;
}
retval = ipmi_sol_payload_access(intf, channel, userid, enable); retval = ipmi_sol_payload_access(intf, channel, userid, enable);
} }