Release prep for v1.2 release (#97)

* Release prep for v1.2 release. Fixes for some minor build warnings. Fix to ensure all ./configure options populate into `wolmqtt/options.h`. Fix for sn-client to build correctly without WOLMQTT_SN defined. Added VS project for sn-client. Added new Visual Studio settings file at `wolfmqtt/vs_settings.h`. * Remove execute bit on code files.
wolfSSL · Nov 7, 2018 · 14b1d77 · 14b1d77
1 parent 3aba67e
commit 14b1d77
Show file tree

Hide file tree

Showing 36 changed files with 433 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ This is an implementation of the MQTT Client written in C for embedded use, whic
 1. `./autogen.sh` (if cloned from GitHub)
 2. `./configure` (to see a list of build options use `./configure --help`)
 3. `make`
+4. `sudo make install`
 
 If `wolfssl` was recently installed run `sudo ldconfig` to update the linker cache.
 
@@ -29,7 +30,8 @@ For building wolfMQTT with TLS support in Visual Studio:
 6. Open the `<wolfmqtt-root>/wolfmqtt.sln` solution.
 7. Make sure you have the same architecture (`x86` or `x64` selected) as used in wolfSSL above.
 8. By default the include path for the wolfssl headers is `./../wolfssl/`. If your wolfssl root location is different you can go into the project settings and adjust this in `C/C++` -> `General` -> `Additional Include Directories`.
-9. Build the wolfMQTT solution.
+9. Configure your Visual Studio build settings using `wolfmqtt/vs_settings.h`.
+10. Build the wolfMQTT solution.
 
 ### Arduino
 
@@ -120,10 +122,21 @@ 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. 
 
-### Mqtt-SN Example
+### 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/`.
 
-## v5.0 Specification Support
+
+## Specification Support
+
+### MQTT v3.1.1 Specification Support
+
+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.
+
+### MQTT v5.0 Specification Support
+
 The wolfMQTT client supports connecting to v5 enabled brokers when configured with the `--enable-mqtt5` option. Handling properties received from the server is accomplished via a callback when the `--enable-propcb` option is set. The following v5.0 specification features are supported by the wolfMQTT client:
 * AUTH packet
 * User properties
@@ -149,7 +162,8 @@ The v5 enabled wolfMQTT client was tested with the following MQTT v5 brokers:
 * Watson IoT Quickserver
 ** `./examples/wiot/wiot`
 
-## Sensor Network Specification Support
+### MQTT Sensor Network (MQTT-SN) Specification Support
+
 The wolfMQTT SN Client implementation is based on the OASIS MQTT-SN v1.2 specification. The SN API is configured with the `--enable-sn` option. There is a separate API for the sensor network API, which all begin with the "SN_" prefix. The wolfMQTT SN Client operates over UDP, which is distinct from the wolfMQTT clients that use TCP. The following features are supported by the wolfMQTT SN Client:
 * Register
 * Will topic and message set up 
@@ -163,8 +177,21 @@ Unsupported features:
 
 The SN client was tested using the Eclipse Paho MQTT-SN Gateway (https://github.com/eclipse/paho.mqtt-sn.embedded-c) running locally and on a separate network node. Instructions for building and running the gateway are in the project README.
 
+
 ## Release Notes
 
+### v1.2 (11/07/18)
+
+* Added MQTT Sensor Network (SN) client support (`--enable-sn` or `WOLFMQTT_SN`). (PR #96)
+* Added MQTT v5.0 support with (`--enable-mqtt5` or `WOLFMQTT_V5`). (PR #87)
+* Added property callback support (MQTT v5.0 only). Enabled with `--enable-propcb` or `WOLFMQTT_PROPERTY_CB`). (PR #87)
+* Fix for Harmony NetConnect function incorrectly checking `EWOULDBLOCK`. Fixes issue #88. (PR #89)
+* Fix to reset the TLS ctx and ssl pointers when they have been free'd. (PR #85)
+* Add way to pass custom context to the wolfMQTT TLS verify callback example `mqtt_tls_verify_cb`. PR #94)
+* Create nonblocking mqttclient example `./examples/nbclient/nbclient`. (PR #93)
+* Add support for publishing in smaller chunks using new API `MqttClient_Publish_ex`. (PR #92)
+* Added simplified Microchip Harmony wolfMQTT network callback example. (PR #83)
+
 ### v1.1 (06/21/18)
 * Fixed case when `use_tls` was requested but TLS feature not compiled in. (PR #57)
 * Fixed non-blocking issue that caused out of buffer error if not all of packet were received. (PR #65)

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2018 wolfSSL Inc.])
-AC_INIT([wolfmqtt],[1.1.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
+AC_INIT([wolfmqtt],[1.2.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=3:0:0
+WOLFMQTT_LIBRARY_VERSION=4:0:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |
@@ -190,7 +190,7 @@ AC_ARG_ENABLE([sn],
 
 if test "x$ENABLED_SN" = "xyes"
 then
-    AM_CPPFLAGS="$AM_CPPFLAGS -DWOLFMQTT_SN"
+    AM_CFLAGS="$AM_CFLAGS -DWOLFMQTT_SN"
 fi
 
 AM_CONDITIONAL([BUILD_SN], [test "x$ENABLED_SN" = "xyes"])
@@ -204,7 +204,7 @@ AC_ARG_ENABLE([mqtt5],
 
 if test "x$ENABLED_MQTTV50" = "xyes"
 then
-    AM_CPPFLAGS="$AM_CPPFLAGS -DWOLFMQTT_V5"
+    AM_CFLAGS="$AM_CFLAGS -DWOLFMQTT_V5"
 fi
 
 AM_CONDITIONAL([BUILD_MQTT5], [test "x$ENABLED_MQTTV50" = "xyes"])
@@ -222,7 +222,7 @@ then
     then
         AC_MSG_ERROR([cannot enable propcb without enabling mqtt5.])
     fi
-    AM_CPPFLAGS="$AM_CPPFLAGS -DWOLFMQTT_PROPERTY_CB"
+    AM_CFLAGS="$AM_CFLAGS -DWOLFMQTT_PROPERTY_CB"
 fi
 
 

diff --git a/examples/aws/awsiot.c b/examples/aws/awsiot.c
diff --git a/examples/aws/awsiot.h b/examples/aws/awsiot.h
diff --git a/examples/aws/awsiot.vcxproj b/examples/aws/awsiot.vcxproj
@@ -79,8 +79,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -92,8 +92,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -107,7 +107,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -122,7 +122,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/examples/azure/azureiothub.c b/examples/azure/azureiothub.c
@@ -347,7 +347,7 @@ int azureiothub_test(MQTTCtx *mqttCtx)
 
             /* Authentication */
             mqttCtx->connect.username = AZURE_USERNAME;
-            mqttCtx->connect.password = mqttCtx->app_ctx;
+            mqttCtx->connect.password = (const char *)mqttCtx->app_ctx;
 
             FALL_THROUGH;
         }

diff --git a/examples/azure/azureiothub.h b/examples/azure/azureiothub.h
diff --git a/examples/azure/azureiothub.vcxproj b/examples/azure/azureiothub.vcxproj
@@ -79,8 +79,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -92,8 +92,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -107,7 +107,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -122,7 +122,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/examples/firmware/firmware.h b/examples/firmware/firmware.h
diff --git a/examples/firmware/fwclient.c b/examples/firmware/fwclient.c
@@ -162,7 +162,7 @@ static int mqtt_message_cb(MqttClient *client, MqttMessage *msg,
 
     /* Verify this message is for the firmware topic */
     if (msg_new &&
-        memcmp(msg->topic_name, FIRMWARE_TOPIC_NAME,
+        XMEMCMP(msg->topic_name, FIRMWARE_TOPIC_NAME,
             msg->topic_name_len) == 0 &&
         !mFwBuf)
     {

diff --git a/examples/firmware/fwclient.h b/examples/firmware/fwclient.h
diff --git a/examples/firmware/fwclient.vcxproj b/examples/firmware/fwclient.vcxproj
@@ -79,8 +79,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -92,8 +92,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -107,7 +107,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -122,7 +122,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/examples/firmware/fwpush.c b/examples/firmware/fwpush.c
@@ -440,7 +440,7 @@ int fwpush_test(MQTTCtx *mqttCtx)
             mqttCtx->publish.topic_name = mqttCtx->topic_name;
             mqttCtx->publish.packet_id = mqtt_get_packetid();
             mqttCtx->publish.buffer_len = FIRMWARE_MAX_BUFFER;
-            mqttCtx->publish.buffer = WOLFMQTT_MALLOC(FIRMWARE_MAX_BUFFER);
+            mqttCtx->publish.buffer = (byte*)WOLFMQTT_MALLOC(FIRMWARE_MAX_BUFFER);
 
             /* Calculate the total payload length and store the FirmwareHeader,
                signature, and key in publish->ctx to be used by the callback.

diff --git a/examples/firmware/fwpush.h b/examples/firmware/fwpush.h
diff --git a/examples/firmware/fwpush.vcxproj b/examples/firmware/fwpush.vcxproj
@@ -79,8 +79,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -92,8 +92,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -107,7 +107,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -122,7 +122,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/examples/include.am b/examples/include.am
@@ -123,4 +123,5 @@ EXTRA_DIST+=       examples/mqttuart.c \
                    examples/firmware/fwpush.vcxproj \
                    examples/azure/azureiothub.vcxproj \
                    examples/aws/awsiot.vcxproj \
-                   examples/wiot/wiot.vcxproj
+                   examples/wiot/wiot.vcxproj \
+                   examples/sn-client/sn-client.vcxproj
diff --git a/examples/mqttclient/mqttclient.c b/examples/mqttclient/mqttclient.c
@@ -307,7 +307,7 @@ int mqttclient_test(MQTTCtx *mqttCtx)
         MqttProp* prop = MqttClient_PropsAdd(&mqttCtx->connect.props);
         prop->type = MQTT_PROP_AUTH_METHOD;
         prop->data_str.str = (char*)DEFAULT_AUTH_METHOD;
-        prop->data_str.len = XSTRLEN(prop->data_str.str);
+        prop->data_str.len = (word16)XSTRLEN(prop->data_str.str);
     }
     {
         /* Request Response Information */
@@ -432,7 +432,7 @@ int mqttclient_test(MQTTCtx *mqttCtx)
         MqttProp* prop = MqttClient_PropsAdd(&mqttCtx->publish.props);
         prop->type = MQTT_PROP_CONTENT_TYPE;
         prop->data_str.str = (char*)"wolf_type";
-        prop->data_str.len = XSTRLEN(prop->data_str.str);
+        prop->data_str.len = (word16)XSTRLEN(prop->data_str.str);
     }
     if ((mqttCtx->topic_alias_max > 0) &&
         (mqttCtx->topic_alias > 0) &&

diff --git a/examples/mqttclient/mqttclient.h b/examples/mqttclient/mqttclient.h
diff --git a/examples/mqttclient/mqttclient.vcxproj b/examples/mqttclient/mqttclient.vcxproj
@@ -79,8 +79,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -92,8 +92,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\;..\..\..\wolfssl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -107,7 +107,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -122,7 +122,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ENABLE_MQTT_TLS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>