From: Jose Bollo <jose.bollo@iot.bzh>
Date: Mon, 2 Mar 2020 13:02:47 +0000 (+0100)
Subject: Fix a tiny issue in the protocol
X-Git-Tag: 9.99.1~3
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-binder.git;a=commitdiff_plain;h=26b09b0df148d1018681ebe5772d3ec1cbd51526

Fix a tiny issue in the protocol

The id sent was 16 bits in one case and 32 bits in the other

Bug-AGL: SPEC-3220

Change-Id: If38c99b2d903b6851ff4682e1f8d771aec7ddcee
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
---

diff --git a/src/afb-proto-ws.c b/src/afb-proto-ws.c
index 0e102308..3365d60e 100644
--- a/src/afb-proto-ws.c
+++ b/src/afb-proto-ws.c
@@ -670,11 +670,11 @@ static void client_on_reply(struct afb_proto_ws *protows, struct readbuf *rb)
 
 static void client_on_description(struct afb_proto_ws *protows, struct readbuf *rb)
 {
-	uint32_t descid;
+	uint16_t descid;
 	struct client_describe *desc, **prv;
 	struct json_object *object;
 
-	if (readbuf_uint32(rb, &descid)) {
+	if (readbuf_uint16(rb, &descid)) {
 		pthread_mutex_lock(&protows->mutex);
 		prv = &protows->describes;
 		while ((desc = *prv) && desc->descid != descid)
@@ -970,13 +970,13 @@ overflow:
 	afb_proto_ws_unref(protows);
 }
 
-static int server_send_description(struct afb_proto_ws *protows, uint32_t descid, struct json_object *descobj)
+static int server_send_description(struct afb_proto_ws *protows, uint16_t descid, struct json_object *descobj)
 {
 	int rc = -1;
 	struct writebuf wb = { .iovcount = 0, .bufcount = 0 };
 
 	if (writebuf_char(&wb, CHAR_FOR_DESCRIPTION)
-	 && writebuf_uint32(&wb, descid)
+	 && writebuf_uint16(&wb, descid)
 	 && writebuf_object(&wb, descobj))
 		rc = proto_write(protows, &wb);
 	return rc;