From 57161da9561f298229b2445b655790e0d71ae48c Mon Sep 17 00:00:00 2001 From: Sukhmani Minhas <50919130+sukhmanm@users.noreply.github.com> Date: Mon, 7 Dec 2020 13:34:12 -0500 Subject: [PATCH] Update HTTP demo project files (#451) * Update project filters * Address inaccurate retry count --- .../Common/http_demo_utils.c | 15 +++++---- .../HTTP_Mutual_Auth/WIN32.vcxproj.filters | 4 ++- .../HTTP_S3_Download/WIN32.vcxproj.filters | 33 +++++++++++++------ .../WIN32.vcxproj | 2 +- .../WIN32.vcxproj.filters | 33 +++++++++++++------ .../HTTP_S3_Upload/WIN32.vcxproj.filters | 33 +++++++++++++------ 6 files changed, 82 insertions(+), 38 deletions(-) diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/Common/http_demo_utils.c b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/Common/http_demo_utils.c index 99c30d2cb..b77f99361 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/Common/http_demo_utils.c +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/Common/http_demo_utils.c @@ -96,18 +96,21 @@ BaseType_t connectToServerWithBackoffRetries( TransportConnect_t connectFunction if( xReturn != pdPASS ) { - LogWarn( ( "Connection to the HTTP server failed. " - "Retrying connection with backoff and jitter." ) ); - LogInfo( ( "Retry attempt %lu out of maximum retry attempts %lu.", - ( xReconnectParams.attemptsDone + 1 ), - RETRY_MAX_ATTEMPTS ) ); - /* Generate a random number and calculate backoff value (in milliseconds) for * the next connection retry. * Note: It is recommended to seed the random number generator with a device-specific * entropy source so that possibility of multiple devices retrying failed network operations * at similar intervals can be avoided. */ xBackoffAlgStatus = BackoffAlgorithm_GetNextBackoff( &xReconnectParams, uxRand(), &usNextBackoff ); + + if( xBackoffAlgStatus == BackoffAlgorithmSuccess ) + { + LogWarn( ( "Connection to the HTTP server failed. " + "Retrying connection with backoff and jitter." ) ); + LogInfo( ( "Retry attempt %lu out of maximum retry attempts %lu.", + xReconnectParams.attemptsDone, + RETRY_MAX_ATTEMPTS ) ); + } } } while( ( xReturn == pdFAIL ) && ( xBackoffAlgStatus == BackoffAlgorithmSuccess ) ); diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/WIN32.vcxproj.filters index 44ed93a7b..63857b7b2 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/WIN32.vcxproj.filters @@ -384,6 +384,7 @@ FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\src + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls @@ -473,13 +474,14 @@ FreeRTOS\Source\include + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\include FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\include - FreeRTOS+\FreeRTOS IoT Libraries\platform diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download/WIN32.vcxproj.filters index d000c82b2..d4df3fbc5 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download/WIN32.vcxproj.filters @@ -35,13 +35,13 @@ {8a90222f-d723-4b4e-8e6e-c57afaf7fa92} - + {2d17d5e6-ed70-4e42-9693-f7a63baf4948} - + {7158b0be-01e7-42d1-8d3f-c75118a596a2} - + {6ad56e6d-c330-4830-8f4b-c75b05dfa866} @@ -232,6 +232,9 @@ FreeRTOS+\mbedtls\library + + FreeRTOS+\mbedtls\library + FreeRTOS+\mbedtls\library @@ -375,6 +378,13 @@ DemoTasks + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\src + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls @@ -390,9 +400,6 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - - - @@ -468,6 +475,16 @@ + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\include + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\include + + + FreeRTOS+\FreeRTOS IoT Libraries\platform + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -724,9 +741,5 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - - - \ No newline at end of file diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/WIN32.vcxproj b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/WIN32.vcxproj index bda001ca6..07838f041 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/WIN32.vcxproj @@ -13,7 +13,7 @@ {C686325E-3261-42F7-AEB1-DDE5280E1CEB} RTOSDemo - 10.0.19041.0 + 10.0 diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/WIN32.vcxproj.filters index 8df842312..aec97b627 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/WIN32.vcxproj.filters @@ -35,13 +35,13 @@ {8a90222f-d723-4b4e-8e6e-c57afaf7fa92} - + {2d17d5e6-ed70-4e42-9693-f7a63baf4948} - + {7158b0be-01e7-42d1-8d3f-c75118a596a2} - + {6ad56e6d-c330-4830-8f4b-c75b05dfa866} @@ -232,6 +232,9 @@ FreeRTOS+\mbedtls\library + + FreeRTOS+\mbedtls\library + FreeRTOS+\mbedtls\library @@ -375,6 +378,13 @@ DemoTasks + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\src + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls @@ -390,9 +400,6 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - - - @@ -468,6 +475,16 @@ + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\include + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\include + + + FreeRTOS+\FreeRTOS IoT Libraries\platform + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -724,9 +741,5 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - - - \ No newline at end of file diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload/WIN32.vcxproj.filters index 27e218d3d..3c663172a 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload/WIN32.vcxproj.filters @@ -35,13 +35,13 @@ {8a90222f-d723-4b4e-8e6e-c57afaf7fa92} - + {2d17d5e6-ed70-4e42-9693-f7a63baf4948} - + {7158b0be-01e7-42d1-8d3f-c75118a596a2} - + {6ad56e6d-c330-4830-8f4b-c75b05dfa866} @@ -232,6 +232,9 @@ FreeRTOS+\mbedtls\library + + FreeRTOS+\mbedtls\library + FreeRTOS+\mbedtls\library @@ -375,6 +378,13 @@ DemoTasks + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\src + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\src + + FreeRTOS+\FreeRTOS IoT Libraries\platform\mbedtls @@ -390,9 +400,6 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform\transport - - - @@ -468,6 +475,16 @@ + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\include + + + FreeRTOS+\FreeRTOS IoT Libraries\standard\coreHTTP\include + + + FreeRTOS+\FreeRTOS IoT Libraries\platform + FreeRTOS+\FreeRTOS IoT Libraries\platform @@ -724,9 +741,5 @@ FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include - - - - \ No newline at end of file