From a20d09c0493bd3239f732aa3a9769f9c2db3d329 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 Aug 2020 19:33:24 +1000
Subject: [PATCH] libeis: use the shared next_message helper

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/libeis-client.c |  8 ++++----
 src/libeis-proto.c  | 24 +++++-------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/libeis-client.c b/src/libeis-client.c
index 248a90b..770a2a1 100644
--- a/src/libeis-client.c
+++ b/src/libeis-client.c
@@ -393,21 +393,21 @@ client_dispatch(struct source *source, void *userdata)
 
 	size_t idx = 0;
 	while (rc == 0) {
-		_cleanup_message_free_ struct message *msg = NULL;
-
 		const char *data = iobuf_data(buf) + idx;
 		size_t len = iobuf_len(buf) - idx;
+		size_t consumed = 0;
 
 		if (len == 0)
 			break;
 
-		msg = eisproto_parse_message(data, &len);
+		_cleanup_message_ struct message *msg =
+			eis_proto_parse_message(data, len, &consumed);
 		if (!msg) {
 			rc = -EBADMSG;
 			goto error;
 		}
 
-		idx += len;
+		idx += consumed;
 
 		switch (client->state) {
 			case EIS_CLIENT_STATE_NEW:
diff --git a/src/libeis-proto.c b/src/libeis-proto.c
index f34730c..d2e52b0 100644
--- a/src/libeis-proto.c
+++ b/src/libeis-proto.c
@@ -32,6 +32,7 @@
 
 #include "proto/ei.pb-c.h"
 #include "libeis-proto.h"
+#include "brei-shared.h"
 
 void
 message_free(struct message *msg)
@@ -146,32 +147,17 @@ eis_proto_send_device_removed(struct eis_client *client, struct eis_device *devi
 struct message *
 eis_proto_parse_message(const char *data, size_t len, size_t *consumed)
 {
-	/* Every message is prefixed by a fixed-length Frame message which
-	 * contains the length of the next message. Parse that one first,
-	 * then the real message */
-	static size_t framelen = 0;
-	if (framelen == 0) {
-		Frame f = FRAME__INIT;
-		f.length = 0xffff;
-		framelen = frame__get_packed_size(&f);
-		assert(framelen >= 5);
-	}
-	Frame *frame = frame__unpack(NULL, framelen, (const unsigned char *)data);
-	if (!frame)
-		return NULL;
+	size_t headerbytes = 0;
+	size_t msglen = 0;
+	const unsigned char *msgdata = brei_next_message(data, &msglen, &headerbytes);
 
-	size_t msglen = frame->length;
-	frame__free_unpacked(frame, NULL);
-
-
-	const unsigned char *msgdata = (const unsigned char *)data + framelen;
 	_cleanup_(message_freep) struct message *msg = xalloc(sizeof(*msg));
 	ClientMessage *proto = client_message__unpack(NULL, msglen, msgdata);
 	if (!proto) {
 		return NULL;
 	}
 
-	*len = framelen + msglen;
+	*consumed = headerbytes + msglen;
 
 	bool success = true;
 	switch (proto->msg_case) {