Merge pull request #267 from embhorn/rel_v1.11.0

dgarske · web-flow · commit 0ba0929bfc0f · 2022-01-07T14:55:05.000-08:00
wolfMQTT Release v1.11.0 preparation
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,21 @@
-
 ## Release Notes
+### v1.11 (1/7/2022)
+* Return correct error code in SN_Client_Connect (PR #268)
+* Removing unsupported TLS and SNI options in sn-client (PR #266)
+* Fixes for multithreading with non-blocking (PR #252)
+* Doxygen work removing depreciated command and fixing other warnings (PR #264)
+* Fix overwriting TLS error in connect (PR #259)
+* Add GitHub Actions (PR #256 #260 #263)
+* Fix wm_Sem on Windows (PR #255 #261)
+* Fix scripts for host without mosquitto (PR #257 #265)
+* Trim whitespace and convert tab to spaces (PR #251)
+* Refactor of write length (PR #250)
+* Fixes for publish edge cases (PR #248)
+* Remove unused sub_id element, add support for local test broker (PR #249)
+* Fix to make sure MqttClient_DecodePacket called in all cases (PR #246)
+
+* Known bug with multithread and without nonblocking enabled in this release.
+
 ### v1.10 (11/2/2021)
 * Improve FALL_THROUGH macro logic for XC32. (PR #227)
 * Fix potential NULL printf in MqttSocket_Connect with verbose debug enabled. (PR #229)
diff --git a/README.md b/README.md
@@ -147,6 +147,7 @@ We setup an AWS IoT endpoint and testing device certificate for testing. The AWS
 
 ### Watson IoT Example
 This example enables the wolfMQTT client to connect to the IBM Watson Internet of Things (WIOT) Platform. The WIOT Platform has a limited test broker called "Quickstart" that allows non-secure connections to exercise the component. The example is located in `/examples/wiot/`. Works with MQTT v5 support enabled.
+**NOTE** The WIOT QuickStart broker is no longer available. The demo may still be useful for users of IBM Watson IOT.
 
 ### MQTT-SN Example
 The Sensor Network client implements the MQTT-SN protocol for low-bandwidth networks. There are several differences from MQTT, including the ability to use a two byte Topic ID instead the full topic during subscribe and publish. The SN client requires an MQTT-SN gateway. The gateway acts as an intermediary between the SN clients and the broker. This client was tested with the Eclipse Paho MQTT-SN Gateway, which connects by default to the public Eclipse broker, much like our wolfMQTT Client example. The address of the gateway must be configured as the host. The example is located in `/examples/sn-client/`.
@@ -226,7 +227,7 @@ wolfMQTT client library has been tested with the following brokers:
 The initially supported version with full specification support for all features and packets type such as:
 * QoS 0-2
 * Last Will and Testament (LWT)
-* Client examples for: AWS, Azure IoT, IBM Watson, Firmware update, non-blocking and generic.
+* Client examples for: AWS, Azure IoT, Firmware update, non-blocking and generic.
 
 ### MQTT v5.0 Specification Support
 
@@ -257,8 +258,6 @@ The v5 enabled wolfMQTT client was tested with the following MQTT v5 brokers:
 ** `./examples/mqttclient/mqttclient -h localhost`
 * HiveMQ Cloud
 ** `./examples/mqttclient/mqttclient -h 833f87e253304692bd2b911f0c18dba1.s1.eu.hivemq.cloud -t -S -u wolf1 -w NEZjcm7i8eRjFKF -p 8883`
-* Watson IoT Quickserver
-** `./examples/wiot/wiot`
 
 ### MQTT Sensor Network (MQTT-SN) Specification Support
 
diff --git a/configure.ac b/configure.ac
@@ -1,9 +1,9 @@
 # wolfmqtt
-# Copyright (C) 2021 wolfSSL Inc.
+# Copyright (C) 2022 wolfSSL Inc.
 # All right reserved.
 
-AC_COPYRIGHT([Copyright (C) 2014-2021 wolfSSL Inc.])
-AC_INIT([wolfmqtt],[1.10.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
+AC_COPYRIGHT([Copyright (C) 2014-2022 wolfSSL Inc.])
+AC_INIT([wolfmqtt],[1.11.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=9:1:0
+WOLFMQTT_LIBRARY_VERSION=10:0:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |
diff --git a/examples/aws/awsiot.c b/examples/aws/awsiot.c
@@ -1,6 +1,6 @@
 /* awsiot.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/aws/awsiot.h b/examples/aws/awsiot.h
@@ -1,6 +1,6 @@
 /* awsiot.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/azure/azureiothub.c b/examples/azure/azureiothub.c
@@ -1,6 +1,6 @@
 /* azureiothub.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/azure/azureiothub.h b/examples/azure/azureiothub.h
@@ -1,6 +1,6 @@
 /* azureiothub.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/firmware/fwclient.c b/examples/firmware/fwclient.c
@@ -1,6 +1,6 @@
 /* fwclient.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/firmware/fwclient.h b/examples/firmware/fwclient.h
@@ -1,6 +1,6 @@
 /* fwclient.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/firmware/fwpush.c b/examples/firmware/fwpush.c
@@ -1,6 +1,6 @@
 /* fwpush.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/firmware/fwpush.h b/examples/firmware/fwpush.h
@@ -1,6 +1,6 @@
 /* fwpush.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttclient/mqttclient.c b/examples/mqttclient/mqttclient.c
@@ -1,6 +1,6 @@
 /* mqttclient.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttclient/mqttclient.h b/examples/mqttclient/mqttclient.h
@@ -1,6 +1,6 @@
 /* mqttclient.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttexample.c b/examples/mqttexample.c
@@ -1,6 +1,6 @@
 /* mqttexample.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttexample.h b/examples/mqttexample.h
@@ -1,6 +1,6 @@
 /* mqttexample.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttnet.c b/examples/mqttnet.c
@@ -1,6 +1,6 @@
 /* mqttnet.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttnet.h b/examples/mqttnet.h
@@ -1,6 +1,6 @@
 /* mqttnet.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttsimple/mqttsimple.c b/examples/mqttsimple/mqttsimple.c
@@ -1,6 +1,6 @@
 /* mqttsimple.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttsimple/mqttsimple.h b/examples/mqttsimple/mqttsimple.h
@@ -1,6 +1,6 @@
 /* mqttsimple
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttuart.c b/examples/mqttuart.c
@@ -1,6 +1,6 @@
 /* mqttuart.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/multithread/multithread.c b/examples/multithread/multithread.c
@@ -1,6 +1,6 @@
 /* multithread.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/multithread/multithread.h b/examples/multithread/multithread.h
@@ -1,6 +1,6 @@
 /* multithread.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/nbclient/nbclient.c b/examples/nbclient/nbclient.c
@@ -1,6 +1,6 @@
 /* nbclient.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/nbclient/nbclient.h b/examples/nbclient/nbclient.h
@@ -1,6 +1,6 @@
 /* nbclient.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/sn-client/sn-client.c b/examples/sn-client/sn-client.c
@@ -1,6 +1,6 @@
 /* sn-client.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/sn-client/sn-client.h b/examples/sn-client/sn-client.h
@@ -1,6 +1,6 @@
 /* sn-client.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/sn-client/sn-client_qos-1.c b/examples/sn-client/sn-client_qos-1.c
@@ -1,6 +1,6 @@
 /* sn-client_qos-1.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/sn-client/sn-multithread.c b/examples/sn-client/sn-multithread.c
@@ -1,6 +1,6 @@
 /* sn-multithread.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/wiot/wiot.c b/examples/wiot/wiot.c
@@ -1,6 +1,6 @@
 /* wiot.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/wiot/wiot.h b/examples/wiot/wiot.h
@@ -1,6 +1,6 @@
 /* wiot.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/scripts/client.test b/scripts/client.test
@@ -22,8 +22,8 @@ do_cleanup() {
 
 def_args="-T -C 2000"
 
-# Wait 1 secs for other tests to conclude
-sleep 1
+# Wait 2 secs for other tests to conclude
+sleep 2
 
 # Check for mosquitto
 if command -v mosquitto
diff --git a/src/mqtt_client.c b/src/mqtt_client.c
@@ -1,6 +1,6 @@
 /* mqtt_client.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/src/mqtt_packet.c b/src/mqtt_packet.c
@@ -1,6 +1,6 @@
 /* mqtt_packet.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/src/mqtt_socket.c b/src/mqtt_socket.c
@@ -1,6 +1,6 @@
 /* mqtt_socket.c
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/mqtt_client.h b/wolfmqtt/mqtt_client.h
@@ -1,6 +1,6 @@
 /* mqtt_client.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/mqtt_packet.h b/wolfmqtt/mqtt_packet.h
@@ -1,6 +1,6 @@
 /* mqtt_packet.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/mqtt_socket.h b/wolfmqtt/mqtt_socket.h
@@ -1,6 +1,6 @@
 /* mqtt_socket.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/mqtt_types.h b/wolfmqtt/mqtt_types.h
@@ -1,6 +1,6 @@
 /* mqtt_types.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/options.h.in b/wolfmqtt/options.h.in
@@ -1,6 +1,6 @@
 /* options.h.in
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/version.h b/wolfmqtt/version.h
@@ -1,6 +1,6 @@
 /* version.h.in
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
@@ -34,8 +34,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFMQTT_VERSION_STRING "1.10.0"
-#define LIBWOLFMQTT_VERSION_HEX 0x01010000
+#define LIBWOLFMQTT_VERSION_STRING "1.11.0"
+#define LIBWOLFMQTT_VERSION_HEX 0x01011000
 
 #ifdef __cplusplus
 }
diff --git a/wolfmqtt/version.h.in b/wolfmqtt/version.h.in
@@ -1,6 +1,6 @@
 /* version.h.in
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/visibility.h b/wolfmqtt/visibility.h
@@ -1,6 +1,6 @@
 /* visibility.h
  *
- * Copyright (C) 2006-2021 wolfSSL Inc.
+ * Copyright (C) 2006-2022 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* awsiot.c`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2006-2021 wolfSSL Inc.`
	`3`	`+ * Copyright (C) 2006-2022 wolfSSL Inc.`
`4`	`4`	`*`
`5`	`5`	`* This file is part of wolfMQTT.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* awsiot.h`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2006-2021 wolfSSL Inc.`
	`3`	`+ * Copyright (C) 2006-2022 wolfSSL Inc.`
`4`	`4`	`*`
`5`	`5`	`* This file is part of wolfMQTT.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* azureiothub.c`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2006-2021 wolfSSL Inc.`
	`3`	`+ * Copyright (C) 2006-2022 wolfSSL Inc.`
`4`	`4`	`*`
`5`	`5`	`* This file is part of wolfMQTT.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* azureiothub.h`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2006-2021 wolfSSL Inc.`
	`3`	`+ * Copyright (C) 2006-2022 wolfSSL Inc.`
`4`	`4`	`*`
`5`	`5`	`* This file is part of wolfMQTT.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* fwclient.c`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2006-2021 wolfSSL Inc.`
	`3`	`+ * Copyright (C) 2006-2022 wolfSSL Inc.`
`4`	`4`	`*`
`5`	`5`	`* This file is part of wolfMQTT.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* fwclient.h`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2006-2021 wolfSSL Inc.`
	`3`	`+ * Copyright (C) 2006-2022 wolfSSL Inc.`
`4`	`4`	`*`
`5`	`5`	`* This file is part of wolfMQTT.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* fwpush.c`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2006-2021 wolfSSL Inc.`
	`3`	`+ * Copyright (C) 2006-2022 wolfSSL Inc.`
`4`	`4`	`*`
`5`	`5`	`* This file is part of wolfMQTT.`
`6`	`6`	`*`