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

bmc interface changes I missed

Browse Source
This commit is contained in:
Duncan Laurie 2005-03-17 23:02:40 +00:00
parent c575d4b028
commit 9c476f36aa
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ipmitool/src/plugins/bmc/bmc.c
View File

@ -58,7 +58,7 @@
#include "bmc.h" #include "bmc.h"
static int curr_seq; static int curr_seq;
static int bmc_method(int fd); static int bmc_method(int fd, int *if_type);
struct ipmi_rs *(*sendrecv_fn)(struct ipmi_intf *, struct ipmi_rq *) = NULL; struct ipmi_rs *(*sendrecv_fn)(struct ipmi_intf *, struct ipmi_rq *) = NULL;
extern int verbose; extern int verbose;
@ -91,6 +91,8 @@ ipmi_bmc_close(struct ipmi_intf *intf)
int int
ipmi_bmc_open(struct ipmi_intf *intf) ipmi_bmc_open(struct ipmi_intf *intf)
{ {
int method;
if (!intf) if (!intf)
return -1; return -1;
@ -105,7 +107,12 @@ ipmi_bmc_open(struct ipmi_intf *intf)
intf->opened = 1; intf->opened = 1;
sendrecv_fn = (bmc_method(intf->fd) == BMC_PUTMSG_METHOD) ? if (bmc_method(intf->fd, &method) < 0) {
perror("Could not determine bmc messaging interface");
return (-1);
}
sendrecv_fn = (method == BMC_PUTMSG_METHOD) ?
ipmi_bmc_send_cmd_putmsg : ipmi_bmc_send_cmd_ioctl; ipmi_bmc_send_cmd_putmsg : ipmi_bmc_send_cmd_ioctl;
return (intf->fd); return (intf->fd);
@ -271,22 +278,33 @@ ipmi_bmc_send_cmd_putmsg(struct ipmi_intf *intf, struct ipmi_rq *req)
* to use. * to use.
*/ */
static int static int
bmc_method(int fd) bmc_method(int fd, int *if_type)
{ {
struct strioctl istr; struct strioctl istr;
uint8_t method = 0; int retval = 0;
uint8_t method = BMC_PUTMSG_METHOD;
istr.ic_cmd = IOCTL_IPMI_INTERFACE_METHOD; istr.ic_cmd = IOCTL_IPMI_INTERFACE_METHOD;
istr.ic_timout = 0; istr.ic_timout = 0;
istr.ic_dp = (uint8_t *)&method; istr.ic_dp = (uint8_t *)&method;
istr.ic_len = 1; istr.ic_len = 1;
/*
* If the ioctl doesn't exist, we should get an EINVAL back.
* Bail out on any other error.
*/
if (ioctl(fd, I_STR, &istr) < 0) { if (ioctl(fd, I_STR, &istr) < 0) {
/* If the IOCTL doesn't exist, use the (old) ioctl interface */
return (BMC_IOCTL_METHOD); if (errno != EINVAL)
retval = -1;
else
method = BMC_IOCTL_METHOD;
} }
return (method); if (retval == 0)
*if_type = method;
return (retval);
} }
static void static void