Parse multi-messages read

src/at.c

@@ -139,6 +139,10 @@ char *at_parse(const char *str, struct bt_at *at) {
 			command[0] = command[sizeof(at->command)] = '\0';
 		}
 
+		/* consume <LF> from the end of the response */
+		if (feed[1] == '\n')
+			feed++;
+
 	}
 
 	/* In the BT specification, all AT commands are in uppercase letters.

src/io.c

@@ -33,9 +33,7 @@
 
 #include "a2dp-codecs.h"
 #include "a2dp-rtp.h"
-#include "at.h"
 #include "bluealsa.h"
-#include "hfp.h"
 #include "transport.h"
 #include "utils.h"
 #include "shared/log.h"

src/rfcomm.c

@@ -357,6 +357,7 @@ void *rfcomm_thread(void *arg) {
 		rfcomm_callback *callback;
 		struct bt_at at;
 		char buffer[256];
+		ssize_t len;
 
 		if (t->rfcomm.hfp_state != HFP_CONNECTED) {
 
@@ -467,7 +468,7 @@ void *rfcomm_thread(void *arg) {
 			continue;
 		}
 
-		if (read(pfds[1].fd, buffer, sizeof(buffer)) == -1) {
+		if ((len = read(pfds[1].fd, buffer, sizeof(buffer))) == -1) {
 			switch (errno) {
 			case ECONNABORTED:
 			case ECONNRESET:
@@ -482,9 +483,16 @@ void *rfcomm_thread(void *arg) {
 			}
 		}
 
+		/* In case of reading more than one message from the RFCOMM, we have to
+		 * parse all of them before we can read from the socket once more. */
+		buffer[len] = '\0';
+		char *msg = buffer;
+		char *next;
+
+parse:
 		/* parse AT message received from the RFCOMM */
-		if (at_parse(buffer, &at) == NULL) {
-			warn("Invalid AT message: %s", buffer);
+		if ((next = at_parse(msg, &at)) == NULL) {
+			warn("Invalid AT message: %s", msg);
 			continue;
 		}
 
@@ -496,6 +504,11 @@ void *rfcomm_thread(void *arg) {
 				rfcomm_write_at_msg(pfds[1].fd, AT_TYPE_RESP, NULL, "ERROR");
 		}
 
+		if (next[0] != '\0') {
+			msg = next;
+			goto parse;
+		}
+
 	}
 
 fail:

test/test-at.c

@@ -73,7 +73,7 @@ int main(void) {
 
 	/* concatenated commands */
 	const char *cmd = "\r\nOK\r\n\r\n+COPS:1\r\n";
-	assert(at_parse(cmd, &at) == &cmd[5]);
+	assert(at_parse(cmd, &at) == &cmd[6]);
 	assert(at.type == AT_TYPE_RESP);
 	assert(strcmp(at.command, "") == 0);
 	assert(strcmp(at.value, "OK") == 0);