From 72b4b25b05e073cf136db2bc9bb26b0952f8801c Mon Sep 17 00:00:00 2001 From: Alexander Amelkin Date: Fri, 27 Jul 2018 17:22:31 +0300 Subject: [PATCH] intf: Refactoring. Remove unused sendrsp() The sendrsp() callback is never ever called from anywhere. Remove it from interface structure. --- include/ipmitool/ipmi_intf.h | 1 - src/plugins/lan/lan.c | 38 ------------------------------------ 2 files changed, 39 deletions(-) diff --git a/include/ipmitool/ipmi_intf.h b/include/ipmitool/ipmi_intf.h index 982f645..ffe8054 100644 --- a/include/ipmitool/ipmi_intf.h +++ b/include/ipmitool/ipmi_intf.h @@ -201,7 +201,6 @@ struct ipmi_intf { int (*open)(struct ipmi_intf * intf); void (*close)(struct ipmi_intf * intf); 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 *(*send_sol)(struct ipmi_intf * intf, struct ipmi_v2_payload * payload); int (*keepalive)(struct ipmi_intf * intf); diff --git a/src/plugins/lan/lan.c b/src/plugins/lan/lan.c index 6acde16..fd7d616 100644 --- a/src/plugins/lan/lan.c +++ b/src/plugins/lan/lan.c @@ -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, struct ipmi_v2_payload * payload); 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 void ipmi_lan_close(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, .close = ipmi_lan_close, .sendrecv = ipmi_lan_send_cmd, - .sendrsp = ipmi_lan_send_rsp, .recv_sol = ipmi_lan_recv_sol, .send_sol = ipmi_lan_send_sol, .keepalive = ipmi_lan_keepalive, @@ -1081,42 +1079,6 @@ ipmi_lan_build_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp, int * llen) 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 * +--------------------+