1 files changed, 17 insertions, 24 deletions

diff --git a/src/plugins/serial/serial_terminal.c b/src/plugins/serial/serial_terminal.c
index cd33422..58bca17 100644
--- a/src/plugins/serial/serial_terminal.c
+++ b/src/plugins/serial/serial_terminal.c
@@ -29,11 +29,12 @@
  * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
  * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
-#define _GNU_SOURCE 1
 
 /* Serial Interface, Terminal Mode plugin. */
 
+#if defined HAVE_ALLOCA_H
 #include <alloca.h>
+#endif
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -77,7 +78,7 @@ struct ipmb_msg_hdr {
 	unsigned char rqSA;
 	unsigned char rqSeq;	/* RQ SEQ | RQ LUN */
 	unsigned char cmd;
-	unsigned char data[0];
+	unsigned char data[];
 };
 
 /*
@@ -99,7 +100,7 @@ struct ipmi_get_message_rp {
 	unsigned char rsSA;
 	unsigned char rqSeq;
 	unsigned char cmd;
-	unsigned char data[0];
+	unsigned char data[];
 };
 
 /*
@@ -148,7 +149,7 @@ ipmi_serial_term_open(struct ipmi_intf * intf)
 	struct termios ti;
 	unsigned int rate = 9600;
 	char *p;
-	int i;
+	size_t i;
 
 	if (!intf->devfile) {
 		lprintf(LOG_ERR, "Serial device is not specified");
@@ -187,12 +188,12 @@ ipmi_serial_term_open(struct ipmi_intf * intf)
 		return -1;
 	}
 
-	for (i = 0; i < sizeof(rates) / sizeof(rates[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(rates); i++) {
 		if (rates[i].baudrate == rate) {
 			break;
 		}
 	}
-	if (i >= sizeof(rates) / sizeof(rates[0])) {
+	if (i >= ARRAY_SIZE(rates)) {
 		lprintf(LOG_ERR, "Unsupported baud rate %i specified", rate);
 		return -1;
 	}
@@ -352,7 +353,7 @@ serial_flush(struct ipmi_intf * intf)
 /*
  *	Receive IPMI response from the device
  *	Len: buffer size
- *	Returns: -1 or response lenth on success
+ *	Returns: -1 or response length on success
  */
 static int
 recv_response(struct ipmi_intf * intf, unsigned char *data, int len)
@@ -371,8 +372,9 @@ recv_response(struct ipmi_intf * intf, unsigned char *data, int len)
 		}
 		p += rv;
 		resp_len += rv;
-		if (*(p - 2) == ']' && (*(p - 1) == '\n' || *(p - 1) == '\r')) {
-			*p = 0;
+		if (resp_len >= 2 && *(p - 2) == ']'
+			&& (*(p - 1) == '\n' || *(p - 1) == '\r')) {
+			*(p - 1) = 0; /* overwrite EOL */
 			break;
 		}
 	}
@@ -392,7 +394,7 @@ recv_response(struct ipmi_intf * intf, unsigned char *data, int len)
 	*pp = 0;
 
 	/* was it an error? */
-	if (strncmp(p, "ERR ", 4) == 0) {
+	if (!strcmp(p, "ERR ")) {
 		serial_write_line(intf, "\r\r\r\r");
 		sleep(1);
 		serial_flush(intf);
@@ -471,18 +473,7 @@ serial_term_build_msg(const struct ipmi_intf * intf,
 	struct serial_term_hdr * term_hdr = (struct serial_term_hdr *) msg;
 	struct ipmi_send_message_rq * outer_rq = NULL;
 	struct ipmi_send_message_rq * inner_rq = NULL;
-	int bridging_level;
-
-	/* acquire bridging level */
-	if (intf->target_addr && intf->target_addr != intf->my_addr) {
-		if (intf->transit_addr != 0) {
-			bridging_level = 2;
-		} else {
-			bridging_level = 1;
-		}
-	} else {
-		bridging_level = 0;
-	}
+	int bridging_level = ipmi_intf_get_bridging_level(intf);
 
 	/* check overall packet length */
 	if(req->msg.data_len + 3 + bridging_level * 8 > max_len) {
@@ -633,7 +624,7 @@ serial_term_send_msg(struct ipmi_intf * intf, uint8_t * msg, int msg_len)
 
 	/* body */
 	for (i = 0; i < msg_len; i++) {
-		buf += sprintf( buf, "%02x", msg[i]);
+		buf += sprintf((char*) buf, "%02x", msg[i]);
 	}
 
 	/* stop character */
@@ -712,11 +703,13 @@ serial_term_wait_response(struct ipmi_intf * intf,
 
 /*
  *	Get message from receive message queue
+ *
+ * Note: Kept max_len in case it's useful later.
  */
 static int
 serial_term_get_message(struct ipmi_intf * intf,
 		struct serial_term_request_ctx * req_ctx,
-		uint8_t * msg, size_t max_len)
+		uint8_t * msg, size_t __UNUSED__(max_len))
 {
 	uint8_t data[IPMI_SERIAL_MAX_RESPONSE];
 	struct serial_term_request_ctx tmp_ctx;