Release v1.0.4

.appveyor.yml

@@ -62,5 +62,5 @@ build_script:
 
 test_script:
     - echo ------------------------- Testing -------------------------
-    - ctest 
+    - ctest -V
 

client/include/cc_mqttsn_client/common.h

@@ -40,7 +40,7 @@ extern "C" {
 #define CC_MQTTSN_CLIENT_MINOR_VERSION 0U
 
 /// @brief Patch level of the library
-#define CC_MQTTSN_CLIENT_PATCH_VERSION 3U
+#define CC_MQTTSN_CLIENT_PATCH_VERSION 4U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_MQTTSN_CLIENT_MAKE_VERSION(major_, minor_, patch_) \

gateway/include/cc_mqttsn_gateway/version.h

@@ -17,7 +17,7 @@
 #define CC_MQTTSN_GW_MINOR_VERSION 0U
 
 /// @brief Patch level of the library
-#define CC_MQTTSN_GW_PATCH_VERSION 3U
+#define CC_MQTTSN_GW_PATCH_VERSION 4U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_MQTTSN_GW_MAKE_VERSION(major_, minor_, patch_) \

gateway/src/lib/session_op/PubSend.cpp

@@ -162,7 +162,10 @@ void PubSend::newSends()
     }
 
     if (st.m_pendingClientDisconnect) {
-        sendDisconnect();
+        if (!m_disconnectAlreadySent) {
+            sendDisconnect();
+            m_disconnectAlreadySent = true;
+        }
         return;
     }
 
@@ -249,6 +252,7 @@ void PubSend::doSend()
 
     if (m_currPub->m_qos == QoS_AtMostOnceDelivery) {
         m_currPub.reset();
+        checkSend();
         return;
     }
 

gateway/src/lib/session_op/PubSend.h

@@ -57,6 +57,7 @@ class PubSend : public SessionOp
     bool m_registered = false;
     bool m_acked = false;
     bool m_ping = false;
+    bool m_disconnectAlreadySent = false;
 };
 
 }  // namespace session_op

gateway/test/Session.th

@@ -8,6 +8,8 @@
 #include <list>
 #include <vector>
 #include <memory>
+#include <iomanip>
+#include <sstream>
 
 #include "comms/comms.h"
 #include "cc_mqttsn_gateway/Session.h"
@@ -82,6 +84,16 @@ private:
         bool m_retain = false;
     };
 
+    static std::string toString(const DataBuf& buf) 
+    {
+        std::stringstream stream;
+        for (auto ch : buf) {
+            stream << std::hex << std::setw(2) << std::setfill('0') << static_cast<unsigned>(ch) << ' ';
+        }
+
+        return stream.str();
+    }
+
     static SessionPtr allocSession(
         State& state,
         TestMsgHandler& handler,
@@ -1317,6 +1329,11 @@ private:
 
     static void verifyNoOtherEvent(State& state, TestMsgHandler& handler)
     {
+        if (!state.m_sentToClient.empty()) {
+            for (auto& data : state.m_sentToClient) {
+                TS_TRACE("Unverified data sent to client: " + toString(data));
+            }
+        }
         TS_ASSERT(state.m_sentToClient.empty());
         TS_ASSERT(state.m_sentToBroker.empty());
         TS_ASSERT(state.m_tickReq.empty());