summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
ad15fdb)
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>
static void client_on_description(struct afb_proto_ws *protows, struct readbuf *rb)
{
static void client_on_description(struct afb_proto_ws *protows, struct readbuf *rb)
{
struct client_describe *desc, **prv;
struct json_object *object;
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)
pthread_mutex_lock(&protows->mutex);
prv = &protows->describes;
while ((desc = *prv) && desc->descid != descid)
afb_proto_ws_unref(protows);
}
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)
{
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;
&& writebuf_object(&wb, descobj))
rc = proto_write(protows, &wb);
return rc;