Skip to content

Commit 3da1a0f

Browse files
authored
Merge pull request #265 from eclipse-zenoh/encoding-fixes
fix misencoding of query body
2 parents 5fff227 + 5a90c01 commit 3da1a0f

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/protocol/codec/message.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ int8_t _z_query_encode(_z_wbuf_t *wbf, const _z_msg_query_t *msg) {
401401
_Z_RETURN_IF_ERR(_z_uint8_encode(wbf, extheader));
402402
_Z_RETURN_IF_ERR(_z_zint_encode(wbf, _z_zint_len(msg->_ext_value.encoding.prefix) +
403403
_z_bytes_encode_len(&msg->_ext_value.encoding.suffix) +
404-
_z_bytes_encode_len(&msg->_ext_value.payload)));
404+
msg->_ext_value.payload.len));
405405
_Z_RETURN_IF_ERR(_z_encoding_prefix_encode(wbf, msg->_ext_value.encoding.prefix));
406406
_Z_RETURN_IF_ERR(_z_bytes_encode(wbf, &msg->_ext_value.encoding.suffix));
407407
_Z_RETURN_IF_ERR(_z_bytes_val_encode(wbf, &msg->_ext_value.payload));

tests/z_msgcodec_test.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@ _z_bytes_t gen_bytes(size_t len) {
184184
if (len == 0) return arr;
185185

186186
arr.start = (uint8_t *)z_malloc(sizeof(uint8_t) * len);
187-
for (_z_zint_t i = 0; i < len; i++) ((uint8_t *)arr.start)[i] = gen_uint8();
187+
for (_z_zint_t i = 0; i < len; i++) {
188+
((uint8_t *)arr.start)[i] = gen_uint8() & 0b01111111;
189+
}
188190

189191
return arr;
190192
}

zenohpico.pc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
prefix=/var/empty/local
1+
prefix=/usr/local
22

33
Name: zenohpico
44
Description:
55
URL:
6-
Version: 0.11.20231017dev
6+
Version: 0.11.20231019dev
77
Cflags: -I${prefix}/include
8-
Libs: -L${prefix}/lib64 -lzenohpico
8+
Libs: -L${prefix}/lib -lzenohpico

0 commit comments

Comments
 (0)