Menu
▾
▴
[Ipmitool-cvs] [SCM] ipmitool branch, master, updated. 3123ce01b5aab516843e58d466ac78377b2ceefe
|
From: Zdenek S. <st...@us...> - 2016-04-10 17:45:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ipmitool".
The branch, master has been updated
via 3123ce01b5aab516843e58d466ac78377b2ceefe (commit)
via f70a19cf639d29887ad0877231d64290fbb83087 (commit)
via 02cdde02644c96e3d46b43cd3e6fc3e2259d805c (commit)
via 19293f08df2203b9750f621d0b745c0765abc781 (commit)
from c7169bc27ee407206e768dece2c3f026e02aee02 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3123ce01b5aab516843e58d466ac78377b2ceefe
Author: Zdenek Styblik <st...@tu...>
Date: Sun Apr 10 19:40:11 2016 +0200
ID:322 - let 'ekanalyzer frushow' run without a working IPMI target
Commit changes a dummy interface in a way that it acts as a dummy interface when
no IPMI_DUMMY_SOCK env variable is set. Therefore, it's possible to run
'ekanalyzer frushow' without having BMC. Still, you need to specify this IPMI
interface.
If IPMI_DUMMY_SOCK is set, then dummy interface will work as it was working
before.
diff --git a/src/plugins/dummy/dummy.c b/src/plugins/dummy/dummy.c
index 8bfc4cf..8600a84 100644
--- a/src/plugins/dummy/dummy.c
+++ b/src/plugins/dummy/dummy.c
@@ -31,6 +31,7 @@
#include <errno.h>
#include <limits.h>
#include <stdio.h>
+#include <stdlib.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
@@ -175,6 +176,14 @@ ipmi_dummyipmi_open(struct ipmi_intf *intf)
struct sockaddr_un address;
int len;
int rc;
+ char *dummy_sock_path;
+
+ dummy_sock_path = getenv("IPMI_DUMMY_SOCK");
+ if (dummy_sock_path == NULL) {
+ lprintf(LOG_DEBUG, "No IPMI_DUMMY_SOCK set. Dummy mode ON.");
+ intf->opened = 1;
+ return intf->fd;
+ }
if (intf->opened == 1) {
return intf->fd;
@@ -185,7 +194,7 @@ ipmi_dummyipmi_open(struct ipmi_intf *intf)
return (-1);
}
address.sun_family = AF_UNIX;
- strcpy(address.sun_path, DUMMY_SOCKET_PATH);
+ strcpy(address.sun_path, dummy_sock_path);
len = sizeof(address);
rc = connect(intf->fd, (struct sockaddr *)&address, len);
if (rc != 0) {
@@ -209,6 +218,12 @@ ipmi_dummyipmi_send_cmd(struct ipmi_intf *intf, struct ipmi_rq *req)
static struct ipmi_rs rsp;
struct dummy_rq req_dummy;
struct dummy_rs rsp_dummy;
+ char *dummy_sock_path;
+ dummy_sock_path = getenv("IPMI_DUMMY_SOCK");
+ if (dummy_sock_path == NULL) {
+ lprintf(LOG_DEBUG, "No IPMI_DUMMY_SOCK set. Dummy mode ON.");
+ return NULL;
+ }
if (intf == NULL || intf->fd < 0 || intf->opened != 1) {
lprintf(LOG_ERR, "dummy failed on intf check.");
return NULL;
diff --git a/src/plugins/dummy/dummy.h b/src/plugins/dummy/dummy.h
index dac9caa..bbe3aa3 100644
--- a/src/plugins/dummy/dummy.h
+++ b/src/plugins/dummy/dummy.h
@@ -1,8 +1,6 @@
#ifndef IPMI_DUMMYIPMI_H
# define IPMI_DUMMYIPMI_H
-# define DUMMY_SOCKET_PATH "/tmp/.ipmi_dummy"
-
struct dummy_rq {
struct {
uint8_t netfn;
commit f70a19cf639d29887ad0877231d64290fbb83087
Author: Milos <mil...@ym...>
Date: Sun Apr 10 15:11:28 2016 +0200
Added missing ipmi_sel_supermicro.h to template Makefile.am
diff --git a/include/ipmitool/Makefile.am b/include/ipmitool/Makefile.am
index 5a9062c..160e354 100644
--- a/include/ipmitool/Makefile.am
+++ b/include/ipmitool/Makefile.am
@@ -38,5 +38,5 @@ noinst_HEADERS = log.h bswap.h hpm2.h helper.h ipmi.h ipmi_cc.h ipmi_intf.h \
ipmi_oem.h ipmi_sdradd.h ipmi_isol.h ipmi_sunoem.h ipmi_picmg.h \
ipmi_fwum.h ipmi_main.h ipmi_tsol.h ipmi_firewall.h \
ipmi_kontronoem.h ipmi_ekanalyzer.h ipmi_gendev.h ipmi_ime.h \
- ipmi_delloem.h ipmi_dcmi.h ipmi_vita.h
+ ipmi_delloem.h ipmi_dcmi.h ipmi_vita.h ipmi_sel_supermicro.h
commit 02cdde02644c96e3d46b43cd3e6fc3e2259d805c
Author: Zdenek Styblik <st...@tu...>
Date: Sun Apr 10 18:17:02 2016 +0200
Make bootstrap script part of dist packages
diff --git a/Makefile.am b/Makefile.am
index 94e267a..c809131 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@
DOCDIR = $(datadir)/doc/$(PACKAGE)
DOCLIST = $(top_srcdir)/README $(top_srcdir)/COPYING $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog
-EXTRA_DIST = $(DOCLIST)
+EXTRA_DIST = $(DOCLIST) bootstrap
AUTOMAKE_OPTIONS = dist-bzip2
commit 19293f08df2203b9750f621d0b745c0765abc781
Author: Zdenek Styblik <st...@tu...>
Date: Sun Apr 10 17:36:12 2016 +0200
ID:355 - Change CFLAG -std=c99 to -std=gnu99
... until we're more C99 compliant and ready, because C99 flag really and
seriously breaks IPMI tool, or so it seems.
diff --git a/configure.ac b/configure.ac
index b92c8a4..43aa08c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_CHECK_FUNCS([alarm gethostbyname getaddrinfo getifaddrs socket select])
AC_CHECK_FUNCS([memmove memset strchr strdup strerror])
AC_CHECK_FUNCS([getpassphrase])
-CFLAGS="$CFLAGS -Wall -Wextra -std=c99 -pedantic -Wformat -Wformat-nonliteral"
+CFLAGS="$CFLAGS -Wall -Wextra -std=gnu99 -pedantic -Wformat -Wformat-nonliteral"
AM_PROG_LIBTOOL
LIBTOOL="$LIBTOOL --silent"
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
configure.ac | 2 +-
include/ipmitool/Makefile.am | 2 +-
src/plugins/dummy/dummy.c | 17 ++++++++++++++++-
src/plugins/dummy/dummy.h | 2 --
5 files changed, 19 insertions(+), 6 deletions(-)
hooks/post-receive
--
ipmitool
|
