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

support sensor bridging in free interface

Browse Source
This commit is contained in:
Albert Chu 2009-11-24 23:21:23 +00:00
parent fae2b40020
commit 021728965c
2 changed files with 66 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipmitool/configure.in
View File

@ -256,7 +256,7 @@ dnl Determine if you got the right FreeIPMI version
0, 0,
NULL, NULL,
0); 0);
], ac_free_version_0_3_0=yes,ac_free_version_0_3_0=no) ], ac_free_version_0_3_0=yes, ac_free_version_0_3_0=no)
AC_MSG_RESULT($ac_free_version_0_3_0) AC_MSG_RESULT($ac_free_version_0_3_0)
AC_MSG_CHECKING([for libfreeipmi version 0.4.0]) AC_MSG_CHECKING([for libfreeipmi version 0.4.0])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
@ -275,7 +275,7 @@ dnl Determine if you got the right FreeIPMI version
0, 0,
NULL, NULL,
0); 0);
], ac_free_version_0_4_0=yes,ac_free_version_0_4_0=no) ], ac_free_version_0_4_0=yes, ac_free_version_0_4_0=no)
AC_MSG_RESULT($ac_free_version_0_4_0) AC_MSG_RESULT($ac_free_version_0_4_0)
AC_MSG_CHECKING([for libfreeipmi version 0.5.0]) AC_MSG_CHECKING([for libfreeipmi version 0.5.0])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
@ -295,7 +295,7 @@ dnl Determine if you got the right FreeIPMI version
NULL, NULL,
0, 0,
0); 0);
], ac_free_version_0_5_0=yes,ac_free_version_0_5_0=no) ], ac_free_version_0_5_0=yes, ac_free_version_0_5_0=no)
AC_MSG_RESULT($ac_free_version_0_5_0) AC_MSG_RESULT($ac_free_version_0_5_0)
AC_MSG_CHECKING([for libfreeipmi version 0.6.0]) AC_MSG_CHECKING([for libfreeipmi version 0.6.0])
@ -314,7 +314,7 @@ dnl Determine if you got the right FreeIPMI version
NULL, NULL,
0, 0,
0); 0);
], ac_free_version_0_6_0=yes,ac_free_version_0_6_0=no) ], ac_free_version_0_6_0=yes, ac_free_version_0_6_0=no)
AC_MSG_RESULT($ac_free_version_0_6_0) AC_MSG_RESULT($ac_free_version_0_6_0)
if test "x$ac_free_version_0_3_0" = "xyes" \ if test "x$ac_free_version_0_3_0" = "xyes" \
@ -340,6 +340,10 @@ dnl Determine if you got the right FreeIPMI version
else else
enable_intf_free=no enable_intf_free=no
fi fi
AC_CHECK_LIB(freeipmi,
ipmi_cmd_raw_ipmb,
AC_DEFINE(IPMI_INTF_FREE_BRIDGING, [1], [Define to 1 to enable FreeIPMI Bridging Support.]))
fi fi
dnl look for termios header file dnl look for termios header file

74
ipmitool/src/plugins/free/free.c
View File

@ -61,6 +61,8 @@ extern int verbose;
static int ipmi_free_open(struct ipmi_intf * intf) static int ipmi_free_open(struct ipmi_intf * intf)
{ {
int kcs_ret = -1, ssif_ret = -1;
if (getuid() != 0) { if (getuid() != 0) {
fprintf(stderr, "Permission denied, must be root\n"); fprintf(stderr, "Permission denied, must be root\n");
return -1; return -1;
@ -199,7 +201,7 @@ static void ipmi_free_close(struct ipmi_intf * intf)
static struct ipmi_rs * ipmi_free_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req) static struct ipmi_rs * ipmi_free_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
{ {
u_int8_t lun = 0; u_int8_t lun = req->msg.lun;
u_int8_t cmd = req->msg.cmd; u_int8_t cmd = req->msg.cmd;
u_int8_t netfn = req->msg.netfn; u_int8_t netfn = req->msg.netfn;
u_int8_t rq_buf[IPMI_BUF_SIZE]; u_int8_t rq_buf[IPMI_BUF_SIZE];
@ -232,25 +234,65 @@ static struct ipmi_rs * ipmi_free_send_cmd(struct ipmi_intf * intf, struct ipmi_
if (req->msg.data) if (req->msg.data)
memcpy(rq_buf + 1, req->msg.data, req->msg.data_len); memcpy(rq_buf + 1, req->msg.data, req->msg.data_len);
if ((rs_len = ipmi_cmd_raw(dev, if (intf->target_addr != 0
lun, && intf->target_addr != IPMI_BMC_SLAVE_ADDR) {
netfn, #if IPMI_INTF_FREE_BRIDGING
rq_buf, if ((rs_len = ipmi_cmd_raw_ipmb(dev,
req->msg.data_len + 1, intf->target_channel,
rs_buf, intf->target_addr,
rs_buf_len)) < 0) { lun,
netfn,
rq_buf,
req->msg.data_len + 1,
rs_buf,
rs_buf_len)) < 0) {
if (verbose > 3)
fprintf(stderr,
"ipmi_cmd_raw_ipmb: %s\n",
ipmi_ctx_strerror(ipmi_ctx_errnum(dev)));
/* Compared to FreeIPMI, user is expected to input
* the target channel on the command line, it is not automatically
* discovered. So that is the likely cause of an error.
*
* Instead of returning an error, return a bad response so output
* of ipmitool commands looks like other interfaces
*/
rs_len = 2;
rs_buf[0] = 0;
rs_buf[0] = 0xC1; /* invalid command */
}
#else /* !IPMI_INTF_FREE_BRIDGING */
if (verbose > 3)
fprintf(stderr, "sensor bridging not supported in this driver version");
/* instead of returning an error, return a bad response so output
* of ipmitool commands looks like other interfaces
*/
rs_len = 2;
rs_buf[0] = 0;
rs_buf[0] = 0xC1; /* invalid command */
#endif /* !IPMI_INTF_FREE_BRIDGING */
}
else {
if ((rs_len = ipmi_cmd_raw(dev,
lun,
netfn,
rq_buf,
req->msg.data_len + 1,
rs_buf,
rs_buf_len)) < 0) {
#if IPMI_INTF_FREE_0_3_0 #if IPMI_INTF_FREE_0_3_0
perror("ipmi_cmd_raw"); perror("ipmi_cmd_raw");
#elif IPMI_INTF_FREE_0_4_0 || IPMI_INTF_FREE_0_5_0 #elif IPMI_INTF_FREE_0_4_0 || IPMI_INTF_FREE_0_5_0
fprintf(stderr, fprintf(stderr,
"ipmi_cmd_raw: %s\n", "ipmi_cmd_raw: %s\n",
ipmi_device_strerror(ipmi_device_errnum(dev))); ipmi_device_strerror(ipmi_device_errnum(dev)));
#elif IPMI_INTF_FREE_0_6_0 #elif IPMI_INTF_FREE_0_6_0
fprintf(stderr, fprintf(stderr,
"ipmi_cmd_raw: %s\n", "ipmi_cmd_raw: %s\n",
ipmi_ctx_strerror(ipmi_ctx_errnum(dev))); ipmi_ctx_strerror(ipmi_ctx_errnum(dev)));
#endif #endif
return NULL; return NULL;
}
} }
memset(&rsp, 0, sizeof(struct ipmi_rs)); memset(&rsp, 0, sizeof(struct ipmi_rs));