Skip to content

Commit

Permalink
Merge pull request #316 from embhorn/rel_v1.15.0
Browse files Browse the repository at this point in the history
wolfMQTT Release v1.15.0 preparation
  • Loading branch information
dgarske authored Jan 3, 2023
2 parents 2501a7e + e87d645 commit fa958ff
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

cmake_minimum_required(VERSION 3.16)

project(wolfMQTT VERSION 1.14.1 LANGUAGES C)
project(wolfMQTT VERSION 1.15.0 LANGUAGES C)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

set(MQTT_SOURCES
Expand Down
6 changes: 6 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## Release Notes

### v1.15.0 (12/30/2022)
* Fix for --with-libwolfssl-prefix config option #312
* Call disconn CB with MQTTv5 reason code #314
* Add github CIFuzz action by @DavidKorczynski #315
* Fix SN disconnect with sleep should not use CB #294

### v1.14.1 (8/31/2022)
* Fix cmake builds #307
* Fix for Vcpkg on Windows not getting wolfssl/options.h included #305
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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.
**NOTE** The WIOT Platform will be disabled DEC2023. 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/`.
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# All right reserved.

AC_COPYRIGHT([Copyright (C) 2014-2022 wolfSSL Inc.])
AC_INIT([wolfmqtt],[1.14.1],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
AC_INIT([wolfmqtt],[1.15.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])

AC_PREREQ([2.63])
AC_CONFIG_AUX_DIR([build-aux])
Expand All @@ -23,7 +23,7 @@ AC_ARG_PROGRAM
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([src/config.h])

WOLFMQTT_LIBRARY_VERSION=13:1:0
WOLFMQTT_LIBRARY_VERSION=14:0:0
# | | |
# +------+ | +---+
# | | |
Expand Down
4 changes: 3 additions & 1 deletion src/mqtt_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@

#ifdef WOLFMQTT_NONBLOCK
/* need EWOULDBLOCK and EAGAIN */
#ifdef MICROCHIP_MPLAB_HARMONY
#if defined(MICROCHIP_MPLAB_HARMONY) && \
((__XC32_VERSION < 4000) || (__XC32_VERSION == 243739000))
/* xc32 versions >= v4.0 no longer have sys/errno.h */
#include <sys/errno.h>
#endif
#include <errno.h>
Expand Down
4 changes: 2 additions & 2 deletions wolfmqtt/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
extern "C" {
#endif

#define LIBWOLFMQTT_VERSION_STRING "1.14.1"
#define LIBWOLFMQTT_VERSION_HEX 0x01014001
#define LIBWOLFMQTT_VERSION_STRING "1.15.0"
#define LIBWOLFMQTT_VERSION_HEX 0x01015000

#ifdef __cplusplus
}
Expand Down

0 comments on commit fa958ff

Please sign in to comment.