summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Amelkin <alexander@amelkin.msk.ru>2018-07-27 16:34:08 +0300
committerAlexander Amelkin <alexander@amelkin.msk.ru>2018-07-27 17:13:18 +0300
commit3aade242971e80abbf16147dc9320ae4638df1e3 (patch)
tree01dace338b4b2644ccd132d8a720df1a2c657856
parent329ebdff84bdc61dc224ca5f7ea33a31eed146f0 (diff)
downloadipmitool-3aade242971e80abbf16147dc9320ae4638df1e3.tar.gz
dummy: Add default dummy socket
fake-ipmistack uses a default socket at /tmp/.ipmi_dummy. Use it when IPMI_DUMMY_SOCK environment variable is not set.
-rw-r--r--src/plugins/dummy/dummy.c12
-rw-r--r--src/plugins/dummy/dummy.h2
2 files changed, 5 insertions, 9 deletions
diff --git a/src/plugins/dummy/dummy.c b/src/plugins/dummy/dummy.c
index 8600a84..0512ad3 100644
--- a/src/plugins/dummy/dummy.c
+++ b/src/plugins/dummy/dummy.c
@@ -180,9 +180,8 @@ ipmi_dummyipmi_open(struct ipmi_intf *intf)
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;
+ lprintf(LOG_DEBUG, "No IPMI_DUMMY_SOCK set. Using " IPMI_DUMMY_DEFAULTSOCK);
+ dummy_sock_path = IPMI_DUMMY_DEFAULTSOCK;
}
if (intf->opened == 1) {
@@ -218,12 +217,7 @@ 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 bbe3aa3..cac4aff 100644
--- a/src/plugins/dummy/dummy.h
+++ b/src/plugins/dummy/dummy.h
@@ -1,6 +1,8 @@
#ifndef IPMI_DUMMYIPMI_H
# define IPMI_DUMMYIPMI_H
+#define IPMI_DUMMY_DEFAULTSOCK "/tmp/.ipmi_dummy"
+
struct dummy_rq {
struct {
uint8_t netfn;