Merge pull request #226 from embhorn/rel_v1.9

wolfMQTT Release v1.9 preparation
wolfSSL · Jul 16, 2021 · 74c09f7 · 74c09f7
2 parents 5c8c61c + 721c185
commit 74c09f7
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 12 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,14 @@
 
 ## Release Notes
+### v1.9 (07/16/2021)
+* Fixes for Sensor Network client (PR #204, 214, 219)
+* Fixes for non-blocking (PR #205)
+* Fixes for multithread (PR #207, 209, 211, 218)
+* Fix for MQTTv5 publish response handling (PR #224, 220)
+* Fix subscribe return code list (PR #210)
+* Fix switch statement fallthrough on other toolchains (PR #225)
+* Add HiveMQ Cloud capability with SNI feature (PR #222)
+* Add ability to publish files from example client, fix chunked publish (PR# 223)
 
 ### v1.8 (02/19/2021)
 * Fixes for non-blocking in WIN32 and large payload (PR #202)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # wolfMQTT
 
-This is an implementation of the MQTT Client written in C for embedded use, which supports SSL/TLS via the wolfSSL library. This library was built from the ground up to be multi-platform, space conscience and extensible. Integrates with wolfSSL to provide TLS support.
+This is an implementation of the MQTT Client written in C for embedded use, which supports SSL/TLS via the wolfSSL library. This library was built from the ground up to be multi-platform, space conscious and extensible. Integrates with wolfSSL to provide TLS support.
 
 
 ## Building
@@ -13,7 +13,7 @@ This is an implementation of the MQTT Client written in C for embedded use, whic
 4. `sudo make install`
 
 Notes:
-* If `wolfssl` was recently installed run `sudo ldconfig` to update the linker cache.
+* If `wolfssl` was recently installed, run `sudo ldconfig` to update the linker cache.
 * Debug messages can be enabled using `--enable-debug` or `--enable-debug=verbose` (for extra logging).
 * For a list of build options run `./configure --help`.
 * The build options are generated in a file here: `wolfmqtt/options.h`.

diff --git a/configure.ac b/configure.ac
@@ -1,9 +1,9 @@
 # wolfmqtt
-# Copyright (C) 2020 wolfSSL Inc.
+# Copyright (C) 2021 wolfSSL Inc.
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2021 wolfSSL Inc.])
-AC_INIT([wolfmqtt],[1.8.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
+AC_INIT([wolfmqtt],[1.9.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
 
 AC_PREREQ([2.63])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -23,7 +23,7 @@ AC_ARG_PROGRAM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/config.h])
 
-WOLFMQTT_LIBRARY_VERSION=8:0:0
+WOLFMQTT_LIBRARY_VERSION=9:0:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |

diff --git a/src/mqtt_client.c b/src/mqtt_client.c
@@ -27,7 +27,6 @@
 #include "wolfmqtt/mqtt_client.h"
 
 /* Options */
-//#define WOLFMQTT_DEBUG_CLIENT
 #ifdef WOLFMQTT_NO_STDIO
     #undef WOLFMQTT_DEBUG_CLIENT
 #endif
@@ -2613,6 +2612,8 @@ static int SN_Client_HandlePacket(MqttClient* client, SN_MsgType packet_type,
         }
     } /* switch (packet_type) */
 
+    (void)packet_id;
+
     return rc;
 }
 

diff --git a/src/mqtt_packet.c b/src/mqtt_packet.c
@@ -1219,7 +1219,10 @@ int MqttEncode_Subscribe(byte *tx_buf, int tx_buf_len,
     for (i = 0; i < subscribe->topic_count; i++) {
         topic = &subscribe->topics[i];
         tx_payload += MqttEncode_String(tx_payload, topic->topic_filter);
-        *tx_payload = topic->qos;
+        /* Sanity check for compilers */
+        if (tx_payload != NULL) {
+            *tx_payload = topic->qos;
+        }
         tx_payload++;
     }
 

diff --git a/src/mqtt_socket.c b/src/mqtt_socket.c
@@ -36,7 +36,6 @@
 #include "wolfmqtt/mqtt_socket.h"
 
 /* Options */
-//#define WOLFMQTT_DEBUG_SOCKET
 #ifdef WOLFMQTT_NO_STDIO
     #undef WOLFMQTT_DEBUG_SOCKET
 #endif

diff --git a/wolfmqtt/mqtt_client.h b/wolfmqtt/mqtt_client.h
@@ -50,7 +50,7 @@ struct _MqttClient;
  *  \discussion If the message payload is larger than the maximum RX buffer
     then this callback is called multiple times.
     If msg_new = 1 its a new message.
-    The topc_name and topic_name length are only valid when msg_new = 1.
+    The topic_name and topic_name length are only valid when msg_new = 1.
     If msg_new = 0 then we are receiving additional payload.
     Each callback populates the payload in MqttMessage.buffer.
     The MqttMessage.buffer_len is the size of the buffer payload.

diff --git a/wolfmqtt/options.h.in b/wolfmqtt/options.h.in
@@ -1,6 +1,6 @@
 /* options.h.in
  *
- * Copyright (C) 2006-2020 wolfSSL Inc.
+ * Copyright (C) 2006-2021 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/wolfmqtt/version.h b/wolfmqtt/version.h
@@ -34,8 +34,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFMQTT_VERSION_STRING "1.8.0"
-#define LIBWOLFMQTT_VERSION_HEX 0x01008000
+#define LIBWOLFMQTT_VERSION_STRING "1.9.0"
+#define LIBWOLFMQTT_VERSION_HEX 0x01009000
 
 #ifdef __cplusplus
 }