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

support FreeIPMI 0.4.0 api

Browse Source
This commit is contained in:
Albert Chu 2007-06-04 18:03:52 +00:00
parent 0faade4b8a
commit 76bb61de6c
2 changed files with 73 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ipmitool/configure.in
View File

@ -239,7 +239,7 @@ if test "x$enable_intf_free" = "xstatic" || test "x$enable_intf_free" = "xplugin
fi fi
if test "x$enable_intf_free" = "xyes"; then if test "x$enable_intf_free" = "xyes"; then
dnl Determine if you got the right FreeIPMI version dnl Determine if you got the right FreeIPMI version
AC_MSG_CHECKING([for good libfreeipmi version]) AC_MSG_CHECKING([for libfreeipmi version 0.3.0])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <sys/types.h> /* For size_t */ #include <sys/types.h> /* For size_t */
#include <stdio.h> /* For NULL */ #include <stdio.h> /* For NULL */
@ -253,13 +253,39 @@ dnl Determine if you got the right FreeIPMI version
0, 0,
NULL, NULL,
0); 0);
], ac_free_version_good=yes,ac_free_version_good=no) ], ac_free_version_0_3_0=yes,ac_free_version_0_3_0=no)
AC_MSG_RESULT($ac_free_version_good) AC_MSG_RESULT($ac_free_version_0_3_0)
if test "x$ac_free_version_good" = "xyes"; then AC_MSG_CHECKING([for libfreeipmi version 0.4.0])
AC_TRY_COMPILE([
#include <sys/types.h> /* For size_t */
#include <stdio.h> /* For NULL */
#include <freeipmi/freeipmi.h>
#include <freeipmi/udm/ipmi-udm.h>
], [
ipmi_device_t dev = NULL;
int rv;
dev = ipmi_device_create();
rv = ipmi_open_inband(dev,
IPMI_DEVICE_KCS,
0,
0,
0,
NULL,
0);
], ac_free_version_0_4_0=yes,ac_free_version_0_4_0=no)
AC_MSG_RESULT($ac_free_version_0_4_0)
if test "x$ac_free_version_0_3_0" = "xyes" || test "x$ac_free_version_0_4_0" = "xyes"; then
AC_DEFINE(IPMI_INTF_FREE, [1], [Define to 1 to enable FreeIPMI interface.]) AC_DEFINE(IPMI_INTF_FREE, [1], [Define to 1 to enable FreeIPMI interface.])
AC_SUBST(INTF_FREE, [free]) AC_SUBST(INTF_FREE, [free])
AC_SUBST(INTF_FREE_LIB, [libintf_free.la]) AC_SUBST(INTF_FREE_LIB, [libintf_free.la])
IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB free/libintf_free.la" IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB free/libintf_free.la"
if test "x$ac_free_version_0_3_0" = "xyes"; then
AC_DEFINE(IPMI_INTF_FREE_VERSION_0_3_0, [1], [Define to 1 for FreeIPMI 0.3.0.])
fi
if test "x$ac_free_version_0_4_0" = "xyes"; then
AC_DEFINE(IPMI_INTF_FREE_VERSION_0_4_0, [1], [Define to 1 for FreeIPMI 0.4.0.])
fi
else else
enable_intf_free=no enable_intf_free=no
fi fi

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

@ -58,6 +58,7 @@ static int ipmi_free_open(struct ipmi_intf * intf)
return -1; return -1;
} }
#if IPMI_INTF_FREE_VERSION_0_3_0
if (!(dev = ipmi_open_inband (IPMI_DEVICE_KCS, if (!(dev = ipmi_open_inband (IPMI_DEVICE_KCS,
0, 0,
0, 0,
@ -74,19 +75,53 @@ static int ipmi_free_open(struct ipmi_intf * intf)
goto cleanup; goto cleanup;
} }
} }
#elif IPMI_INTF_FREE_VERSION_0_4_0
if (!(dev = ipmi_device_create())) {
perror("ipmi_open_inband()");
goto cleanup;
}
if (ipmi_open_inband (dev,
IPMI_DEVICE_KCS,
0,
0,
0,
NULL,
IPMI_FLAGS_DEFAULT) < 0) {
if (ipmi_open_inband (dev,
IPMI_DEVICE_SSIF,
0,
0,
0,
NULL,
IPMI_FLAGS_DEFAULT) < 0) {
fprintf(stderr,
"ipmi_open_inband(): %s\n",
ipmi_device_strerror(ipmi_device_errnum(dev)));
goto cleanup;
}
}
#endif
intf->opened = 1; intf->opened = 1;
return 0; return 0;
cleanup: cleanup:
if (dev) if (dev) {
ipmi_close_device(dev); ipmi_close_device(dev);
#if IPMI_INTF_FREE_VERSION_0_4_0
ipmi_device_destroy(dev);
#endif
}
return -1; return -1;
} }
static void ipmi_free_close(struct ipmi_intf * intf) static void ipmi_free_close(struct ipmi_intf * intf)
{ {
if (dev) if (dev) {
ipmi_close_device(dev); ipmi_close_device(dev);
#if IPMI_INTF_FREE_VERSION_0_4_0
ipmi_device_destroy(dev);
#endif
}
intf->opened = 0; intf->opened = 0;
} }
@ -132,7 +167,13 @@ static struct ipmi_rs * ipmi_free_send_cmd(struct ipmi_intf * intf, struct ipmi_
req->msg.data_len + 1, req->msg.data_len + 1,
rs_buf, rs_buf,
rs_buf_len)) < 0) { rs_buf_len)) < 0) {
#if IPMI_INTF_FREE_VERSION_0_3_0
perror("ipmi_cmd_raw"); perror("ipmi_cmd_raw");
#elif IPMI_INTF_FREE_VERSION_0_4_0
fprintf(stderr,
"ipmi_cmd_raw: %s\n",
ipmi_device_strerror(ipmi_device_errnum(dev)));
#endif
return NULL; return NULL;
} }