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

open: fix whitespace

Browse Source 
Apply whitespace fixes via clang-format-6.0 to src/plugins/open/open.c
to cleanup spaces and fixup line lengths, etc.

Signed-off-by: Patrick Venture <venture@google.com>
This commit is contained in:
Patrick Venture 2018-11-26 10:26:25 -08:00 committed by Alexander Amelkin
parent 08348f1b72
commit 3bfa1da201
1 changed files with 180 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/plugins/open/open.c
View File

@ -88,8 +88,9 @@
extern int verbose; extern int verbose;
static int static
ipmi_openipmi_open(struct ipmi_intf * intf) int
ipmi_openipmi_open(struct ipmi_intf *intf)
{ {
char ipmi_dev[16]; char ipmi_dev[16];
char ipmi_devfs[16]; char ipmi_devfs[16];
@ -112,7 +113,7 @@ ipmi_openipmi_open(struct ipmi_intf * intf)
} }
if (intf->fd < 0) { if (intf->fd < 0) {
lperror(LOG_ERR, "Could not open device at %s or %s or %s", lperror(LOG_ERR, "Could not open device at %s or %s or %s",
ipmi_dev, ipmi_devfs , ipmi_devfs2); ipmi_dev, ipmi_devfs, ipmi_devfs2);
return -1; return -1;
} }
} }
@ -132,14 +133,15 @@ ipmi_openipmi_open(struct ipmi_intf * intf)
lperror(LOG_ERR, "Could not set IPMB address"); lperror(LOG_ERR, "Could not set IPMB address");
return -1; return -1;
} }
lprintf(LOG_DEBUG, "Set IPMB address to 0x%x", lprintf(LOG_DEBUG, "Set IPMB address to 0x%x", intf->my_addr);
intf->my_addr );
} }
intf->manufacturer_id = ipmi_get_oem(intf); intf->manufacturer_id = ipmi_get_oem(intf);
return intf->fd; return intf->fd;
} }
static int
static
int
ipmi_openipmi_set_my_addr(struct ipmi_intf *intf, uint8_t addr) ipmi_openipmi_set_my_addr(struct ipmi_intf *intf, uint8_t addr)
{ {
unsigned int a = addr; unsigned int a = addr;
@ -151,8 +153,9 @@ ipmi_openipmi_set_my_addr(struct ipmi_intf *intf, uint8_t addr)
return 0; return 0;
} }
static void static
ipmi_openipmi_close(struct ipmi_intf * intf) void
ipmi_openipmi_close(struct ipmi_intf *intf)
{ {
if (intf->fd >= 0) { if (intf->fd >= 0) {
close(intf->fd); close(intf->fd);
@ -163,8 +166,9 @@ ipmi_openipmi_close(struct ipmi_intf * intf)
intf->manufacturer_id = IPMI_OEM_UNKNOWN; intf->manufacturer_id = IPMI_OEM_UNKNOWN;
} }
static struct ipmi_rs * static
ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req) struct ipmi_rs *
ipmi_openipmi_send_cmd(struct ipmi_intf *intf, struct ipmi_rq *req)
{ {
struct ipmi_recv recv; struct ipmi_recv recv;
struct ipmi_addr addr; struct ipmi_addr addr;
@ -181,11 +185,10 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
static int curr_seq = 0; static int curr_seq = 0;
fd_set rset; fd_set rset;
uint8_t * data = NULL; uint8_t *data = NULL;
int data_len = 0; int data_len = 0;
int retval = 0; int retval = 0;
if (!intf || !req) if (!intf || !req)
return NULL; return NULL;
@ -197,13 +200,12 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
if (verbose > 2) { if (verbose > 2) {
fprintf(stderr, "OpenIPMI Request Message Header:\n"); fprintf(stderr, "OpenIPMI Request Message Header:\n");
fprintf(stderr, " netfn = 0x%x\n", req->msg.netfn ); fprintf(stderr, " netfn = 0x%x\n", req->msg.netfn);
fprintf(stderr, " cmd = 0x%x\n", req->msg.cmd); fprintf(stderr, " cmd = 0x%x\n", req->msg.cmd);
printbuf(req->msg.data, req->msg.data_len, "OpenIPMI Request Message Data"); printbuf(req->msg.data, req->msg.data_len,
"OpenIPMI Request Message Data");
} }
/* /*
* setup and send message * setup and send message
*/ */
@ -211,38 +213,43 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
memset(&_req, 0, sizeof(struct ipmi_req)); memset(&_req, 0, sizeof(struct ipmi_req));
if (intf->target_addr != 0 && if (intf->target_addr != 0 &&
intf->target_addr != intf->my_addr) { intf->target_addr != intf->my_addr)
{
/* use IPMB address if needed */ /* use IPMB address if needed */
ipmb_addr.slave_addr = intf->target_addr; ipmb_addr.slave_addr = intf->target_addr;
ipmb_addr.lun = req->msg.lun; ipmb_addr.lun = req->msg.lun;
lprintf(LOG_DEBUG, "Sending request 0x%x to " lprintf(LOG_DEBUG,
"Sending request 0x%x to "
"IPMB target @ 0x%x:0x%x (from 0x%x)", "IPMB target @ 0x%x:0x%x (from 0x%x)",
req->msg.cmd, req->msg.cmd, intf->target_addr, intf->target_channel,
intf->target_addr,intf->target_channel, intf->my_addr); intf->my_addr);
if(intf->transit_addr != 0 && intf->transit_addr != intf->my_addr) { if (intf->transit_addr != 0 &&
intf->transit_addr != intf->my_addr)
{
uint8_t index = 0; uint8_t index = 0;
lprintf(LOG_DEBUG, "Encapsulating data sent to " lprintf(LOG_DEBUG,
"end target [0x%02x,0x%02x] using transit [0x%02x,0x%02x] from 0x%x ", "Encapsulating data sent to "
"end target [0x%02x,0x%02x] using "
"transit [0x%02x,0x%02x] from 0x%x ",
(0x40 | intf->target_channel), (0x40 | intf->target_channel),
intf->target_addr, intf->target_addr,
intf->transit_channel, intf->transit_channel,
intf->transit_addr, intf->transit_addr,
intf->my_addr intf->my_addr);
);
/* Convert Message to 'Send Message' */ /* Convert Message to 'Send Message' */
/* Supplied req : req , internal req : _req */ /* Supplied req : req , internal req : _req */
if (verbose > 4) { if (verbose > 4) {
fprintf(stderr, "Converting message:\n"); fprintf(stderr, "Converting message:\n");
fprintf(stderr, " netfn = 0x%x\n", req->msg.netfn ); fprintf(stderr, " netfn = 0x%x\n", req->msg.netfn);
fprintf(stderr, " cmd = 0x%x\n", req->msg.cmd); fprintf(stderr, " cmd = 0x%x\n", req->msg.cmd);
if (req->msg.data && req->msg.data_len) { if (req->msg.data && req->msg.data_len) {
fprintf(stderr, " data_len = %d\n", req->msg.data_len); fprintf(stderr, " data_len = %d\n", req->msg.data_len);
fprintf(stderr, " data = %s\n", fprintf(stderr, " data = %s\n",
buf2str(req->msg.data,req->msg.data_len)); buf2str(req->msg.data, req->msg.data_len));
} }
} }
@ -260,36 +267,36 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
memset(data, 0, data_len); memset(data, 0, data_len);
data[index++] = (0x40|intf->target_channel); data[index++] = (0x40 | intf->target_channel);
data[index++] = intf->target_addr; data[index++] = intf->target_addr;
data[index++] = ( req->msg.netfn << 2 ) | req->msg.lun ; data[index++] = (req->msg.netfn << 2) | req->msg.lun;
data[index++] = ipmi_csum(data+1, 2); data[index++] = ipmi_csum(data + 1, 2);
data[index++] = 0xFF; /* normally 0x20 , overwritten by IPMC */ data[index++] = 0xFF; /* normally 0x20 , overwritten by IPMC */
data[index++] = ( (0) << 2) | 0 ; /* FIXME */ data[index++] = ((0) << 2) | 0; /* FIXME */
data[index++] = req->msg.cmd; data[index++] = req->msg.cmd;
memcpy( (data+index) , req->msg.data, req->msg.data_len); memcpy((data + index), req->msg.data, req->msg.data_len);
index += req->msg.data_len; index += req->msg.data_len;
data[index++] = ipmi_csum( (data+4),(req->msg.data_len + 3) ); data[index++] = ipmi_csum((data + 4), (req->msg.data_len + 3));
if (verbose > 4) { if (verbose > 4) {
fprintf(stderr, "Encapsulated message:\n"); fprintf(stderr, "Encapsulated message:\n");
fprintf(stderr, " netfn = 0x%x\n", IPMI_NETFN_APP ); fprintf(stderr, " netfn = 0x%x\n", IPMI_NETFN_APP);
fprintf(stderr, " cmd = 0x%x\n", 0x34 ); fprintf(stderr, " cmd = 0x%x\n", 0x34);
if (data && data_len) { if (data && data_len) {
fprintf(stderr, " data_len = %d\n", data_len); fprintf(stderr, " data_len = %d\n", data_len);
fprintf(stderr, " data = %s\n", fprintf(stderr, " data = %s\n",
buf2str(data,data_len)); buf2str(data, data_len));
} }
} }
} }
_req.addr = (unsigned char *) &ipmb_addr; _req.addr = (unsigned char *)&ipmb_addr;
_req.addr_len = sizeof(ipmb_addr); _req.addr_len = sizeof(ipmb_addr);
} else { } else {
/* otherwise use system interface */ /* otherwise use system interface */
lprintf(LOG_DEBUG+2, "Sending request 0x%x to " lprintf(LOG_DEBUG + 2, "Sending request 0x%x to System Interface",
"System Interface", req->msg.cmd); req->msg.cmd);
bmc_addr.lun = req->msg.lun; bmc_addr.lun = req->msg.lun;
_req.addr = (unsigned char *) &bmc_addr; _req.addr = (unsigned char *)&bmc_addr;
_req.addr_len = sizeof(bmc_addr); _req.addr_len = sizeof(bmc_addr);
} }
@ -335,7 +342,7 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
read_timeout.tv_sec = IPMI_OPENIPMI_READ_TIMEOUT; read_timeout.tv_sec = IPMI_OPENIPMI_READ_TIMEOUT;
read_timeout.tv_usec = 0; read_timeout.tv_usec = 0;
do { do {
retval = select(intf->fd+1, &rset, NULL, NULL, &read_timeout); retval = select(intf->fd + 1, &rset, NULL, NULL, &read_timeout);
} while (retval < 0 && errno == EINTR); } while (retval < 0 && errno == EINTR);
if (retval < 0) { if (retval < 0) {
lperror(LOG_ERR, "I/O Error"); lperror(LOG_ERR, "I/O Error");
@ -361,7 +368,7 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
return NULL; return NULL;
} }
recv.addr = (unsigned char *) &addr; recv.addr = (unsigned char *)&addr;
recv.addr_len = sizeof(addr); recv.addr_len = sizeof(addr);
recv.msg.data = rsp.data; recv.msg.data = rsp.data;
recv.msg.data_len = sizeof(rsp.data); recv.msg.data_len = sizeof(rsp.data);
@ -392,29 +399,32 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
} }
} }
if(intf->transit_addr != 0 && intf->transit_addr != intf->my_addr) { if (intf->transit_addr != 0 && intf->transit_addr != intf->my_addr) {
/* ipmb_addr.transit_slave_addr = intf->transit_addr; */ /* ipmb_addr.transit_slave_addr = intf->transit_addr; */
lprintf(LOG_DEBUG, "Decapsulating data received from transit " lprintf(LOG_DEBUG,
"IPMB target @ 0x%x", intf->transit_addr); "Decapsulating data received from transit "
"IPMB target @ 0x%x",
intf->transit_addr);
/* comp code */ /* comp code */
/* Check data */ /* Check data */
if( recv.msg.data[0] == 0 ) { if (recv.msg.data[0] == 0) {
recv.msg.netfn = recv.msg.data[2] >> 2; recv.msg.netfn = recv.msg.data[2] >> 2;
recv.msg.cmd = recv.msg.data[6]; recv.msg.cmd = recv.msg.data[6];
recv.msg.data = memmove(recv.msg.data ,recv.msg.data+7 , recv.msg.data_len - 7); recv.msg.data = memmove(recv.msg.data, recv.msg.data + 7,
recv.msg.data_len -=8; recv.msg.data_len - 7);
recv.msg.data_len -= 8;
if (verbose > 4) { if (verbose > 4) {
fprintf(stderr, "Decapsulated message:\n"); fprintf(stderr, "Decapsulated message:\n");
fprintf(stderr, " netfn = 0x%x\n", recv.msg.netfn ); fprintf(stderr, " netfn = 0x%x\n", recv.msg.netfn);
fprintf(stderr, " cmd = 0x%x\n", recv.msg.cmd); fprintf(stderr, " cmd = 0x%x\n", recv.msg.cmd);
if (recv.msg.data && recv.msg.data_len) { if (recv.msg.data && recv.msg.data_len) {
fprintf(stderr, " data_len = %d\n", recv.msg.data_len); fprintf(stderr, " data_len = %d\n", recv.msg.data_len);
fprintf(stderr, " data = %s\n", fprintf(stderr, " data = %s\n",
buf2str(recv.msg.data,recv.msg.data_len)); buf2str(recv.msg.data, recv.msg.data_len));
} }
} }
} }
@ -438,7 +448,8 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
return &rsp; return &rsp;
} }
int ipmi_openipmi_setup(struct ipmi_intf * intf) int
ipmi_openipmi_setup(struct ipmi_intf *intf)
{ {
/* set default payload size */ /* set default payload size */
intf->max_request_data_size = IPMI_OPENIPMI_MAX_RQ_DATA_SIZE; intf->max_request_data_size = IPMI_OPENIPMI_MAX_RQ_DATA_SIZE;