From 8e722df5dda20d71a0e3726283f7826927690c5d Mon Sep 17 00:00:00 2001 From: Paul Bartell Date: Tue, 25 Oct 2022 13:26:06 -0700 Subject: [PATCH] Revert unwanted coreHTTP demo changes --- .../HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c | 8 ++++---- .../HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c | 6 +++--- .../HTTP_S3_Download/DemoTasks/S3DownloadHTTPExample.c | 6 +++--- .../DemoTasks/S3DownloadMultithreadedHTTPExample.c | 6 +++--- .../HTTP_S3_Upload/DemoTasks/S3UploadHTTPExample.c | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c index eddcb1eb76..0cf6f23530 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth/DemoTasks/MutualAuthHTTPExample.c @@ -60,7 +60,7 @@ #include "core_http_client.h" /* Transport interface implementation include header for TLS. */ -#include "using_mbedtls.h" +#include "transport_mbedtls.h" /* Common HTTP demo utilities. */ #include "http_demo_utils.h" @@ -120,10 +120,10 @@ * * @note When using ALPN, port 443 must be used to connect to AWS IoT Core. */ -#define IOT_CORE_ALPN_PROTOCOL_NAME "\x0ex-amzn-http-ca" +#define IOT_CORE_ALPN_PROTOCOL_NAME "x-amzn-http-ca" -/** - * @brief Each compilation unit that consumes the NetworkContext must define it. +/** + * @brief Each compilation unit that consumes the NetworkContext must define it. * It should contain a single pointer to the type of your desired transport. * When using multiple transports in the same compilation unit, define this pointer as void *. * diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c index 3c5a5dfaca..7638685f65 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext/DemoTasks/PlainTextHTTPExample.c @@ -57,7 +57,7 @@ #include "core_http_client.h" /* Transport interface implementation include for plaintext communication. */ -#include "using_plaintext.h" +#include "transport_plaintext.h" /* Common HTTP demo utilities. */ #include "http_demo_utils.h" @@ -164,8 +164,8 @@ */ #define httpexampleNUMBER_HTTP_PATHS ( 4 ) -/** - * @brief Each compilation unit that consumes the NetworkContext must define it. +/** + * @brief Each compilation unit that consumes the NetworkContext must define it. * It should contain a single pointer to the type of your desired transport. * When using multiple transports in the same compilation unit, define this pointer as void *. * diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download/DemoTasks/S3DownloadHTTPExample.c b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download/DemoTasks/S3DownloadHTTPExample.c index 2eb3454aa1..ec02083d1c 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download/DemoTasks/S3DownloadHTTPExample.c +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download/DemoTasks/S3DownloadHTTPExample.c @@ -71,7 +71,7 @@ #include "core_http_client.h" /* Transport interface implementation include header for TLS. */ -#include "using_mbedtls.h" +#include "transport_mbedtls.h" /* Common HTTP demo utilities. */ #include "http_demo_utils.h" @@ -278,8 +278,8 @@ */ #define DELAY_BETWEEN_DEMO_RETRY_ITERATIONS_TICKS ( pdMS_TO_TICKS( 5000U ) ) -/** - * @brief Each compilation unit that consumes the NetworkContext must define it. +/** + * @brief Each compilation unit that consumes the NetworkContext must define it. * It should contain a single pointer to the type of your desired transport. * When using multiple transports in the same compilation unit, define this pointer as void *. * diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/DemoTasks/S3DownloadMultithreadedHTTPExample.c b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/DemoTasks/S3DownloadMultithreadedHTTPExample.c index e1b1e6ca3b..2b73340392 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/DemoTasks/S3DownloadMultithreadedHTTPExample.c +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded/DemoTasks/S3DownloadMultithreadedHTTPExample.c @@ -87,7 +87,7 @@ #include "core_http_client.h" /* Transport interface implementation include header for TLS. */ -#include "using_mbedtls.h" +#include "transport_mbedtls.h" /* Common HTTP demo utilities. */ #include "http_demo_utils.h" @@ -196,8 +196,8 @@ */ #define DELAY_BETWEEN_DEMO_RETRY_ITERATIONS_TICKS ( pdMS_TO_TICKS( 5000U ) ) -/** - * @brief Each compilation unit that consumes the NetworkContext must define it. +/** + * @brief Each compilation unit that consumes the NetworkContext must define it. * It should contain a single pointer to the type of your desired transport. * When using multiple transports in the same compilation unit, define this pointer as void *. * diff --git a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload/DemoTasks/S3UploadHTTPExample.c b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload/DemoTasks/S3UploadHTTPExample.c index b1f72c155e..131f1ee911 100644 --- a/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload/DemoTasks/S3UploadHTTPExample.c +++ b/FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload/DemoTasks/S3UploadHTTPExample.c @@ -63,7 +63,7 @@ #include "core_http_client.h" /* Transport interface implementation include header for TLS. */ -#include "using_mbedtls.h" +#include "transport_mbedtls.h" /* Common HTTP demo utilities. */ #include "http_demo_utils.h" @@ -166,8 +166,8 @@ */ #define DELAY_BETWEEN_DEMO_RETRY_ITERATIONS_TICKS ( pdMS_TO_TICKS( 5000U ) ) -/** - * @brief Each compilation unit that consumes the NetworkContext must define it. +/** + * @brief Each compilation unit that consumes the NetworkContext must define it. * It should contain a single pointer to the type of your desired transport. * When using multiple transports in the same compilation unit, define this pointer as void *. *