deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

intf: Refactoring. Remove unused sendrsp()

Browse Source 
The sendrsp() callback is never ever called from anywhere.
Remove it from interface structure.
This commit is contained in:
Alexander Amelkin 2018-07-27 17:22:31 +03:00
parent 3aade24297
commit 72b4b25b05
No known key found for this signature in database
GPG Key ID: E893587B5B74178D
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ipmitool/ipmi_intf.h
View File

@ -201,7 +201,6 @@ struct ipmi_intf {
int (*open)(struct ipmi_intf * intf); int (*open)(struct ipmi_intf * intf);
void (*close)(struct ipmi_intf * intf); void (*close)(struct ipmi_intf * intf);
struct ipmi_rs *(*sendrecv)(struct ipmi_intf * intf, struct ipmi_rq * req); struct ipmi_rs *(*sendrecv)(struct ipmi_intf * intf, struct ipmi_rq * req);
int (*sendrsp)(struct ipmi_intf * intf, struct ipmi_rs * rsp);
struct ipmi_rs *(*recv_sol)(struct ipmi_intf * intf); struct ipmi_rs *(*recv_sol)(struct ipmi_intf * intf);
struct ipmi_rs *(*send_sol)(struct ipmi_intf * intf, struct ipmi_v2_payload * payload); struct ipmi_rs *(*send_sol)(struct ipmi_intf * intf, struct ipmi_v2_payload * payload);
int (*keepalive)(struct ipmi_intf * intf); int (*keepalive)(struct ipmi_intf * intf);

38
src/plugins/lan/lan.c
View File

@ -94,7 +94,6 @@ static struct ipmi_rs * ipmi_lan_recv_sol(struct ipmi_intf * intf);
static struct ipmi_rs * ipmi_lan_send_sol(struct ipmi_intf * intf, static struct ipmi_rs * ipmi_lan_send_sol(struct ipmi_intf * intf,
struct ipmi_v2_payload * payload); struct ipmi_v2_payload * payload);
static struct ipmi_rs * ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req); static struct ipmi_rs * ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req);
static int ipmi_lan_send_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp);
static int ipmi_lan_open(struct ipmi_intf * intf); static int ipmi_lan_open(struct ipmi_intf * intf);
static void ipmi_lan_close(struct ipmi_intf * intf); static void ipmi_lan_close(struct ipmi_intf * intf);
static int ipmi_lan_ping(struct ipmi_intf * intf); static int ipmi_lan_ping(struct ipmi_intf * intf);
@ -108,7 +107,6 @@ struct ipmi_intf ipmi_lan_intf = {
.open = ipmi_lan_open, .open = ipmi_lan_open,
.close = ipmi_lan_close, .close = ipmi_lan_close,
.sendrecv = ipmi_lan_send_cmd, .sendrecv = ipmi_lan_send_cmd,
.sendrsp = ipmi_lan_send_rsp,
.recv_sol = ipmi_lan_recv_sol, .recv_sol = ipmi_lan_recv_sol,
.send_sol = ipmi_lan_send_sol, .send_sol = ipmi_lan_send_sol,
.keepalive = ipmi_lan_keepalive, .keepalive = ipmi_lan_keepalive,
@ -1081,42 +1079,6 @@ ipmi_lan_build_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp, int * llen)
return msg; return msg;
} }
static int
ipmi_lan_send_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp)
{
uint8_t * msg;
int len = 0;
int rv;
msg = ipmi_lan_build_rsp(intf, rsp, &len);
if (len <= 0 || msg == NULL) {
lprintf(LOG_ERR, "Invalid response packet");
if (msg != NULL) {
free(msg);
msg = NULL;
}
return -1;
}
rv = sendto(intf->fd, msg, len, 0,
(struct sockaddr *)&intf->session->addr,
intf->session->addrlen);
if (rv < 0) {
lprintf(LOG_ERR, "Packet send failed");
if (msg != NULL) {
free(msg);
msg = NULL;
}
return -1;
}
if (msg != NULL) {
free(msg);
msg = NULL;
}
return 0;
}
/* /*
* IPMI SOL Payload Format * IPMI SOL Payload Format
* +--------------------+ * +--------------------+