From 01e59a036ca7006299bdd39b01b665266750fda7 Mon Sep 17 00:00:00 2001 From: Oscar Michael Abrina Date: Thu, 5 Nov 2020 16:47:43 -0800 Subject: [PATCH] Restructure platform directory (#382) This updates the platform and logging directory and moves it to the following places: FreeRTOS\FreeRTOS-Plus\Source\Utilities FreeRTOS\FreeRTOS-Plus\Source\Application-Protocols\network_transport\freertos_plus_tcp Project files are updated to follow suite. All updated demos are tested to work as expected. --- .../DemoTasks/shadow_demo_helpers.c | 6 ++-- .../DemoTasks/shadow_demo_helpers.h | 2 +- .../Device_Shadow_Demo/WIN32.vcxproj | 28 ++++++++-------- .../Device_Shadow_Demo/WIN32.vcxproj.filters | 20 ++++++------ .../WIN32.vcxproj | 2 +- .../DemoTasks/BasicTLSMQTTExample.c | 6 ++-- .../MQTT_Basic_TLS/WIN32.vcxproj | 28 ++++++++-------- .../MQTT_Basic_TLS/WIN32.vcxproj.filters | 20 ++++++------ .../DemoTasks/KeepAliveMQTTExample.c | 8 ++--- .../MQTT_Keep_Alive/WIN32.vcxproj | 18 +++++------ .../MQTT_Keep_Alive/WIN32.vcxproj.filters | 8 ++--- .../DemoTasks/MultitaskMQTTExample.c | 8 ++--- .../MQTT_Multitask/WIN32.vcxproj | 32 +++++++++---------- .../MQTT_Multitask/WIN32.vcxproj.filters | 22 ++++++------- .../DemoTasks/MutualAuthMQTTExample.c | 6 ++-- .../MQTT_Mutual_Auth/WIN32.vcxproj | 28 ++++++++-------- .../MQTT_Mutual_Auth/WIN32.vcxproj.filters | 20 ++++++------ .../DemoTasks/PlaintextMQTTExample.c | 8 ++--- .../MQTT_Plain_Text/WIN32.vcxproj | 20 ++++++------ .../MQTT_Plain_Text/WIN32.vcxproj.filters | 12 +++---- .../DemoTasks/SerializerMQTTExample.c | 6 ++-- .../MQTT_Serializer/WIN32.vcxproj | 4 +-- .../MQTT_Serializer/WIN32.vcxproj.filters | 2 +- .../DemoTasks/MutualAuthMQTTExample.c | 2 +- .../WIN32.vcxproj | 28 ++++++++-------- .../WIN32.vcxproj.filters | 20 ++++++------ .../WIN32.vcxproj | 8 ++--- .../freertos_plus_tcp/sockets_wrapper.c} | 4 +-- .../freertos_plus_tcp/sockets_wrapper.h} | 8 ++--- .../using_mbedtls/using_mbedtls.c} | 4 +-- .../using_mbedtls/using_mbedtls.h} | 6 ++-- .../using_mbedtls_pkcs11.c} | 4 +-- .../using_mbedtls_pkcs11.h} | 6 ++-- .../using_plaintext/using_plaintext.c} | 4 +-- .../using_plaintext/using_plaintext.h} | 6 ++-- .../network_transport/readme.txt | 6 ++++ .../exponential_backoff.c} | 4 +-- .../exponential_backoff.h} | 14 ++++---- .../{Logging => Utilities/logging}/logging.h | 0 .../logging}/logging_levels.h | 0 .../logging}/logging_stack.h | 0 .../mbedtls_freertos}/mbedtls_error.c | 0 .../mbedtls_freertos}/mbedtls_error.h | 0 .../mbedtls_freertos}/mbedtls_freertos_port.c | 0 .../mbedtls_freertos}/threading_alt.h | 0 .../Full-TCP-Networkless/WIN32.vcxproj | 2 +- .../Integration/Full-TCP-Suite/WIN32.vcxproj | 2 +- 47 files changed, 224 insertions(+), 218 deletions(-) rename FreeRTOS-Plus/Source/Application-Protocols/{platform/transport/freertos_plus_tcp_sockets_wrapper.c => network_transport/freertos_plus_tcp/sockets_wrapper.c} (98%) rename FreeRTOS-Plus/Source/Application-Protocols/{platform/transport/freertos_plus_tcp_sockets_wrapper.h => network_transport/freertos_plus_tcp/sockets_wrapper.h} (94%) rename FreeRTOS-Plus/Source/Application-Protocols/{platform/transport/tls/freertos_plus_tcp_mbedtls.c => network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.c} (99%) rename FreeRTOS-Plus/Source/Application-Protocols/{platform/transport/tls/include/freertos_plus_tcp_mbedtls.h => network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.h} (98%) rename FreeRTOS-Plus/Source/Application-Protocols/{platform/transport/tls/freertos_plus_tcp_mbedtls_pkcs11.c => network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.c} (99%) rename FreeRTOS-Plus/Source/Application-Protocols/{platform/transport/tls/include/freertos_plus_tcp_mbedtls_pkcs11.h => network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.h} (98%) rename FreeRTOS-Plus/Source/Application-Protocols/{platform/transport/plaintext/freertos_plus_tcp_plaintext.c => network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.c} (98%) rename FreeRTOS-Plus/Source/Application-Protocols/{platform/transport/plaintext/include/freertos_plus_tcp_plaintext.h => network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.h} (97%) create mode 100644 FreeRTOS-Plus/Source/Application-Protocols/network_transport/readme.txt rename FreeRTOS-Plus/Source/{Application-Protocols/platform/retry_utils/retry_utils.c => Utilities/exponential_backoff/exponential_backoff.c} (98%) rename FreeRTOS-Plus/Source/{Application-Protocols/platform/retry_utils/retry_utils.h => Utilities/exponential_backoff/exponential_backoff.h} (96%) rename FreeRTOS-Plus/Source/{Logging => Utilities/logging}/logging.h (100%) rename FreeRTOS-Plus/Source/{Logging => Utilities/logging}/logging_levels.h (100%) rename FreeRTOS-Plus/Source/{Logging => Utilities/logging}/logging_stack.h (100%) rename FreeRTOS-Plus/Source/{Application-Protocols/platform/mbedtls => Utilities/mbedtls_freertos}/mbedtls_error.c (100%) rename FreeRTOS-Plus/Source/{Application-Protocols/platform/mbedtls => Utilities/mbedtls_freertos}/mbedtls_error.h (100%) rename FreeRTOS-Plus/Source/{Application-Protocols/platform/mbedtls => Utilities/mbedtls_freertos}/mbedtls_freertos_port.c (100%) rename FreeRTOS-Plus/Source/{Application-Protocols/platform/mbedtls => Utilities/mbedtls_freertos}/threading_alt.h (100%) diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.c b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.c index dc6172e617..5e0caf1d27 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.c +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.c @@ -49,11 +49,11 @@ /* MQTT library includes. */ #include "core_mqtt.h" -/* Retry utilities include. */ -#include "retry_utils.h" +/* Exponential backoff retry include. */ +#include "exponential_backoff.h" /* Transport interface implementation include header for TLS. */ -#include "freertos_plus_tcp_mbedtls.h" +#include "using_mbedtls.h" /*------------- Demo configurations -------------------------*/ diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.h b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.h index 77846c400c..8f6a6615c1 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.h +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/DemoTasks/shadow_demo_helpers.h @@ -27,7 +27,7 @@ #include "core_mqtt.h" /* Transport interface implementation include header for TLS. */ -#include "freertos_plus_tcp_mbedtls.h" +#include "using_mbedtls.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj index e156225a02..e8e82b52cc 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\..\Source\Application-Protocols\platform\transport;..\..\..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\..\..\Source\Application-Protocols\platform\mbedtls;..\..\..\..\..\Source\mbedtls_utils;..\..\..\..\ThirdParty\mbedtls\include;..\..\..\..\Source\AWS\device-shadow\source\include;..\..\..\..\Source\coreJSON\source\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\common\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\..\Source\Utilities\exponential_backoff;..\..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls;..\..\..\..\Source\Utilities\mbedtls_freertos;..\..\..\..\..\Source\mbedtls_utils;..\..\..\..\ThirdParty\mbedtls\include;..\..\..\..\Source\AWS\device-shadow\source\include;..\..\..\..\Source\coreJSON\source\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,11 +157,11 @@ - - - - - + + + + + @@ -516,14 +516,14 @@ - - - - - - - - + + + + + + + + diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj.filters index 24ee8f351e..65762ace6a 100644 --- a/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/AWS/Device_Shadow_Windows_Simulator/Device_Shadow_Demo/WIN32.vcxproj.filters @@ -150,19 +150,19 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport @@ -502,20 +502,20 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/WIN32.vcxproj index 8da0b58998..d33df9604a 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/WIN32.vcxproj @@ -116,7 +116,7 @@ .\Release/ Level3 true - ..\Common\Utils;..\Common\ethernet\lwip-1.4.0\ports\win32\WinPCap;..\Common\ethernet\lwip-1.4.0\src\include\ipv4;..\Common\ethernet\lwip-1.4.0\src\include;..\..\Source\include;..\..\Source\portable\MSVC-MingW;..\Common\ethernet\lwip-1.4.0\ports\win32\include;..\Common\Include;..\..\Source\Logging;.\lwIP_Apps;.;%(AdditionalIncludeDirectories) + ..\Common\Utils;..\Common\ethernet\lwip-1.4.0\ports\win32\WinPCap;..\Common\ethernet\lwip-1.4.0\src\include\ipv4;..\Common\ethernet\lwip-1.4.0\src\include;..\..\Source\include;..\..\Source\portable\MSVC-MingW;..\Common\ethernet\lwip-1.4.0\ports\win32\include;..\Common\Include;..\..\Source\Utilities\logging;.\lwIP_Apps;.;%(AdditionalIncludeDirectories) NDEBUG;%(PreprocessorDefinitions) diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/DemoTasks/BasicTLSMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/DemoTasks/BasicTLSMQTTExample.c index dcbe9bf860..b9c9a7fb4f 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/DemoTasks/BasicTLSMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/DemoTasks/BasicTLSMQTTExample.c @@ -53,11 +53,11 @@ /* MQTT library includes. */ #include "core_mqtt.h" -/* Retry utilities include. */ -#include "retry_utils.h" +/* Exponential backoff retry include. */ +#include "exponential_backoff.h" /* Transport interface implementation include header for TLS. */ -#include "freertos_plus_tcp_mbedtls.h" +#include "using_mbedtls.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj index 35278573d3..b29d88687a 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\..\Source\Application-Protocols\platform\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Utilities\exponential_backoff;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls;..\..\..\Source\Utilities\mbedtls_freertos;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,11 +157,11 @@ - - - - - + + + + + @@ -513,14 +513,14 @@ - - - - - - - - + + + + + + + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj.filters index c7a3061d19..c00ad94560 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/WIN32.vcxproj.filters @@ -387,19 +387,19 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport @@ -489,7 +489,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -733,16 +733,16 @@ FreeRTOS+\mbedtls\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/DemoTasks/KeepAliveMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/DemoTasks/KeepAliveMQTTExample.c index 490ea6c799..0fff1e0aec 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/DemoTasks/KeepAliveMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/DemoTasks/KeepAliveMQTTExample.c @@ -56,11 +56,11 @@ /* MQTT library includes. */ #include "core_mqtt.h" -/* Retry utilities include. */ -#include "retry_utils.h" +/* Exponential backoff retry include. */ +#include "exponential_backoff.h" /* Transport interface include. */ -#include "freertos_plus_tcp_plaintext.h" +#include "using_plaintext.h" /*-----------------------------------------------------------*/ @@ -508,7 +508,7 @@ static void prvMQTTDemoTask( void * pvParameters ) /* If the server rejected the subscription request, attempt to resubscribe * to the topic. Attempts are made according to the exponential backoff retry - * strategy declared in retry_utils.h. */ + * strategy declared in exponential_backoff.h. */ prvMQTTSubscribeWithBackoffRetries( &xMQTTContext ); /************************ Send PINGREQ packet. ************************/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj index 6c249b2cf6..a8deae32ee 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\plaintext\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Utilities\exponential_backoff;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_plaintext;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,9 +157,9 @@ - - - + + + @@ -191,12 +191,12 @@ - - - - + + + + - + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj.filters index 890a342987..07e319697a 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/WIN32.vcxproj.filters @@ -120,10 +120,10 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -210,13 +210,13 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/DemoTasks/MultitaskMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/DemoTasks/MultitaskMQTTExample.c index d67d555ba3..2d9657ebae 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/DemoTasks/MultitaskMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/DemoTasks/MultitaskMQTTExample.c @@ -70,14 +70,14 @@ #include "core_mqtt.h" #include "core_mqtt_state.h" -/* Retry utilities include. */ -#include "retry_utils.h" +/* Exponential backoff retry include. */ +#include "exponential_backoff.h" /* Transport interface include. */ #if defined( democonfigUSE_TLS ) && ( democonfigUSE_TLS == 1 ) - #include "freertos_plus_tcp_mbedtls.h" + #include "using_mbedtls.h" #else - #include "freertos_plus_tcp_plaintext.h" + #include "using_plaintext.h" #endif /** diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj index 4b7ce70da6..e7a55d5c94 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\plaintext\include;..\..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\..\Source\Application-Protocols\platform\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Utilities\exponential_backoff;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_plaintext;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls;..\..\..\Source\Utilities\mbedtls_freertos;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,12 +157,12 @@ - - - - - - + + + + + + @@ -514,15 +514,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj.filters index d81b4b0343..89c38c57d8 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask/WIN32.vcxproj.filters @@ -387,22 +387,22 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport @@ -492,7 +492,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -736,16 +736,16 @@ FreeRTOS+\mbedtls\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c index 9beed57b5a..399c647ae8 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/DemoTasks/MutualAuthMQTTExample.c @@ -54,11 +54,11 @@ /* MQTT library includes. */ #include "core_mqtt.h" -/* Retry utilities include. */ -#include "retry_utils.h" +/* Exponential backoff retry include. */ +#include "exponential_backoff.h" /* Transport interface implementation include header for TLS. */ -#include "freertos_plus_tcp_mbedtls.h" +#include "using_mbedtls.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj index eeb8216075..0e111506a6 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\..\Source\Application-Protocols\platform\mbedtls;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Utilities\exponential_backoff;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls;..\..\..\Source\Utilities\mbedtls_freertos;..\..\..\..\Source\mbedtls_utils;..\..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,11 +157,11 @@ - - - - - + + + + + @@ -513,14 +513,14 @@ - - - - - - - - + + + + + + + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj.filters index a63fcd4866..eb2ee25be8 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/WIN32.vcxproj.filters @@ -387,19 +387,19 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\freertos - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport @@ -489,7 +489,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -733,16 +733,16 @@ FreeRTOS+\mbedtls\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/DemoTasks/PlaintextMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/DemoTasks/PlaintextMQTTExample.c index da50dc322e..a644dcbbeb 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/DemoTasks/PlaintextMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/DemoTasks/PlaintextMQTTExample.c @@ -52,11 +52,11 @@ /* MQTT library includes. */ #include "core_mqtt.h" -/* Retry utilities include. */ -#include "retry_utils.h" +/* Exponential backoff retry include. */ +#include "exponential_backoff.h" /* Transport interface include. */ -#include "freertos_plus_tcp_plaintext.h" +#include "using_plaintext.h" /*-----------------------------------------------------------*/ @@ -370,7 +370,7 @@ static void prvMQTTDemoTask( void * pvParameters ) /* If server rejected the subscription request, attempt to resubscribe to * the topic. Attempts are made according to the exponential backoff retry - * strategy declared in retry_utils.h. */ + * strategy declared in exponential_backoff.h. */ prvMQTTSubscribeWithBackoffRetries( &xMQTTContext ); /******************* Publish and Keep Alive Loop. *********************/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj index c63807bb9f..a93e02f687 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\platform\transport;..\..\..\Source\Application-Protocols\platform\transport\plaintext\include;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Utilities\exponential_backoff;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_plaintext;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,9 +157,9 @@ - - - + + + @@ -191,12 +191,12 @@ - - - - - - + + + + + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj.filters index e2d4ff32f4..7a10141eee 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/WIN32.vcxproj.filters @@ -120,13 +120,13 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -213,16 +213,16 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/DemoTasks/SerializerMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/DemoTasks/SerializerMQTTExample.c index 81c0e5d29e..772c833bda 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/DemoTasks/SerializerMQTTExample.c +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/DemoTasks/SerializerMQTTExample.c @@ -60,8 +60,8 @@ /* MQTT library includes. */ #include "core_mqtt_serializer.h" -/* Retry utilities include. */ -#include "retry_utils.h" +/* Exponential backoff retry include. */ +#include "exponential_backoff.h" /*-----------------------------------------------------------*/ @@ -421,7 +421,7 @@ static void prvMQTTDemoTask( void * pvParameters ) /* If the server rejected the subscription request, attempt to resubscribe * to the topic. Attempts are made according to the exponential backoff - * retry strategy declared in retry_utils.h. */ + * retry strategy declared in exponential_backoff.h. */ prvMQTTSubscribeWithBackoffRetries( xMQTTSocket ); /**************************** Publish and Keep-Alive Loop. ******************************/ diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj index 8ca27dadea..9820cd56f7 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Application-Protocols\platform\retry_utils;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\Common\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\Utilities\exponential_backoff;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,7 +157,7 @@ - + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj.filters index 07fa16da15..357f786128 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/WIN32.vcxproj.filters @@ -114,7 +114,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreMQTT\src - + FreeRTOS+\FreeRTOS IoT Libraries\platform diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/DemoTasks/MutualAuthMQTTExample.c b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/DemoTasks/MutualAuthMQTTExample.c index 49cc2f2a06..7f12ff6324 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/DemoTasks/MutualAuthMQTTExample.c +++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/DemoTasks/MutualAuthMQTTExample.c @@ -53,7 +53,7 @@ #include "core_mqtt.h" /* Transport interface implementation include header for TLS. */ -#include "freertos_plus_tcp_mbedtls_pkcs11.h" +#include "using_mbedtls_pkcs11.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj index 966bbbd8c9..80a111ac47 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\FreeRTOS-Plus\Source\Logging;..\coreMQTT_Windows_Simulator\Common;..\coreMQTT_Windows_Simulator\common\WinPCap;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\3rdparty\pkcs11;..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\Source\Application-Protocols\platform\retry_utils;..\..\Source\Application-Protocols\platform\transport;..\..\Source\Application-Protocols\platform\transport\tls\include;..\..\Source\Application-Protocols\platform\mbedtls;..\..\Source\mbedtls_utils;..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) + ..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\coreMQTT_Windows_Simulator\Common;..\coreMQTT_Windows_Simulator\common\WinPCap;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\3rdparty\pkcs11;..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\Source\Utilities\exponential_backoff;..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls_pkcs11;..\..\Source\Utilities\mbedtls_freertos;..\..\Source\mbedtls_utils;..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories) MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -157,15 +157,15 @@ - - - - + + + + - + @@ -283,14 +283,14 @@ - - - - - - - - + + + + + + + + diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters index 9685c9a35b..e717b1261f 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters @@ -166,16 +166,16 @@ coreMQTT - + Transport - + ThirdParty - + Transport - + Transport @@ -452,7 +452,7 @@ ThirdParty\mbedtls - + Transport @@ -541,20 +541,20 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - + FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj index a3cc2a4647..04c5c4a408 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\FreeRTOS-Plus\Source\Logging;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\portable\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\pkcs11;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\mbedtls_utils;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;examples;.;%(AdditionalIncludeDirectories) + ..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\portable\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\pkcs11;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\mbedtls_utils;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;examples;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;MBEDTLS_CONFIG_FILE="aws_mbedtls_config.h";CONFIG_MEDTLS_USE_AFR_MEMORY;%(PreprocessorDefinitions) false EnableFastChecks @@ -149,9 +149,9 @@ - - - + + + diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.c b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/sockets_wrapper.c similarity index 98% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.c rename to FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/sockets_wrapper.c index fa2d21125e..6b067917c4 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/sockets_wrapper.c @@ -20,7 +20,7 @@ */ /** - * @file freertos_plus_tcp_sockets_wrapper.c + * @file sockets_wrapper.c * @brief FreeRTOS Sockets connect and disconnect wrapper implementation. */ @@ -30,7 +30,7 @@ /* FreeRTOS includes. */ #include "FreeRTOS.h" -#include "freertos_plus_tcp_sockets_wrapper.h" +#include "sockets_wrapper.h" /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.h b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/sockets_wrapper.h similarity index 94% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.h rename to FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/sockets_wrapper.h index 6d801a8a2a..a690bc4290 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/freertos_plus_tcp_sockets_wrapper.h +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/sockets_wrapper.h @@ -20,12 +20,12 @@ */ /** - * @file freertos_plus_tcp_sockets_wrapper.h + * @file sockets_wrapper.h * @brief FreeRTOS Sockets connect and disconnect function wrapper. */ -#ifndef FREERTOS_SOCKETS_WRAPPER_H_ -#define FREERTOS_SOCKETS_WRAPPER_H_ +#ifndef SOCKETS_WRAPPER_H +#define SOCKETS_WRAPPER_H /* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" @@ -83,4 +83,4 @@ BaseType_t Sockets_Connect( Socket_t * pTcpSocket, */ void Sockets_Disconnect( Socket_t tcpSocket ); -#endif /* ifndef FREERTOS_SOCKETS_WRAPPER_H_ */ +#endif /* ifndef SOCKETS_WRAPPER_H */ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls.c b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.c similarity index 99% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls.c rename to FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.c index 9b230a1f36..08193b12bf 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.c @@ -36,10 +36,10 @@ #include "FreeRTOS_Sockets.h" /* TLS transport header. */ -#include "freertos_plus_tcp_mbedtls.h" +#include "using_mbedtls.h" /* FreeRTOS Socket wrapper include. */ -#include "freertos_plus_tcp_sockets_wrapper.h" +#include "sockets_wrapper.h" /* mbedTLS util includes. */ #include "mbedtls_error.h" diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls.h b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.h similarity index 98% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls.h rename to FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.h index 9ae7fb6735..1b7c52ab04 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls.h +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls/using_mbedtls.h @@ -24,8 +24,8 @@ * @brief TLS transport interface header. */ -#ifndef TLS_FREERTOS_H_ -#define TLS_FREERTOS_H_ +#ifndef USING_MBEDTLS +#define USING_MBEDTLS /**************************************************/ /******* DO NOT CHANGE the following order ********/ @@ -196,4 +196,4 @@ int32_t TLS_FreeRTOS_send( NetworkContext_t * pNetworkContext, const void * pBuffer, size_t bytesToSend ); -#endif /* ifndef TLS_FREERTOS_H_ */ +#endif /* ifndef USING_MBEDTLS */ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls_pkcs11.c b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.c similarity index 99% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls_pkcs11.c rename to FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.c index 87cf9e8ef4..d2d072ced8 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/freertos_plus_tcp_mbedtls_pkcs11.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.c @@ -39,10 +39,10 @@ #include "FreeRTOS_Sockets.h" /* TLS transport header. */ -#include "freertos_plus_tcp_mbedtls_pkcs11.h" +#include "using_mbedtls_pkcs11.h" /* FreeRTOS Socket wrapper include. */ -#include "freertos_plus_tcp_sockets_wrapper.h" +#include "sockets_wrapper.h" /* mbedTLS util includes. */ #include "mbedtls_error.h" diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls_pkcs11.h b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.h similarity index 98% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls_pkcs11.h rename to FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.h index 44f53fbc36..019aeed5a1 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/tls/include/freertos_plus_tcp_mbedtls_pkcs11.h +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_mbedtls_pkcs11/using_mbedtls_pkcs11.h @@ -27,8 +27,8 @@ * PKCS #11 when using TLS. */ -#ifndef TLS_FREERTOS_H_ -#define TLS_FREERTOS_H_ +#ifndef USING_MBEDTLS_PKCS11 +#define USING_MBEDTLS_PKCS11 /**************************************************/ /******* DO NOT CHANGE the following order ********/ @@ -209,4 +209,4 @@ int32_t TLS_FreeRTOS_send( NetworkContext_t * pNetworkContext, const void * pBuffer, size_t bytesToSend ); -#endif /* ifndef TLS_FREERTOS_H_ */ +#endif /* ifndef USING_MBEDTLS_PKCS11 */ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/freertos_plus_tcp_plaintext.c b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.c similarity index 98% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/freertos_plus_tcp_plaintext.c rename to FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.c index 3232240887..6ec16551ec 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/freertos_plus_tcp_plaintext.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.c @@ -30,10 +30,10 @@ #include "FreeRTOS_Sockets.h" /* FreeRTOS Socket wrapper include. */ -#include "freertos_plus_tcp_sockets_wrapper.h" +#include "sockets_wrapper.h" /* Transport interface include. */ -#include "freertos_plus_tcp_plaintext.h" +#include "using_plaintext.h" PlaintextTransportStatus_t Plaintext_FreeRTOS_Connect( NetworkContext_t * pNetworkContext, const char * pHostName, diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/include/freertos_plus_tcp_plaintext.h b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.h similarity index 97% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/include/freertos_plus_tcp_plaintext.h rename to FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.h index 128e376ad3..4ce4ec08ab 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/transport/plaintext/include/freertos_plus_tcp_plaintext.h +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/freertos_plus_tcp/using_plaintext/using_plaintext.h @@ -19,8 +19,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef TRANSPORT_INTERFACE_FREERTOS_H_ -#define TRANSPORT_INTERFACE_FREERTOS_H_ +#ifndef USING_PLAINTEXT_H +#define USING_PLAINTEXT_H /**************************************************/ /******* DO NOT CHANGE the following order ********/ @@ -127,4 +127,4 @@ int32_t Plaintext_FreeRTOS_send( NetworkContext_t * pNetworkContext, const void * pBuffer, size_t bytesToSend ); -#endif /* ifndef TRANSPORT_INTERFACE_FREERTOS_H_ */ +#endif /* ifndef USING_PLAINTEXT_H */ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/network_transport/readme.txt b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/readme.txt new file mode 100644 index 0000000000..51b07988dd --- /dev/null +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/readme.txt @@ -0,0 +1,6 @@ +Building a network transport implementation: + +1. Go into the sub directory for the TCP/IP stack you are using (e.g. freertos_plus_tcp). +2. Build the wrapper file located in the directory (i.e. sockets_wrapper.c). +3. Select an additional folder based on the TLS stack you are using (e.g. using_mbedtls), or the using_plaintext folder if not using TLS. +4. Build and include all files from the selected folder. diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.c b/FreeRTOS-Plus/Source/Utilities/exponential_backoff/exponential_backoff.c similarity index 98% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.c rename to FreeRTOS-Plus/Source/Utilities/exponential_backoff/exponential_backoff.c index 9fa8f04425..7546884b25 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.c +++ b/FreeRTOS-Plus/Source/Utilities/exponential_backoff/exponential_backoff.c @@ -20,7 +20,7 @@ */ /** - * @file retry_utils.c + * @file exponential_backoff.c * @brief Utility implementation of backoff logic, used for attempting retries of failed processes. */ @@ -31,7 +31,7 @@ #include "FreeRTOS.h" #include "task.h" -#include "retry_utils.h" +#include "exponential_backoff.h" #define MILLISECONDS_PER_SECOND ( 1000U ) /**< @brief Milliseconds per second. */ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.h b/FreeRTOS-Plus/Source/Utilities/exponential_backoff/exponential_backoff.h similarity index 96% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.h rename to FreeRTOS-Plus/Source/Utilities/exponential_backoff/exponential_backoff.h index 734bb8ca04..b075478181 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/platform/retry_utils/retry_utils.h +++ b/FreeRTOS-Plus/Source/Utilities/exponential_backoff/exponential_backoff.h @@ -20,13 +20,13 @@ */ /** - * @file retry_utils.h + * @file exponential_backoff.h * @brief Declaration of the exponential backoff retry logic utility functions * and constants. */ -#ifndef RETRY_UTILS_H_ -#define RETRY_UTILS_H_ +#ifndef EXPONENTIAL_BACKOFF_H +#define EXPONENTIAL_BACKOFF_H /* Standard include. */ #include @@ -66,11 +66,11 @@ * The functions are used as shown in the diagram below. This is the exponential * backoff with jitter loop: * - * @image html retry_utils_flow.png width=25% + * @image html exponential_backoff_flow.png width=25% * * The following steps give guidance on implementing the Retry Utils. An example - * implementation of the Retry Utils for a POSIX platform can be found in file - * @ref retry_utils_posix.c. + * implementation of the Retry Utils for the FreeRTOS platform can be found in file + * @ref exponential_backoff.c. * * -# Implementing @ref RetryUtils_ParamsReset * @snippet this define_retryutils_paramsreset @@ -242,4 +242,4 @@ void RetryUtils_ParamsReset( RetryUtilsParams_t * pRetryParams ); */ RetryUtilsStatus_t RetryUtils_BackoffAndSleep( RetryUtilsParams_t * pRetryParams ); -#endif /* ifndef RETRY_UTILS_H_ */ +#endif /* ifndef EXPONENTIAL_BACKOFF_H */ diff --git a/FreeRTOS-Plus/Source/Logging/logging.h b/FreeRTOS-Plus/Source/Utilities/logging/logging.h similarity index 100% rename from FreeRTOS-Plus/Source/Logging/logging.h rename to FreeRTOS-Plus/Source/Utilities/logging/logging.h diff --git a/FreeRTOS-Plus/Source/Logging/logging_levels.h b/FreeRTOS-Plus/Source/Utilities/logging/logging_levels.h similarity index 100% rename from FreeRTOS-Plus/Source/Logging/logging_levels.h rename to FreeRTOS-Plus/Source/Utilities/logging/logging_levels.h diff --git a/FreeRTOS-Plus/Source/Logging/logging_stack.h b/FreeRTOS-Plus/Source/Utilities/logging/logging_stack.h similarity index 100% rename from FreeRTOS-Plus/Source/Logging/logging_stack.h rename to FreeRTOS-Plus/Source/Utilities/logging/logging_stack.h diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_error.c b/FreeRTOS-Plus/Source/Utilities/mbedtls_freertos/mbedtls_error.c similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_error.c rename to FreeRTOS-Plus/Source/Utilities/mbedtls_freertos/mbedtls_error.c diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_error.h b/FreeRTOS-Plus/Source/Utilities/mbedtls_freertos/mbedtls_error.h similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_error.h rename to FreeRTOS-Plus/Source/Utilities/mbedtls_freertos/mbedtls_error.h diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_freertos_port.c b/FreeRTOS-Plus/Source/Utilities/mbedtls_freertos/mbedtls_freertos_port.c similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/mbedtls_freertos_port.c rename to FreeRTOS-Plus/Source/Utilities/mbedtls_freertos/mbedtls_freertos_port.c diff --git a/FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/threading_alt.h b/FreeRTOS-Plus/Source/Utilities/mbedtls_freertos/threading_alt.h similarity index 100% rename from FreeRTOS-Plus/Source/Application-Protocols/platform/mbedtls/threading_alt.h rename to FreeRTOS-Plus/Source/Utilities/mbedtls_freertos/threading_alt.h diff --git a/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Networkless/WIN32.vcxproj b/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Networkless/WIN32.vcxproj index 8d226a2e99..feff8c6d58 100644 --- a/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Networkless/WIN32.vcxproj +++ b/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Networkless/WIN32.vcxproj @@ -62,7 +62,7 @@ Disabled - ..\..\..\..\Source\Logging;.\Test_Code\Test_Runner;..\..\..\CMock\vendor\unity\src;..\..\..\CMock\vendor\unity\extras\fixture\src;.\Config;..\..\..\CMock\vendor\unity\extras\memory\src;..\..\..\..\Source\FreeRTOS-Plus-FAT\include;..\..\..\..\Source\FreeRTOS-Plus-FAT\portable\common;..\..\..\..\Source\FreeRTOS-Plus-TCP\protocols\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-Plus-CLI;.\Test_Code\Test_Cases;..\..\..\..\Source\FreeRTOS-Plus-TCP\include;.\DemoTasks\include;.\TraceMacros\Example1;.\WinPCap;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\Utilities\logging;.\Test_Code\Test_Runner;..\..\..\CMock\vendor\unity\src;..\..\..\CMock\vendor\unity\extras\fixture\src;.\Config;..\..\..\CMock\vendor\unity\extras\memory\src;..\..\..\..\Source\FreeRTOS-Plus-FAT\include;..\..\..\..\Source\FreeRTOS-Plus-FAT\portable\common;..\..\..\..\Source\FreeRTOS-Plus-TCP\protocols\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-Plus-CLI;.\Test_Code\Test_Cases;..\..\..\..\Source\FreeRTOS-Plus-TCP\include;.\DemoTasks\include;.\TraceMacros\Example1;.\WinPCap;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;FREERTOS_ENABLE_UNIT_TESTS;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Suite/WIN32.vcxproj b/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Suite/WIN32.vcxproj index 07c1960a37..852ae7961d 100644 --- a/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Suite/WIN32.vcxproj +++ b/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Suite/WIN32.vcxproj @@ -62,7 +62,7 @@ Disabled - ..\..\..\..\Source\Logging;.\Config;.\Test_Code\Test_Cases\include;..\..\..\CMock\vendor\unity\extras\fixture\src;..\..\..\..\Source\FreeRTOS-Plus-FAT\include;..\..\..\..\Source\FreeRTOS-Plus-FAT\portable\common;..\..\..\..\Source\FreeRTOS-Plus-TCP\protocols\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\CMock\vendor\unity\extras\memory\src;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-Plus-CLI;..\..\..\CMock\vendor\unity\src;.\TraceMacros\Example1;.;%(AdditionalIncludeDirectories) + ..\..\..\..\Source\Utilities\logging;.\Config;.\Test_Code\Test_Cases\include;..\..\..\CMock\vendor\unity\extras\fixture\src;..\..\..\..\Source\FreeRTOS-Plus-FAT\include;..\..\..\..\Source\FreeRTOS-Plus-FAT\portable\common;..\..\..\..\Source\FreeRTOS-Plus-TCP\protocols\include;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\CMock\vendor\unity\extras\memory\src;.\DemoTasks\include;.\WinPCap;..\..\..\..\..\FreeRTOS\Source\include;..\..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\..\Source\FreeRTOS-Plus-CLI;..\..\..\CMock\vendor\unity\src;.\TraceMacros\Example1;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0600;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks