From bd245f93bc841135b3c2e7ada03e3c34b4ce3223 Mon Sep 17 00:00:00 2001
From: OlivierHecart <olivier.hecart@adlinktech.com>
Date: Mon, 11 Sep 2023 16:40:38 +0200
Subject: [PATCH] Fix codec bugs (#244)

* Fix codec bugs

* Ignore response final extensions

* Make _z_n_qos_make macro even safer
---
 include/zenoh-pico/protocol/definitions/network.h | 2 +-
 src/protocol/codec/network.c                      | 9 +++++++--
 zenohpico.pc                                      | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/zenoh-pico/protocol/definitions/network.h b/include/zenoh-pico/protocol/definitions/network.h
index e439b276a..69226b6e0 100644
--- a/include/zenoh-pico/protocol/definitions/network.h
+++ b/include/zenoh-pico/protocol/definitions/network.h
@@ -63,7 +63,7 @@ typedef struct {
 } _z_n_qos_t;
 
 #define _z_n_qos_make(express, nodrop, priority) \
-    (_z_n_qos_t) { ._val = ((express << 4) | (nodrop << 3) | priority) }
+    (_z_n_qos_t) { ._val = (((express) << 4) | ((nodrop) << 3) | (priority)) }
 #define _Z_N_QOS_DEFAULT _z_n_qos_make(0, 0, 5)
 
 // RESPONSE FINAL message flags:
diff --git a/src/protocol/codec/network.c b/src/protocol/codec/network.c
index 857e391aa..28abb51d1 100644
--- a/src/protocol/codec/network.c
+++ b/src/protocol/codec/network.c
@@ -39,17 +39,18 @@
 int8_t _z_push_encode(_z_wbuf_t *wbf, const _z_n_msg_push_t *msg) {
     uint8_t header = _Z_MID_N_PUSH | (_z_keyexpr_is_local(&msg->_key) ? _Z_FLAG_N_REQUEST_M : 0);
     _Bool has_suffix = _z_keyexpr_has_suffix(msg->_key);
+    _Bool has_qos_ext = msg->_qos._val != _Z_N_QOS_DEFAULT._val;
     _Bool has_timestamp_ext = _z_timestamp_check(&msg->_timestamp);
     if (has_suffix) {
         header |= _Z_FLAG_N_REQUEST_N;
     }
-    if (has_timestamp_ext) {
+    if (has_qos_ext || has_timestamp_ext) {
         header |= _Z_FLAG_N_Z;
     }
     _Z_RETURN_IF_ERR(_z_uint8_encode(wbf, header));
     _Z_RETURN_IF_ERR(_z_keyexpr_encode(wbf, has_suffix, &msg->_key));
 
-    if (msg->_qos._val != _Z_N_QOS_DEFAULT._val) {
+    if (has_qos_ext) {
         _Z_RETURN_IF_ERR(_z_uint8_encode(wbf, _Z_MSG_EXT_ENC_ZINT | 0x01 | (has_timestamp_ext << 7)));
         _Z_RETURN_IF_ERR(_z_uint8_encode(wbf, msg->_qos._val));
     }
@@ -411,12 +412,16 @@ int8_t _z_response_final_encode(_z_wbuf_t *wbf, const _z_n_msg_response_final_t
 
     return ret;
 }
+
 int8_t _z_response_final_decode(_z_n_msg_response_final_t *msg, _z_zbuf_t *zbf, uint8_t header) {
     (void)(header);
 
     *msg = (_z_n_msg_response_final_t){0};
     int8_t ret = _Z_RES_OK;
     ret |= _z_zint_decode(&msg->_request_id, zbf);
+    if (_Z_HAS_FLAG(header, _Z_FLAG_Z_Z)) {
+        _Z_RETURN_IF_ERR(_z_msg_ext_skip_non_mandatories(zbf, 0x1a));
+    }
     return ret;
 }
 
diff --git a/zenohpico.pc b/zenohpico.pc
index 6b54a5398..5617384c4 100644
--- a/zenohpico.pc
+++ b/zenohpico.pc
@@ -3,6 +3,6 @@ prefix=/usr/local
 Name: zenohpico
 Description: 
 URL: 
-Version: 0.10.20230906dev
+Version: 0.10.20230911dev
 Cflags: -I${prefix}/
 Libs: -L${prefix}/ -lzenohpico