From 792efb4bb7e6bc4ef849504833b513b81b5e7dd3 Mon Sep 17 00:00:00 2001 From: Xiaodong Li <85011700+ChaiTowKway@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:18:09 -0700 Subject: [PATCH] Create GitHub workflows to execute the WinSim demos with libslirp network interface implemented in FreeRTOS+TCP VS Static Project (#1054) * Add libslirp to the existing FreeRTOS+TCP static project * Update demos to run with libslirp * Add ipconfigUSE_LIBSLIRP * Call developer command prompt and update meson build options --------- Co-authored-by: Xiaodong Li --- .github/scripts/core_checker.py | 1 + .github/workflows/freertos_demos.yml | 27 +- .github/workflows/freertos_plus_demos.yml | 391 +++- .gitignore | 1 + .gitmodules | 6 + .../DemoTasks/TCPEchoClient_SingleTasks.c | 19 +- .../FreeRTOS_Plus_TCP_Minimal.sln | 18 + .../FreeRTOS_Plus_TCP_Minimal.vcxproj | 64 + .../main.c | 12 +- .../FreeRTOS_Plus_WolfSSL.sln | 27 + ...TOS_Plus_WolfSSL_Windows_Simulator.vcxproj | 70 + .../MQTT_Basic_TLS/MQTT_Basic_TLS.vcxproj | 70 + .../MQTT_Basic_TLS/mqtt_basic_tls_demo.sln | 33 + .../MQTT_Keep_Alive/MQTT_Keep_Alive.vcxproj | 40 + .../MQTT_Keep_Alive/mqtt_keep_alive_demo.sln | 33 + .../MQTT_Mutual_Auth/MQTT_Mutual_Auth.vcxproj | 70 + .../mqtt_mutual_auth_demo.sln | 33 + .../MQTT_Mutual_Auth_wolfSSL.vcxproj | 72 + .../mqtt_mutual_auth_demo_wolfSSL.sln | 21 + .../MQTT_Plain_Text/MQTT_Plain_Text.vcxproj | 70 + .../MQTT_Plain_Text/mqtt_plain_text_demo.sln | 33 + .../MQTT_Serializer/MQTT_Serializer.vcxproj | 70 + .../MQTT_Serializer/mqtt_serializer_demo.sln | 33 + .../CorePKCS11_Demos.sln | 26 + .../CorePKCS11_Demos.vcxproj | 64 + FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP | 2 +- FreeRTOS-Plus/ThirdParty/glib | 1 + FreeRTOS-Plus/ThirdParty/libslirp | 1 + .../FreeRTOS+TCP/FreeRTOS+TCP.vcxproj | 1632 ++++++++++++++++- .../FreeRTOS+TCP/FreeRTOS+TCP.vcxproj.filters | 644 ++++++- .../FreeRTOS+TCP/libslirp-version.h | 24 + .../FreeRTOS+TCP/plus_tcp_hooks_winsim.c | 8 +- .../FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj | 52 + .../FreeRTOS_Plus_Libs.sln | 30 +- .../Logging/Logging.vcxproj | 62 + .../MbedTLS/MbedTLS.vcxproj | 54 + .../coreHTTP/coreHTTP.vcxproj | 62 + .../corePKCS11/corePKCS11.vcxproj | 62 + manifest.yml | 16 +- 39 files changed, 3821 insertions(+), 133 deletions(-) create mode 160000 FreeRTOS-Plus/ThirdParty/glib create mode 160000 FreeRTOS-Plus/ThirdParty/libslirp create mode 100644 FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/libslirp-version.h diff --git a/.github/scripts/core_checker.py b/.github/scripts/core_checker.py index 8332898f751..d1793923079 100755 --- a/.github/scripts/core_checker.py +++ b/.github/scripts/core_checker.py @@ -309,6 +309,7 @@ 'interrupt_vector.s', 'reg_test.S', 'gdbinit', + 'libslirp-version.h', ] FREERTOS_HEADER = [ diff --git a/.github/workflows/freertos_demos.yml b/.github/workflows/freertos_demos.yml index 47c70b32579..ea5494807f3 100644 --- a/.github/workflows/freertos_demos.yml +++ b/.github/workflows/freertos_demos.yml @@ -18,7 +18,7 @@ jobs: # Fetch Kernel Submodule echo "::group::Fetch Kernel Submodule" git submodule update --checkout --init --depth 1 FreeRTOS/Source - echo "::engdroup::" + echo "::endgroup::" if [[ "$?" = "0" ]] then echo -e "\033[32;3mCloned the Kernel\033[0m" @@ -125,7 +125,7 @@ jobs: # Fetch Kernel Submodule echo "::group::Fetch Kernel Submodule" git submodule update --checkout --init --depth 1 FreeRTOS/Source - echo "::engdroup::" + echo "::endgroup::" if [[ "$?" = "0" ]] then echo -e "\033[32;3mCloned the Kernel\033[0m" @@ -172,7 +172,6 @@ jobs: echo "::group::Build WIN32-MingW Blinky Demo" $content = Get-Content -Path 'main.c' -Raw $newContent = $content -replace '#define\s+mainCREATE_SIMPLE_BLINKY_DEMO_ONLY\s+0', '#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY 1' - $newContent = $newContent -replace 'int\s+main(.*?)void(.*?)\r?\n\s*{', 'int main( void ){setvbuf( stdout, NULL, _IONBF, 0 );' $newContent | Set-Content -Path 'main.c' gcc --version make --version @@ -207,7 +206,7 @@ jobs: # Fetch Kernel Submodule echo "::group::Fetch Kernel Submodule" git submodule update --checkout --init --depth 1 FreeRTOS/Source - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mCloned the Kernel\033[0m" else @@ -298,7 +297,7 @@ jobs: # Fetch Kernel Submodule echo "::group::Fetch Kernel Submodule" git submodule update --checkout --init --depth 1 FreeRTOS/Source - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mCloned the Kernel\033[0m" else @@ -349,7 +348,7 @@ jobs: # Fetch Kernel Submodule echo "::group::Fetch Kernel Submodule" git submodule update --checkout --init --depth 1 FreeRTOS/Source - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mCloned the Kernel\033[0m" else @@ -378,7 +377,7 @@ jobs: echo "::group::Install GNU ARM Toolchain" sudo apt-get -y update sudo apt-get -y install gcc-arm-none-eabi build-essential cmake git ninja-build python3-minimal - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mInstalled the GNU ARM Toolchain\033[0m" else @@ -393,7 +392,7 @@ jobs: # Build CORTEX_MPU_M3_MPS2_QEMU_GCC Demo echo "::group::Build CORTEX_MPU_M3_MPS2_QEMU_GCC Demo" make -j - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mBuild CORTEX_MPU_M3_MPS2_QEMU_GCC Demo\033[0m" else @@ -408,7 +407,7 @@ jobs: # Build CORTEX_LM3S102_GCC Demo echo "::group::Build CORTEX_LM3S102_GCC Demo" make -j - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mBuilt the CORTEX_LM3S102_GCC Demo Kernel\033[0m" else @@ -424,7 +423,7 @@ jobs: echo "::group::Build CORTEX_M3_MPS2_QEMU_GCC Demo" make clean make -j - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mBuilt the CORTEX_M3_MPS2_QEMU_GCC Demo\033[0m" else @@ -440,7 +439,7 @@ jobs: echo "::group::Build CORTEX_M3_MPS2_QEMU_GCC Full Demo" make clean make FULL_DEMO=1 -j - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mBuilt the CORTEX_M3_MPS2_QEMU_GCC Full Demo\033[0m" else @@ -455,7 +454,7 @@ jobs: # Build CORTEX_LM3S811_GCC Demo echo "::group::Build CORTEX_LM3S811_GCC Demo" make -j - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mBuilt the CORTEX_LM3S811_GCC Demo\033[0m" else @@ -472,7 +471,7 @@ jobs: git clone https://github.com/raspberrypi/pico-sdk.git cmake -B build -DPICO_SDK_PATH=pico-sdk -GNinja ninja -C build --verbose - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mBuilt CORTEX_M0+_RP2040 Demos\033[0m" else @@ -487,7 +486,7 @@ jobs: # Build CORTEX_MPS2_QEMU_IAR_GCC Demo echo "::group::Build CORTEX_MPS2_QEMU_IAR_GCC Demo" make -C build/gcc -j - echo "::engdroup::" + echo "::endgroup::" if [ "$?" = "0" ]; then echo -e "\033[32;3mBuilt the CORTEX_MPS2_QEMU_IAR_GCC Demo\033[0m" else diff --git a/.github/workflows/freertos_plus_demos.yml b/.github/workflows/freertos_plus_demos.yml index 9ed651c5072..89c6a6c257e 100644 --- a/.github/workflows/freertos_plus_demos.yml +++ b/.github/workflows/freertos_plus_demos.yml @@ -83,7 +83,9 @@ jobs: FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \ FreeRTOS-Plus/Source/Utilities/backoff_algorithm \ FreeRTOS-Plus/Source/coreJSON \ - FreeRTOS-Plus/ThirdParty/mbedtls + FreeRTOS-Plus/ThirdParty/mbedtls \ + FreeRTOS-Plus/ThirdParty/glib \ + FreeRTOS-Plus/ThirdParty/libslirp git -C FreeRTOS-Plus/Source/Application-Protocols/coreHTTP submodule update --checkout --init --depth 1 source/dependency/3rdparty/llhttp - name: Add msbuild to PATH @@ -112,26 +114,30 @@ jobs: echo ' #define democonfigS3_OBJECT_NAME ""' | tee -a */demo_config.h echo '#endif /* DEMO_CONFIG_H_TEST_BUILD */' | tee -a */demo_config.h - - name: Build HTTP Mutual Auth Demo - working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth - run: msbuild http_mutual_auth_demo.sln -t:rebuild - - name: Build HTTP Plain Text Demo + id: build-http-plain-text-demo working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Plaintext - run: msbuild http_plain_text_demo.sln -t:rebuild - - - name: Build HTTP S3 Download Demo - working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download - run: msbuild http_s3_download_demo.sln -t:rebuild + run: msbuild http_plain_text_demo.sln -t:rebuild -property:Configuration=Debug -m - - name: Build HTTP S3 Download Multithreaded Demo - working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded - run: msbuild http_s3_download_multithreaded_demo.sln -t:rebuild + - name: Build HTTP Mutual Auth Demo + id: build-http-mutual-auth-demo + working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_Mutual_Auth + run: msbuild http_mutual_auth_demo.sln -t:rebuild -property:Configuration=Debug -m - name: Build HTTP S3 Upload Demo + id: build-http-s3-upload-demo working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Upload - run: msbuild http_s3_upload_demo.sln -t:rebuild + run: msbuild http_s3_upload_demo.sln -t:rebuild -property:Configuration=Debug -m + - name: Build HTTP S3 Download Multithreaded Demo + id: build-http-s3-download-multithreaded-demo + working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download_Multithreaded + run: msbuild http_s3_download_multithreaded_demo.sln -t:rebuild -property:Configuration=Debug -m + + - name: Build HTTP S3 Download Demo + id: build-http-s3-download-demo + working-directory: FreeRTOS-Plus/Demo/coreHTTP_Windows_Simulator/HTTP_S3_Download + run: msbuild http_s3_download_demo.sln -t:rebuild -property:Configuration=Debug -m winsim_corePKCS11: name: corePKCS11 WinSim Demos @@ -151,16 +157,42 @@ jobs: FreeRTOS-Plus/Source/Utilities/backoff_algorithm \ FreeRTOS-Plus/Source/coreJSON \ FreeRTOS-Plus/Source/corePKCS11 \ - FreeRTOS-Plus/ThirdParty/mbedtls + FreeRTOS-Plus/ThirdParty/mbedtls \ + FreeRTOS-Plus/ThirdParty/glib \ + FreeRTOS-Plus/ThirdParty/libslirp git -C FreeRTOS-Plus/Source/corePKCS11 submodule update --checkout --init --depth 1 source/dependency/3rdparty/pkcs11 - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 - - name: corePKCS11 Demo + - name: Install meson + run: pip install meson + + - name: Install Glib + continue-on-error: true + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" + cd FreeRTOS-Plus/ThirdParty/glib + meson setup build --backend=vs2019 -Dselinux=disabled -Dxattr=false -Dbsymbolic_functions=false -Dtests=false -Dglib_debug=disabled -Dglib_assert=false --buildtype=release + meson compile -C build + + - name: Build corePKCS11 Demo + id: build-corePKCS11-demo working-directory: FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator - run: msbuild CorePKCS11_Demos.sln -t:rebuild -m + run: msbuild CorePKCS11_Demos.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m + + - name: Run and monitor corePKCS11 Demo + if: success() || failure() && steps.build-corePKCS11-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/Debug_with_Libslirp/CorePKCS11_Demos.exe + log-dir: demo_run_logs + timeout-seconds: 30 + success-line: "Finished DEMO" + success-exit-code: 0 + retry-attempts: 3 winsim_corelibs: name: core Library Windows Simulator Demos @@ -194,7 +226,9 @@ jobs: FreeRTOS-Plus/Source/corePKCS11 \ FreeRTOS-Plus/ThirdParty/mbedtls \ FreeRTOS-Plus/ThirdParty/tinycbor \ - FreeRTOS-Plus/ThirdParty/wolfSSL + FreeRTOS-Plus/ThirdParty/wolfSSL \ + FreeRTOS-Plus/ThirdParty/glib \ + FreeRTOS-Plus/ThirdParty/libslirp git -C FreeRTOS-Plus/Source/Application-Protocols/coreHTTP submodule update --checkout --init --depth 1 source/dependency/3rdparty/llhttp git -C FreeRTOS-Plus/Source/corePKCS11 submodule update --checkout --init --depth 1 source/dependency/3rdparty/pkcs11 @@ -202,49 +236,221 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 - - name: Configure coreMQTT Demos + - name: Install meson + run: pip install meson + + - name: Install Glib + continue-on-error: true + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" + cd FreeRTOS-Plus/ThirdParty/glib + meson setup build --backend=vs2019 -Dselinux=disabled -Dxattr=false -Dbsymbolic_functions=false -Dtests=false -Dglib_debug=disabled -Dglib_assert=false --buildtype=release + meson compile -C build + + - name: Generate SSL credentials + id: generate-credentials + uses: FreeRTOS/CI-CD-GitHub-Actions/ssl-credential-creator@main + + - name: Start localhost MQTT broker + id: mqtt-broker + uses: FreeRTOS/CI-CD-GitHub-Actions/localhost-mqtt-broker@main + with: + root-ca-cert-path: ${{ steps.generate-credentials.outputs.root-ca-cert-path }} + server-priv-key-path: ${{ steps.generate-credentials.outputs.server-priv-key-path }} + server-cert-path: ${{ steps.generate-credentials.outputs.server-cert-path }} + + - name: Update main.c to force stdout to write immediately + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/Common + run: | + $content = Get-Content -Path 'main.c' -Raw + $newContent = $content -replace 'int\s+main(.*?)void(.*?)\r?\n\s*{', 'int main( void ){setvbuf( stdout, NULL, _IONBF, 0 );' + $newContent | Set-Content -Path 'main.c' + + - name: Configure MQTT Plain Text Demo shell: bash - working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text run: | - echo '#ifndef DEMO_CONFIG_H_TEST_BUILD' | tee -a */demo_config.h - echo ' #define DEMO_CONFIG_H_TEST_BUILD' | tee -a */demo_config.h - echo ' #define democonfigCLIENT_CERTIFICATE_PEM ""' | tee -a */demo_config.h - echo ' #define democonfigCLIENT_IDENTIFIER ""' | tee -a */demo_config.h - echo ' #define democonfigCLIENT_PRIVATE_KEY_PEM ""' | tee -a */demo_config.h - echo ' #define democonfigCLIENT_PRIVATE_KEY_PEM ""' | tee -a */demo_config.h - echo ' #define democonfigMQTT_BROKER_ENDPOINT ""' | tee -a */demo_config.h - echo ' #define democonfigMQTT_BROKER_PORT ( 8883 )' | tee -a */demo_config.h - echo ' #define democonfigROOT_CA_PEM ""' | tee -a */demo_config.h - echo ' #define democonfigUSE_AWS_IOT_CORE_BROKER ( 1U )' | tee -a */demo_config.h - echo '#endif /* DEMO_CONFIG_H_TEST_BUILD */' | tee -a */demo_config.h + echo '#define democonfigCLIENT_IDENTIFIER "mqtt_demo_test"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_ENDPOINT "127.0.0.1"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_PORT ( 1883 )' >> demo_config.h + + - name: Build MQTT Plain Text Demo + id: build-mqtt-plain-text-demo + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text + run: | + msbuild mqtt_plain_text_demo.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m + + - name: Run and monitor MQTT Plain Text Demo + if: success() || failure() && steps.build-mqtt-plain-text-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/Debug_with_Libslirp/MQTT_Plain_Text.exe + log-dir: demo_run_logs + timeout-seconds: 120 + success-line: "Demo completed successfully" + retry-attempts: 3 + + - name: Configure MQTT Basic TLS Demo + shell: bash + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS + run: | + echo '#define democonfigROOT_CA_PEM \' >> demo_config.h + sed 's/.*/"&\\n"\\/' ${{ steps.generate-credentials.outputs.root-ca-cert-path }} >> root_ca_cert.txt + sed '$ s/.$//' root_ca_cert.txt >> demo_config.h + echo '#define democonfigCLIENT_IDENTIFIER "mqtt_demo_test"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_ENDPOINT "127.0.0.1"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_PORT ( 8883 )' >> demo_config.h + sed -i -z "s/define[[:space:]]*democonfigDISABLE_SNI[[:space:]]*([[:space:]]*[a-zA-Z0-9]\+[[:space:]]*)/define democonfigDISABLE_SNI ( pdTRUE )/g" demo_config.h - name: Build MQTT Basic TLS Demo + id: build-mqtt-basic-tls-demo working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS - run: msbuild mqtt_basic_tls_demo.sln -t:rebuild -property:Configuration=Debug -m + run: msbuild mqtt_basic_tls_demo.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m - - name: Build MQTT Keep Alive Demo - working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive - run: msbuild mqtt_keep_alive_demo.sln -t:rebuild -property:Configuration=Debug -m + - name: Run and monitor MQTT Basic TLS Demo + if: success() || failure() && steps.build-mqtt-basic-tls-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/Debug_with_Libslirp/MQTT_Basic_TLS.exe + log-dir: demo_run_logs + timeout-seconds: 120 + success-line: "Demo completed successfully" + retry-attempts: 3 - - name: Build MQTT Multi-Task Demo - working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask - run: msbuild mqtt_multitask_demo.sln -t:rebuild -property:Configuration=Debug -m + - name: Configure MQTT Mutual Authentication with mbedtls Demo + shell: bash + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth + run: | + echo '#define democonfigROOT_CA_PEM \' >> demo_config.h + sed 's/.*/"&\\n"\\/' ${{ steps.generate-credentials.outputs.root-ca-cert-path }} >> root_ca_cert.txt + sed '$ s/.$//' root_ca_cert.txt >> demo_config.h + echo '#define democonfigCLIENT_CERTIFICATE_PEM \' >> demo_config.h + sed 's/.*/"&\\n"\\/' ${{ steps.generate-credentials.outputs.device-cert-path }} >> device_cert.txt + sed '$ s/.$//' device_cert.txt >> demo_config.h + echo '#define democonfigCLIENT_PRIVATE_KEY_PEM \' >> demo_config.h + sed 's/.*/"&\\n"\\/' ${{ steps.generate-credentials.outputs.device-priv-key-path }} >> device_priv_key.txt + sed '$ s/.$//' device_priv_key.txt >> demo_config.h + echo '#define democonfigCLIENT_IDENTIFIER "mqtt_demo_test"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_ENDPOINT "127.0.0.1"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_PORT ( 8883 )' >> demo_config.h + sed -i -z "s/define[[:space:]]*democonfigDISABLE_SNI[[:space:]]*([[:space:]]*[a-zA-Z0-9]\+[[:space:]]*)/define democonfigDISABLE_SNI ( pdTRUE )/g" demo_config.h - name: Build MQTT Mutual Authentication with mbedtls Demo + id: build-mqtt-mutual-auth-demo working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth - run: msbuild mqtt_mutual_auth_demo.sln -t:rebuild -property:Configuration=Debug -m + run: msbuild mqtt_mutual_auth_demo.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m - - name: Build MQTT Mutual Authentication with WolfSSL Demo - working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL - run: msbuild mqtt_mutual_auth_demo_wolfSSL.sln -t:rebuild -property:Configuration=Debug -m + - name: Run and monitor MQTT Mutual Authentication with mbedtls Demo + if: success() || failure() && steps.build-mqtt-mutual-auth-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/Debug_with_Libslirp/MQTT_Mutual_Auth.exe + log-dir: demo_run_logs + timeout-seconds: 120 + success-line: "Demo completed successfully" + retry-attempts: 3 - - name: Build MQTT Plain Text Demo - working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text - run: msbuild mqtt_plain_text_demo.sln -t:rebuild -property:Configuration=Debug -m + - name: Configure MQTT Keep Alive Demo + shell: bash + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive + run: | + echo '#ifndef DEMO_CONFIG_H_TEST_BUILD' >> demo_config.h + echo ' #define DEMO_CONFIG_H_TEST_BUILD' >> demo_config.h + echo ' #define democonfigCLIENT_IDENTIFIER "mqtt_demo_test"' >> demo_config.h + echo ' #define democonfigMQTT_BROKER_ENDPOINT "127.0.0.1"' >> demo_config.h + echo ' #define democonfigMQTT_BROKER_PORT ( 1883 )' >> demo_config.h + echo '#endif /* DEMO_CONFIG_H_TEST_BUILD */' >> demo_config.h + + - name: Build MQTT Keep Alive Demo + id: build-mqtt-keep-alive-demo + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive + run: msbuild mqtt_keep_alive_demo.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m + + - name: Run and monitor MQTT Keep Alive Demo + if: success() || failure() && steps.build-mqtt-keep-alive-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/Debug_with_Libslirp/MQTT_Keep_Alive.exe + log-dir: demo_run_logs + timeout-seconds: 90 + success-line: "Demo completed successfully" + retry-attempts: 3 + + - name: Configure MQTT Serializer Demo + shell: bash + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer + run: | + echo '#define democonfigCLIENT_IDENTIFIER "mqtt_demo_test"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_ENDPOINT "127.0.0.1"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_PORT ( 1883 )' >> demo_config.h - name: Build MQTT Serializer Demo + id: build-mqtt-serializer-demo working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer - run: msbuild mqtt_serializer_demo.sln -t:rebuild -property:Configuration=Debug -m + run: msbuild mqtt_serializer_demo.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m + + - name: Run and monitor MQTT Serializer Demo + if: success() || failure() && steps.build-mqtt-serializer-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/Debug_with_Libslirp/MQTT_Serializer.exe + log-dir: demo_run_logs + timeout-seconds: 90 + success-line: "Demo completed successfully" + retry-attempts: 3 + + - name: Configure MQTT Mutual Authentication with WolfSSL Demo + shell: bash + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL + run: | + echo '#define democonfigCREDENTIALS_IN_BUFFER 0' >> demo_config.h + echo '#define democonfigROOT_CA_PEM \' >> demo_config.h + sed 's/.*/"&\\n"\\/' ${{ steps.generate-credentials.outputs.root-ca-cert-path }} >> root_ca_cert.txt + sed '$ s/.$//' root_ca_cert.txt >> demo_config.h + echo '#define democonfigCLIENT_CERTIFICATE_PEM \' >> demo_config.h + sed 's/.*/"&\\n"\\/' ${{ steps.generate-credentials.outputs.device-cert-path }} >> device_cert.txt + sed '$ s/.$//' device_cert.txt >> demo_config.h + echo '#define democonfigCLIENT_PRIVATE_KEY_PEM \' >> demo_config.h + sed 's/.*/"&\\n"\\/' ${{ steps.generate-credentials.outputs.device-priv-key-path }} >> device_priv_key.txt + sed '$ s/.$//' device_priv_key.txt >> demo_config.h + echo '#define democonfigCLIENT_IDENTIFIER "mqtt_demo_test"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_ENDPOINT "127.0.0.1"' >> demo_config.h + echo '#define democonfigMQTT_BROKER_PORT ( 8883 )' >> demo_config.h + + - name: Build MQTT Mutual Authentication with WolfSSL Demo + id: build-mqtt-mutual-auth-with-wolfssl-demo + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL + run: msbuild mqtt_mutual_auth_demo_wolfSSL.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m + + - name: Run and monitor MQTT Mutual Authentication with WolfSSL Demo + if: success() || failure() && steps.build-mqtt-mutual-auth-with-wolfssl-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/Debug/RTOSDemo.exe + log-dir: demo_run_logs + timeout-seconds: 90 + success-line: "Demo completed successfully" + retry-attempts: 3 + + - name: Configure MQTT Multi-Task Demo + shell: bash + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask + run: | + echo '#ifndef DEMO_CONFIG_H_TEST_BUILD' | tee -a demo_config.h + echo ' #define DEMO_CONFIG_H_TEST_BUILD' | tee -a demo_config.h + echo ' #define democonfigCLIENT_CERTIFICATE_PEM ""' | tee -a demo_config.h + echo ' #define democonfigCLIENT_IDENTIFIER ""' | tee -a demo_config.h + echo ' #define democonfigCLIENT_PRIVATE_KEY_PEM ""' | tee -a demo_config.h + echo ' #define democonfigMQTT_BROKER_ENDPOINT ""' | tee -a demo_config.h + echo ' #define democonfigMQTT_BROKER_PORT ( 8883 )' | tee -a demo_config.h + echo ' #define democonfigROOT_CA_PEM ""' | tee -a demo_config.h + echo '#endif /* DEMO_CONFIG_H_TEST_BUILD */' | tee -a demo_config.h + + - name: Build MQTT Multi-Task Demo + id: build-mqtt-multitask-demo + working-directory: FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Multitask + run: msbuild mqtt_multitask_demo.sln -t:rebuild -property:Configuration=Debug -m - name: Configure corePKCS11_MQTT_Mutual_Auth_Windows_Simulator shell: bash @@ -265,7 +471,7 @@ jobs: - name: Build corePKCS11 + coreMQTT Mutual Auth Demo working-directory: FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator - run: msbuild corePKCS11_MQTT_Mutual_Auth.sln -t:rebuild + run: msbuild corePKCS11_MQTT_Mutual_Auth.sln -t:rebuild -property:Configuration=Debug -property:Platform=Win32 -m - name: Configure coreSNTP_Windows_Simulator shell: bash @@ -279,10 +485,9 @@ jobs: echo ' #define democonfigSNTP_CLIENT_POLLING_INTERVAL_SECONDS 500U' | tee -a demo_config.h echo '#endif /* DEMO_CONFIG_H_TEST_BUILD */' | tee -a demo_config.h - - name: coreSNTP Demo + - name: Build coreSNTP Demo working-directory: FreeRTOS-Plus/Demo/coreSNTP_Windows_Simulator - run: msbuild core_sntp_demo.sln -t:rebuild - + run: msbuild core_sntp_demo.sln -t:rebuild -property:Configuration=Debug -property:Platform=Win32 -m winsim_aws_iot: name: AWS IoT Windows Simulator Demos @@ -403,8 +608,9 @@ jobs: with: exe-path: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/build/posix_tcp_demo log-dir: demo_run_logs - timeout-seconds: 180 - success-line: "Received correct data 3 times." + timeout-seconds: 30 + success-line: "Received correct data 3 times" + retry-attempts: 3 plus_tcp_arm: name: FreeRTOS+TCP QEMU ARM MPS2 AN385 @@ -442,22 +648,90 @@ jobs: FreeRTOS/Source \ FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP \ FreeRTOS-Plus/ThirdParty/mbedtls \ - FreeRTOS-Plus/ThirdParty/wolfSSL + FreeRTOS-Plus/ThirdParty/wolfSSL \ + FreeRTOS-Plus/ThirdParty/glib \ + FreeRTOS-Plus/ThirdParty/libslirp - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 + - name: Install meson + run: pip install meson + + - name: Install Glib + continue-on-error: true + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" + cd FreeRTOS-Plus/ThirdParty/glib + meson setup build --backend=vs2019 -Dselinux=disabled -Dxattr=false -Dbsymbolic_functions=false -Dtests=false -Dglib_debug=disabled -Dglib_assert=false --buildtype=release + meson compile -C build + + - name: Start localhost Echo server + id: echo-server + uses: FreeRTOS/CI-CD-GitHub-Actions/localhost-echo-server@main + with: + port_number: 5000 + - name: Build FreeRTOS+TCP Minimal Demo + id: build-plus-tcp-minimal-demo working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator - run: msbuild FreeRTOS_Plus_TCP_Minimal.sln -t:rebuild -property:Configuration=Debug -m + run: | + $content = Get-Content -Path 'DemoTasks\TCPEchoClient_SingleTasks.c' -Raw + $newContent = $content -replace '#define\s+echoECHO_PORT.*', '#define echoECHO_PORT ( 5000 )' + $newContent | Set-Content -Path 'DemoTasks\TCPEchoClient_SingleTasks.c' + $content = Get-Content -Path 'tcp_echo_config.h' -Raw + $newContent = $content -replace '#define\s+configECHO_SERVER_ADDR.*', '#define configECHO_SERVER_ADDR "127.0.0.1"' + $newContent | Set-Content -Path 'tcp_echo_config.h' + $content = Get-Content -Path 'main.c' -Raw + $newContent = $content -replace 'int\s+main(.*?)void(.*?)\r?\n\s*{', 'int main( void ){setvbuf( stdout, NULL, _IONBF, 0 );' + $newContent | Set-Content -Path 'main.c' + msbuild FreeRTOS_Plus_TCP_Minimal.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m + + - name: Run and monitor FreeRTOS+TCP Minimal Demo + if: success() || failure() && steps.build-plus-tcp-minimal-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/Debug_with_Libslirp/FreeRTOS_Plus_TCP_Minimal.exe + log-dir: demo_run_logs + timeout-seconds: 30 + success-line: "Received correct data 3 times" + retry-attempts: 3 - - name: Build FreeRTOS+TCP UDP CLI Demo - working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator - run: msbuild FreeRTOS_Plus_UDP_with_CLI.sln -t:rebuild -property:Configuration=Debug -m + - name: Generate SSL credentials + id: generate-credentials + uses: FreeRTOS/CI-CD-GitHub-Actions/ssl-credential-creator@main + + - name: Configure FreeRTOS+WolfSSL Demo + shell: bash + working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator + run: | + cp ${{ steps.generate-credentials.outputs.root-ca-cert-path }} . + cp ${{ steps.generate-credentials.outputs.server-cert-path }} . + cp ${{ steps.generate-credentials.outputs.server-priv-key-path }} . + sed -i -z "s/ca-cert.pem/root_ca_cert.crt/g" SecureTCPServerTask.c + sed -i -z "s/server-cert.pem/server_cert.crt/g" SecureTCPServerTask.c + sed -i -z "s/server-key.pem/server_priv_key.key/g" SecureTCPServerTask.c + sed -i -z "s/ca-cert.pem/root_ca_cert.crt/g" SecureTCPClientTask.c - name: Build FreeRTOS+WolfSSL Demo + id: build-freertos-wolfssl-demo working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator - run: msbuild FreeRTOS_Plus_WolfSSL.sln -t:rebuild -property:Configuration=Debug -m + run: msbuild FreeRTOS_Plus_WolfSSL.sln -t:rebuild -property:Configuration=Debug_with_Libslirp -property:Platform=Win32 -m + + - name: Run and monitor FreeRTOS+WolfSSL Demo + if: success() || failure() && steps.build-freertos-wolfssl-demo.outcome == 'success' + uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main + with: + exe-path: FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/Debug_with_Libslirp/FreeRTOS_Plus_WolfSSL_Windows_Simulator.exe + log-dir: demo_run_logs + timeout-seconds: 60 + success-line: "Received by the secure server: Message number 9" + retry-attempts: 3 + + - name: Build FreeRTOS+TCP UDP CLI Demo + working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator + run: msbuild FreeRTOS_Plus_UDP_with_CLI.sln -t:rebuild -property:Configuration=Debug -m - name: Build FreeRTOS+WolfSSL FIPS Demo working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_FIPS_Ready_Windows_Simulator @@ -511,4 +785,3 @@ jobs: - name: Build FreeRTOS+RelianceEdge+CLI Demo working-directory: FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator run: msbuild FreeRTOS_Plus_Reliance_Edge_with_CLI.sln -t:rebuild -property:Configuration=Debug -m - diff --git a/.gitignore b/.gitignore index 72f084f465e..dc8dc7a25bd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # Ignore build results [Dd]ebug/ [Dd]ebugPublic/ +[Dd]ebug_with_Libslirp/ [Rr]elease/ [Rr]eleases/ [Bb]in/ diff --git a/.gitmodules b/.gitmodules index 88ad6e43c3a..1b7ef3456a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,6 +40,12 @@ [submodule "FreeRTOS-Plus/ThirdParty/wolfSSL"] path = FreeRTOS-Plus/ThirdParty/wolfSSL url = https://github.com/wolfSSL/wolfssl.git +[submodule "FreeRTOS-Plus/ThirdParty/libslirp"] + path = FreeRTOS-Plus/ThirdParty/libslirp + url = https://gitlab.freedesktop.org/slirp/libslirp.git +[submodule "FreeRTOS-Plus/ThirdParty/glib"] + path = FreeRTOS-Plus/ThirdParty/glib + url = https://gitlab.gnome.org/GNOME/glib.git [submodule "FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent"] path = FreeRTOS-Plus/Source/Application-Protocols/coreMQTT-Agent url = https://github.com/FreeRTOS/coreMQTT-Agent.git diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/TCPEchoClient_SingleTasks.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/TCPEchoClient_SingleTasks.c index f5166259b0a..a5c1e60b3ac 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/TCPEchoClient_SingleTasks.c +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/TCPEchoClient_SingleTasks.c @@ -193,6 +193,11 @@ TickType_t xTimeOnEntering; /* Add in some unique text at the front of the string. */ sprintf( pcTransmittedString, "TxRx message number %u", ulTxCount ); + + /* Replace '\0' with '-' for string length and comparison functions */ + pcTransmittedString[ strlen( pcTransmittedString ) ] = '-'; + + printf( "\n\tSending %d bytes of data to the echo server\n", lStringLength ); ulTxCount++; /* Send the string to the socket. */ @@ -250,12 +255,17 @@ TickType_t xTimeOnEntering; { /* The echo reply was received without error. */ ulTxRxCycles[ xInstance ]++; + + /* The "Received correct data" line is used to determine if + * this demo runs successfully on a GitHub workflow. */ + printf( "\tReceived correct data %d times.\n", ulTxRxCycles[ xInstance ] ); } else { /* The received string did not match the transmitted string. */ ulTxRxFailures[ xInstance ]++; + printf( "\tReceived incorrect data %d times.\n", ulTxRxFailures[ xInstance ] ); break; } } @@ -306,7 +316,7 @@ TickType_t xTimeOnEntering; static BaseType_t prvCreateTxData( char *cBuffer, uint32_t ulBufferLength ) { BaseType_t lCharactersToAdd, lCharacter; -char cChar = '0'; +char cChar = 'A'; const BaseType_t lMinimumLength = 60; uint32_t ulRandomNumber; @@ -324,12 +334,15 @@ uint32_t ulRandomNumber; cBuffer[ lCharacter ] = cChar; cChar++; - if( cChar > '~' ) + if( cChar > 'Z' ) { - cChar = '0'; + cChar = 'A'; } } + cBuffer[ lCharacter - 1 ] = '\n'; + cBuffer[ lCharacter ] = '\0'; + return lCharactersToAdd; } /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.sln b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.sln index acecc464f90..f71e7e3d55d 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.sln +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.sln @@ -15,12 +15,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -29,6 +35,10 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|Win32.Build.0 = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.ActiveCfg = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -37,6 +47,10 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|Win32.Build.0 = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.ActiveCfg = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 + {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug|Win32.ActiveCfg = Debug|Win32 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug|Win32.Build.0 = Debug|Win32 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug|x64.ActiveCfg = Debug|x64 @@ -45,6 +59,10 @@ Global {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Release|Win32.Build.0 = Release|Win32 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Release|x64.ActiveCfg = Release|x64 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Release|x64.Build.0 = Release|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj index 29bc70b3845..ed848dc8379 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -45,6 +59,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -60,12 +80,18 @@ + + + + + + @@ -87,6 +113,25 @@ %(AdditionalDependencies) + + + Level3 + true + ipconfigUSE_LIBSLIRP;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\ThirdParty\glib;..\..\ThirdParty\glib\build;..\..\ThirdParty\glib\build\glib;..\..\ThirdParty\glib\build\subprojects\pcre2-10.42;..\..\ThirdParty\glib\subprojects\proxy-libintl;..\..\ThirdParty\libslirp\src;.;..\..\Source\Utilities\logging;DemoTasks\include;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 @@ -119,6 +164,25 @@ %(AdditionalDependencies) + + + Level3 + true + ipconfigUSE_LIBSLIRP;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\ThirdParty\glib;..\..\ThirdParty\glib\build;..\..\ThirdParty\glib\build\glib;..\..\ThirdParty\glib\build\subprojects\pcre2-10.42;..\..\ThirdParty\glib\subprojects\proxy-libintl;..\..\ThirdParty\libslirp\src;.;..\..\Source\Utilities\logging;DemoTasks\include;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c index 89332126930..62c77919a8d 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c @@ -88,8 +88,8 @@ * connections on the standard echo port (port 7), then echos back any data * received on that connection. */ -#define mainCREATE_SIMPLE_UDP_CLIENT_SERVER_TASKS 1 -#define mainCREATE_TCP_ECHO_TASKS_SINGLE 0 +#define mainCREATE_SIMPLE_UDP_CLIENT_SERVER_TASKS 0 +#define mainCREATE_TCP_ECHO_TASKS_SINGLE 1 #define mainCREATE_TCP_ECHO_SERVER_TASK 0 /*-----------------------------------------------------------*/ @@ -168,8 +168,14 @@ int main( void ) FreeRTOS_debug_printf( ( "FreeRTOS_IPInit\r\n" ) ); #if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) - /* Initialise the interface descriptor for WinPCap. */ + +#ifdef ipconfigUSE_LIBSLIRP + extern NetworkInterface_t* pxFillInterfaceDescriptor(BaseType_t xEMACIndex, + NetworkInterface_t * pxInterface); + pxFillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) ); +#else pxWinPcap_FillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) ); +#endif /* === End-point 0 === */ FreeRTOS_FillEndPoint( &( xInterfaces[ 0 ] ), &( xEndPoints[ 0 ] ), ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress ); diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL.sln b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL.sln index 57e83da00cd..ba59754e16e 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL.sln +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL.sln @@ -15,6 +15,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 + Debug_with_Libslirp|x86 = Debug_with_Libslirp|x86 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 @@ -23,6 +26,12 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug|Win32.ActiveCfg = Debug|Win32 {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug|Win32.Build.0 = Debug|Win32 {C8144D60-5005-4111-841E-FA3529F84A8B}.Debug|x64.ActiveCfg = Debug|x64 @@ -35,6 +44,12 @@ Global {C8144D60-5005-4111-841E-FA3529F84A8B}.Release|x64.Build.0 = Release|x64 {C8144D60-5005-4111-841E-FA3529F84A8B}.Release|x86.ActiveCfg = Release|Win32 {C8144D60-5005-4111-841E-FA3529F84A8B}.Release|x86.Build.0 = Release|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -47,6 +62,12 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.ActiveCfg = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.Build.0 = Release|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -59,6 +80,12 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.ActiveCfg = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.Build.0 = Release|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL_Windows_Simulator.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL_Windows_Simulator.vcxproj index 14e737be5bd..dfea90f722a 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL_Windows_Simulator.vcxproj +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL_Windows_Simulator.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -45,6 +59,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -60,12 +80,18 @@ + + + + + + @@ -73,12 +99,18 @@ true + + true + false true + + true + false @@ -96,6 +128,25 @@ Bcrypt.lib;%(AdditionalDependencies) + + + Level3 + true + WOLFSSL_USER_SETTINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WOLFSSL_IGNORE_FILE_WARN + true + ..\..\ThirdParty\WolfSSL;.;%(AdditionalIncludeDirectories) + + + Console + true + Bcrypt.lib;Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 @@ -126,6 +177,25 @@ true + + + Level3 + true + WOLFSSL_USER_SETTINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WOLFSSL_IGNORE_FILE_WARN + true + ..\..\ThirdParty\WolfSSL;.;%(AdditionalIncludeDirectories) + + + Console + true + Bcrypt.lib;Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/MQTT_Basic_TLS.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/MQTT_Basic_TLS.vcxproj index f6c4dd0bd77..86816d11c1a 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/MQTT_Basic_TLS.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/MQTT_Basic_TLS.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -45,6 +59,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -60,12 +80,18 @@ + + + + + + @@ -73,12 +99,18 @@ true + + true + false true + + true + false @@ -95,6 +127,25 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS + true + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 @@ -125,6 +176,25 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS + true + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/mqtt_basic_tls_demo.sln b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/mqtt_basic_tls_demo.sln index d5ca27a3496..e112a036894 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/mqtt_basic_tls_demo.sln +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Basic_TLS/mqtt_basic_tls_demo.sln @@ -17,6 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 + Debug_with_Libslirp|x86 = Debug_with_Libslirp|x86 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 @@ -25,6 +28,12 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug|Win32.ActiveCfg = Debug|Win32 {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug|Win32.Build.0 = Debug|Win32 {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Debug|x64.ActiveCfg = Debug|x64 @@ -37,6 +46,12 @@ Global {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Release|x64.Build.0 = Release|x64 {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Release|x86.ActiveCfg = Release|Win32 {0B57F66E-FFDB-430F-A28D-0D9F8062FAEB}.Release|x86.Build.0 = Release|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -49,6 +64,12 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.ActiveCfg = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.Build.0 = Release|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -61,6 +82,12 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.ActiveCfg = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.Build.0 = Release|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.ActiveCfg = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.Build.0 = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.ActiveCfg = Debug|x64 @@ -73,6 +100,12 @@ Global {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|x64.Build.0 = Release|x64 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|x86.ActiveCfg = Release|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|x86.Build.0 = Release|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/MQTT_Keep_Alive.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/MQTT_Keep_Alive.vcxproj index a3ec80e16e9..b5bef438a9c 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/MQTT_Keep_Alive.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/MQTT_Keep_Alive.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -52,6 +60,12 @@ true Unicode + + v142 + + + v142 + @@ -142,6 +156,32 @@ true + + + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;%(AdditionalIncludeDirectories) + + + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + + + + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;%(AdditionalIncludeDirectories) + + + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/mqtt_keep_alive_demo.sln b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/mqtt_keep_alive_demo.sln index 8ec05951461..29ad6a9a8a5 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/mqtt_keep_alive_demo.sln +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Keep_Alive/mqtt_keep_alive_demo.sln @@ -17,6 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 + Debug_with_Libslirp|x86 = Debug_with_Libslirp|x86 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 @@ -25,6 +28,12 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug|Win32.ActiveCfg = Debug|Win32 {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug|Win32.Build.0 = Debug|Win32 {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Debug|x64.ActiveCfg = Debug|x64 @@ -37,6 +46,12 @@ Global {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Release|x64.Build.0 = Release|x64 {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Release|x86.ActiveCfg = Release|Win32 {7260CB0D-0BBF-4DAC-91D9-D091022C1F9A}.Release|x86.Build.0 = Release|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -49,6 +64,12 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.ActiveCfg = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.Build.0 = Release|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -61,6 +82,12 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.ActiveCfg = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.Build.0 = Release|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 @@ -73,6 +100,12 @@ Global {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.Build.0 = Release|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.ActiveCfg = Release|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.Build.0 = Release|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.ActiveCfg = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.Build.0 = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/MQTT_Mutual_Auth.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/MQTT_Mutual_Auth.vcxproj index 5924dc3b14d..357f19f2b43 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/MQTT_Mutual_Auth.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/MQTT_Mutual_Auth.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -45,6 +59,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -60,12 +80,18 @@ + + + + + + @@ -73,12 +99,18 @@ true + + true + false true + + true + false @@ -95,6 +127,25 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";%(PreprocessorDefinitions) + true + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 @@ -125,6 +176,25 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/mqtt_mutual_auth_demo.sln b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/mqtt_mutual_auth_demo.sln index 38f3d10f4cc..6587256f5eb 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/mqtt_mutual_auth_demo.sln +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth/mqtt_mutual_auth_demo.sln @@ -17,6 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 + Debug_with_Libslirp|x86 = Debug_with_Libslirp|x86 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 @@ -25,6 +28,12 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug|Win32.ActiveCfg = Debug|Win32 {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug|Win32.Build.0 = Debug|Win32 {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Debug|x64.ActiveCfg = Debug|x64 @@ -37,6 +46,12 @@ Global {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Release|x64.Build.0 = Release|x64 {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Release|x86.ActiveCfg = Release|Win32 {DD2281B6-6D9B-4477-BA0A-8842F2E917C7}.Release|x86.Build.0 = Release|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -49,6 +64,12 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.ActiveCfg = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.Build.0 = Release|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -61,6 +82,12 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.ActiveCfg = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.Build.0 = Release|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 @@ -73,6 +100,12 @@ Global {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.Build.0 = Release|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.ActiveCfg = Release|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.Build.0 = Release|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.ActiveCfg = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.Build.0 = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/MQTT_Mutual_Auth_wolfSSL.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/MQTT_Mutual_Auth_wolfSSL.vcxproj index a1a3773bc89..23034ba895a 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/MQTT_Mutual_Auth_wolfSSL.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/MQTT_Mutual_Auth_wolfSSL.vcxproj @@ -1,6 +1,10 @@  + + Debug_with_Libslirp + Win32 + Debug Win32 @@ -18,6 +22,12 @@ MultiByte v142 + + Application + false + MultiByte + v142 + @@ -25,13 +35,21 @@ + + + + <_ProjectFileVersion>10.0.30319.1 .\Debug\ + .\Debug\ .\Debug\ + .\Debug\ true + true AllRules.ruleset + AllRules.ruleset @@ -82,6 +100,60 @@ .\Debug/WIN32.bsc + + + .\Debug/WIN32.tlb + + + + + Disabled + .\;..\Common;..\..\..\..\FreeRTOS-Plus\Source\Application-Protocols\coreMQTT\source\include;..\..\..\..\FreeRTOS-Plus\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\..\FreeRTOS-Plus\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\wolfSSL_freertos;..\..\..\ThirdParty\wolfSSL;%(AdditionalIncludeDirectories) + WOLFSSL_USER_SETTINGS;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDLL + .\Debug/WIN32.pch + .\Debug/ + .\Debug/ + .\Debug/ + Level4 + true + false + EditAndContinue + /wd4210 /wd4127 /wd4214 /wd4201 /wd4244 /wd4310 /wd4200 %(AdditionalOptions) + true + NotUsing + false + CompileAsC + 4819;4206;4706 + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c09 + + + .\Debug/RTOSDemo.exe + true + true + .\Debug/WIN32.pdb + Console + MachineX86 + Bcrypt.lib;Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + ..\..\Common\WinPCap + false + false + + + true + .\Debug/WIN32.bsc + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/mqtt_mutual_auth_demo_wolfSSL.sln b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/mqtt_mutual_auth_demo_wolfSSL.sln index 9695a8552eb..b2dcf1b29d8 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/mqtt_mutual_auth_demo_wolfSSL.sln +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Mutual_Auth_wolfSSL/mqtt_mutual_auth_demo_wolfSSL.sln @@ -17,12 +17,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|Win32 {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug|Win32.ActiveCfg = Debug|Win32 {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug|Win32.Build.0 = Debug|Win32 {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Debug|x64.ActiveCfg = Debug|Win32 @@ -30,6 +35,10 @@ Global {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Release|Win32.Build.0 = Debug|Win32 {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Release|x64.ActiveCfg = Debug|Win32 {C686325E-3261-42F7-AEB1-DDE5280E1CEB}.Release|x64.Build.0 = Debug|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -38,6 +47,10 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|Win32.Build.0 = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.ActiveCfg = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -46,6 +59,10 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|Win32.Build.0 = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.ActiveCfg = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 @@ -54,6 +71,10 @@ Global {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|Win32.Build.0 = Release|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.ActiveCfg = Release|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.Build.0 = Release|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.ActiveCfg = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.Build.0 = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/MQTT_Plain_Text.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/MQTT_Plain_Text.vcxproj index 12ef19a10f2..fc9c9ca3604 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/MQTT_Plain_Text.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/MQTT_Plain_Text.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -45,6 +59,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -60,12 +80,18 @@ + + + + + + @@ -73,12 +99,18 @@ true + + true + false true + + true + false @@ -95,6 +127,25 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 @@ -125,6 +176,25 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS + true + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Utilities\backoff_algorithm\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/mqtt_plain_text_demo.sln b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/mqtt_plain_text_demo.sln index c9a5f83d4f5..3979b820a53 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/mqtt_plain_text_demo.sln +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Plain_Text/mqtt_plain_text_demo.sln @@ -17,6 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 + Debug_with_Libslirp|x86 = Debug_with_Libslirp|x86 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 @@ -25,6 +28,12 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug|Win32.ActiveCfg = Debug|Win32 {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug|Win32.Build.0 = Debug|Win32 {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Debug|x64.ActiveCfg = Debug|x64 @@ -37,6 +46,12 @@ Global {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Release|x64.Build.0 = Release|x64 {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Release|x86.ActiveCfg = Release|Win32 {95746A42-54E8-4A6C-AE5D-EE5CE3B086BD}.Release|x86.Build.0 = Release|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -49,6 +64,12 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.ActiveCfg = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.Build.0 = Release|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -61,6 +82,12 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.ActiveCfg = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.Build.0 = Release|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 @@ -73,6 +100,12 @@ Global {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.Build.0 = Release|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.ActiveCfg = Release|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.Build.0 = Release|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.ActiveCfg = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.Build.0 = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/MQTT_Serializer.vcxproj b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/MQTT_Serializer.vcxproj index 1a85ad51f2a..480bd0e6a44 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/MQTT_Serializer.vcxproj +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/MQTT_Serializer.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -45,6 +59,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -60,12 +80,18 @@ + + + + + + @@ -73,12 +99,18 @@ true + + true + false true + + true + false @@ -95,6 +127,25 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Utilities\backoff_algorithm\source\include;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 @@ -125,6 +176,25 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS + true + .\;..\Common;..\..\..\Source\Application-Protocols\network_transport\tcp_sockets_wrapper\include;..\..\..\Source\Application-Protocols\network_transport;..\..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\..\Source\Utilities\backoff_algorithm\source\include;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/mqtt_serializer_demo.sln b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/mqtt_serializer_demo.sln index bdd954306c0..fe504e6692c 100644 --- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/mqtt_serializer_demo.sln +++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/mqtt_serializer_demo.sln @@ -17,6 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 + Debug_with_Libslirp|x86 = Debug_with_Libslirp|x86 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 @@ -25,6 +28,12 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug|Win32.ActiveCfg = Debug|Win32 {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug|Win32.Build.0 = Debug|Win32 {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Debug|x64.ActiveCfg = Debug|x64 @@ -37,6 +46,12 @@ Global {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Release|x64.Build.0 = Release|x64 {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Release|x86.ActiveCfg = Release|Win32 {B7A01D2B-CF81-4A65-BC54-AF2185F6E51A}.Release|x86.Build.0 = Release|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -49,6 +64,12 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.ActiveCfg = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.Build.0 = Release|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -61,6 +82,12 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.ActiveCfg = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.Build.0 = Release|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 @@ -73,6 +100,12 @@ Global {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.Build.0 = Release|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.ActiveCfg = Release|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.Build.0 = Release|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.ActiveCfg = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.Build.0 = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/CorePKCS11_Demos.sln b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/CorePKCS11_Demos.sln index 1f926281662..0ecb1898805 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/CorePKCS11_Demos.sln +++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/CorePKCS11_Demos.sln @@ -19,12 +19,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Statically Linked Libraries EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|Win32 = Debug_with_Libslirp|Win32 + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.ActiveCfg = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|Win32.Build.0 = Debug|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 @@ -33,6 +39,10 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|Win32.Build.0 = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.ActiveCfg = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.ActiveCfg = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|Win32.Build.0 = Debug|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 @@ -41,6 +51,10 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|Win32.Build.0 = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.ActiveCfg = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 + {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug|Win32.ActiveCfg = Debug|Win32 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug|Win32.Build.0 = Debug|Win32 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Debug|x64.ActiveCfg = Debug|x64 @@ -49,6 +63,10 @@ Global {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Release|Win32.Build.0 = Release|Win32 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Release|x64.ActiveCfg = Release|x64 {382DC80F-E278-4BC9-9DB6-59014486DA0F}.Release|x64.Build.0 = Release|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.ActiveCfg = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|Win32.Build.0 = Debug|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 @@ -57,6 +75,10 @@ Global {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|Win32.Build.0 = Release|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.ActiveCfg = Release|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.Build.0 = Release|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.ActiveCfg = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|Win32.Build.0 = Debug|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.ActiveCfg = Debug|x64 @@ -65,6 +87,10 @@ Global {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|Win32.Build.0 = Release|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|x64.ActiveCfg = Release|x64 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|x64.Build.0 = Release|x64 + {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug_with_Libslirp|Win32.ActiveCfg = Debug_with_Libslirp|Win32 + {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug_with_Libslirp|Win32.Build.0 = Debug_with_Libslirp|Win32 + {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug|Win32.ActiveCfg = Debug|Win32 {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug|Win32.Build.0 = Debug|Win32 {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/CorePKCS11_Demos.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/CorePKCS11_Demos.vcxproj index 48cd331e9a4..884af50514e 100644 --- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/CorePKCS11_Demos.vcxproj +++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/CorePKCS11_Demos.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -45,6 +59,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -60,12 +80,18 @@ + + + + + + @@ -87,6 +113,25 @@ %(AdditionalDependencies) + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + .;examples;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 @@ -119,6 +164,25 @@ %(AdditionalDependencies) + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + .;examples;%(AdditionalIncludeDirectories) + + + Console + true + Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies) + + + xcopy /y /d "..\..\ThirdParty\glib\build\glib\glib-2.0-0.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\proxy-libintl\intl-8.dll" "$(OutDir)" +xcopy /y /d "..\..\ThirdParty\glib\build\subprojects\pcre2-10.42\pcre2-8-0.dll" "$(OutDir)" + + Level3 diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP index a7b8a27020a..8197dde3f7a 160000 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP @@ -1 +1 @@ -Subproject commit a7b8a27020aa46711b67b9176e556a42de484e64 +Subproject commit 8197dde3f7a1b622cc25d9a29210619e9a29c2d8 diff --git a/FreeRTOS-Plus/ThirdParty/glib b/FreeRTOS-Plus/ThirdParty/glib new file mode 160000 index 00000000000..69e209764bc --- /dev/null +++ b/FreeRTOS-Plus/ThirdParty/glib @@ -0,0 +1 @@ +Subproject commit 69e209764bcfef599a21b32f82f88f1906bf197c diff --git a/FreeRTOS-Plus/ThirdParty/libslirp b/FreeRTOS-Plus/ThirdParty/libslirp new file mode 160000 index 00000000000..177da3d7521 --- /dev/null +++ b/FreeRTOS-Plus/ThirdParty/libslirp @@ -0,0 +1 @@ +Subproject commit 177da3d752176274059181988a7cd4c0953f34a9 diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj index aa7965875a5..a1a72c2a16f 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -31,6 +39,11 @@ true v142 + + StaticLibrary + true + v142 + StaticLibrary false @@ -41,6 +54,11 @@ true v142 + + StaticLibrary + true + v142 + StaticLibrary false @@ -54,12 +72,18 @@ + + + + + + @@ -80,6 +104,16 @@ ..\..\Source\FreeRTOS-Plus-TCP\source;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\ ..\..\Source\FreeRTOS-Plus-TCP\source;..\..\Source\FreeRTOS-Plus-TCP\tools;$(SourcePath) + + ..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories) + true + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);..\..\ThirdParty\winpcap\lib\x64 + $(IncludePath) + ..\..\Source\FreeRTOS-Plus-TCP\source;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\ + ..\..\Source\FreeRTOS-Plus-TCP\source;..\..\Source\FreeRTOS-Plus-TCP\tools;$(SourcePath) + ..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories) true @@ -100,6 +134,16 @@ ..\..\Source\FreeRTOS-Plus-TCP\source;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\ ..\..\Source\FreeRTOS-Plus-TCP\source;..\..\Source\FreeRTOS-Plus-TCP\tools;$(SourcePath) + + ..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories) + true + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\..\ThirdParty\winpcap\lib\x86 + $(IncludePath) + ..\..\Source\FreeRTOS-Plus-TCP\source;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\ + ..\..\Source\FreeRTOS-Plus-TCP\source;..\..\Source\FreeRTOS-Plus-TCP\tools;$(SourcePath) + ..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories) true @@ -131,6 +175,24 @@ wpcap.lib;%(AdditionalDependencies) + + + BUILDING_LIBSLIRP;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + ProgramDatabase + Disabled + ..\..\ThirdParty\glib;..\..\ThirdParty\glib\glib;..\..\ThirdParty\glib\build;..\..\ThirdParty\glib\build\glib;..\..\ThirdParty\glib\build\subprojects\pcre2-10.42;..\..\ThirdParty\glib\subprojects\proxy-libintl;..\..\ThirdParty\libslirp\src;..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\ThirdParty\winpcap\include;..\..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories) + + + MachineX86 + true + Windows + + + wpcap.lib;%(AdditionalDependencies) + + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) @@ -160,6 +222,16 @@ wpcap.lib;%(AdditionalDependencies) + + + + BUILDING_LIBSLIRP;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\ThirdParty\glib;..\..\ThirdParty\glib\glib;..\..\ThirdParty\glib\build\;..\..\ThirdParty\glib\build\glib;..\..\ThirdParty\glib\build\subprojects\pcre2-10.42;..\..\ThirdParty\glib\subprojects\proxy-libintl;..\..\ThirdParty\libslirp\src;..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\ThirdParty\winpcap\include;..\..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories) + + + wpcap.lib;%(AdditionalDependencies) + + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) @@ -213,11 +285,285 @@ + + false + true + true + false + true + true + + + false + true + true + false + true + true + - - + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + false + true + true + true + true + false + + + true + true + + + + + + + ipconfigUSE_LIBSLIRP;BUILDING_LIBSLIRP;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ipconfigUSE_LIBSLIRP;BUILDING_LIBSLIRP;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + @@ -265,22 +611,1246 @@ - - - - - - - - - - - - - - - - + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + @@ -291,6 +1861,32 @@ true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + + false + false + true + true + true + true + + diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj.filters b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj.filters index 126c586f16c..5a6e679341a 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj.filters +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj.filters @@ -12,22 +12,49 @@ {a3216426-70cf-4b4f-8b8f-423c8d0416cb} - - {b2e06bcd-b665-4ef4-8eff-5203748463d1} + + {21d82bd5-24ba-4986-bf91-cc5eefe88952} - - {af7dc417-59c0-4c2b-bb4b-cc9b84817e89} + + {6ceb2f4f-e7f3-4a8d-a60b-4c48157f091d} - + {97a99563-c215-4975-9cb8-c6a29a30f03f} h - + {7a52d3bf-8fc9-4242-8636-e173ade0aa68} - + {2968f486-aba8-47f5-a175-fe77e197a2c6} + + {b2e06bcd-b665-4ef4-8eff-5203748463d1} + + + {af7dc417-59c0-4c2b-bb4b-cc9b84817e89} + + + {2f9d315d-e376-46c7-b896-052a57fa90c9} + + + {80f9d2cd-c700-4cc5-b0a4-e00ad25ad4b0} + + + {dd33c19f-f4e9-4a7e-bdf9-c2716cf554b9} + + + {e1a1fbf5-cbe9-4b8c-8cc0-b07325ec237a} + + + {c96ee908-213c-4a3b-bf42-eb90362fe673} + + + {0e5bd1c4-dcc1-4cfe-ade2-37c6b0137e5b} + + + {bf054a66-9772-4e3d-9f7d-2ad8b488c759} + @@ -94,19 +121,17 @@ source - tcp_utilities + Network Interface\tcp_utilities - tcp_utilities + Network Interface\tcp_utilities - tcp_utilities + Network Interface\tcp_utilities source - - source @@ -170,6 +195,111 @@ source + + Network Interface\winpcap + + + Network Interface\libslirp + + + Network Interface\libslirp + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface\libslirp\source + + + Network Interface + @@ -254,13 +384,13 @@ include - tcp_utilities\include + Network Interface\tcp_utilities\include - tcp_utilities\include + Network Interface\tcp_utilities\include - tcp_utilities\include + Network Interface\tcp_utilities\include compiler_msvc @@ -269,53 +399,53 @@ compiler_msvc - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include + Network Interface\winpcap\include - winpcap\include\pcap + Network Interface\winpcap\include\pcap - winpcap\include\pcap + Network Interface\winpcap\include\pcap - winpcap\include\pcap + Network Interface\winpcap\include\pcap - winpcap\include\pcap + Network Interface\winpcap\include\pcap include @@ -356,5 +486,457 @@ include + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\dependency\glib\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + Network Interface\libslirp\include + + + + + Network Interface\libslirp\dependency\glib\x86 + + + Network Interface\libslirp\dependency\glib\x86 + + + Network Interface\libslirp\dependency\glib\x86 + \ No newline at end of file diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/libslirp-version.h b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/libslirp-version.h new file mode 100644 index 00000000000..4fd051fec8a --- /dev/null +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/libslirp-version.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ +#ifndef LIBSLIRP_VERSION_H_ +#define LIBSLIRP_VERSION_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define SLIRP_MAJOR_VERSION 4 +#define SLIRP_MINOR_VERSION 7 +#define SLIRP_MICRO_VERSION 0 +#define SLIRP_VERSION_STRING "4.7.0" + +#define SLIRP_CHECK_VERSION(major,minor,micro) \ + (SLIRP_MAJOR_VERSION > (major) || \ + (SLIRP_MAJOR_VERSION == (major) && SLIRP_MINOR_VERSION > (minor)) || \ + (SLIRP_MAJOR_VERSION == (major) && SLIRP_MINOR_VERSION == (minor) && \ + SLIRP_MICRO_VERSION >= (micro))) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* LIBSLIRP_VERSION_H_ */ diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c index 93ceaf1d3f0..373a9a087c3 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c @@ -204,7 +204,13 @@ void vPlatformInitIpStack( void ) #if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) /* Initialise the interface descriptor for WinPCap. */ - pxWinPcap_FillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) ); + #ifdef ipconfigUSE_LIBSLIRP + extern NetworkInterface_t* pxFillInterfaceDescriptor(BaseType_t xEMACIndex, + NetworkInterface_t * pxInterface); + pxFillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) ); + #else + pxWinPcap_FillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) ); + #endif /* === End-point 0 === */ FreeRTOS_FillEndPoint( &( xInterfaces[ 0 ] ), &( xEndPoints[ 0 ] ), ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress ); diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj index b7f449ad8b6..604bf2d32c5 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -31,6 +39,11 @@ true v142 + + StaticLibrary + true + v142 + StaticLibrary false @@ -41,6 +54,11 @@ true v142 + + StaticLibrary + true + v142 + StaticLibrary false @@ -54,12 +72,18 @@ + + + + + + @@ -71,6 +95,13 @@ ..\..\..\FreeRTOS\Source;$(SourcePath) ..\..\..\FreeRTOS\Source;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\FreeRTOS\Source\portable\MemMang;$(PublicModuleDirectories) + + true + build\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + ..\..\..\FreeRTOS\Source;$(SourcePath) + ..\..\..\FreeRTOS\Source;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\FreeRTOS\Source\portable\MemMang;$(PublicModuleDirectories) + true build\$(ProjectName)\$(Platform)\$(Configuration)\ @@ -89,6 +120,12 @@ ..\..\..\FreeRTOS\Source;$(SourcePath) ..\..\..\FreeRTOS\Source;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\FreeRTOS\Source\portable\MemMang;$(PublicModuleDirectories) + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) + ..\..\..\FreeRTOS\Source;$(SourcePath) + ..\..\..\FreeRTOS\Source;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\FreeRTOS\Source\portable\MemMang;$(PublicModuleDirectories) + build\$(ProjectName)\$(Platform)\$(Configuration)\ $(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath) @@ -112,6 +149,20 @@ Windows + + + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + ProgramDatabase + Disabled + + + MachineX86 + true + Windows + + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) @@ -131,6 +182,7 @@ ..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\FreeRTOS\Source\include;.\;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS_Plus_Libs.sln b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS_Plus_Libs.sln index 2695edc7995..35ca82aff90 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS_Plus_Libs.sln +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS_Plus_Libs.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.3.32819.101 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.33529.622 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeRTOS+TCP", "FreeRTOS+TCP\FreeRTOS+TCP.vcxproj", "{C90E6CC5-818B-4C97-8876-0986D989387C}" EndProject @@ -17,12 +17,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corePKCS11", "corePKCS11\co EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_with_Libslirp|x64 = Debug_with_Libslirp|x64 + Debug_with_Libslirp|x86 = Debug_with_Libslirp|x86 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.ActiveCfg = Debug|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x64.Build.0 = Debug|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Debug|x86.ActiveCfg = Debug|Win32 @@ -31,6 +37,10 @@ Global {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x64.Build.0 = Release|x64 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.ActiveCfg = Release|Win32 {C90E6CC5-818B-4C97-8876-0986D989387C}.Release|x86.Build.0 = Release|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.ActiveCfg = Debug|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x64.Build.0 = Debug|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Debug|x86.ActiveCfg = Debug|Win32 @@ -39,6 +49,10 @@ Global {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x64.Build.0 = Release|x64 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.ActiveCfg = Release|Win32 {72C209C4-49A4-4942-A201-44706C9D77EC}.Release|x86.Build.0 = Release|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.ActiveCfg = Debug|x64 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x64.Build.0 = Debug|x64 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Debug|x86.ActiveCfg = Debug|Win32 @@ -47,6 +61,10 @@ Global {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|x64.Build.0 = Release|x64 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|x86.ActiveCfg = Release|Win32 {E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}.Release|x86.Build.0 = Release|Win32 + {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Debug|x64.ActiveCfg = Debug|x64 {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Debug|x64.Build.0 = Debug|x64 {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Debug|x86.ActiveCfg = Debug|Win32 @@ -55,6 +73,10 @@ Global {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Release|x64.Build.0 = Release|x64 {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Release|x86.ActiveCfg = Release|Win32 {EE39FA0F-CEFB-4C29-A571-05A28FDD47FD}.Release|x86.Build.0 = Release|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.ActiveCfg = Debug|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x64.Build.0 = Debug|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Debug|x86.ActiveCfg = Debug|Win32 @@ -63,6 +85,10 @@ Global {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x64.Build.0 = Release|x64 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.ActiveCfg = Release|Win32 {BE362AC0-B10B-4276-B84E-6304652BA228}.Release|x86.Build.0 = Release|Win32 + {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug_with_Libslirp|x64.ActiveCfg = Debug_with_Libslirp|x64 + {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug_with_Libslirp|x64.Build.0 = Debug_with_Libslirp|x64 + {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug_with_Libslirp|x86.ActiveCfg = Debug_with_Libslirp|Win32 + {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug_with_Libslirp|x86.Build.0 = Debug_with_Libslirp|Win32 {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug|x64.ActiveCfg = Debug|x64 {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug|x64.Build.0 = Debug|x64 {19F0FF1A-3368-491A-9932-A2F089508F51}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/Logging/Logging.vcxproj b/FreeRTOS-Plus/VisualStudio_StaticProjects/Logging/Logging.vcxproj index 8df642c3a30..b88ba8dbb64 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/Logging/Logging.vcxproj +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/Logging/Logging.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -45,6 +59,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -60,12 +80,18 @@ + + + + + + @@ -74,6 +100,10 @@ ..\..\Source\Utilities\logging;$(PublicIncludeDirectories) true + + ..\..\Source\Utilities\logging;$(PublicIncludeDirectories) + true + ..\..\Source\Utilities\logging;$(PublicIncludeDirectories) true @@ -82,6 +112,10 @@ ..\..\Source\Utilities\logging;$(PublicIncludeDirectories) true + + ..\..\Source\Utilities\logging;$(PublicIncludeDirectories) + true + ..\..\Source\Utilities\logging;$(PublicIncludeDirectories) true @@ -100,6 +134,20 @@ true + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(PublicIncludeDirectories) + true + + + Console + true + + Level3 @@ -132,6 +180,20 @@ true + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(PublicIncludeDirectories) + true + + + Console + true + + Level3 diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/MbedTLS/MbedTLS.vcxproj b/FreeRTOS-Plus/VisualStudio_StaticProjects/MbedTLS/MbedTLS.vcxproj index 9c84651a538..d5ad906da17 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/MbedTLS/MbedTLS.vcxproj +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/MbedTLS/MbedTLS.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -258,6 +266,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -271,6 +285,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -286,12 +306,18 @@ + + + + + + @@ -319,6 +345,20 @@ true + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h" + true + .\;..\..\ThirdParty\mbedtls\library;..\..\ThirdParty\mbedtls\include + true + + + Console + true + + Level3 @@ -351,6 +391,20 @@ true + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h" + true + .\;..\..\ThirdParty\mbedtls\library;..\..\ThirdParty\mbedtls\include + true + + + Console + true + + Level3 diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/coreHTTP/coreHTTP.vcxproj b/FreeRTOS-Plus/VisualStudio_StaticProjects/coreHTTP/coreHTTP.vcxproj index 69d92c481fd..8f0b76ce500 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/coreHTTP/coreHTTP.vcxproj +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/coreHTTP/coreHTTP.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -45,6 +59,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -60,12 +80,18 @@ + + + + + + @@ -74,6 +100,10 @@ ..\..\Source\Application-Protocols\coreHTTP\source\include;..\..\Source\Application-Protocols\coreHTTP\source\dependency\3rdparty\llhttp\include;..\..\Source\Application-Protocols\coreHTTP\source\interface;.\;%(AdditionalIncludeDirectories);$(PublicIncludeDirectories) true + + ..\..\Source\Application-Protocols\coreHTTP\source\include;..\..\Source\Application-Protocols\coreHTTP\source\dependency\3rdparty\llhttp\include;..\..\Source\Application-Protocols\coreHTTP\source\interface;.\;%(AdditionalIncludeDirectories);$(PublicIncludeDirectories) + true + ..\..\Source\Application-Protocols\coreHTTP\source\include;..\..\Source\Application-Protocols\coreHTTP\source\dependency\3rdparty\llhttp\include;..\..\Source\Application-Protocols\coreHTTP\source\interface;.\;%(AdditionalIncludeDirectories);$(PublicIncludeDirectories) true @@ -82,6 +112,10 @@ ..\..\Source\Application-Protocols\coreHTTP\source\include;..\..\Source\Application-Protocols\coreHTTP\source\dependency\3rdparty\llhttp\include;..\..\Source\Application-Protocols\coreHTTP\source\interface;.\;%(AdditionalIncludeDirectories);$(PublicIncludeDirectories) true + + ..\..\Source\Application-Protocols\coreHTTP\source\include;..\..\Source\Application-Protocols\coreHTTP\source\dependency\3rdparty\llhttp\include;..\..\Source\Application-Protocols\coreHTTP\source\interface;.\;%(AdditionalIncludeDirectories);$(PublicIncludeDirectories) + true + ..\..\Source\Application-Protocols\coreHTTP\source\include;..\..\Source\Application-Protocols\coreHTTP\source\dependency\3rdparty\llhttp\include;..\..\Source\Application-Protocols\coreHTTP\source\interface;.\;%(AdditionalIncludeDirectories);$(PublicIncludeDirectories) true @@ -103,6 +137,20 @@ true + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\Source\Application-Protocols\coreHTTP\source\include;..\..\Source\Application-Protocols\coreHTTP\source\dependency\3rdparty\llhttp\include;..\..\Source\Application-Protocols\coreHTTP\source\interface;.\;%(AdditionalIncludeDirectories) + true + + + Console + true + + Level3 @@ -135,6 +183,20 @@ true + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\Source\Application-Protocols\coreHTTP\source\include;..\..\Source\Application-Protocols\coreHTTP\source\dependency\3rdparty\llhttp\include;..\..\Source\Application-Protocols\coreHTTP\source\interface;.\;%(AdditionalIncludeDirectories) + true + + + Console + true + + Level3 diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/corePKCS11/corePKCS11.vcxproj b/FreeRTOS-Plus/VisualStudio_StaticProjects/corePKCS11/corePKCS11.vcxproj index f97344c01a2..e28c2d72cc7 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/corePKCS11/corePKCS11.vcxproj +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/corePKCS11/corePKCS11.vcxproj @@ -1,6 +1,14 @@ + + Debug_with_Libslirp + Win32 + + + Debug_with_Libslirp + x64 + Debug Win32 @@ -32,6 +40,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -45,6 +59,12 @@ v142 Unicode + + StaticLibrary + true + v142 + Unicode + StaticLibrary false @@ -60,12 +80,18 @@ + + + + + + @@ -74,6 +100,10 @@ ..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;.\ true + + ..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;.\ + true + ..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;.\ true @@ -82,6 +112,10 @@ ..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;.\ true + + ..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;.\ + true + ..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;.\ true @@ -100,6 +134,20 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\portable\os;..\..\Source\corePKCS11\source\portable\os\freertos_winsim;..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;.\;%(AdditionalIncludeDirectories) + true + + + Console + true + + Level3 @@ -132,6 +180,20 @@ true + + + Level3 + true + MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h";_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + ..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\portable\os;..\..\Source\corePKCS11\source\portable\os\freertos_winsim;..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;.\;%(AdditionalIncludeDirectories) + true + + + Console + true + + Level3 diff --git a/manifest.yml b/manifest.yml index 64240e59f45..e49091bedc3 100644 --- a/manifest.yml +++ b/manifest.yml @@ -11,7 +11,7 @@ dependencies: path: "FreeRTOS/Source" - name: "FreeRTOS-Plus-TCP" - version: "a7b8a27" + version: "8197dde" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Plus-TCP.git" @@ -94,6 +94,20 @@ dependencies: url: "https://github.com/Mbed-TLS/mbedtls.git" path: "FreeRTOS-Plus/ThirdParty/mbedtls" + - name: "glib" + version: "2.76.3" + repository: + type: "git" + url: "https://gitlab.gnome.org/GNOME/glib.git" + path: "FreeRTOS-Plus/ThirdParty/glib" + + - name: "libslirp" + version: "177da3d" + repository: + type: "git" + url: "https://gitlab.freedesktop.org/slirp/libslirp.git" + path: "FreeRTOS-Plus/ThirdParty/libslirp" + - name: "backoffAlgorithm" version: "f4b3fcf" repository: