From c84c9dceba7033b36fcd97c220e464801743e98a Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Fri, 10 Sep 2004 20:19:36 +0000 Subject: [PATCH] change BUF_SIZE to IPMI_BUF_SIZE --- ipmitool/include/ipmitool/ipmi.h | 6 +++--- ipmitool/src/plugins/lan/lan.c | 6 +++--- ipmitool/src/plugins/lanplus/lanplus.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ipmitool/include/ipmitool/ipmi.h b/ipmitool/include/ipmitool/ipmi.h index c415755..81dda21 100644 --- a/ipmitool/include/ipmitool/ipmi.h +++ b/ipmitool/include/ipmitool/ipmi.h @@ -43,7 +43,7 @@ #include #include -#define BUF_SIZE 1024 +#define IPMI_BUF_SIZE 1024 /* From table 13.16 of the IPMI v2 specification */ #define IPMI_PAYLOAD_TYPE_IPMI 0x00 @@ -115,7 +115,7 @@ struct ipmi_v2_payload { } rakp_4_message; struct { - unsigned char data[BUF_SIZE]; + unsigned char data[IPMI_BUF_SIZE]; unsigned short character_count; unsigned char packet_sequence_number; unsigned char acked_packet_number; @@ -148,7 +148,7 @@ struct ipmi_rq_entry { struct ipmi_rs { unsigned char ccode; - unsigned char data[BUF_SIZE]; + unsigned char data[IPMI_BUF_SIZE]; /* * Looks like this is the length of the entire packet, including the RMCP diff --git a/ipmitool/src/plugins/lan/lan.c b/ipmitool/src/plugins/lan/lan.c index 9389ee8..eef4a38 100644 --- a/ipmitool/src/plugins/lan/lan.c +++ b/ipmitool/src/plugins/lan/lan.c @@ -256,7 +256,7 @@ struct ipmi_rs * ipmi_lan_recv_packet(struct ipmi_intf * intf) } alarm(IPMI_LAN_TIMEOUT); - rc = recv(intf->fd, &rsp.data, BUF_SIZE, 0); + rc = recv(intf->fd, &rsp.data, IPMI_BUF_SIZE, 0); alarm(0); /* the first read may return ECONNREFUSED because the rmcp ping @@ -271,7 +271,7 @@ struct ipmi_rs * ipmi_lan_recv_packet(struct ipmi_intf * intf) */ if (rc < 0) { alarm(IPMI_LAN_TIMEOUT); - rc = recv(intf->fd, &rsp.data, BUF_SIZE, 0); + rc = recv(intf->fd, &rsp.data, IPMI_BUF_SIZE, 0); alarm(0); if (rc < 0) { perror("recv failed"); @@ -519,7 +519,7 @@ ipmi_lan_poll_recv(struct ipmi_intf * intf) if (rsp && rsp->data_len > x) { rsp->data_len -= x + 1; memmove(rsp->data, rsp->data + x, rsp->data_len); - memset(rsp->data + rsp->data_len, 0, BUF_SIZE - rsp->data_len); + memset(rsp->data + rsp->data_len, 0, IPMI_BUF_SIZE - rsp->data_len); } return rsp; diff --git a/ipmitool/src/plugins/lanplus/lanplus.c b/ipmitool/src/plugins/lanplus/lanplus.c index 5eb8b52..11e2af1 100644 --- a/ipmitool/src/plugins/lanplus/lanplus.c +++ b/ipmitool/src/plugins/lanplus/lanplus.c @@ -282,7 +282,7 @@ ipmi_lan_recv_packet(struct ipmi_intf * intf) } alarm(intf->session->timeout); - rc = recv(intf->fd, &rsp.data, BUF_SIZE, 0); + rc = recv(intf->fd, &rsp.data, IPMI_BUF_SIZE, 0); alarm(0); /* the first read may return ECONNREFUSED because the rmcp ping @@ -297,7 +297,7 @@ ipmi_lan_recv_packet(struct ipmi_intf * intf) */ if (rc < 0) { alarm(intf->session->timeout); - rc = recv(intf->fd, &rsp.data, BUF_SIZE, 0); + rc = recv(intf->fd, &rsp.data, IPMI_BUF_SIZE, 0); alarm(0); if (rc < 0) { perror("recv failed");