diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ec7687972..fceaa90532 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,7 +129,7 @@ jobs: exclude-dirs: source/portable/NetworkInterface/STM32 formatting: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Check formatting diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index af9725ba09..c9b5d6ec4b 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -10,6 +10,10 @@ on: description: 'Release Version Number (Eg, v1.0.0-rc1)' required: true +# Workflow permissions block +permissions: + contents: write # This grants write access to repository content, including pushing commits/tags and creating releases. + jobs: tag-commit: name: Tag commit @@ -32,4 +36,4 @@ jobs: git tag -d ${{ github.event.inputs.version_number }} git remote update git checkout tags/${{ github.event.inputs.version_number }} - git diff ${{ github.event.inputs.commit_id }} tags/${{ github.event.inputs.version_number }} + git diff ${{ github.event.inputs.commit_id }} tags/${{ github.event.inputs.version_number }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf816e2b0d..159add0960 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,10 @@ on: description: 'Release Version Number (Eg, v1.0.0)' required: true +# Workflow permissions block +permissions: + contents: write # This grants write access to repository content, including pushing commits/tags and creating releases. + jobs: tag-commit: name: Tag commit @@ -140,6 +144,9 @@ jobs: ref: ${{ github.event.inputs.version_number }} add_release: "true" create-release: + permissions: + contents: write + id-token: write needs: - create-zip - deploy-doxygen @@ -171,6 +178,11 @@ jobs: asset_path: ./FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip asset_name: FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip asset_content_type: application/zip + - name: Backup Release Asset + uses: FreeRTOS/CI-CD-Github-Actions/artifact-backup@main + with: + artifact_path: ./FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip + release_tag: ${{ github.event.inputs.version_number }} cleanup: needs: - create-release diff --git a/History.txt b/History.txt index c003f2b08c..4862c07aaf 100644 --- a/History.txt +++ b/History.txt @@ -1,5 +1,45 @@ Documentation and download available at https://www.FreeRTOS.org/ +Changes between FreeRTOS-plus-TCP V4.3.4 and V4.3.3 released October 10, 2025: + + The implementation lacked sufficient checks to ensure that received packets + meet the minimum size requirements for certain ICMPv6 message types, leading to + out-of-bounds read operations when processing packets smaller than the expected + size. This issue has been fixed by adding checks to prevent out-of-bounds reads. + The implementation lacked sufficient checks to prevent null pointer dereference + when an IPv6 multicast packet is received on a device not configured with a + link-local endpoint. This issue has been fixed by adding checks to prevent + null pointer dereference. + + The implementation lacked sufficient checks to validate the payload length field + in the IPv6 packet header. This allowed malicious packets with incorrect payload + lengths to cause integer wraparound, resulting in erroneously large calculated + payload length. This inflated payload length bypassed the existing + bounds-checking mechanisms, leading to out-of-bounds read operations. This issue + has been fixed by adding checks to validate the payload length field in the IPv6 + packet header. + + The implementation lacked sufficient checks to validate the IP version field + when a UDP/IPv6 packet is received with ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM + disabled. This allowed the processing of packets with an incorrect IP version + field instead of rejecting them early. Subsequent attempts to extract network + buffers from these invalid UDP packets could result in dereferencing of an + invalid pointer due to incorrect pointer arithmetic. + We would like to thank Ivan Gotovchits of Mayhem Security for collaborating on + this issue through the coordinated vulnerability disclosure process. + +Changes between FreeRTOS-plus-TCP V4.3.3 and V4.3.2 released June 10, 2025: + + Fixed maximum network buffer allocation size check when buffer + allocation scheme 1 is used which caused allocation failure on + some network interfaces. + +Changes between FreeRTOS-plus-TCP V4.3.2 and V4.3.1 released June 03, 2025: + + It was possible to cause an out-of-bounds write when processing LLMNR + or mDNS queries with very long DNS names. This issue only affects systems + using Buffer Allocation Scheme 1 with LLMNR or mDNS enabled. + This issue has been fixed by adding checks to prevent out of bounds write. + We would like to thank Paschal Amusuo (@AmPaschal), + James C Davis (@davisjam), Taylor Le Lievre (@tlelievre26), and + Aravind Kumar Machiry (@machiry) of Purdue University for collaborating + on this issue through the coordinated vulnerability disclosure process. + Changes between FreeRTOS-plus-TCP V4.3.1 and V4.3.0 released December 16, 2024: + Update README.md with information related to migrating to V4.3.0 and above for users utilising the STM32 network interface. diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile index 99d7c4c051..57bd1b6dc8 100644 --- a/docs/doxygen/config.doxyfile +++ b/docs/doxygen/config.doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = FreeRTOS-Plus-TCP # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = V4.3.0 +PROJECT_NUMBER = V4.3.4 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/manifest.yml b/manifest.yml index 9b361a9992..99f3855252 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,5 +1,5 @@ name: "FreeRTOS-Plus-TCP" -version: "V4.3.1" +version: "V4.3.4" description: "Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to implement the TCP/IP protocol. Suitable for microcontrollers." diff --git a/sbom.spdx b/sbom.spdx new file mode 100644 index 0000000000..f08d9d1758 --- /dev/null +++ b/sbom.spdx @@ -0,0 +1,751 @@ +SPDXVersion: SPDX-2.2 +DataLicense: CC0-1.0 +SPDXID: SPDXRef-DOCUMENT +DocumentName: FreeRTOS-Plus-TCP +DocumentNamespace: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/V4.3.3/sbom.spdx +Creator: Organization:Amazon Web Services +Created: 2025-06-10T15:48:38Z +CreatorComment: NOASSERTION +DocumentComment: NOASSERTION + +PackageName: FreeRTOS-Plus-TCP +SPDXID: SPDXRef-Package-FreeRTOS-Plus-TCP +PackageVersion: V4.3.3 +PackageDownloadLocation: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/tree/V4.3.3 +PackageLicenseDeclared: MIT +PackageLicenseConcluded: MIT +PackageLicenseInfoFromFiles: NOASSERTION +FilesAnalyzed: true +PackageVerificationCode: a221f86de733012f37d8dc2b820852018455fce3 +PackageCopyrightText: NOASSERTION +PackageSummary: NOASSERTION +PackageDescription: Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to implement the TCP/IP protocol. Suitable for microcontrollers. + +FileName: ./FreeRTOS_ARP.c +SPDXID: SPDXRef-File-FreeRTOSARP.c +FileChecksum: SHA1: 16f5973dbd9ae669d54d22558d6332282bb579ad +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_DNS_Callback.c +SPDXID: SPDXRef-File-FreeRTOSDNSCallback.c +FileChecksum: SHA1: ea6209c6966bf015eb150a859f06cd671de167d7 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IPv4.c +SPDXID: SPDXRef-File-FreeRTOSIPv4.c +FileChecksum: SHA1: e86af56c9ff77c78f45350b8427a2eaa0a92b558 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_Utils_IPv4.c +SPDXID: SPDXRef-File-FreeRTOSTCPUtilsIPv4.c +FileChecksum: SHA1: 1fb038ca0f22f4967edfa7f4b0992053733013af +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_Transmission.c +SPDXID: SPDXRef-File-FreeRTOSTCPTransmission.c +FileChecksum: SHA1: 21c91a48188bb3d2438844521bdb57e00d1e1637 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_IP.c +SPDXID: SPDXRef-File-FreeRTOSTCPIP.c +FileChecksum: SHA1: c295bb10284c43982a43534663760dd0273194f7 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IPv4_Sockets.c +SPDXID: SPDXRef-File-FreeRTOSIPv4Sockets.c +FileChecksum: SHA1: eaecabbf8886a95d41166ecfd2f53f0fa38df1f7 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_Transmission_IPv4.c +SPDXID: SPDXRef-File-FreeRTOSTCPTransmissionIPv4.c +FileChecksum: SHA1: c1e452d44aacc13d4516d498a3e40fc82009cf2e +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_DNS_Parser.c +SPDXID: SPDXRef-File-FreeRTOSDNSParser.c +FileChecksum: SHA1: ecd5b1f0624592a457d118d9da2757d8ca263029 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IPv6.c +SPDXID: SPDXRef-File-FreeRTOSIPv6.c +FileChecksum: SHA1: d8f0b26a75a7931247b92d307214af4022fa95ed +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_IP_IPv6.c +SPDXID: SPDXRef-File-FreeRTOSTCPIPIPv6.c +FileChecksum: SHA1: 7e09175e838c1a2762a83d12a5f6de2a091661e3 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_ND.c +SPDXID: SPDXRef-File-FreeRTOSND.c +FileChecksum: SHA1: 726d8cd61768fbb9a6b544f46449aa19c1f4a229 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_DNS_Networking.c +SPDXID: SPDXRef-File-FreeRTOSDNSNetworking.c +FileChecksum: SHA1: a91fe160c19705fad5e8d309c6cf49f78415433a +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IPv6_Sockets.c +SPDXID: SPDXRef-File-FreeRTOSIPv6Sockets.c +FileChecksum: SHA1: 4a0056279bd6dd3d571c05f4c6d77db1fd654f42 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_UDP_IPv4.c +SPDXID: SPDXRef-File-FreeRTOSUDPIPv4.c +FileChecksum: SHA1: eddad030c5983c278b2417bfa32fb0b909ec0043 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_Reception.c +SPDXID: SPDXRef-File-FreeRTOSTCPReception.c +FileChecksum: SHA1: beacdf805a628e99b12d1aead554feac2e69d067 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_DNS.c +SPDXID: SPDXRef-File-FreeRTOSDNS.c +FileChecksum: SHA1: e915da3858ab7cd717b0af97dec3bfd747fcc0c2 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_UDP_IPv6.c +SPDXID: SPDXRef-File-FreeRTOSUDPIPv6.c +FileChecksum: SHA1: 25209ed70c9349ca29d6fc1bb60d65fcc9bca4ba +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_Routing.c +SPDXID: SPDXRef-File-FreeRTOSRouting.c +FileChecksum: SHA1: aace333769957a463d53867645ba3da8c9a6a654 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_IP_IPv4.c +SPDXID: SPDXRef-File-FreeRTOSTCPIPIPv4.c +FileChecksum: SHA1: 2e85015128c27f705aeee899c549173fb682969d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IP.c +SPDXID: SPDXRef-File-FreeRTOSIP.c +FileChecksum: SHA1: cdad91f98924d63bd5479ba4f9d4ff074e4d2515 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_WIN.c +SPDXID: SPDXRef-File-FreeRTOSTCPWIN.c +FileChecksum: SHA1: 13aaa9ca1513e4153ad9aed7b6a20d6fc8de7603 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_State_Handling.c +SPDXID: SPDXRef-File-FreeRTOSTCPStateHandling.c +FileChecksum: SHA1: 08d2a06fb31550dd99b446d76d753b3f094d7f92 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_Transmission_IPv6.c +SPDXID: SPDXRef-File-FreeRTOSTCPTransmissionIPv6.c +FileChecksum: SHA1: 1063106a5022690ed9fc388b5e127c1c2ab7fd98 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_DHCP.c +SPDXID: SPDXRef-File-FreeRTOSDHCP.c +FileChecksum: SHA1: 10641237e9295928973e4a69d2d7728354996305 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_DNS_Cache.c +SPDXID: SPDXRef-File-FreeRTOSDNSCache.c +FileChecksum: SHA1: 9a05df08d0bc1b9e54fb9e4be879ed5fbdf44f91 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_State_Handling_IPv4.c +SPDXID: SPDXRef-File-FreeRTOSTCPStateHandlingIPv4.c +FileChecksum: SHA1: 693fb02e7eea950d2782875c4ee43e877e7fc15e +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_State_Handling_IPv6.c +SPDXID: SPDXRef-File-FreeRTOSTCPStateHandlingIPv6.c +FileChecksum: SHA1: 96b2de6b70a48fec8b828d35a104cf2c7803c4c0 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IPv6_Utils.c +SPDXID: SPDXRef-File-FreeRTOSIPv6Utils.c +FileChecksum: SHA1: 5ce2f0bf5fe9f16a390c515819dbf260529dd4c3 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_Tiny_TCP.c +SPDXID: SPDXRef-File-FreeRTOSTinyTCP.c +FileChecksum: SHA1: f0ba39c0d00921a747ecafcde9c9ec38811cdf8c +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_Sockets.c +SPDXID: SPDXRef-File-FreeRTOSSockets.c +FileChecksum: SHA1: 43ce5cb6bd36ac7c2f73c40b65a8d3465e85184d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IP_Utils.c +SPDXID: SPDXRef-File-FreeRTOSIPUtils.c +FileChecksum: SHA1: 3802688b025e548fedc49765aecd22979d9085a1 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_UDP_IP.c +SPDXID: SPDXRef-File-FreeRTOSUDPIP.c +FileChecksum: SHA1: b510bd3f056c4802adb218e275b2f16c85fd26a7 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_Utils_IPv6.c +SPDXID: SPDXRef-File-FreeRTOSTCPUtilsIPv6.c +FileChecksum: SHA1: e86120c6f2892d4b2c84a0b3d9b283b2f83a16f0 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IP_Timers.c +SPDXID: SPDXRef-File-FreeRTOSIPTimers.c +FileChecksum: SHA1: 540fee6f46ba936eac345c3eb9ebcd91fa30552b +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_RA.c +SPDXID: SPDXRef-File-FreeRTOSRA.c +FileChecksum: SHA1: dcf94f44625f6d6dd6e62ed3fe6204f78fddbf8d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_ICMP.c +SPDXID: SPDXRef-File-FreeRTOSICMP.c +FileChecksum: SHA1: 6a56a5887a52b2fd80010c0c17e017c58cafafe6 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_IPv4_Utils.c +SPDXID: SPDXRef-File-FreeRTOSIPv4Utils.c +FileChecksum: SHA1: 996f8e33f80d6f76382bf9837d12ea12af9d225c +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_TCP_Utils.c +SPDXID: SPDXRef-File-FreeRTOSTCPUtils.c +FileChecksum: SHA1: 279cb0dffcb4283a91bc5c8fe9095a99670f38bc +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_Stream_Buffer.c +SPDXID: SPDXRef-File-FreeRTOSStreamBuffer.c +FileChecksum: SHA1: 54866d2d6c77bd5b658bb04265a320a717601985 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_BitConfig.c +SPDXID: SPDXRef-File-FreeRTOSBitConfig.c +FileChecksum: SHA1: 2de509e0e15a63fb00debdb686d53a4265cf71ef +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./FreeRTOS_DHCPv6.c +SPDXID: SPDXRef-File-FreeRTOSDHCPv6.c +FileChecksum: SHA1: 7349f278ee0ae62f2d43d78a34f21b3782a243af +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/Common/phyHandling.c +SPDXID: SPDXRef-File-portable-NetworkInterface-Common-phyHandling.c +FileChecksum: SHA1: 40e2d417d5f3f2114c2137ab09d717246e5ca69c +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/libslirp/MBuffNetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-libslirp-MBuffNetworkInterface.c +FileChecksum: SHA1: 84e769736da533a6854349bab3c6af67e920aaa6 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/libslirp/MBuffNetifBackendLibslirp.c +SPDXID: SPDXRef-File-portable-NetworkInterface-libslirp-MBuffNetifBackendLibslirp.c +FileChecksum: SHA1: 3a87091fca9f0cf4a40601c4847457c782fe7ff6 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/mw300_rd/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-mw300rd-NetworkInterface.c +FileChecksum: SHA1: 439d178234b1c9814995f1b81585b632be6f4cf7 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/ksz8851snl/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-ksz8851snl-NetworkInterface.c +FileChecksum: SHA1: c16f3a57f9cfc3840bdbb6180e48b5d0338b2420 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/ksz8851snl/ksz8851snl.c +SPDXID: SPDXRef-File-portable-NetworkInterface-ksz8851snl-ksz8851snl.c +FileChecksum: SHA1: 1ebaba711088fd35f69278c4dd98d692b63879d3 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/MPS2_AN385/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-MPS2AN385-NetworkInterface.c +FileChecksum: SHA1: 072728cb20e4399bdd3863ef887f46fa9f585e4e +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/MPS2_AN385/ether_lan9118/smsc9220_eth_drv.c +SPDXID: SPDXRef-File-portable-NetworkInterface-MPS2AN385-etherlan9118-smsc9220ethdrv.c +FileChecksum: SHA1: 4dea999b13a46ae8966fc7ed55f8802f61cad16d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/MPS3_AN552/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-MPS3AN552-NetworkInterface.c +FileChecksum: SHA1: 02e576e087e36b0e4b22f54d55e598d2c2b5e129 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/ETH_LAN91C111.c +SPDXID: SPDXRef-File-portable-NetworkInterface-MPS3AN552-CMSISDriver-ETHLAN91C111.c +FileChecksum: SHA1: f83733bfe6206ead4a27e1bcc7253f34a99e1be8 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/RX/ether_callback.c +SPDXID: SPDXRef-File-portable-NetworkInterface-RX-ethercallback.c +FileChecksum: SHA1: 149f0402a44e27d70307a7e736344e03478a23d7 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/RX/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-RX-NetworkInterface.c +FileChecksum: SHA1: cd93e3a5275597af533c2959c3ccb09bc52358c8 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c +SPDXID: SPDXRef-File-portable-NetworkInterface-ThirdParty-MSP432-NetworkMiddleware.c +FileChecksum: SHA1: 1a53ca3c52d62b14517931fbb89d26d4e394e17c +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-ThirdParty-MSP432-NetworkInterface.c +FileChecksum: SHA1: 993ce22f5e200217dc609e6853e50034feb2a651 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-NetworkInterface.c +FileChecksum: SHA1: e720ed38b96d9ecdf431af7bf8667bd5f98a7130 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Legacy/STM32Hxx/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Legacy-STM32Hxx-NetworkInterface.c +FileChecksum: SHA1: 8369a6989f8e8eda06b723206310156907ad99ad +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Legacy/STM32Hxx/stm32hxx_hal_eth.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Legacy-STM32Hxx-stm32hxxhaleth.c +FileChecksum: SHA1: bd3a097f93c6c5ae8012fee0b95af049dadfe16a +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Legacy/STM32Fxx/stm32fxx_hal_eth.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Legacy-STM32Fxx-stm32fxxhaleth.c +FileChecksum: SHA1: 92b2f12f433a4f09c7046ee77736c1b74dc3176f +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Legacy/STM32Fxx/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Legacy-STM32Fxx-NetworkInterface.c +FileChecksum: SHA1: 50d4088dd1e4a66f92cc17b0f9b83d56a90b2a87 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Drivers/H5/stm32h5xx_hal_eth_ex.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Drivers-H5-stm32h5xxhalethex.c +FileChecksum: SHA1: 25d6c7bd050a710938877ba28307b09d7291ef2d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Drivers/H5/stm32h5xx_hal_eth.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Drivers-H5-stm32h5xxhaleth.c +FileChecksum: SHA1: 911d3150a51e3d3d2ec808f06c8b46971ac7538f +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Drivers/F4/stm32f4xx_hal_eth.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Drivers-F4-stm32f4xxhaleth.c +FileChecksum: SHA1: bf9dd5929385189bcf846b6a0788813b8295e9cc +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Drivers/H7/stm32h7xx_hal_eth.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Drivers-H7-stm32h7xxhaleth.c +FileChecksum: SHA1: 5ad3cea3d027d17effac1936d9ce5fb8b435bcbb +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Drivers/H7/stm32h7xx_hal_eth_ex.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Drivers-H7-stm32h7xxhalethex.c +FileChecksum: SHA1: 6938d0780f852344e348a554976d06192bca6567 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/STM32/Drivers/F7/stm32f7xx_hal_eth.c +SPDXID: SPDXRef-File-portable-NetworkInterface-STM32-Drivers-F7-stm32f7xxhaleth.c +FileChecksum: SHA1: fde5f3d8a90447245e16b8e770b860bde6c26586 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/LPC54018/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-LPC54018-NetworkInterface.c +FileChecksum: SHA1: 760aad89a3d3e24f23758f793c628c80b8a70bc3 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/loopback/loopbackNetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-loopback-loopbackNetworkInterface.c +FileChecksum: SHA1: cea674dad531fc46cc6868cd4bc070a211cab136 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c +SPDXID: SPDXRef-File-portable-NetworkInterface-xilinxultrascale-uncachedmemory.c +FileChecksum: SHA1: f6247c4560c659623456afd03429c2d1c289f0b4 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_physpeed.c +SPDXID: SPDXRef-File-portable-NetworkInterface-xilinxultrascale-xemacpsifphyspeed.c +FileChecksum: SHA1: 2fd08ab72640ccda871a1b0b9150a0e97f6670e9 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_hw.c +SPDXID: SPDXRef-File-portable-NetworkInterface-xilinxultrascale-xemacpsifhw.c +FileChecksum: SHA1: d81cd739a07a2a199214586e7bcc8a92e2608a3d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-xilinxultrascale-NetworkInterface.c +FileChecksum: SHA1: 6e30beecfbee0392bbc904d742433c84c78f0f9e +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c +SPDXID: SPDXRef-File-portable-NetworkInterface-xilinxultrascale-xemacpsifdma.c +FileChecksum: SHA1: 7351df82d03d382b4096b3720001d404d4a471b2 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/DriverSAM/gmac_SAM.c +SPDXID: SPDXRef-File-portable-NetworkInterface-DriverSAM-gmacSAM.c +FileChecksum: SHA1: 4b52d28114ae8c69d5b2ce4ab266e84bb382f30d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/DriverSAM/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-DriverSAM-NetworkInterface.c +FileChecksum: SHA1: b562f446df60ea5ad5f145b48ed50b8dc3ba791d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/ATSAM4E/ethernet_phy.c +SPDXID: SPDXRef-File-portable-NetworkInterface-ATSAM4E-ethernetphy.c +FileChecksum: SHA1: 40490a00413a5823bf4f6c7c74bd1f68b045ccfc +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/ATSAM4E/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-ATSAM4E-NetworkInterface.c +FileChecksum: SHA1: f3f625e882f1509509a3e980b01d2bae973bb834 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/ATSAM4E/gmac.c +SPDXID: SPDXRef-File-portable-NetworkInterface-ATSAM4E-gmac.c +FileChecksum: SHA1: 7661cf9883fdd005bc663b737b8a43d8512aa914 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/NXP1060/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-NXP1060-NetworkInterface.c +FileChecksum: SHA1: c2b4ca17b5e36a8cd283bc6ada0fda8eddd6b48b +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/LPC18xx/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-LPC18xx-NetworkInterface.c +FileChecksum: SHA1: a7f7cb122f307eefeb485fd3430fb7b19110da5c +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/LPC17xx/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-LPC17xx-NetworkInterface.c +FileChecksum: SHA1: 3ee1ba22cfb83dac51eefe7e2d3a2e862b05a84d +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/linux/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-linux-NetworkInterface.c +FileChecksum: SHA1: 367eea31c4a6ed9ad4a6dca761fa9495e163c652 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/board_family/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-boardfamily-NetworkInterface.c +FileChecksum: SHA1: a43ea486c231cb6b48e864f51ec7cb3c84ff230c +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/Zynq/uncached_memory.c +SPDXID: SPDXRef-File-portable-NetworkInterface-Zynq-uncachedmemory.c +FileChecksum: SHA1: da79c2ba096d3ea9137c26d95986c9f3cd51adf9 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/Zynq/x_emacpsif_physpeed.c +SPDXID: SPDXRef-File-portable-NetworkInterface-Zynq-xemacpsifphyspeed.c +FileChecksum: SHA1: cffcfe94c7c3e2db1b7bf1b75b59d4d3e2e8b7bc +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/Zynq/x_emacpsif_hw.c +SPDXID: SPDXRef-File-portable-NetworkInterface-Zynq-xemacpsifhw.c +FileChecksum: SHA1: 578c15c5ee78186f49a4060088d742f0ee386409 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/Zynq/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-Zynq-NetworkInterface.c +FileChecksum: SHA1: e2870564a6f7b4b658ce9f932a2f801fa3e2d48e +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/Zynq/x_emacpsif_dma.c +SPDXID: SPDXRef-File-portable-NetworkInterface-Zynq-xemacpsifdma.c +FileChecksum: SHA1: 1fbd43d70793b8131be58af249d06f3d52b07e2e +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/TM4C/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-TM4C-NetworkInterface.c +FileChecksum: SHA1: 9543186324c41d90b4ee0f2794fdc840eff9e69c +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/ATSAME5x/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-ATSAME5x-NetworkInterface.c +FileChecksum: SHA1: 5259e49cf55af83e3c6778d5f0afb341624d2d75 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/WinPCap/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-WinPCap-NetworkInterface.c +FileChecksum: SHA1: abb5207a4fdd9e98de4752a5492a4f2df4ae26d3 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/WinPCap/FaultInjection.c +SPDXID: SPDXRef-File-portable-NetworkInterface-WinPCap-FaultInjection.c +FileChecksum: SHA1: e7eddd2edef440d27f6bef5839f722884d2cf447 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/MPS4_CS315/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-MPS4CS315-NetworkInterface.c +FileChecksum: SHA1: 02e576e087e36b0e4b22f54d55e598d2c2b5e129 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/MPS4_CS315/CMSIS_Driver/ETH_LAN91C111.c +SPDXID: SPDXRef-File-portable-NetworkInterface-MPS4CS315-CMSISDriver-ETHLAN91C111.c +FileChecksum: SHA1: ae6fbf4c93e02bd1ce0fa97d386250b285083423 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/SH2A/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-SH2A-NetworkInterface.c +FileChecksum: SHA1: 035dbe380793a31b8dfd95140b9f728d50f558d9 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/M487/m480_eth.c +SPDXID: SPDXRef-File-portable-NetworkInterface-M487-m480eth.c +FileChecksum: SHA1: b555c5dac03afb3cd39e5373d71738398dcfdcd3 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/M487/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-M487-NetworkInterface.c +FileChecksum: SHA1: f18821b873ca4837166e78f1b3a7d534b8e69ae2 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/esp32/NetworkInterface.c +SPDXID: SPDXRef-File-portable-NetworkInterface-esp32-NetworkInterface.c +FileChecksum: SHA1: bd7f42cf691da33263a9e780f93218628f12b611 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/pic32mzef/BufferAllocation_2.c +SPDXID: SPDXRef-File-portable-NetworkInterface-pic32mzef-BufferAllocation2.c +FileChecksum: SHA1: fd23c62620943ccaa80c62e465a88906b6357551 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/pic32mzef/NetworkInterface_eth.c +SPDXID: SPDXRef-File-portable-NetworkInterface-pic32mzef-NetworkInterfaceeth.c +FileChecksum: SHA1: f5cec8f2c47f18e1fa305ff65e43693578f8c786 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/NetworkInterface/pic32mzef/NetworkInterface_wifi.c +SPDXID: SPDXRef-File-portable-NetworkInterface-pic32mzef-NetworkInterfacewifi.c +FileChecksum: SHA1: 57c966e7ba03effad3a01ac48545afe4d28670e6 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/BufferManagement/BufferAllocation_1.c +SPDXID: SPDXRef-File-portable-BufferManagement-BufferAllocation1.c +FileChecksum: SHA1: bdacf6ae045d5dc876f89c4e2c9e8a717cc692a2 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + +FileName: ./portable/BufferManagement/BufferAllocation_2.c +SPDXID: SPDXRef-File-portable-BufferManagement-BufferAllocation2.c +FileChecksum: SHA1: 58fd6d6a5c6e5dab74a0edd70ac782c35acaf562 +LicenseConcluded: MIT +FileCopyrightText: NOASSERTION +FileComment: NOASSERTION + diff --git a/source/FreeRTOS_ARP.c b/source/FreeRTOS_ARP.c index a9a3edfec9..030630bf4f 100644 --- a/source/FreeRTOS_ARP.c +++ b/source/FreeRTOS_ARP.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_BitConfig.c b/source/FreeRTOS_BitConfig.c index 5fd3d2deee..3dfcec4f75 100644 --- a/source/FreeRTOS_BitConfig.c +++ b/source/FreeRTOS_BitConfig.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/FreeRTOS_DHCP.c b/source/FreeRTOS_DHCP.c index 819d2c59e0..d840f62b97 100644 --- a/source/FreeRTOS_DHCP.c +++ b/source/FreeRTOS_DHCP.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_DHCPv6.c b/source/FreeRTOS_DHCPv6.c index 978fa395d3..37f3baa1f2 100644 --- a/source/FreeRTOS_DHCPv6.c +++ b/source/FreeRTOS_DHCPv6.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/FreeRTOS_DNS.c b/source/FreeRTOS_DNS.c index 4ef18c4245..9d0bf6635e 100644 --- a/source/FreeRTOS_DNS.c +++ b/source/FreeRTOS_DNS.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_DNS_Cache.c b/source/FreeRTOS_DNS_Cache.c index 119be881d1..70c655ac7e 100644 --- a/source/FreeRTOS_DNS_Cache.c +++ b/source/FreeRTOS_DNS_Cache.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_DNS_Callback.c b/source/FreeRTOS_DNS_Callback.c index 5dd1658ac7..c5e27e2a19 100644 --- a/source/FreeRTOS_DNS_Callback.c +++ b/source/FreeRTOS_DNS_Callback.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_DNS_Networking.c b/source/FreeRTOS_DNS_Networking.c index 9d41bcd877..04211f98c2 100644 --- a/source/FreeRTOS_DNS_Networking.c +++ b/source/FreeRTOS_DNS_Networking.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_DNS_Parser.c b/source/FreeRTOS_DNS_Parser.c index a1a3f2038a..6f060dc026 100644 --- a/source/FreeRTOS_DNS_Parser.c +++ b/source/FreeRTOS_DNS_Parser.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -486,31 +486,30 @@ LLMNRAnswer_t * pxAnswer; uint8_t * pucNewBuffer = NULL; size_t uxExtraLength; + size_t uxDataLength = uxBufferLength + + sizeof( UDPHeader_t ) + + sizeof( EthernetHeader_t ) + + uxIPHeaderSizePacket( pxNetworkBuffer ); - if( xBufferAllocFixedSize == pdFALSE ) - { - size_t uxDataLength = uxBufferLength + - sizeof( UDPHeader_t ) + - sizeof( EthernetHeader_t ) + - uxIPHeaderSizePacket( pxNetworkBuffer ); - - #if ( ipconfigUSE_IPv6 != 0 ) - if( xSet.usType == dnsTYPE_AAAA_HOST ) - { - uxExtraLength = sizeof( LLMNRAnswer_t ) + ipSIZE_OF_IPv6_ADDRESS - sizeof( pxAnswer->ulIPAddress ); - } - else - #endif /* ( ipconfigUSE_IPv6 != 0 ) */ - #if ( ipconfigUSE_IPv4 != 0 ) - { - uxExtraLength = sizeof( LLMNRAnswer_t ); - } - #else /* ( ipconfigUSE_IPv4 != 0 ) */ + #if ( ipconfigUSE_IPv6 != 0 ) + if( xSet.usType == dnsTYPE_AAAA_HOST ) { - /* do nothing, coverity happy */ + uxExtraLength = sizeof( LLMNRAnswer_t ) + ipSIZE_OF_IPv6_ADDRESS - sizeof( pxAnswer->ulIPAddress ); } - #endif /* ( ipconfigUSE_IPv4 != 0 ) */ + else + #endif /* ( ipconfigUSE_IPv6 != 0 ) */ + #if ( ipconfigUSE_IPv4 != 0 ) + { + uxExtraLength = sizeof( LLMNRAnswer_t ); + } + #else /* ( ipconfigUSE_IPv4 != 0 ) */ + { + /* do nothing, coverity happy */ + } + #endif /* ( ipconfigUSE_IPv4 != 0 ) */ + if( xBufferAllocFixedSize == pdFALSE ) + { /* Set the size of the outgoing packet. */ pxNetworkBuffer->xDataLength = uxDataLength; pxNewBuffer = pxDuplicateNetworkBufferWithDescriptor( pxNetworkBuffer, @@ -539,7 +538,17 @@ } else { - pucNewBuffer = &( pxNetworkBuffer->pucEthernetBuffer[ uxUDPOffset ] ); + /* When xBufferAllocFixedSize is TRUE, check if the buffer size is big enough to + * store the answer. */ + if( ( uxDataLength + uxExtraLength ) <= ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ) + { + pucNewBuffer = &( pxNetworkBuffer->pucEthernetBuffer[ uxUDPOffset ] ); + } + else + { + /* Just to indicate that the message may not be answered. */ + pxNetworkBuffer = NULL; + } } if( ( pxNetworkBuffer != NULL ) ) @@ -1210,7 +1219,11 @@ { /* BufferAllocation_1.c is used, the Network Buffers can contain at least * ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER. */ - configASSERT( uxSizeNeeded < ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ); + if( uxSizeNeeded > ( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ) ) + { + /* The buffer is too small to reply. Drop silently. */ + break; + } } pxNetworkBuffer->xDataLength = uxSizeNeeded; diff --git a/source/FreeRTOS_ICMP.c b/source/FreeRTOS_ICMP.c index 062922d5d3..a2feacdbe2 100644 --- a/source/FreeRTOS_ICMP.c +++ b/source/FreeRTOS_ICMP.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_IP.c b/source/FreeRTOS_IP.c index 38e6e01d19..f0ba1d00ae 100644 --- a/source/FreeRTOS_IP.c +++ b/source/FreeRTOS_IP.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_IP_Timers.c b/source/FreeRTOS_IP_Timers.c index 2edf0c6759..354bcbf926 100644 --- a/source/FreeRTOS_IP_Timers.c +++ b/source/FreeRTOS_IP_Timers.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_IP_Utils.c b/source/FreeRTOS_IP_Utils.c index 07d1bc253e..0e2f7a4706 100644 --- a/source/FreeRTOS_IP_Utils.c +++ b/source/FreeRTOS_IP_Utils.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_IPv4.c b/source/FreeRTOS_IPv4.c index e5e5e48d5d..3dcb0c1706 100644 --- a/source/FreeRTOS_IPv4.c +++ b/source/FreeRTOS_IPv4.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_IPv4_Sockets.c b/source/FreeRTOS_IPv4_Sockets.c index c6a5533ed9..0b76194e9e 100644 --- a/source/FreeRTOS_IPv4_Sockets.c +++ b/source/FreeRTOS_IPv4_Sockets.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_IPv4_Utils.c b/source/FreeRTOS_IPv4_Utils.c index f7c1d3f847..88f7b5cde2 100644 --- a/source/FreeRTOS_IPv4_Utils.c +++ b/source/FreeRTOS_IPv4_Utils.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_IPv6.c b/source/FreeRTOS_IPv6.c index 0e8f85ea19..082476c2f8 100644 --- a/source/FreeRTOS_IPv6.c +++ b/source/FreeRTOS_IPv6.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -93,7 +93,6 @@ const struct xIPv6_Address FreeRTOS_in6addr_loopback = { { 0U, 0U, 0U, 0U, 0U, 0 size_t uxBufferLength ) { BaseType_t xResult = pdFAIL; - uint16_t ucVersionTrafficClass; uint16_t usPayloadLength; uint8_t ucNextHeader; size_t uxMinimumLength; @@ -116,15 +115,6 @@ const struct xIPv6_Address FreeRTOS_in6addr_loopback = { { 0U, 0U, 0U, 0U, 0U, 0 break; } - ucVersionTrafficClass = pxIPv6Packet->xIPHeader.ucVersionTrafficClass; - - /* Test if the IP-version is 6. */ - if( ( ( ucVersionTrafficClass & ( uint8_t ) 0xF0U ) >> 4 ) != 6U ) - { - DEBUG_SET_TRACE_VARIABLE( xLocation, 2 ); - break; - } - /* Check if the IPv6-header is transferred. */ if( uxBufferLength < ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER ) ) { @@ -497,6 +487,7 @@ eFrameProcessingResult_t prvAllowIPPacketIPv6( const IPHeader_IPv6_t * const pxI const IPv6_Address_t * pxDestinationIPAddress = &( pxIPv6Header->xDestinationAddress ); const IPv6_Address_t * pxSourceIPAddress = &( pxIPv6Header->xSourceAddress ); BaseType_t xHasUnspecifiedAddress = pdFALSE; + uint16_t ucVersionTrafficClass = pxIPv6Header->ucVersionTrafficClass; /* Drop if packet has unspecified IPv6 address (defined in RFC4291 - sec 2.5.2) * either in source or destination address. */ @@ -506,10 +497,17 @@ eFrameProcessingResult_t prvAllowIPPacketIPv6( const IPHeader_IPv6_t * const pxI xHasUnspecifiedAddress = pdTRUE; } + /* Test if the IP-version is 6. */ + if( ( ( ucVersionTrafficClass & ( uint8_t ) 0xF0U ) >> 4 ) != 6U ) + { + /* Can not handle, unknown or invalid header version. */ + eReturn = eReleaseBuffer; + FreeRTOS_printf( ( "prvAllowIPPacketIPv6: drop packet, invalid header version: %u\n", ( ucVersionTrafficClass & ( uint8_t ) 0xF0U ) >> 4 ) ); + } /* Is the packet for this IP address? */ - if( ( xHasUnspecifiedAddress == pdFALSE ) && - ( pxNetworkBuffer->pxEndPoint != NULL ) && - ( memcmp( pxDestinationIPAddress->ucBytes, pxNetworkBuffer->pxEndPoint->ipv6_settings.xIPAddress.ucBytes, sizeof( IPv6_Address_t ) ) == 0 ) ) + else if( ( xHasUnspecifiedAddress == pdFALSE ) && + ( pxNetworkBuffer->pxEndPoint != NULL ) && + ( memcmp( pxDestinationIPAddress->ucBytes, pxNetworkBuffer->pxEndPoint->ipv6_settings.xIPAddress.ucBytes, sizeof( IPv6_Address_t ) ) == 0 ) ) { eReturn = eProcessBuffer; } diff --git a/source/FreeRTOS_IPv6_Sockets.c b/source/FreeRTOS_IPv6_Sockets.c index 0801c34775..02c44759d1 100644 --- a/source/FreeRTOS_IPv6_Sockets.c +++ b/source/FreeRTOS_IPv6_Sockets.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_IPv6_Utils.c b/source/FreeRTOS_IPv6_Utils.c index 9e9f2abd6d..66dc8932c9 100644 --- a/source/FreeRTOS_IPv6_Utils.c +++ b/source/FreeRTOS_IPv6_Utils.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -92,7 +92,7 @@ BaseType_t prvChecksumIPv6Checks( uint8_t * pucEthernetBuffer, { uxExtensionHeaderLength = usGetExtensionHeaderLength( pucEthernetBuffer, uxBufferLength, &pxSet->ucProtocol ); - if( uxExtensionHeaderLength >= uxBufferLength ) + if( ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxExtensionHeaderLength ) >= uxBufferLength ) { /* Error detected when parsing extension header. */ pxSet->usChecksum = ipINVALID_LENGTH; @@ -107,8 +107,18 @@ BaseType_t prvChecksumIPv6Checks( uint8_t * pucEthernetBuffer, /* coverity[misra_c_2012_rule_11_3_violation] */ pxSet->pxProtocolHeaders = ( ( ProtocolHeaders_t * ) &( pucEthernetBuffer[ ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxExtensionHeaderLength ] ) ); pxSet->usPayloadLength = FreeRTOS_ntohs( pxSet->pxIPPacket_IPv6->usPayloadLength ); + /* For IPv6, the number of bytes in the protocol is indicated. */ - pxSet->usProtocolBytes = ( uint16_t ) ( pxSet->usPayloadLength - uxExtensionHeaderLength ); + if( pxSet->usPayloadLength < uxExtensionHeaderLength ) + { + /* Invalid payload length - extension headers exceed payload. */ + pxSet->usChecksum = ipINVALID_LENGTH; + xReturn = 4; + } + else + { + pxSet->usProtocolBytes = ( uint16_t ) ( pxSet->usPayloadLength - uxExtensionHeaderLength ); + } uxNeeded = ( size_t ) pxSet->usPayloadLength; uxNeeded += ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER; diff --git a/source/FreeRTOS_ND.c b/source/FreeRTOS_ND.c index 3dddfc470f..4e7efa975e 100644 --- a/source/FreeRTOS_ND.c +++ b/source/FreeRTOS_ND.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -153,7 +153,7 @@ MACAddress_t * const pxMACAddress, NetworkEndPoint_t ** ppxEndPoint ) { - eResolutionLookupResult_t eReturn; + eResolutionLookupResult_t eReturn = eResolutionCacheMiss; /* Mostly used multi-cast address is ff02::. */ if( xIsIPv6AllowedMulticast( pxAddressToLookup ) != pdFALSE ) @@ -163,14 +163,20 @@ if( ppxEndPoint != NULL ) { *ppxEndPoint = pxFindLocalEndpoint(); - } - eReturn = eResolutionCacheHit; + if( *ppxEndPoint != NULL ) + { + eReturn = eResolutionCacheHit; + } + else + { + /* No link-local endpoint configured, eResolutionCacheMiss */ + } + } } else { - /* Not a multicast IP address. */ - eReturn = eResolutionCacheMiss; + /* Not a multicast IP address, eResolutionCacheMiss */ } return eReturn; @@ -258,12 +264,15 @@ /* See if the gateway has an entry in the cache. */ eReturn = prvNDCacheLookup( pxIPAddress, pxMACAddress, ppxEndPoint ); - if( *ppxEndPoint != NULL ) + if( ( ppxEndPoint != NULL ) && ( *ppxEndPoint != NULL ) ) { FreeRTOS_printf( ( "eNDGetCacheEntry: found end-point %pip\n", ( void * ) ( *ppxEndPoint )->ipv6_settings.xIPAddress.ucBytes ) ); } - *( ppxEndPoint ) = pxEndPoint; + if( ppxEndPoint != NULL ) + { + *( ppxEndPoint ) = pxEndPoint; + } } } } @@ -978,194 +987,238 @@ */ eFrameProcessingResult_t prvProcessICMPMessage_IPv6( NetworkBufferDescriptor_t * const pxNetworkBuffer ) { - /* MISRA Ref 11.3.1 [Misaligned access] */ - /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */ - /* coverity[misra_c_2012_rule_11_3_violation] */ - ICMPPacket_IPv6_t * pxICMPPacket = ( ( ICMPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer ); - /* coverity[misra_c_2012_rule_11_3_violation] */ - ICMPHeader_IPv6_t * pxICMPHeader_IPv6 = ( ( ICMPHeader_IPv6_t * ) &( pxICMPPacket->xICMPHeaderIPv6 ) ); - /* Note: pxNetworkBuffer->pxEndPoint is already verified to be non-NULL in prvProcessEthernetPacket() */ - NetworkEndPoint_t * pxEndPoint = pxNetworkBuffer->pxEndPoint; - size_t uxNeededSize; - - #if ( ipconfigHAS_PRINTF == 1 ) + /* + * ICMPv6 messages have the following general format: + * + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Type | Code | Checksum | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | | + + Message Body + + | | + | + | The packet should contain atleast 4 bytes of general fields + | + */ + if( pxNetworkBuffer->xDataLength >= ( ( size_t ) ipSIZE_OF_ETH_HEADER + ( size_t ) ipSIZE_OF_IPv6_HEADER + ( size_t ) ipICMPv6_GENERAL_FIELD_SIZE ) ) { - if( pxICMPHeader_IPv6->ucTypeOfMessage != ipICMP_PING_REQUEST_IPv6 ) + /* MISRA Ref 11.3.1 [Misaligned access] */ + /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */ + /* coverity[misra_c_2012_rule_11_3_violation] */ + ICMPPacket_IPv6_t * pxICMPPacket = ( ( ICMPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer ); + /* coverity[misra_c_2012_rule_11_3_violation] */ + ICMPHeader_IPv6_t * pxICMPHeader_IPv6 = ( ( ICMPHeader_IPv6_t * ) &( pxICMPPacket->xICMPHeaderIPv6 ) ); + /* Note: pxNetworkBuffer->pxEndPoint is already verified to be non-NULL in prvProcessEthernetPacket() */ + NetworkEndPoint_t * pxEndPoint = pxNetworkBuffer->pxEndPoint; + size_t uxNeededSize; + + #if ( ipconfigHAS_PRINTF == 1 ) { - char pcAddress[ 40 ]; - FreeRTOS_printf( ( "ICMPv6_recv %d (%s) from %pip to %pip end-point = %s\n", - pxICMPHeader_IPv6->ucTypeOfMessage, - pcMessageType( ( BaseType_t ) pxICMPHeader_IPv6->ucTypeOfMessage ), - ( void * ) pxICMPPacket->xIPHeader.xSourceAddress.ucBytes, - ( void * ) pxICMPPacket->xIPHeader.xDestinationAddress.ucBytes, - pcEndpointName( pxEndPoint, pcAddress, sizeof( pcAddress ) ) ) ); + if( pxICMPHeader_IPv6->ucTypeOfMessage != ipICMP_PING_REQUEST_IPv6 ) + { + char pcAddress[ 40 ]; + FreeRTOS_printf( ( "ICMPv6_recv %d (%s) from %pip to %pip end-point = %s\n", + pxICMPHeader_IPv6->ucTypeOfMessage, + pcMessageType( ( BaseType_t ) pxICMPHeader_IPv6->ucTypeOfMessage ), + ( void * ) pxICMPPacket->xIPHeader.xSourceAddress.ucBytes, + ( void * ) pxICMPPacket->xIPHeader.xDestinationAddress.ucBytes, + pcEndpointName( pxEndPoint, pcAddress, sizeof( pcAddress ) ) ) ); + } } - } - #endif /* ( ipconfigHAS_PRINTF == 1 ) */ + #endif /* ( ipconfigHAS_PRINTF == 1 ) */ - if( pxEndPoint->bits.bIPv6 != pdFALSE_UNSIGNED ) - { - switch( pxICMPHeader_IPv6->ucTypeOfMessage ) + if( pxEndPoint->bits.bIPv6 != pdFALSE_UNSIGNED ) { - case ipICMP_DEST_UNREACHABLE_IPv6: - case ipICMP_PACKET_TOO_BIG_IPv6: - case ipICMP_TIME_EXCEEDED_IPv6: - case ipICMP_PARAMETER_PROBLEM_IPv6: - /* These message types are not implemented. They are logged here above. */ - break; + switch( pxICMPHeader_IPv6->ucTypeOfMessage ) + { + case ipICMP_DEST_UNREACHABLE_IPv6: + case ipICMP_PACKET_TOO_BIG_IPv6: + case ipICMP_TIME_EXCEEDED_IPv6: + case ipICMP_PARAMETER_PROBLEM_IPv6: + /* These message types are not implemented. They are logged here above. */ + break; + + case ipICMP_PING_REQUEST_IPv6: + { + size_t uxICMPSize; + uint16_t usICMPSize; - case ipICMP_PING_REQUEST_IPv6: - { - size_t uxICMPSize; - uint16_t usICMPSize; + /* Lint would complain about casting '()' immediately. */ + usICMPSize = FreeRTOS_ntohs( pxICMPPacket->xIPHeader.usPayloadLength ); + uxICMPSize = ( size_t ) usICMPSize; + uxNeededSize = ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxICMPSize ); + + if( uxNeededSize > pxNetworkBuffer->xDataLength ) + { + FreeRTOS_printf( ( "Too small\n" ) ); + break; + } - /* Lint would complain about casting '()' immediately. */ - usICMPSize = FreeRTOS_ntohs( pxICMPPacket->xIPHeader.usPayloadLength ); - uxICMPSize = ( size_t ) usICMPSize; - uxNeededSize = ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxICMPSize ); + pxICMPHeader_IPv6->ucTypeOfMessage = ipICMP_PING_REPLY_IPv6; - if( uxNeededSize > pxNetworkBuffer->xDataLength ) - { - FreeRTOS_printf( ( "Too small\n" ) ); - break; + /* MISRA Ref 4.14.1 [The validity of values received from external sources]. */ + /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#directive-414. */ + /* coverity[misra_c_2012_directive_4_14_violation] */ + prvReturnICMP_IPv6( pxNetworkBuffer, uxICMPSize ); } + break; - pxICMPHeader_IPv6->ucTypeOfMessage = ipICMP_PING_REPLY_IPv6; + #if ( ipconfigSUPPORT_OUTGOING_PINGS != 0 ) + case ipICMP_PING_REPLY_IPv6: + { + ePingReplyStatus_t eStatus = eSuccess; + /* MISRA Ref 11.3.1 [Misaligned access] */ + /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */ + /* coverity[misra_c_2012_rule_11_3_violation] */ + const ICMPEcho_IPv6_t * pxICMPEchoHeader = ( ( const ICMPEcho_IPv6_t * ) pxICMPHeader_IPv6 ); + size_t uxDataLength, uxCount; + const uint8_t * pucByte; - /* MISRA Ref 4.14.1 [The validity of values received from external sources]. */ - /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#directive-414. */ - /* coverity[misra_c_2012_directive_4_14_violation] */ - prvReturnICMP_IPv6( pxNetworkBuffer, uxICMPSize ); - } - break; + /* Find the total length of the IP packet. */ + uxDataLength = ipNUMERIC_CAST( size_t, FreeRTOS_ntohs( pxICMPPacket->xIPHeader.usPayloadLength ) ); - #if ( ipconfigSUPPORT_OUTGOING_PINGS != 0 ) - case ipICMP_PING_REPLY_IPv6: - { - ePingReplyStatus_t eStatus = eSuccess; - /* MISRA Ref 11.3.1 [Misaligned access] */ - /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */ - /* coverity[misra_c_2012_rule_11_3_violation] */ - const ICMPEcho_IPv6_t * pxICMPEchoHeader = ( ( const ICMPEcho_IPv6_t * ) pxICMPHeader_IPv6 ); - size_t uxDataLength, uxCount; - const uint8_t * pucByte; - - /* Find the total length of the IP packet. */ - uxDataLength = ipNUMERIC_CAST( size_t, FreeRTOS_ntohs( pxICMPPacket->xIPHeader.usPayloadLength ) ); - uxDataLength = uxDataLength - sizeof( *pxICMPEchoHeader ); - - /* Find the first byte of the data within the ICMP packet. */ - pucByte = ( const uint8_t * ) pxICMPEchoHeader; - pucByte = &( pucByte[ sizeof( *pxICMPEchoHeader ) ] ); - - /* Check each byte. */ - for( uxCount = 0; uxCount < uxDataLength; uxCount++ ) - { - if( *pucByte != ( uint8_t ) ipECHO_DATA_FILL_BYTE ) + uxNeededSize = ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxDataLength ); + + if( uxNeededSize > pxNetworkBuffer->xDataLength ) { - eStatus = eInvalidData; + FreeRTOS_printf( ( "Too small\n" ) ); break; } - pucByte++; - } + uxDataLength = uxDataLength - sizeof( *pxICMPEchoHeader ); - /* Call back into the application to pass it the result. */ - vApplicationPingReplyHook( eStatus, pxICMPEchoHeader->usIdentifier ); - } - break; - #endif /* ( ipconfigSUPPORT_OUTGOING_PINGS != 0 ) */ - case ipICMP_NEIGHBOR_SOLICITATION_IPv6: - { - size_t uxICMPSize; - BaseType_t xCompare; - const NetworkEndPoint_t * pxTargetedEndPoint = pxEndPoint; - const NetworkEndPoint_t * pxEndPointInSameSubnet = FreeRTOS_InterfaceEPInSameSubnet_IPv6( pxNetworkBuffer->pxInterface, &( pxICMPHeader_IPv6->xIPv6Address ) ); + /* Find the first byte of the data within the ICMP packet. */ + pucByte = ( const uint8_t * ) pxICMPEchoHeader; + pucByte = &( pucByte[ sizeof( *pxICMPEchoHeader ) ] ); - if( pxEndPointInSameSubnet != NULL ) - { - pxTargetedEndPoint = pxEndPointInSameSubnet; - } - else - { - FreeRTOS_debug_printf( ( "prvProcessICMPMessage_IPv6: No match for %pip\n", - pxICMPHeader_IPv6->xIPv6Address.ucBytes ) ); - } + /* Check each byte. */ + for( uxCount = 0; uxCount < uxDataLength; uxCount++ ) + { + if( *pucByte != ( uint8_t ) ipECHO_DATA_FILL_BYTE ) + { + eStatus = eInvalidData; + break; + } - uxICMPSize = sizeof( ICMPHeader_IPv6_t ); - uxNeededSize = ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxICMPSize ); + pucByte++; + } - if( uxNeededSize > pxNetworkBuffer->xDataLength ) + /* Call back into the application to pass it the result. */ + vApplicationPingReplyHook( eStatus, pxICMPEchoHeader->usIdentifier ); + } + break; + #endif /* ( ipconfigSUPPORT_OUTGOING_PINGS != 0 ) */ + case ipICMP_NEIGHBOR_SOLICITATION_IPv6: { - FreeRTOS_printf( ( "Too small\n" ) ); - break; - } + size_t uxICMPSize; + BaseType_t xCompare; + const NetworkEndPoint_t * pxTargetedEndPoint = pxEndPoint; + const NetworkEndPoint_t * pxEndPointInSameSubnet = FreeRTOS_InterfaceEPInSameSubnet_IPv6( pxNetworkBuffer->pxInterface, &( pxICMPHeader_IPv6->xIPv6Address ) ); - xCompare = memcmp( pxICMPHeader_IPv6->xIPv6Address.ucBytes, pxTargetedEndPoint->ipv6_settings.xIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); + if( pxEndPointInSameSubnet != NULL ) + { + pxTargetedEndPoint = pxEndPointInSameSubnet; + } + else + { + FreeRTOS_debug_printf( ( "prvProcessICMPMessage_IPv6: No match for %pip\n", + pxICMPHeader_IPv6->xIPv6Address.ucBytes ) ); + } - FreeRTOS_printf( ( "ND NS for %pip endpoint %pip %s\n", - ( void * ) pxICMPHeader_IPv6->xIPv6Address.ucBytes, - ( void * ) pxNetworkBuffer->pxEndPoint->ipv6_settings.xIPAddress.ucBytes, - ( xCompare == 0 ) ? "Reply" : "Ignore" ) ); + uxICMPSize = sizeof( ICMPHeader_IPv6_t ); + uxNeededSize = ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxICMPSize ); - if( xCompare == 0 ) - { - pxICMPHeader_IPv6->ucTypeOfMessage = ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6; - pxICMPHeader_IPv6->ucTypeOfService = 0U; - pxICMPHeader_IPv6->ulReserved = ndICMPv6_FLAG_SOLICITED | ndICMPv6_FLAG_UPDATE; - pxICMPHeader_IPv6->ulReserved = FreeRTOS_htonl( pxICMPHeader_IPv6->ulReserved ); - - /* Type of option. */ - pxICMPHeader_IPv6->ucOptionType = ndICMP_TARGET_LINK_LAYER_ADDRESS; - /* Length of option in units of 8 bytes. */ - pxICMPHeader_IPv6->ucOptionLength = 1U; - ( void ) memcpy( pxICMPHeader_IPv6->ucOptionBytes, pxTargetedEndPoint->xMACAddress.ucBytes, sizeof( MACAddress_t ) ); - pxICMPPacket->xIPHeader.ucHopLimit = 255U; - ( void ) memcpy( pxICMPHeader_IPv6->xIPv6Address.ucBytes, pxTargetedEndPoint->ipv6_settings.xIPAddress.ucBytes, sizeof( pxICMPHeader_IPv6->xIPv6Address.ucBytes ) ); - prvReturnICMP_IPv6( pxNetworkBuffer, uxICMPSize ); - } - } - break; + if( uxNeededSize > pxNetworkBuffer->xDataLength ) + { + FreeRTOS_printf( ( "Too small\n" ) ); + break; + } - case ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6: - /* MISRA Ref 11.3.1 [Misaligned access] */ - /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */ - /* coverity[misra_c_2012_rule_11_3_violation] */ - vNDRefreshCacheEntry( ( ( const MACAddress_t * ) pxICMPHeader_IPv6->ucOptionBytes ), - &( pxICMPHeader_IPv6->xIPv6Address ), - pxEndPoint ); - FreeRTOS_printf( ( "NEIGHBOR_ADV from %pip\n", - ( void * ) pxICMPHeader_IPv6->xIPv6Address.ucBytes ) ); + xCompare = memcmp( pxICMPHeader_IPv6->xIPv6Address.ucBytes, pxTargetedEndPoint->ipv6_settings.xIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); - #if ( ipconfigUSE_RA != 0 ) + FreeRTOS_printf( ( "ND NS for %pip endpoint %pip %s\n", + ( void * ) pxICMPHeader_IPv6->xIPv6Address.ucBytes, + ( void * ) pxNetworkBuffer->pxEndPoint->ipv6_settings.xIPAddress.ucBytes, + ( xCompare == 0 ) ? "Reply" : "Ignore" ) ); - /* Receive a NA ( Neighbour Advertisement ) message to see if a chosen IP-address is already in use. - * This is important during SLAAC. */ - vReceiveNA( pxNetworkBuffer ); - #endif + if( xCompare == 0 ) + { + pxICMPHeader_IPv6->ucTypeOfMessage = ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6; + pxICMPHeader_IPv6->ucTypeOfService = 0U; + pxICMPHeader_IPv6->ulReserved = ndICMPv6_FLAG_SOLICITED | ndICMPv6_FLAG_UPDATE; + pxICMPHeader_IPv6->ulReserved = FreeRTOS_htonl( pxICMPHeader_IPv6->ulReserved ); + + /* Type of option. */ + pxICMPHeader_IPv6->ucOptionType = ndICMP_TARGET_LINK_LAYER_ADDRESS; + /* Length of option in units of 8 bytes. */ + pxICMPHeader_IPv6->ucOptionLength = 1U; + ( void ) memcpy( pxICMPHeader_IPv6->ucOptionBytes, pxTargetedEndPoint->xMACAddress.ucBytes, sizeof( MACAddress_t ) ); + pxICMPPacket->xIPHeader.ucHopLimit = 255U; + ( void ) memcpy( pxICMPHeader_IPv6->xIPv6Address.ucBytes, pxTargetedEndPoint->ipv6_settings.xIPAddress.ucBytes, sizeof( pxICMPHeader_IPv6->xIPv6Address.ucBytes ) ); + prvReturnICMP_IPv6( pxNetworkBuffer, uxICMPSize ); + } + } + break; - if( ( pxNDWaitingNetworkBuffer != NULL ) && - ( uxIPHeaderSizePacket( pxNDWaitingNetworkBuffer ) == ipSIZE_OF_IPv6_HEADER ) ) - { - prvCheckWaitingBuffer( &( pxICMPHeader_IPv6->xIPv6Address ) ); - } + case ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6: + { + size_t uxICMPSize; + uxICMPSize = sizeof( ICMPHeader_IPv6_t ); + uxNeededSize = ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxICMPSize ); - break; + if( uxNeededSize > pxNetworkBuffer->xDataLength ) + { + FreeRTOS_printf( ( "Too small\n" ) ); + break; + } - case ipICMP_ROUTER_SOLICITATION_IPv6: - break; + /* MISRA Ref 11.3.1 [Misaligned access] */ + /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */ + /* coverity[misra_c_2012_rule_11_3_violation] */ + vNDRefreshCacheEntry( ( ( const MACAddress_t * ) pxICMPHeader_IPv6->ucOptionBytes ), + &( pxICMPHeader_IPv6->xIPv6Address ), + pxEndPoint ); + FreeRTOS_printf( ( "NEIGHBOR_ADV from %pip\n", + ( void * ) pxICMPHeader_IPv6->xIPv6Address.ucBytes ) ); - #if ( ipconfigUSE_RA != 0 ) - case ipICMP_ROUTER_ADVERTISEMENT_IPv6: - vReceiveRA( pxNetworkBuffer ); - break; - #endif /* ( ipconfigUSE_RA != 0 ) */ + #if ( ipconfigUSE_RA != 0 ) - default: - /* All possible values are included here above. */ - break; - } /* switch( pxICMPHeader_IPv6->ucTypeOfMessage ) */ - } /* if( pxEndPoint->bits.bIPv6 != pdFALSE_UNSIGNED ) */ + /* Receive a NA ( Neighbour Advertisement ) message to see if a chosen IP-address is already in use. + * This is important during SLAAC. */ + vReceiveNA( pxNetworkBuffer ); + #endif + + if( ( pxNDWaitingNetworkBuffer != NULL ) && + ( uxIPHeaderSizePacket( pxNDWaitingNetworkBuffer ) == ipSIZE_OF_IPv6_HEADER ) ) + { + prvCheckWaitingBuffer( &( pxICMPHeader_IPv6->xIPv6Address ) ); + } + } + break; + + case ipICMP_ROUTER_SOLICITATION_IPv6: + break; + + #if ( ipconfigUSE_RA != 0 ) + case ipICMP_ROUTER_ADVERTISEMENT_IPv6: + /* Size check is done inside vReceiveRA */ + vReceiveRA( pxNetworkBuffer ); + break; + #endif /* ( ipconfigUSE_RA != 0 ) */ + + default: + /* All possible values are included here above. */ + break; + } /* switch( pxICMPHeader_IPv6->ucTypeOfMessage ) */ + } /* if( pxEndPoint->bits.bIPv6 != pdFALSE_UNSIGNED ) */ + } + else + { + /* Malformed ICMPv6 packet, release the network buffer (performed + * in prvProcessEthernetPacket)*/ + } return eReleaseBuffer; } diff --git a/source/FreeRTOS_RA.c b/source/FreeRTOS_RA.c index 2f6875ff8a..cde93f791b 100644 --- a/source/FreeRTOS_RA.c +++ b/source/FreeRTOS_RA.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/FreeRTOS_Routing.c b/source/FreeRTOS_Routing.c index 097f91708c..71af5d97fe 100644 --- a/source/FreeRTOS_Routing.c +++ b/source/FreeRTOS_Routing.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/FreeRTOS_Sockets.c b/source/FreeRTOS_Sockets.c index b473c06f5b..7157570d7d 100644 --- a/source/FreeRTOS_Sockets.c +++ b/source/FreeRTOS_Sockets.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_Stream_Buffer.c b/source/FreeRTOS_Stream_Buffer.c index 5f0d08f5bc..9fcefa4e16 100644 --- a/source/FreeRTOS_Stream_Buffer.c +++ b/source/FreeRTOS_Stream_Buffer.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_IP.c b/source/FreeRTOS_TCP_IP.c index 6ba71a33f2..02f29fe5f6 100644 --- a/source/FreeRTOS_TCP_IP.c +++ b/source/FreeRTOS_TCP_IP.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_IP_IPv4.c b/source/FreeRTOS_TCP_IP_IPv4.c index 39552cc3c8..c75b9f894d 100644 --- a/source/FreeRTOS_TCP_IP_IPv4.c +++ b/source/FreeRTOS_TCP_IP_IPv4.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_IP_IPv6.c b/source/FreeRTOS_TCP_IP_IPv6.c index acb24fda13..f597539e2e 100644 --- a/source/FreeRTOS_TCP_IP_IPv6.c +++ b/source/FreeRTOS_TCP_IP_IPv6.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_Reception.c b/source/FreeRTOS_TCP_Reception.c index 4f1003a67c..7cd09f31a2 100644 --- a/source/FreeRTOS_TCP_Reception.c +++ b/source/FreeRTOS_TCP_Reception.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_State_Handling.c b/source/FreeRTOS_TCP_State_Handling.c index 6376af4367..124d4a6a2d 100644 --- a/source/FreeRTOS_TCP_State_Handling.c +++ b/source/FreeRTOS_TCP_State_Handling.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_State_Handling_IPv4.c b/source/FreeRTOS_TCP_State_Handling_IPv4.c index 8ccae1883a..6a71241abf 100644 --- a/source/FreeRTOS_TCP_State_Handling_IPv4.c +++ b/source/FreeRTOS_TCP_State_Handling_IPv4.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_State_Handling_IPv6.c b/source/FreeRTOS_TCP_State_Handling_IPv6.c index 40ed8ca8aa..da14ffc025 100644 --- a/source/FreeRTOS_TCP_State_Handling_IPv6.c +++ b/source/FreeRTOS_TCP_State_Handling_IPv6.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_Transmission.c b/source/FreeRTOS_TCP_Transmission.c index 3b0abe63f7..a18d2ab0af 100644 --- a/source/FreeRTOS_TCP_Transmission.c +++ b/source/FreeRTOS_TCP_Transmission.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_Transmission_IPv4.c b/source/FreeRTOS_TCP_Transmission_IPv4.c index f341b09ac1..ad6249cb41 100644 --- a/source/FreeRTOS_TCP_Transmission_IPv4.c +++ b/source/FreeRTOS_TCP_Transmission_IPv4.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_Transmission_IPv6.c b/source/FreeRTOS_TCP_Transmission_IPv6.c index 1a3cc36209..24bd6063f2 100644 --- a/source/FreeRTOS_TCP_Transmission_IPv6.c +++ b/source/FreeRTOS_TCP_Transmission_IPv6.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_Utils.c b/source/FreeRTOS_TCP_Utils.c index 425906e219..c57a076fe3 100644 --- a/source/FreeRTOS_TCP_Utils.c +++ b/source/FreeRTOS_TCP_Utils.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_Utils_IPv4.c b/source/FreeRTOS_TCP_Utils_IPv4.c index 40760fd4ed..3ac89ee190 100644 --- a/source/FreeRTOS_TCP_Utils_IPv4.c +++ b/source/FreeRTOS_TCP_Utils_IPv4.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_Utils_IPv6.c b/source/FreeRTOS_TCP_Utils_IPv6.c index 789bfe6ace..012e2335da 100644 --- a/source/FreeRTOS_TCP_Utils_IPv6.c +++ b/source/FreeRTOS_TCP_Utils_IPv6.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_TCP_WIN.c b/source/FreeRTOS_TCP_WIN.c index 303fd22ea3..3e02bbf25c 100644 --- a/source/FreeRTOS_TCP_WIN.c +++ b/source/FreeRTOS_TCP_WIN.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_Tiny_TCP.c b/source/FreeRTOS_Tiny_TCP.c index 2778b7083b..688be00f46 100644 --- a/source/FreeRTOS_Tiny_TCP.c +++ b/source/FreeRTOS_Tiny_TCP.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_UDP_IP.c b/source/FreeRTOS_UDP_IP.c index 4321b64e8e..eb53db89c7 100644 --- a/source/FreeRTOS_UDP_IP.c +++ b/source/FreeRTOS_UDP_IP.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_UDP_IPv4.c b/source/FreeRTOS_UDP_IPv4.c index 2fceed8a95..2f17078847 100644 --- a/source/FreeRTOS_UDP_IPv4.c +++ b/source/FreeRTOS_UDP_IPv4.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/FreeRTOS_UDP_IPv6.c b/source/FreeRTOS_UDP_IPv6.c index 1efd1927a1..860931f401 100644 --- a/source/FreeRTOS_UDP_IPv6.c +++ b/source/FreeRTOS_UDP_IPv6.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h index 77ae9e9c8c..6b38fd1bec 100644 --- a/source/include/FreeRTOSIPConfigDefaults.h +++ b/source/include/FreeRTOSIPConfigDefaults.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOSIPDeprecatedDefinitions.h b/source/include/FreeRTOSIPDeprecatedDefinitions.h index 48c71407f5..6b5d3c9580 100644 --- a/source/include/FreeRTOSIPDeprecatedDefinitions.h +++ b/source/include/FreeRTOSIPDeprecatedDefinitions.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_ARP.h b/source/include/FreeRTOS_ARP.h index e01ece18a2..141f17d58f 100644 --- a/source/include/FreeRTOS_ARP.h +++ b/source/include/FreeRTOS_ARP.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_BitConfig.h b/source/include/FreeRTOS_BitConfig.h index 3cc313d99d..0a66287dd0 100644 --- a/source/include/FreeRTOS_BitConfig.h +++ b/source/include/FreeRTOS_BitConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/include/FreeRTOS_DHCP.h b/source/include/FreeRTOS_DHCP.h index f5b6433c18..7d32147030 100644 --- a/source/include/FreeRTOS_DHCP.h +++ b/source/include/FreeRTOS_DHCP.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_DHCPv6.h b/source/include/FreeRTOS_DHCPv6.h index 11bf3f0334..9bfe5619bc 100644 --- a/source/include/FreeRTOS_DHCPv6.h +++ b/source/include/FreeRTOS_DHCPv6.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/include/FreeRTOS_DNS.h b/source/include/FreeRTOS_DNS.h index b9ab2e6954..5eb5b37a7b 100644 --- a/source/include/FreeRTOS_DNS.h +++ b/source/include/FreeRTOS_DNS.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_DNS_Cache.h b/source/include/FreeRTOS_DNS_Cache.h index f94442217f..c9e346676c 100644 --- a/source/include/FreeRTOS_DNS_Cache.h +++ b/source/include/FreeRTOS_DNS_Cache.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_DNS_Callback.h b/source/include/FreeRTOS_DNS_Callback.h index 94955c9252..d221b10d00 100644 --- a/source/include/FreeRTOS_DNS_Callback.h +++ b/source/include/FreeRTOS_DNS_Callback.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_DNS_Globals.h b/source/include/FreeRTOS_DNS_Globals.h index 0de266e6c8..4d51fc8ca2 100644 --- a/source/include/FreeRTOS_DNS_Globals.h +++ b/source/include/FreeRTOS_DNS_Globals.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_DNS_Networking.h b/source/include/FreeRTOS_DNS_Networking.h index 7a2ede391c..28d8084823 100644 --- a/source/include/FreeRTOS_DNS_Networking.h +++ b/source/include/FreeRTOS_DNS_Networking.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_DNS_Parser.h b/source/include/FreeRTOS_DNS_Parser.h index e45e619249..893327fc36 100644 --- a/source/include/FreeRTOS_DNS_Parser.h +++ b/source/include/FreeRTOS_DNS_Parser.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_ICMP.h b/source/include/FreeRTOS_ICMP.h index 45eaf79639..419eb01df6 100644 --- a/source/include/FreeRTOS_ICMP.h +++ b/source/include/FreeRTOS_ICMP.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IP.h b/source/include/FreeRTOS_IP.h index a177dcc053..cb1394f979 100644 --- a/source/include/FreeRTOS_IP.h +++ b/source/include/FreeRTOS_IP.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IP_Common.h b/source/include/FreeRTOS_IP_Common.h index e557fd07b2..bfd91c1524 100644 --- a/source/include/FreeRTOS_IP_Common.h +++ b/source/include/FreeRTOS_IP_Common.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IP_Private.h b/source/include/FreeRTOS_IP_Private.h index cd5afb8c01..0ebca96ea3 100644 --- a/source/include/FreeRTOS_IP_Private.h +++ b/source/include/FreeRTOS_IP_Private.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IP_Timers.h b/source/include/FreeRTOS_IP_Timers.h index 3f23ffe34c..e1052bd94f 100644 --- a/source/include/FreeRTOS_IP_Timers.h +++ b/source/include/FreeRTOS_IP_Timers.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IP_Utils.h b/source/include/FreeRTOS_IP_Utils.h index 6f8cd07b67..0d0fdb6bca 100644 --- a/source/include/FreeRTOS_IP_Utils.h +++ b/source/include/FreeRTOS_IP_Utils.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IPv4.h b/source/include/FreeRTOS_IPv4.h index 7197ab9f00..df2c211a76 100644 --- a/source/include/FreeRTOS_IPv4.h +++ b/source/include/FreeRTOS_IPv4.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IPv4_Private.h b/source/include/FreeRTOS_IPv4_Private.h index fd1cc922cf..b7e0a9e4e0 100644 --- a/source/include/FreeRTOS_IPv4_Private.h +++ b/source/include/FreeRTOS_IPv4_Private.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IPv4_Sockets.h b/source/include/FreeRTOS_IPv4_Sockets.h index 0d6ef32213..8c765e768c 100644 --- a/source/include/FreeRTOS_IPv4_Sockets.h +++ b/source/include/FreeRTOS_IPv4_Sockets.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IPv4_Utils.h b/source/include/FreeRTOS_IPv4_Utils.h index 0ac2f66ce0..afb5e71388 100644 --- a/source/include/FreeRTOS_IPv4_Utils.h +++ b/source/include/FreeRTOS_IPv4_Utils.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IPv6.h b/source/include/FreeRTOS_IPv6.h index 84b8415956..8c0ab37aa9 100644 --- a/source/include/FreeRTOS_IPv6.h +++ b/source/include/FreeRTOS_IPv6.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/include/FreeRTOS_IPv6_Private.h b/source/include/FreeRTOS_IPv6_Private.h index c56c9b32b3..473c0110e2 100644 --- a/source/include/FreeRTOS_IPv6_Private.h +++ b/source/include/FreeRTOS_IPv6_Private.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -132,6 +132,8 @@ struct xNetworkEndPoint; struct xNetworkInterface; +#define ipICMPv6_GENERAL_FIELD_SIZE ( 4U ) + #include "pack_struct_start.h" struct xIP_HEADER_IPv6 { diff --git a/source/include/FreeRTOS_IPv6_Sockets.h b/source/include/FreeRTOS_IPv6_Sockets.h index c9a931e67a..337037ea31 100644 --- a/source/include/FreeRTOS_IPv6_Sockets.h +++ b/source/include/FreeRTOS_IPv6_Sockets.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_IPv6_Utils.h b/source/include/FreeRTOS_IPv6_Utils.h index db80071d4b..c72f74bdc6 100644 --- a/source/include/FreeRTOS_IPv6_Utils.h +++ b/source/include/FreeRTOS_IPv6_Utils.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_ND.h b/source/include/FreeRTOS_ND.h index f7c791aceb..01e95d52f8 100644 --- a/source/include/FreeRTOS_ND.h +++ b/source/include/FreeRTOS_ND.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/include/FreeRTOS_Routing.h b/source/include/FreeRTOS_Routing.h index 0fa9fab88e..2ca6eb9abb 100644 --- a/source/include/FreeRTOS_Routing.h +++ b/source/include/FreeRTOS_Routing.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/include/FreeRTOS_Sockets.h b/source/include/FreeRTOS_Sockets.h index 4045e51bcf..3b0a749427 100644 --- a/source/include/FreeRTOS_Sockets.h +++ b/source/include/FreeRTOS_Sockets.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_Stream_Buffer.h b/source/include/FreeRTOS_Stream_Buffer.h index 884ad044ab..939623bd55 100644 --- a/source/include/FreeRTOS_Stream_Buffer.h +++ b/source/include/FreeRTOS_Stream_Buffer.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_TCP_IP.h b/source/include/FreeRTOS_TCP_IP.h index e2a5dc398b..2170b34eba 100644 --- a/source/include/FreeRTOS_TCP_IP.h +++ b/source/include/FreeRTOS_TCP_IP.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_TCP_Reception.h b/source/include/FreeRTOS_TCP_Reception.h index 004b0f3c7d..b731e0eb5c 100644 --- a/source/include/FreeRTOS_TCP_Reception.h +++ b/source/include/FreeRTOS_TCP_Reception.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_TCP_State_Handling.h b/source/include/FreeRTOS_TCP_State_Handling.h index 21208c5e21..585711dcf9 100644 --- a/source/include/FreeRTOS_TCP_State_Handling.h +++ b/source/include/FreeRTOS_TCP_State_Handling.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_TCP_Transmission.h b/source/include/FreeRTOS_TCP_Transmission.h index 1e48fbc30a..42fae347cf 100644 --- a/source/include/FreeRTOS_TCP_Transmission.h +++ b/source/include/FreeRTOS_TCP_Transmission.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_TCP_Utils.h b/source/include/FreeRTOS_TCP_Utils.h index 12d2daf407..5bf46bd331 100644 --- a/source/include/FreeRTOS_TCP_Utils.h +++ b/source/include/FreeRTOS_TCP_Utils.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_TCP_WIN.h b/source/include/FreeRTOS_TCP_WIN.h index 36ea00cc14..69a1b3d27e 100644 --- a/source/include/FreeRTOS_TCP_WIN.h +++ b/source/include/FreeRTOS_TCP_WIN.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/FreeRTOS_UDP_IP.h b/source/include/FreeRTOS_UDP_IP.h index c1a6f35443..2acb2cdff2 100644 --- a/source/include/FreeRTOS_UDP_IP.h +++ b/source/include/FreeRTOS_UDP_IP.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/IPTraceMacroDefaults.h b/source/include/IPTraceMacroDefaults.h index fe3ec8aa2f..2a58643c58 100644 --- a/source/include/IPTraceMacroDefaults.h +++ b/source/include/IPTraceMacroDefaults.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/NetworkBufferManagement.h b/source/include/NetworkBufferManagement.h index 3fd9804a3f..6dede9c15a 100644 --- a/source/include/NetworkBufferManagement.h +++ b/source/include/NetworkBufferManagement.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/include/NetworkInterface.h b/source/include/NetworkInterface.h index 50b354ca9d..768747e5c7 100644 --- a/source/include/NetworkInterface.h +++ b/source/include/NetworkInterface.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -48,7 +48,7 @@ */ /* The following function is defined only when BufferAllocation_1.c is linked in the project. */ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ); +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ); BaseType_t xGetPhyLinkStatus( struct xNetworkInterface * pxInterface ); diff --git a/source/portable/BufferManagement/BufferAllocation_1.c b/source/portable/BufferManagement/BufferAllocation_1.c index 55ac667ecd..4601105504 100644 --- a/source/portable/BufferManagement/BufferAllocation_1.c +++ b/source/portable/BufferManagement/BufferAllocation_1.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -70,6 +70,8 @@ static NetworkBufferDescriptor_t xNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DES * packet. No resizing will be done. */ const BaseType_t xBufferAllocFixedSize = pdTRUE; +static size_t uxMaxNetworkInterfaceAllocatedSizeBytes; + /* The semaphore used to obtain network buffers. */ static SemaphoreHandle_t xNetworkBufferSemaphore = NULL; @@ -201,7 +203,10 @@ BaseType_t xNetworkBuffersInitialise( void ) /* Initialise all the network buffers. The buffer storage comes * from the network interface, and different hardware has different * requirements. */ - vNetworkInterfaceAllocateRAMToBuffers( xNetworkBuffers ); + uxMaxNetworkInterfaceAllocatedSizeBytes = uxNetworkInterfaceAllocateRAMToBuffers( xNetworkBuffers ); + + /* The allocated buffer should hold atleast ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER bytes */ + configASSERT( ( uxMaxNetworkInterfaceAllocatedSizeBytes >= ( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ) ) ); for( x = 0U; x < ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS; x++ ) { @@ -237,11 +242,8 @@ NetworkBufferDescriptor_t * pxGetNetworkBufferWithDescriptor( size_t xRequestedS BaseType_t xInvalid = pdFALSE; UBaseType_t uxCount; - /* The current implementation only has a single size memory block, so - * the requested size parameter is not used (yet). */ - ( void ) xRequestedSizeBytes; - - if( xNetworkBufferSemaphore != NULL ) + if( ( xNetworkBufferSemaphore != NULL ) && + ( xRequestedSizeBytes <= uxMaxNetworkInterfaceAllocatedSizeBytes ) ) { /* If there is a semaphore available, there is a network buffer * available. */ @@ -432,10 +434,18 @@ UBaseType_t uxGetNumberOfFreeNetworkBuffers( void ) NetworkBufferDescriptor_t * pxResizeNetworkBufferWithDescriptor( NetworkBufferDescriptor_t * pxNetworkBuffer, size_t xNewSizeBytes ) { - /* In BufferAllocation_1.c all network buffer are allocated with a - * maximum size of 'ipTOTAL_ETHERNET_FRAME_SIZE'.No need to resize the - * network buffer. */ - pxNetworkBuffer->xDataLength = xNewSizeBytes; + if( xNewSizeBytes <= uxMaxNetworkInterfaceAllocatedSizeBytes ) + { + /* In BufferAllocation_1.c all network buffer are allocated with a + * maximum size of 'ipTOTAL_ETHERNET_FRAME_SIZE'.No need to resize the + * network buffer. */ + pxNetworkBuffer->xDataLength = xNewSizeBytes; + } + else + { + pxNetworkBuffer = NULL; + } + return pxNetworkBuffer; } diff --git a/source/portable/BufferManagement/BufferAllocation_2.c b/source/portable/BufferManagement/BufferAllocation_2.c index b67d1d4249..50d28e4556 100644 --- a/source/portable/BufferManagement/BufferAllocation_2.c +++ b/source/portable/BufferManagement/BufferAllocation_2.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/CompilerName/pack_struct_end.h b/source/portable/Compiler/CompilerName/pack_struct_end.h index dc3ba6bb96..136b51edf2 100644 --- a/source/portable/Compiler/CompilerName/pack_struct_end.h +++ b/source/portable/Compiler/CompilerName/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/CompilerName/pack_struct_start.h b/source/portable/Compiler/CompilerName/pack_struct_start.h index 7057df4b9f..7fa14e47bb 100644 --- a/source/portable/Compiler/CompilerName/pack_struct_start.h +++ b/source/portable/Compiler/CompilerName/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/GCC/pack_struct_end.h b/source/portable/Compiler/GCC/pack_struct_end.h index 260eddc22e..bf12191287 100644 --- a/source/portable/Compiler/GCC/pack_struct_end.h +++ b/source/portable/Compiler/GCC/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/GCC/pack_struct_start.h b/source/portable/Compiler/GCC/pack_struct_start.h index 62fb479075..dbc2a78a0c 100644 --- a/source/portable/Compiler/GCC/pack_struct_start.h +++ b/source/portable/Compiler/GCC/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/IAR/pack_struct_end.h b/source/portable/Compiler/IAR/pack_struct_end.h index 0dc5384759..6122648d7b 100644 --- a/source/portable/Compiler/IAR/pack_struct_end.h +++ b/source/portable/Compiler/IAR/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/IAR/pack_struct_start.h b/source/portable/Compiler/IAR/pack_struct_start.h index e2c75aa1e8..26c31c175f 100644 --- a/source/portable/Compiler/IAR/pack_struct_start.h +++ b/source/portable/Compiler/IAR/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/Keil/pack_struct_end.h b/source/portable/Compiler/Keil/pack_struct_end.h index 19f2a83e40..54304d385f 100644 --- a/source/portable/Compiler/Keil/pack_struct_end.h +++ b/source/portable/Compiler/Keil/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/Keil/pack_struct_start.h b/source/portable/Compiler/Keil/pack_struct_start.h index f2b041aa33..81795b88cf 100644 --- a/source/portable/Compiler/Keil/pack_struct_start.h +++ b/source/portable/Compiler/Keil/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/MPLAB_XC/pack_struct_end.h b/source/portable/Compiler/MPLAB_XC/pack_struct_end.h index 99ede1f678..e905459f48 100644 --- a/source/portable/Compiler/MPLAB_XC/pack_struct_end.h +++ b/source/portable/Compiler/MPLAB_XC/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/MPLAB_XC/pack_struct_start.h b/source/portable/Compiler/MPLAB_XC/pack_struct_start.h index 3e780eb632..d4504f4b24 100644 --- a/source/portable/Compiler/MPLAB_XC/pack_struct_start.h +++ b/source/portable/Compiler/MPLAB_XC/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/MSVC/pack_struct_end.h b/source/portable/Compiler/MSVC/pack_struct_end.h index c273cb9d1e..a53dbe3738 100644 --- a/source/portable/Compiler/MSVC/pack_struct_end.h +++ b/source/portable/Compiler/MSVC/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/MSVC/pack_struct_start.h b/source/portable/Compiler/MSVC/pack_struct_start.h index 75014b7ccb..313fbc91b2 100644 --- a/source/portable/Compiler/MSVC/pack_struct_start.h +++ b/source/portable/Compiler/MSVC/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/Renesas/pack_struct_end.h b/source/portable/Compiler/Renesas/pack_struct_end.h index 3a298cc2f1..b95e6b9ab7 100644 --- a/source/portable/Compiler/Renesas/pack_struct_end.h +++ b/source/portable/Compiler/Renesas/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/Renesas/pack_struct_start.h b/source/portable/Compiler/Renesas/pack_struct_start.h index d23a822bd6..2ff37f9e6d 100644 --- a/source/portable/Compiler/Renesas/pack_struct_start.h +++ b/source/portable/Compiler/Renesas/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/Tasking/pack_struct_end.h b/source/portable/Compiler/Tasking/pack_struct_end.h index 78f9032926..3b73d61664 100644 --- a/source/portable/Compiler/Tasking/pack_struct_end.h +++ b/source/portable/Compiler/Tasking/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/Compiler/Tasking/pack_struct_start.h b/source/portable/Compiler/Tasking/pack_struct_start.h index 62fb479075..dbc2a78a0c 100644 --- a/source/portable/Compiler/Tasking/pack_struct_start.h +++ b/source/portable/Compiler/Tasking/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/ATSAM4E/NetworkInterface.c b/source/portable/NetworkInterface/ATSAM4E/NetworkInterface.c index 96ee3c48fe..405130d379 100644 --- a/source/portable/NetworkInterface/ATSAM4E/NetworkInterface.c +++ b/source/portable/NetworkInterface/ATSAM4E/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/ATSAME5x/NetworkInterface.c b/source/portable/NetworkInterface/ATSAME5x/NetworkInterface.c index dabedde096..c0dc3941fe 100644 --- a/source/portable/NetworkInterface/ATSAME5x/NetworkInterface.c +++ b/source/portable/NetworkInterface/ATSAME5x/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -499,9 +499,10 @@ void xRxCallback( void ) #if ( ipUSE_STATIC_ALLOCATION == 1 ) -/* Next provide the vNetworkInterfaceAllocateRAMToBuffers() function, which - * simply fills in the pucEthernetBuffer member of each descriptor. */ - void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +/* Next provide the uxNetworkInterfaceAllocateRAMToBuffers() function, which + * simply fills in the pucEthernetBuffer member of each descriptor and returns + * the allocated buffer size. */ + size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { BaseType_t x; @@ -515,6 +516,8 @@ void xRxCallback( void ) * future versions. */ *( ( uint32_t * ) &ucBuffers[ x ][ 0 ] ) = ( uint32_t ) &( pxNetworkBuffers[ x ] ); } + + return( NETWORK_BUFFER_SIZE - ipBUFFER_PADDING ); } #endif /* if ( ipUSE_STATIC_ALLOCATION == 1 ) */ diff --git a/source/portable/NetworkInterface/Common/phyHandling.c b/source/portable/NetworkInterface/Common/phyHandling.c index 05041e93d9..8de3c22764 100644 --- a/source/portable/NetworkInterface/Common/phyHandling.c +++ b/source/portable/NetworkInterface/Common/phyHandling.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c b/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c index b79d1008f1..25247513b8 100644 --- a/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c +++ b/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -1409,7 +1409,7 @@ static void vCheckBuffersAndQueue( void ) /*-----------------------------------------------------------*/ extern uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS * NETWORK_BUFFER_SIZE ]; -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { uint8_t * ucRAMBuffer = ucNetworkPackets; uint32_t ulIndex; @@ -1422,6 +1422,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB } cache_clean_invalidate(); + + return( NETWORK_BUFFER_SIZE - ipBUFFER_PADDING ); } /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/LPC17xx/NetworkInterface.c b/source/portable/NetworkInterface/LPC17xx/NetworkInterface.c index be0a2647a3..740488cfa8 100644 --- a/source/portable/NetworkInterface/LPC17xx/NetworkInterface.c +++ b/source/portable/NetworkInterface/LPC17xx/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/LPC18xx/NetworkInterface.c b/source/portable/NetworkInterface/LPC18xx/NetworkInterface.c index 5f4e5742b4..97a10e3f5d 100644 --- a/source/portable/NetworkInterface/LPC18xx/NetworkInterface.c +++ b/source/portable/NetworkInterface/LPC18xx/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -332,7 +332,7 @@ BaseType_t xNetworkInterfaceInitialise( void ) static __attribute__( ( section( "._ramAHB32" ) ) ) uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS * niBUFFER_1_PACKET_SIZE ] __attribute__( ( aligned( 32 ) ) ); -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { uint8_t * ucRAMBuffer = ucNetworkPackets; uint32_t ul; @@ -343,6 +343,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB *( ( unsigned * ) ucRAMBuffer ) = ( unsigned ) ( &( pxNetworkBuffers[ ul ] ) ); ucRAMBuffer += niBUFFER_1_PACKET_SIZE; } + + return( niBUFFER_1_PACKET_SIZE - ipBUFFER_PADDING ); } /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/LPC54018/NetworkInterface.c b/source/portable/NetworkInterface/LPC54018/NetworkInterface.c index d6a822fb0b..f88838d86c 100644 --- a/source/portable/NetworkInterface/LPC54018/NetworkInterface.c +++ b/source/portable/NetworkInterface/LPC54018/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -372,11 +372,13 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxNetworkB /* statically allocate the buffers */ /* allocating them as uint32_t's to force them into word alignment, a requirement of the DMA. */ __ALIGN_BEGIN static uint32_t buffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ][ ( ipBUFFER_PADDING + ENET_RXBUFF_SIZE ) / sizeof( uint32_t ) + 1 ] __ALIGN_END; -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { for( int x = 0; x < ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS; x++ ) { pxNetworkBuffers[ x ].pucEthernetBuffer = ( uint8_t * ) &buffers[ x ][ 0 ] + ipBUFFER_PADDING; buffers[ x ][ 0 ] = ( uint32_t ) &pxNetworkBuffers[ x ]; } + + return ENET_RXBUFF_SIZE; } diff --git a/source/portable/NetworkInterface/M487/NetworkInterface.c b/source/portable/NetworkInterface/M487/NetworkInterface.c index 32b3208031..8c1c07fd67 100644 --- a/source/portable/NetworkInterface/M487/NetworkInterface.c +++ b/source/portable/NetworkInterface/M487/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -180,7 +180,7 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxDescript } -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { uint8_t * ucRAMBuffer = ucNetworkPackets; uint32_t ul; @@ -191,6 +191,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB *( ( unsigned * ) ucRAMBuffer ) = ( unsigned ) ( &( pxNetworkBuffers[ ul ] ) ); ucRAMBuffer += niBUFFER_1_PACKET_SIZE; } + + return( niBUFFER_1_PACKET_SIZE - ipBUFFER_PADDING ); } diff --git a/source/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c b/source/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c index 1c55f82dbf..3bbaa2de20 100644 --- a/source/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c +++ b/source/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -368,7 +368,7 @@ static BaseType_t xMPS2_NetworkInterfaceOutput( NetworkInterface_t * pxInterface } /*-----------------------------------------------------------*/ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { /* FIX ME if you want to use BufferAllocation_1.c, which uses statically * allocated network buffers. */ @@ -377,6 +377,7 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB * without implementing this function. */ configASSERT( xRxTaskHandle == ( TaskHandle_t ) 1 ); ( void ) pxNetworkBuffers; + return 0; } /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/MPS3_AN552/NetworkInterface.c b/source/portable/NetworkInterface/MPS3_AN552/NetworkInterface.c index ac68594ac2..dbda1df209 100644 --- a/source/portable/NetworkInterface/MPS3_AN552/NetworkInterface.c +++ b/source/portable/NetworkInterface/MPS3_AN552/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Copyright 2023 Arm Limited and/or its affiliates * @@ -485,7 +485,7 @@ static BaseType_t xLAN91C111_NetworkInterfaceOutput( NetworkInterface_t * pxInte } /*-----------------------------------------------------------*/ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { /* FIX ME if you want to use BufferAllocation_1.c, which uses statically * allocated network buffers. */ @@ -494,6 +494,7 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB * without implementing this function. */ configASSERT( 0 ); ( void ) pxNetworkBuffers; + return 0; } /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/MPS4_CS315/NetworkInterface.c b/source/portable/NetworkInterface/MPS4_CS315/NetworkInterface.c index ac68594ac2..dbda1df209 100644 --- a/source/portable/NetworkInterface/MPS4_CS315/NetworkInterface.c +++ b/source/portable/NetworkInterface/MPS4_CS315/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Copyright 2023 Arm Limited and/or its affiliates * @@ -485,7 +485,7 @@ static BaseType_t xLAN91C111_NetworkInterfaceOutput( NetworkInterface_t * pxInte } /*-----------------------------------------------------------*/ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { /* FIX ME if you want to use BufferAllocation_1.c, which uses statically * allocated network buffers. */ @@ -494,6 +494,7 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB * without implementing this function. */ configASSERT( 0 ); ( void ) pxNetworkBuffers; + return 0; } /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/NXP1060/NetworkInterface.c b/source/portable/NetworkInterface/NXP1060/NetworkInterface.c index 4d50974258..59473c2091 100644 --- a/source/portable/NetworkInterface/NXP1060/NetworkInterface.c +++ b/source/portable/NetworkInterface/NXP1060/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/RX/NetworkInterface.c b/source/portable/NetworkInterface/RX/NetworkInterface.c index 516da7b450..0aa3815a9b 100644 --- a/source/portable/NetworkInterface/RX/NetworkInterface.c +++ b/source/portable/NetworkInterface/RX/NetworkInterface.c @@ -416,13 +416,13 @@ static void prvEMACDeferredInterruptHandlerTask( void * pvParameters ) /*********************************************************************************************************************** - * Function Name: vNetworkInterfaceAllocateRAMToBuffers () + * Function Name: uxNetworkInterfaceAllocateRAMToBuffers () * Description : . * Arguments : pxNetworkBuffers * Return Value : none **********************************************************************************************************************/ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { uint32_t ul; uint8_t * buffer_address; @@ -443,7 +443,9 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB *( ( unsigned * ) buffer_address ) = ( unsigned ) ( &( pxNetworkBuffers[ ul ] ) ); buffer_address += ETHER_CFG_BUFSIZE; } -} /* End of function vNetworkInterfaceAllocateRAMToBuffers() */ + + return( ETHER_CFG_BUFSIZE - ipBUFFER_PADDING ); +} /* End of function uxNetworkInterfaceAllocateRAMToBuffers() */ /*********************************************************************************************************************** * Function Name: prvLinkStatusChange () diff --git a/source/portable/NetworkInterface/SH2A/NetworkInterface.c b/source/portable/NetworkInterface/SH2A/NetworkInterface.c index 3225126227..e49244fc05 100644 --- a/source/portable/NetworkInterface/SH2A/NetworkInterface.c +++ b/source/portable/NetworkInterface/SH2A/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/STM32/Legacy/STM32Fxx/NetworkInterface.c b/source/portable/NetworkInterface/STM32/Legacy/STM32Fxx/NetworkInterface.c index 2e06048bd0..737364b68e 100644 --- a/source/portable/NetworkInterface/STM32/Legacy/STM32Fxx/NetworkInterface.c +++ b/source/portable/NetworkInterface/STM32/Legacy/STM32Fxx/NetworkInterface.c @@ -4,7 +4,7 @@ */ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -1377,7 +1377,7 @@ static BaseType_t xSTM32F_GetPhyLinkStatus( NetworkInterface_t * pxInterface ) /* Uncomment this in case BufferAllocation_1.c is used. */ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static #if defined( STM32F7xx ) @@ -1393,6 +1393,7 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB *( ( unsigned * ) ucRAMBuffer ) = ( unsigned ) ( &( pxNetworkBuffers[ ul ] ) ); ucRAMBuffer += ETH_MAX_PACKET_SIZE; } + return (ETH_MAX_PACKET_SIZE - ipBUFFER_PADDING); } /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/STM32/Legacy/STM32Hxx/NetworkInterface.c b/source/portable/NetworkInterface/STM32/Legacy/STM32Hxx/NetworkInterface.c index 6536b3085a..ed406d9673 100644 --- a/source/portable/NetworkInterface/STM32/Legacy/STM32Hxx/NetworkInterface.c +++ b/source/portable/NetworkInterface/STM32/Legacy/STM32Hxx/NetworkInterface.c @@ -4,7 +4,7 @@ */ /* - * FreeRTOS+TCP V2.3.2 + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -1034,7 +1034,7 @@ uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS * ETH_RX_BUF_SI #endif /* ( ipconfigZERO_COPY_RX_DRIVER != 0 || ipconfigZERO_COPY_TX_DRIVER != 0 ) */ __attribute__( ( aligned( 32 ) ) ); -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { uint8_t * ucRAMBuffer = ucNetworkPackets; uint32_t ul; @@ -1045,6 +1045,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB *( ( unsigned * ) ucRAMBuffer ) = ( unsigned ) ( &( pxNetworkBuffers[ ul ] ) ); ucRAMBuffer += ETH_RX_BUF_SIZE; } + + return (ETH_RX_BUF_SIZE - ipBUFFER_PADDING); } /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/STM32/NetworkInterface.c b/source/portable/NetworkInterface/STM32/NetworkInterface.c index edc79b5f08..4ba970f74d 100644 --- a/source/portable/NetworkInterface/STM32/NetworkInterface.c +++ b/source/portable/NetworkInterface/STM32/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -1971,7 +1971,7 @@ void HAL_ETH_TxFreeCallback( uint32_t * pulBuff ) /*===========================================================================*/ /*---------------------------------------------------------------------------*/ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ][ niEMAC_TOTAL_BUFFER_SIZE ] __ALIGNED( niEMAC_BUF_ALIGNMENT ) __attribute__( ( section( niEMAC_BUFFERS_SECTION ) ) ); @@ -1985,6 +1985,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB pxNetworkBuffers[ uxIndex ].pucEthernetBuffer = &( ucNetworkPackets[ uxIndex ][ ipBUFFER_PADDING ] ); *( ( uint32_t * ) &( ucNetworkPackets[ uxIndex ][ 0 ] ) ) = ( uint32_t ) ( &( pxNetworkBuffers[ uxIndex ] ) ); } + + return (niEMAC_TOTAL_BUFFER_SIZE - ipBUFFER_PADDING); } /*---------------------------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/TM4C/NetworkInterface.c b/source/portable/NetworkInterface/TM4C/NetworkInterface.c index 5a5a4f1cd3..bca3ae8573 100644 --- a/source/portable/NetworkInterface/TM4C/NetworkInterface.c +++ b/source/portable/NetworkInterface/TM4C/NetworkInterface.c @@ -57,7 +57,7 @@ #include "NetworkInterface.h" #include "phyHandling.h" -#define BUFFER_SIZE_WO_PADDING ( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ) +#define BUFFER_SIZE_WO_PADDING ( ipTOTAL_ETHERNET_FRAME_SIZE ) #define BUFFER_SIZE ( BUFFER_SIZE_WO_PADDING + ipBUFFER_PADDING ) #define BUFFER_SIZE_ROUNDED_UP ( ( BUFFER_SIZE + 7 ) & ~0x7UL ) #define PHY_PHYS_ADDR 0 @@ -403,7 +403,7 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxNetworkB return success; } -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +void uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { BaseType_t i; @@ -415,6 +415,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB /* Set the 'hidden' reference to the descriptor for use in DMA interrupts */ *( ( uint32_t * ) &_network_buffers[ i ][ 0 ] ) = ( uint32_t ) &( ( pxNetworkBuffers[ i ] ) ); } + + return( BUFFER_SIZE_ROUNDED_UP - ipBUFFER_PADDING ); } static BaseType_t _ethernet_mac_get( uint8_t * mac_address_bytes ) diff --git a/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c b/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c index bac7e4587c..497190b5dd 100644 --- a/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c +++ b/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -997,7 +997,7 @@ BaseType_t xGetPhyLinkStatus( void ) #define BUFFER_SIZE_ALLOC1 ( ipTOTAL_ETHERNET_FRAME_SIZE + ipBUFFER_PADDING ) #define BUFFER_SIZE_ALLOC1_ROUNDED_UP ( ( BUFFER_SIZE_ALLOC1 + 7 ) & ~0x07UL ) static uint8_t ucBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ][ BUFFER_SIZE_ALLOC1_ROUNDED_UP ]; -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { BaseType_t x; @@ -1011,4 +1011,6 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB * future versions. */ *( ( uint32_t * ) &ucBuffers[ x ][ 0 ] ) = ( uint32_t ) &( pxNetworkBuffers[ x ] ); } + + return( BUFFER_SIZE_ALLOC1_ROUNDED_UP - ipBUFFER_PADDING ); } diff --git a/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.h b/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.h index 70f59fff0c..d39bc5b6ce 100644 --- a/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.h +++ b/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkInterface.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c b/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c index 7a4f97f50b..6621e660f8 100644 --- a/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c +++ b/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.h b/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.h index 57a37135de..131b416292 100644 --- a/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.h +++ b/source/portable/NetworkInterface/ThirdParty/MSP432/NetworkMiddleware.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/WinPCap/NetworkInterface.c b/source/portable/NetworkInterface/WinPCap/NetworkInterface.c index e7f8975a8a..514116455a 100644 --- a/source/portable/NetworkInterface/WinPCap/NetworkInterface.c +++ b/source/portable/NetworkInterface/WinPCap/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -946,7 +946,7 @@ static const char * prvRemoveSpaces( char * pcBuffer, #define BUFFER_SIZE ( ipTOTAL_ETHERNET_FRAME_SIZE + ipBUFFER_PADDING ) #define BUFFER_SIZE_ROUNDED_UP ( ( BUFFER_SIZE + 7 ) & ~0x07UL ) -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static uint8_t * pucNetworkPacketBuffers = NULL; size_t uxIndex; @@ -979,4 +979,6 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB pxNetworkBuffers[ uxIndex ].pucEthernetBuffer = &( pucNetworkPacketBuffers[ uxOffset + ipBUFFER_PADDING ] ); } } + + return( BUFFER_SIZE_ROUNDED_UP - ipBUFFER_PADDING ); } diff --git a/source/portable/NetworkInterface/Zynq/NetworkInterface.c b/source/portable/NetworkInterface/Zynq/NetworkInterface.c index 8b5913bf16..9b9216a06a 100644 --- a/source/portable/NetworkInterface/Zynq/NetworkInterface.c +++ b/source/portable/NetworkInterface/Zynq/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -486,7 +486,7 @@ static BaseType_t prvGMACWaitLS( BaseType_t xEMACIndex, /*-----------------------------------------------------------*/ #if ( nicUSE_UNCACHED_MEMORY == 0 ) - void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) + size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS * niBUFFER_1_PACKET_SIZE ] __attribute__( ( aligned( 32 ) ) ); uint8_t * ucRAMBuffer = ucNetworkPackets; @@ -498,9 +498,11 @@ static BaseType_t prvGMACWaitLS( BaseType_t xEMACIndex, *( ( unsigned * ) ucRAMBuffer ) = ( unsigned ) ( &( pxNetworkBuffers[ ul ] ) ); ucRAMBuffer += niBUFFER_1_PACKET_SIZE; } + + return( niBUFFER_1_PACKET_SIZE - ipBUFFER_PADDING ); } #else /* if ( nicUSE_UNCACHED_MEMORY == 0 ) */ - void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) + size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static uint8_t * pucNetworkPackets = NULL; @@ -521,6 +523,8 @@ static BaseType_t prvGMACWaitLS( BaseType_t xEMACIndex, } } } + + return( niBUFFER_1_PACKET_SIZE - ipBUFFER_PADDING ); } #endif /* ( nicUSE_UNCACHED_MEMORY == 0 ) */ /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif_dma.c b/source/portable/NetworkInterface/Zynq/x_emacpsif_dma.c index f1684982bb..86e63a43ac 100644 --- a/source/portable/NetworkInterface/Zynq/x_emacpsif_dma.c +++ b/source/portable/NetworkInterface/Zynq/x_emacpsif_dma.c @@ -31,7 +31,7 @@ ******************************************************************************/ /* - * FreeRTOS+TCP V2.3.3 + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -89,7 +89,7 @@ #endif #define TX_OFFSET ipconfigPACKET_FILLER_SIZE -#define dmaRX_TX_BUFFER_SIZE 1536 +#define dmaRX_TX_BUFFER_SIZE ( 1536 - ipBUFFER_PADDING ) /* Defined in NetworkInterface.c */ extern TaskHandle_t xEMACTaskHandles[ XPAR_XEMACPS_NUM_INSTANCES ]; diff --git a/source/portable/NetworkInterface/board_family/NetworkInterface.c b/source/portable/NetworkInterface/board_family/NetworkInterface.c index dfb1979c61..c65964105a 100644 --- a/source/portable/NetworkInterface/board_family/NetworkInterface.c +++ b/source/portable/NetworkInterface/board_family/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -64,9 +64,10 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxNetworkB return pdFALSE; } -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { /* FIX ME. */ + return 0; } BaseType_t xGetPhyLinkStatus( void ) diff --git a/source/portable/NetworkInterface/include/phyHandling.h b/source/portable/NetworkInterface/include/phyHandling.h index ed9cc3a469..d2604c6dd1 100644 --- a/source/portable/NetworkInterface/include/phyHandling.h +++ b/source/portable/NetworkInterface/include/phyHandling.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/ksz8851snl/NetworkInterface.c b/source/portable/NetworkInterface/ksz8851snl/NetworkInterface.c index fb019faf6f..25c715c311 100644 --- a/source/portable/NetworkInterface/ksz8851snl/NetworkInterface.c +++ b/source/portable/NetworkInterface/ksz8851snl/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/libslirp/MBuffNetifBackendLibslirp.c b/source/portable/NetworkInterface/libslirp/MBuffNetifBackendLibslirp.c index 85760bcbd9..848d00d280 100644 --- a/source/portable/NetworkInterface/libslirp/MBuffNetifBackendLibslirp.c +++ b/source/portable/NetworkInterface/libslirp/MBuffNetifBackendLibslirp.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/libslirp/MBuffNetworkInterface.c b/source/portable/NetworkInterface/libslirp/MBuffNetworkInterface.c index 234ee8cb7c..8c277e314e 100644 --- a/source/portable/NetworkInterface/libslirp/MBuffNetworkInterface.c +++ b/source/portable/NetworkInterface/libslirp/MBuffNetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -335,7 +335,7 @@ static BaseType_t xNetworkInterfaceOutput( NetworkInterface_t * pxNetif, * Called when the BufferAllocation1 scheme is used. * @param [in,out] pxNetworkBuffers Pointer to an array of NetworkBufferDescriptor_t to populate. */ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static uint8_t * pucNetworkPacketBuffers = NULL; size_t uxIndex; @@ -368,6 +368,8 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB pxNetworkBuffers[ uxIndex ].pucEthernetBuffer = &( pucNetworkPacketBuffers[ uxOffset + ipBUFFER_PADDING ] ); } } + + return( BUFFER_SIZE_ROUNDED_UP - ipBUFFER_PADDING ); } BaseType_t xGetPhyLinkStatus( NetworkInterface_t * pxNetif ) diff --git a/source/portable/NetworkInterface/linux/NetworkInterface.c b/source/portable/NetworkInterface/linux/NetworkInterface.c index a198be31cb..ef7efe30fe 100644 --- a/source/portable/NetworkInterface/linux/NetworkInterface.c +++ b/source/portable/NetworkInterface/linux/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -1098,7 +1098,7 @@ static void print_hex( unsigned const char * const bin_data, * Called when the BufferAllocation1 scheme is used. * @param [in,out] pxNetworkBuffers Pointer to an array of NetworkBufferDescriptor_t to populate. */ -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static uint8_t * pucNetworkPacketBuffers = NULL; size_t uxIndex; @@ -1131,4 +1131,6 @@ void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkB pxNetworkBuffers[ uxIndex ].pucEthernetBuffer = &( pucNetworkPacketBuffers[ uxOffset + ipBUFFER_PADDING ] ); } } + + return( BUFFER_SIZE_ROUNDED_UP - ipBUFFER_PADDING ); } diff --git a/source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c b/source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c index ffe058be5c..a4435fbc0c 100644 --- a/source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c +++ b/source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/source/portable/NetworkInterface/mw300_rd/NetworkInterface.c b/source/portable/NetworkInterface/mw300_rd/NetworkInterface.c index 26baf2ddc9..3c72e406c2 100644 --- a/source/portable/NetworkInterface/mw300_rd/NetworkInterface.c +++ b/source/portable/NetworkInterface/mw300_rd/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -181,9 +181,15 @@ BaseType_t xNetworkInterfaceInitialise( void ) return ( xInterfaceState == INTERFACE_UP && ret == WM_SUCCESS ) ? pdTRUE : pdFALSE; } -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { /* FIX ME. */ + + /* Hard force an assert as this driver cannot be used with BufferAllocation_1.c + * without implementing this function. */ + configASSERT( 0 ); + ( void ) pxNetworkBuffers; + return 0; } BaseType_t xGetPhyLinkStatus( void ) diff --git a/source/portable/NetworkInterface/pic32mzef/BufferAllocation_2.c b/source/portable/NetworkInterface/pic32mzef/BufferAllocation_2.c index 622a9b84fa..1cd13e4f8c 100644 --- a/source/portable/NetworkInterface/pic32mzef/BufferAllocation_2.c +++ b/source/portable/NetworkInterface/pic32mzef/BufferAllocation_2.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c b/source/portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c index bf97e3e276..480838d5b2 100644 --- a/source/portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c +++ b/source/portable/NetworkInterface/xilinx_ultrascale/NetworkInterface.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -599,7 +599,7 @@ static BaseType_t prvGMACWaitLS( BaseType_t xEMACIndex, /*-----------------------------------------------------------*/ #if ( nicUSE_UNCACHED_MEMORY == 0 ) - void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) + size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static uint8_t ucNetworkPackets[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS * niBUFFER_1_PACKET_SIZE ] __attribute__( ( aligned( 32 ) ) ); uint8_t * ucRAMBuffer = ucNetworkPackets; @@ -611,9 +611,11 @@ static BaseType_t prvGMACWaitLS( BaseType_t xEMACIndex, *( ( uintptr_t * ) ucRAMBuffer ) = ( uintptr_t ) &( pxNetworkBuffers[ ul ] ); ucRAMBuffer += niBUFFER_1_PACKET_SIZE; } + + return( niBUFFER_1_PACKET_SIZE - ipBUFFER_PADDING ); } #else /* if ( nicUSE_UNCACHED_MEMORY == 0 ) */ - void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) + size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { static uint8_t * pucNetworkPackets = NULL; @@ -634,6 +636,8 @@ static BaseType_t prvGMACWaitLS( BaseType_t xEMACIndex, } } } + + return( niBUFFER_1_PACKET_SIZE - ipBUFFER_PADDING ); } #endif /* ( nicUSE_UNCACHED_MEMORY == 0 ) */ /*-----------------------------------------------------------*/ diff --git a/source/portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c b/source/portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c index 18a0d9d6ab..52b5a4c440 100644 --- a/source/portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c +++ b/source/portable/NetworkInterface/xilinx_ultrascale/uncached_memory.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c b/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c index 959ff0ab5d..2065d4ea84 100644 --- a/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c +++ b/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_dma.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -68,9 +68,9 @@ #endif /* ( ipconfigNETWORK_MTU > 1526 ) */ #if ( USE_JUMBO_FRAMES == 1 ) - #define dmaRX_TX_BUFFER_SIZE 10240 + #define dmaRX_TX_BUFFER_SIZE ( 10240 - ipBUFFER_PADDING ) #else - #define dmaRX_TX_BUFFER_SIZE 1536 + #define dmaRX_TX_BUFFER_SIZE ( 1536 - ipBUFFER_PADDING ) #endif /* ( USE_JUMBO_FRAMES == 1 ) */ extern XScuGic xInterruptController; diff --git a/test/Coverity/ConfigFiles/FreeRTOSConfig.h b/test/Coverity/ConfigFiles/FreeRTOSConfig.h index f98d4c7796..702f52a164 100644 --- a/test/Coverity/ConfigFiles/FreeRTOSConfig.h +++ b/test/Coverity/ConfigFiles/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/Coverity/ConfigFiles/FreeRTOSIPConfig.h b/test/Coverity/ConfigFiles/FreeRTOSIPConfig.h index b37503cd79..10560150bc 100644 --- a/test/Coverity/ConfigFiles/FreeRTOSIPConfig.h +++ b/test/Coverity/ConfigFiles/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/Coverity/ConfigFiles/pack_struct_end.h b/test/Coverity/ConfigFiles/pack_struct_end.h index 6642548c3b..d012748c18 100644 --- a/test/Coverity/ConfigFiles/pack_struct_end.h +++ b/test/Coverity/ConfigFiles/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/Coverity/ConfigFiles/pack_struct_start.h b/test/Coverity/ConfigFiles/pack_struct_start.h index 62fb479075..dbc2a78a0c 100644 --- a/test/Coverity/ConfigFiles/pack_struct_start.h +++ b/test/Coverity/ConfigFiles/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/Coverity/ConfigFiles/portmacro.h b/test/Coverity/ConfigFiles/portmacro.h index e315c4e839..48cc0b951a 100644 --- a/test/Coverity/ConfigFiles/portmacro.h +++ b/test/Coverity/ConfigFiles/portmacro.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/AllDisable/FreeRTOSIPConfig.h b/test/build-combination/AllDisable/FreeRTOSIPConfig.h index ba46611a14..76bf551ea0 100644 --- a/test/build-combination/AllDisable/FreeRTOSIPConfig.h +++ b/test/build-combination/AllDisable/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/AllEnable/FreeRTOSIPConfig.h b/test/build-combination/AllEnable/FreeRTOSIPConfig.h index 44c7e8df91..3672e0a096 100644 --- a/test/build-combination/AllEnable/FreeRTOSIPConfig.h +++ b/test/build-combination/AllEnable/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Common/FreeRTOSConfig.h b/test/build-combination/Common/FreeRTOSConfig.h index fbfac53dff..bdbaead5bd 100644 --- a/test/build-combination/Common/FreeRTOSConfig.h +++ b/test/build-combination/Common/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Common/main.c b/test/build-combination/Common/main.c index f904ad5a7e..8d8bed10aa 100644 --- a/test/build-combination/Common/main.c +++ b/test/build-combination/Common/main.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/build-combination/DefaultConf/FreeRTOSIPConfig.h b/test/build-combination/DefaultConf/FreeRTOSIPConfig.h index 313c401e6e..7473218ddb 100644 --- a/test/build-combination/DefaultConf/FreeRTOSIPConfig.h +++ b/test/build-combination/DefaultConf/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Enable_IPv4/FreeRTOSIPConfig.h b/test/build-combination/Enable_IPv4/FreeRTOSIPConfig.h index b610106031..73b8ebe222 100644 --- a/test/build-combination/Enable_IPv4/FreeRTOSIPConfig.h +++ b/test/build-combination/Enable_IPv4/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Enable_IPv4_IPv6/FreeRTOSIPConfig.h b/test/build-combination/Enable_IPv4_IPv6/FreeRTOSIPConfig.h index 3c7b30e67b..91def06676 100644 --- a/test/build-combination/Enable_IPv4_IPv6/FreeRTOSIPConfig.h +++ b/test/build-combination/Enable_IPv4_IPv6/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Enable_IPv4_TCP/FreeRTOSIPConfig.h b/test/build-combination/Enable_IPv4_TCP/FreeRTOSIPConfig.h index eea9281f20..1318ec2a5e 100644 --- a/test/build-combination/Enable_IPv4_TCP/FreeRTOSIPConfig.h +++ b/test/build-combination/Enable_IPv4_TCP/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Enable_IPv6/FreeRTOSIPConfig.h b/test/build-combination/Enable_IPv6/FreeRTOSIPConfig.h index 0bf7c1def1..9bf0d488b1 100644 --- a/test/build-combination/Enable_IPv6/FreeRTOSIPConfig.h +++ b/test/build-combination/Enable_IPv6/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Enable_IPv6_TCP/FreeRTOSIPConfig.h b/test/build-combination/Enable_IPv6_TCP/FreeRTOSIPConfig.h index 17e679550c..8957356b50 100644 --- a/test/build-combination/Enable_IPv6_TCP/FreeRTOSIPConfig.h +++ b/test/build-combination/Enable_IPv6_TCP/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Header_Self_Contain/FreeRTOSConfig.h b/test/build-combination/Header_Self_Contain/FreeRTOSConfig.h index fbfac53dff..bdbaead5bd 100644 --- a/test/build-combination/Header_Self_Contain/FreeRTOSConfig.h +++ b/test/build-combination/Header_Self_Contain/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/build-combination/Header_Self_Contain/FreeRTOSIPConfig.h b/test/build-combination/Header_Self_Contain/FreeRTOSIPConfig.h index ce7022b2ec..865ec0aac3 100644 --- a/test/build-combination/Header_Self_Contain/FreeRTOSIPConfig.h +++ b/test/build-combination/Header_Self_Contain/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/patches/FreeRTOSConfig.h b/test/cbmc/patches/FreeRTOSConfig.h index e0d033b4fb..fb553dd26f 100644 --- a/test/cbmc/patches/FreeRTOSConfig.h +++ b/test/cbmc/patches/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/patches/FreeRTOSIPConfig.h b/test/cbmc/patches/FreeRTOSIPConfig.h index 55dfc29292..5d73ff73af 100644 --- a/test/cbmc/patches/FreeRTOSIPConfig.h +++ b/test/cbmc/patches/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/Configurations.json b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/Configurations.json index ff5898c18c..8e0123bdc9 100644 --- a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/Configurations.json +++ b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/Configurations.json @@ -4,7 +4,7 @@ "CBMCFLAGS": [ "--unwind {MINIMUM_PACKET_BYTES}", - "--unwindset xNetworkBuffersInitialise.0:3,xNetworkBuffersInitialise.1:3,vListInsert.0:3,pxGetNetworkBufferWithDescriptor.0:3,pxGetNetworkBufferWithDescriptor.1:3,vNetworkInterfaceAllocateRAMToBuffers.0:3" + "--unwindset xNetworkBuffersInitialise.0:3,xNetworkBuffersInitialise.1:3,vListInsert.0:3,pxGetNetworkBufferWithDescriptor.0:3,pxGetNetworkBufferWithDescriptor.1:3,uxNetworkInterfaceAllocateRAMToBuffers.0:3" ], "OBJS": [ diff --git a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/OutputARPRequest_harness.c b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/OutputARPRequest_harness.c index 24762ed1cd..3d49a835f1 100644 --- a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/OutputARPRequest_harness.c +++ b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/OutputARPRequest_harness.c @@ -23,19 +23,28 @@ #include "NetworkInterface.h" #include "NetworkBufferManagement.h" -void vNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) +size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetworkBuffers[ ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS ] ) { + /* + * In the case of buffer allocation scheme 1 the network buffers are + * fixed size and its asserted in xNetworkBuffersInitialise call that the + * buffer is at least ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER bytes + * + * Refer: + * configASSERT( ( uxMaxNetworkInterfaceAllocatedSizeBytes >= ( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ) ) ); + * + */ + size_t xAllocSize = ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER; + for( int x = 0; x < ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS; x++ ) { NetworkBufferDescriptor_t * current = &pxNetworkBuffers[ x ]; - #if ( ipconfigETHERNET_MINIMUM_PACKET_BYTES > 0 ) - current->pucEthernetBuffer = malloc( sizeof( ARPPacket_t ) + ( ipconfigETHERNET_MINIMUM_PACKET_BYTES - sizeof( ARPPacket_t ) ) ); - #else - current->pucEthernetBuffer = malloc( sizeof( ARPPacket_t ) ); - #endif + current->pucEthernetBuffer = malloc( xAllocSize ); __CPROVER_assume( current->pucEthernetBuffer != NULL ); current->xDataLength = sizeof( ARPPacket_t ); } + + return xAllocSize; } /* The code expects that the Semaphore creation relying on pvPortMalloc diff --git a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/README.md b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/README.md index ea5eac78d4..7cc692c93d 100644 --- a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/README.md +++ b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc1/README.md @@ -16,7 +16,7 @@ this function: * xTaskPriorityDisinherit This proof checks ```FreeRTOS_OutputARPRequest``` in multiple configurations. -All assume the memory safety of vNetworkInterfaceAllocateRAMToBuffers. +All assume the memory safety of uxNetworkInterfaceAllocateRAMToBuffers. * The ```config_minimal_configuration``` proof sets ```ipconfigUSE_LINKED_RX_MESSAGES=0```. * The ```config_minimal_configuration_linked_rx_messages``` proof sets diff --git a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc2/Configurations.json b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc2/Configurations.json index d37f17720e..42165fed64 100644 --- a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc2/Configurations.json +++ b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc2/Configurations.json @@ -4,7 +4,7 @@ "CBMCFLAGS": [ "--unwind {MINIMUM_PACKET_BYTES}", - "--unwindset xNetworkBuffersInitialise.0:3,xNetworkBuffersInitialise.1:3,vListInsert.0:3,pxGetNetworkBufferWithDescriptor.0:3,pxGetNetworkBufferWithDescriptor.1:3,vNetworkInterfaceAllocateRAMToBuffers.0:3" + "--unwindset xNetworkBuffersInitialise.0:3,xNetworkBuffersInitialise.1:3,vListInsert.0:3,pxGetNetworkBufferWithDescriptor.0:3,pxGetNetworkBufferWithDescriptor.1:3,uxNetworkInterfaceAllocateRAMToBuffers.0:3" ], "OBJS": [ diff --git a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc2/README.md b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc2/README.md index 5d509a7e83..642d2a42be 100644 --- a/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc2/README.md +++ b/test/cbmc/proofs/ARP/ARP_OutputARPRequest_buffer_alloc2/README.md @@ -18,7 +18,7 @@ this function: * pvPortMalloc * pvPortFree * xNetworkInterfaceOutput -* vNetworkInterfaceAllocateRAMToBuffers +* uxNetworkInterfaceAllocateRAMToBuffers This proof disables the tracing library in the header. @@ -29,7 +29,7 @@ This proof checks FreeRTOS_OutputARPRequest in multiple configuration: FreeRTOS_OutputARPRequest and FreeRTOS-Plus-TCP/source/portable/BufferManagement/BufferAllocation_2.c are memory save. This proof depends entirely of the implementation - correctness of vNetworkInterfaceAllocateRAMToBuffers. + correctness of uxNetworkInterfaceAllocateRAMToBuffers. * The proof in directory minimal_configuration_minimal_packet_size guarantees that using FreeRTOS-Plus-TCP/source/portable/BufferManagement/BufferAllocation_2.c diff --git a/test/cbmc/proofs/DNS/DNSTreatNBNS/DNS_TreatNBNS_harness.c b/test/cbmc/proofs/DNS/DNSTreatNBNS/DNS_TreatNBNS_harness.c index 54d13c4d6f..cea7f57f53 100644 --- a/test/cbmc/proofs/DNS/DNSTreatNBNS/DNS_TreatNBNS_harness.c +++ b/test/cbmc/proofs/DNS/DNSTreatNBNS/DNS_TreatNBNS_harness.c @@ -122,10 +122,7 @@ void harness() BaseType_t xDataSize; - /* When re-adjusting the buffer, (sizeof( NBNSAnswer_t ) - 2 * sizeof( uint16_t )) more bytes are - * required to be added to the existing buffer. Make sure total bytes doesn't exceed ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER - * when re-resizing. This will prevent hitting an assert if Buffer Allocation 1 is used. */ - __CPROVER_assume( ( xDataSize != 0 ) && ( xDataSize < ( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER - ( sizeof( NBNSAnswer_t ) - 2 * sizeof( uint16_t ) ) ) ) ); + __CPROVER_assume( ( xDataSize > 0 ) && ( xDataSize < ( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ) ) ); xNetworkBuffer.pucEthernetBuffer = safeMalloc( xDataSize ); xNetworkBuffer.xDataLength = xDataSize; diff --git a/test/cbmc/proofs/DNS/DNSTreatNBNS/Makefile.json b/test/cbmc/proofs/DNS/DNSTreatNBNS/Makefile.json index d3ab0d582a..7de551e7c8 100644 --- a/test/cbmc/proofs/DNS/DNSTreatNBNS/Makefile.json +++ b/test/cbmc/proofs/DNS/DNSTreatNBNS/Makefile.json @@ -23,6 +23,7 @@ "DEF": [ "ipconfigUSE_DNS_CACHE={USE_CACHE}", - "ipconfigUSE_NBNS=1" + "ipconfigUSE_NBNS=1", + "ipconfigNETWORK_MTU=586" ] } diff --git a/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json b/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json index 80f783f4cd..ae8c857026 100644 --- a/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json +++ b/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json @@ -1,16 +1,18 @@ { "ENTRY": "DNS_ParseDNSReply", - "TEST_PAYLOAD_SIZE": 2, - "TEST_IPV4_PACKET_SIZE": 29, - "TEST_IPV6_PACKET_SIZE": 49, + "TEST_MAX_TEST_UNWIND_LOOP": 6, + "TEST_MIN_TEST_DNS_HEADER": 12, + "TEST_MIN_IPV4_UDP_PACKET_SIZE": 42, + "TEST_MIN_IPV6_UDP_PACKET_SIZE": 62, + "TEST_IPV4_NETWORK_MTU": "__eval {TEST_MIN_IPV4_UDP_PACKET_SIZE} + {TEST_MIN_TEST_DNS_HEADER} + {TEST_MAX_TEST_UNWIND_LOOP}", + "TEST_IPV6_NETWORK_MTU": "__eval {TEST_MIN_IPV6_UDP_PACKET_SIZE} + {TEST_MIN_TEST_DNS_HEADER} + {TEST_MAX_TEST_UNWIND_LOOP}", "CBMCFLAGS": [ "--unwind 1", - "--unwindset DNS_ParseDNSReply.0:{TEST_PAYLOAD_SIZE}", - "--unwindset DNS_ReadNameField.0:{TEST_PAYLOAD_SIZE}", - "--unwindset DNS_ReadNameField.1:{TEST_PAYLOAD_SIZE}", - "--unwindset parseDNSAnswer.0:{TEST_PAYLOAD_SIZE}", - "--unwindset strncpy.0:{TEST_PAYLOAD_SIZE}" + "--unwindset strlen.0:{TEST_MAX_TEST_UNWIND_LOOP}", + "--unwindset DNS_ParseDNSReply.0:{TEST_MAX_TEST_UNWIND_LOOP}", + "--unwindset DNS_ReadNameField.0:{TEST_MAX_TEST_UNWIND_LOOP}", + "--unwindset DNS_ReadNameField.1:{TEST_MAX_TEST_UNWIND_LOOP}" ], "OPT": [ @@ -25,21 +27,63 @@ "DEF": [ { - "IPv4": + "IPv4_FixedNetworkBufferSize": [ - "TEST_PACKET_SIZE={TEST_IPV4_PACKET_SIZE}", + "TEST_MAX_PAYLOAD_SIZE={TEST_MAX_TEST_UNWIND_LOOP}", "ipconfigUSE_LLMNR=1", "ipconfigUSE_MDNS=1", - "IS_TESTING_IPV6=0" + "IS_TESTING_IPV6=0", + "IS_BUFFER_ALLOCATE_FIXED=1", + "ipconfigNETWORK_MTU={TEST_IPV4_NETWORK_MTU}", + "ipconfigUSE_TCP=0", + "ipconfigUSE_DHCP=0", + "ipconfigTCP_MSS=536", + "ipconfigDNS_CACHE_NAME_LENGTH={TEST_MAX_TEST_UNWIND_LOOP}" ] }, { - "IPv6": + "IPv6_FixedNetworkBufferSize": [ - "TEST_PACKET_SIZE={TEST_IPV6_PACKET_SIZE}", + "TEST_MAX_PAYLOAD_SIZE={TEST_MAX_TEST_UNWIND_LOOP}", "ipconfigUSE_LLMNR=1", "ipconfigUSE_MDNS=1", - "IS_TESTING_IPV6=1" + "IS_TESTING_IPV6=1", + "IS_BUFFER_ALLOCATE_FIXED=1", + "ipconfigNETWORK_MTU={TEST_IPV6_NETWORK_MTU}", + "ipconfigUSE_TCP=0", + "ipconfigUSE_DHCP=0", + "ipconfigTCP_MSS=536", + "ipconfigDNS_CACHE_NAME_LENGTH={TEST_MAX_TEST_UNWIND_LOOP}" + ] + }, + { + "IPv4_DynamicNetworkBufferSize": + [ + "TEST_MAX_PAYLOAD_SIZE={TEST_MAX_TEST_UNWIND_LOOP}", + "ipconfigUSE_LLMNR=1", + "ipconfigUSE_MDNS=1", + "IS_TESTING_IPV6=0", + "IS_BUFFER_ALLOCATE_FIXED=0", + "ipconfigNETWORK_MTU={TEST_IPV4_NETWORK_MTU}", + "ipconfigUSE_TCP=0", + "ipconfigUSE_DHCP=0", + "ipconfigTCP_MSS=536", + "ipconfigDNS_CACHE_NAME_LENGTH={TEST_MAX_TEST_UNWIND_LOOP}" + ] + }, + { + "IPv6_DynamicNetworkBufferSize": + [ + "TEST_MAX_PAYLOAD_SIZE={TEST_MAX_TEST_UNWIND_LOOP}", + "ipconfigUSE_LLMNR=1", + "ipconfigUSE_MDNS=1", + "IS_TESTING_IPV6=1", + "IS_BUFFER_ALLOCATE_FIXED=0", + "ipconfigNETWORK_MTU={TEST_IPV6_NETWORK_MTU}", + "ipconfigUSE_TCP=0", + "ipconfigUSE_DHCP=0", + "ipconfigTCP_MSS=536", + "ipconfigDNS_CACHE_NAME_LENGTH={TEST_MAX_TEST_UNWIND_LOOP}" ] } ], diff --git a/test/cbmc/proofs/DNS_ParseDNSReply/DNS_ParseDNSReply_harness.c b/test/cbmc/proofs/DNS_ParseDNSReply/DNS_ParseDNSReply_harness.c index 9fae89ddc8..60572ef2df 100644 --- a/test/cbmc/proofs/DNS_ParseDNSReply/DNS_ParseDNSReply_harness.c +++ b/test/cbmc/proofs/DNS_ParseDNSReply/DNS_ParseDNSReply_harness.c @@ -10,6 +10,7 @@ /* FreeRTOS+TCP includes. */ #include "FreeRTOS_IP.h" +#include "FreeRTOS_IP_Private.h" #include "FreeRTOS_DNS.h" #include "FreeRTOS_DNS_Parser.h" #include "NetworkBufferManagement.h" @@ -17,7 +18,8 @@ #include "IPTraceMacroDefaults.h" #include "cbmc.h" -#include "../../utility/memory_assignments.c" + +const BaseType_t xBufferAllocFixedSize = IS_BUFFER_ALLOCATE_FIXED; /**************************************************************** * Signature of function under test @@ -60,12 +62,18 @@ NetworkBufferDescriptor_t * pxUDPPayloadBuffer_to_NetworkBuffer( const void * pv uint32_t ulChar2u32( const uint8_t * pucPtr ) { + uint32_t ret; + __CPROVER_assert( __CPROVER_r_ok( pucPtr, 4 ), "must be 4 bytes legal address to read" ); + return ret; } uint16_t usChar2u16( const uint8_t * pucPtr ) { + uint16_t ret; + __CPROVER_assert( __CPROVER_r_ok( pucPtr, 2 ), "must be 2 bytes legal address to read" ); + return ret; } const char * FreeRTOS_inet_ntop( BaseType_t xAddressFamily, @@ -131,11 +139,14 @@ NetworkBufferDescriptor_t * pxDuplicateNetworkBufferWithDescriptor( const Networ { NetworkBufferDescriptor_t * pxNetworkBuffer = safeMalloc( sizeof( NetworkBufferDescriptor_t ) ); - if( ensure_memory_is_valid( pxNetworkBuffer, xNewLength ) ) + if( pxNetworkBuffer != NULL ) { pxNetworkBuffer->pucEthernetBuffer = safeMalloc( xNewLength ); - __CPROVER_assume( pxNetworkBuffer->pucEthernetBuffer ); + __CPROVER_assume( pxNetworkBuffer->pucEthernetBuffer != NULL ); pxNetworkBuffer->xDataLength = xNewLength; + + pxNetworkBuffer->pxEndPoint = safeMalloc( sizeof( NetworkEndPoint_t ) ); + __CPROVER_assume( pxNetworkBuffer->pxEndPoint != NULL ); } return pxNetworkBuffer; @@ -176,23 +187,31 @@ void harness() uint8_t * pPayloadBuffer; size_t uxPayloadBufferLength; - __CPROVER_assert( TEST_PACKET_SIZE < CBMC_MAX_OBJECT_SIZE, - "TEST_PACKET_SIZE < CBMC_MAX_OBJECT_SIZE" ); - - __CPROVER_assume( uxBufferLength < CBMC_MAX_OBJECT_SIZE ); - __CPROVER_assume( uxBufferLength <= TEST_PACKET_SIZE ); + __CPROVER_assume( uxBufferLength <= ipconfigNETWORK_MTU ); + __CPROVER_assume( pxNetworkEndPoint_Temp != NULL ); lIsIPv6Packet = IS_TESTING_IPV6; - xNetworkBuffer.pucEthernetBuffer = safeMalloc( uxBufferLength ); - xNetworkBuffer.xDataLength = uxBufferLength; - xNetworkBuffer.pxEndPoint = pxNetworkEndPoint_Temp; + if( xBufferAllocFixedSize != pdFALSE ) + { + /* When xBufferAllocFixedSize is true, buffers in all network descriptors + * is big enough to allow all Ethernet packet. */ + xNetworkBuffer.pucEthernetBuffer = safeMalloc( ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ); + xNetworkBuffer.xDataLength = uxBufferLength; + xNetworkBuffer.pxEndPoint = pxNetworkEndPoint_Temp; + } + else + { + xNetworkBuffer.pucEthernetBuffer = safeMalloc( uxBufferLength ); + xNetworkBuffer.xDataLength = uxBufferLength; + xNetworkBuffer.pxEndPoint = pxNetworkEndPoint_Temp; + } __CPROVER_assume( xNetworkBuffer.pucEthernetBuffer != NULL ); if( lIsIPv6Packet ) { - __CPROVER_assume( uxBufferLength >= ulIpv6UdpOffset ); /* 62 is total size of IPv4 UDP header, including ethernet, IPv6, UDP headers. */ + __CPROVER_assume( uxBufferLength >= ulIpv6UdpOffset ); /* 62 is total size of IPv6 UDP header, including ethernet, IPv6, UDP headers. */ pPayloadBuffer = xNetworkBuffer.pucEthernetBuffer + ulIpv6UdpOffset; uxPayloadBufferLength = uxBufferLength - ulIpv6UdpOffset; } diff --git a/test/cbmc/proofs/ND/prvProcessICMPMessage_IPv6/ProcessICMPMessage_IPv6_harness.c b/test/cbmc/proofs/ND/prvProcessICMPMessage_IPv6/ProcessICMPMessage_IPv6_harness.c index 8fdbc87a71..602d429797 100644 --- a/test/cbmc/proofs/ND/prvProcessICMPMessage_IPv6/ProcessICMPMessage_IPv6_harness.c +++ b/test/cbmc/proofs/ND/prvProcessICMPMessage_IPv6/ProcessICMPMessage_IPv6_harness.c @@ -137,7 +137,9 @@ void harness() uint16_t usEthernetBufferSize; NetworkBufferDescriptor_t * pxLocalARPWaitingNetworkBuffer; - __CPROVER_assume( ( ulLen >= sizeof( ICMPPacket_IPv6_t ) ) && ( ulLen < ipconfigNETWORK_MTU ) ); + /* Following assumption is to make sure ulLen doesn't go + * beyond CBMC_MAX_OBJECT_SIZE */ + __CPROVER_assume( ulLen < ( CBMC_MAX_OBJECT_SIZE - ipBUFFER_PADDING ) ); pxNetworkBuffer = pxGetNetworkBufferWithDescriptor( ulLen, 0 ); diff --git a/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket/ProcessReceivedTCPPacket_harness.c b/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket/ProcessReceivedTCPPacket_harness.c index c15387b900..d60cdd6bc9 100644 --- a/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket/ProcessReceivedTCPPacket_harness.c +++ b/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket/ProcessReceivedTCPPacket_harness.c @@ -47,8 +47,7 @@ void prvTCPReturnPacket( FreeRTOS_Socket_t * pxSocket, uint32_t ulLen, BaseType_t xReleaseAfterSend ) { - __CPROVER_assert( pxSocket != NULL, "pxSocket should not be NULL" ); - __CPROVER_assert( pxDescriptor != NULL, "pxDescriptor should not be NULL" ); + __CPROVER_assert( pxSocket != NULL || pxDescriptor != NULL, "Either pxSocket or pxDescriptor must be non-NULL" ); __CPROVER_assert( pxDescriptor->pucEthernetBuffer != NULL, "pucEthernetBuffer should not be NULL" ); } @@ -57,11 +56,14 @@ int32_t prvTCPPrepareSend( FreeRTOS_Socket_t * pxSocket, NetworkBufferDescriptor_t ** ppxNetworkBuffer, UBaseType_t uxOptionsLength ) { + int32_t ret = nondet_int32(); + __CPROVER_assert( pxSocket != NULL, "pxSocket cannot be NULL" ); __CPROVER_assert( *ppxNetworkBuffer != NULL, "*ppxNetworkBuffer cannot be NULL" ); __CPROVER_assert( __CPROVER_r_ok( ( *ppxNetworkBuffer )->pucEthernetBuffer, ( *ppxNetworkBuffer )->xDataLength ), "Data in *ppxNetworkBuffer must be readable" ); - return nondet_int32(); + __CPROVER_assume( ret >= 0 && ret <= ipconfigNETWORK_MTU ); + return ret; } /* prvTCPHandleState is proven separately. */ @@ -137,6 +139,7 @@ FreeRTOS_Socket_t * pxTCPSocketLookup( uint32_t ulLocalIP, { /* This test case is for IPv4. */ __CPROVER_assume( xRetSocket->bits.bIsIPv6 == pdFALSE ); + __CPROVER_assume( xRetSocket->u.xTCP.ucPeerWinScaleFactor <= tcpTCP_OPT_WSOPT_MAXIMUM_VALUE ); } return xRetSocket; @@ -151,7 +154,7 @@ NetworkBufferDescriptor_t * pxGetNetworkBufferWithDescriptor( size_t xRequestedS if( pxNetworkBuffer ) { pxNetworkBuffer->pucEthernetBuffer = safeMalloc( xRequestedSizeBytes ); - __CPROVER_assume( pxNetworkBuffer->xDataLength == ipSIZE_OF_ETH_HEADER + sizeof( int32_t ) ); + pxNetworkBuffer->xDataLength = xRequestedSizeBytes; } return pxNetworkBuffer; @@ -174,8 +177,12 @@ size_t uxIPHeaderSizeSocket( const FreeRTOS_Socket_t * pxSocket ) void harness() { NetworkBufferDescriptor_t * pxNetworkBuffer; + size_t tcpPacketSize; + + __CPROVER_assume( tcpPacketSize >= ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv4_HEADER + sizeof( TCPHeader_t ) ) ); + + pxNetworkBuffer = pxGetNetworkBufferWithDescriptor( tcpPacketSize, 0 ); - pxNetworkBuffer = pxGetNetworkBufferWithDescriptor( sizeof( TCPPacket_t ), 0 ); /* To avoid asserting on the network buffer being NULL. */ __CPROVER_assume( pxNetworkBuffer != NULL ); diff --git a/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket_IPv6/ProcessReceivedTCPPacket_IPv6_harness.c b/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket_IPv6/ProcessReceivedTCPPacket_IPv6_harness.c index 4135a9144f..204d404e44 100644 --- a/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket_IPv6/ProcessReceivedTCPPacket_IPv6_harness.c +++ b/test/cbmc/proofs/parsing/ProcessReceivedTCPPacket_IPv6/ProcessReceivedTCPPacket_IPv6_harness.c @@ -63,6 +63,7 @@ FreeRTOS_Socket_t * pxTCPSocketLookup( uint32_t ulLocalIP, { /* This test case is for IPv6. */ __CPROVER_assume( xRetSocket->bits.bIsIPv6 == pdTRUE ); + __CPROVER_assume( xRetSocket->u.xTCP.ucPeerWinScaleFactor <= tcpTCP_OPT_WSOPT_MAXIMUM_VALUE ); } return xRetSocket; @@ -101,8 +102,11 @@ void harness() { NetworkBufferDescriptor_t * pxNetworkBuffer; EthernetHeader_t * pxEthernetHeader; + size_t tcpPacketSize; - pxNetworkBuffer = pxGetNetworkBufferWithDescriptor( sizeof( TCPPacket_IPv6_t ), 0 ); + __CPROVER_assume( tcpPacketSize >= ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + sizeof( TCPHeader_t ) ) ); + + pxNetworkBuffer = pxGetNetworkBufferWithDescriptor( tcpPacketSize, 0 ); /* To avoid asserting on the ethernet buffer being NULL. */ __CPROVER_assume( pxNetworkBuffer != NULL ); diff --git a/test/cbmc/proofs/prvChecksumIPv6Checks/prvChecksumIPv6Checks_harness.c b/test/cbmc/proofs/prvChecksumIPv6Checks/prvChecksumIPv6Checks_harness.c index bcb8d4a12f..e43f2db645 100644 --- a/test/cbmc/proofs/prvChecksumIPv6Checks/prvChecksumIPv6Checks_harness.c +++ b/test/cbmc/proofs/prvChecksumIPv6Checks/prvChecksumIPv6Checks_harness.c @@ -21,6 +21,7 @@ void harness() size_t uxBufferSize; uint8_t * pucEthernetBuffer; struct xPacketSummary xSet; + BaseType_t xReturn; /* We must have ethernet header to get frame type. */ __CPROVER_assume( uxBufferSize >= sizeof( IPPacket_IPv6_t ) && uxBufferSize <= ipconfigNETWORK_MTU ); @@ -28,12 +29,18 @@ void harness() /* Ethernet buffer is not possible to be NULL. */ pucEthernetBuffer = ( uint8_t * ) safeMalloc( uxBufferSize ); __CPROVER_assume( pucEthernetBuffer != NULL ); + __CPROVER_havoc_object( pucEthernetBuffer ); /* This is set before calling prvChecksumIPv6Checks. */ xSet.pxIPPacket = ( const IPPacket_t * ) pucEthernetBuffer; xSet.pxIPPacket_IPv6 = ( const IPHeader_IPv6_t * ) ( pucEthernetBuffer + ipSIZE_OF_ETH_HEADER ); - prvChecksumIPv6Checks( pucEthernetBuffer, - uxBufferSize, - &xSet ); + xReturn = prvChecksumIPv6Checks( pucEthernetBuffer, + uxBufferSize, + &xSet ); + + if( xReturn == 0 ) + { + __CPROVER_assert( ( xSet.usProtocolBytes <= FreeRTOS_ntohs( xSet.pxIPPacket_IPv6->usPayloadLength ) ), "xSet.usProtocolBytes shouldn't be greater than IPv6 usPayloadLength" ); + } } diff --git a/test/unit-test/ConfigFiles/FreeRTOSConfig.h b/test/unit-test/ConfigFiles/FreeRTOSConfig.h index b0ba377dbb..faf1dbd80c 100644 --- a/test/unit-test/ConfigFiles/FreeRTOSConfig.h +++ b/test/unit-test/ConfigFiles/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/ConfigFiles/FreeRTOSIPConfig.h b/test/unit-test/ConfigFiles/FreeRTOSIPConfig.h index f10ea2e30a..a50c2763bb 100644 --- a/test/unit-test/ConfigFiles/FreeRTOSIPConfig.h +++ b/test/unit-test/ConfigFiles/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/ConfigFiles/pack_struct_end.h b/test/unit-test/ConfigFiles/pack_struct_end.h index 260eddc22e..bf12191287 100644 --- a/test/unit-test/ConfigFiles/pack_struct_end.h +++ b/test/unit-test/ConfigFiles/pack_struct_end.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/ConfigFiles/pack_struct_start.h b/test/unit-test/ConfigFiles/pack_struct_start.h index 62fb479075..dbc2a78a0c 100644 --- a/test/unit-test/ConfigFiles/pack_struct_start.h +++ b/test/unit-test/ConfigFiles/pack_struct_start.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/ConfigFiles/portmacro.h b/test/unit-test/ConfigFiles/portmacro.h index e57917690c..fbc4c25bbd 100644 --- a/test/unit-test/ConfigFiles/portmacro.h +++ b/test/unit-test/ConfigFiles/portmacro.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/ARP_DataLenLessThanMinPacket_list_macros.h b/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/ARP_DataLenLessThanMinPacket_list_macros.h index b40ec2d73a..3441eb21e5 100644 --- a/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/ARP_DataLenLessThanMinPacket_list_macros.h +++ b/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/ARP_DataLenLessThanMinPacket_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOSIPConfig.h index 8c2a65c70d..0992520c92 100644 --- a/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_BitConfig/FreeRTOS_BitConfig_utest.c b/test/unit-test/FreeRTOS_BitConfig/FreeRTOS_BitConfig_utest.c index e7321b3dda..2f6790ed7b 100644 --- a/test/unit-test/FreeRTOS_BitConfig/FreeRTOS_BitConfig_utest.c +++ b/test/unit-test/FreeRTOS_BitConfig/FreeRTOS_BitConfig_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSConfig.h index 1a4f663455..619eb8dc7b 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSIPConfig.h index 8dcb9d8659..91017c3ecf 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_stubs.c b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_stubs.c index 1e3a4e3830..f00af4a0c2 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_stubs.c +++ b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c index aa44055356..6d5c14f688 100644 --- a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c +++ b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_DNS/FreeRTOSIPConfig.h index 52819c5ae8..7f1e3fc1c2 100644 --- a/test/unit-test/FreeRTOS_DNS/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_DNS/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_stubs.c b/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_stubs.c index e5fc06fbb5..4bfe7af221 100644 --- a/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_stubs.c +++ b/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_utest.c b/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_utest.c index 69ef050dfe..6df9145306 100644 --- a/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_utest.c +++ b/test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_Cache/FreeRTOS_DNS_Cache_stubs.c b/test/unit-test/FreeRTOS_DNS_Cache/FreeRTOS_DNS_Cache_stubs.c index 3ff0cf2260..fcdaaefd53 100644 --- a/test/unit-test/FreeRTOS_DNS_Cache/FreeRTOS_DNS_Cache_stubs.c +++ b/test/unit-test/FreeRTOS_DNS_Cache/FreeRTOS_DNS_Cache_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_Cache/FreeRTOS_DNS_Cache_utest.c b/test/unit-test/FreeRTOS_DNS_Cache/FreeRTOS_DNS_Cache_utest.c index 89c9aeb4f4..3601fa12f6 100644 --- a/test/unit-test/FreeRTOS_DNS_Cache/FreeRTOS_DNS_Cache_utest.c +++ b/test/unit-test/FreeRTOS_DNS_Cache/FreeRTOS_DNS_Cache_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_stubs.c b/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_stubs.c index b7ad3e2d0d..aeacff6549 100644 --- a/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_stubs.c +++ b/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c b/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c index 1f3eae7f0e..4bd6458565 100644 --- a/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c +++ b/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOSIPConfig.h index 4f9154c359..34384d928e 100644 --- a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_stubs.c b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_stubs.c index 8f3e20ef1b..ce9b7aac33 100644 --- a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_stubs.c +++ b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_utest.c b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_utest.c index b00f4970ec..192417c7c0 100644 --- a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_utest.c +++ b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOS_DNS_ConfigNoCallback_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_Networking/FreeRTOS_DNS_Networking_stubs.c b/test/unit-test/FreeRTOS_DNS_Networking/FreeRTOS_DNS_Networking_stubs.c index f65fde89e5..38dbe618ea 100644 --- a/test/unit-test/FreeRTOS_DNS_Networking/FreeRTOS_DNS_Networking_stubs.c +++ b/test/unit-test/FreeRTOS_DNS_Networking/FreeRTOS_DNS_Networking_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_Networking/FreeRTOS_DNS_Networking_utest.c b/test/unit-test/FreeRTOS_DNS_Networking/FreeRTOS_DNS_Networking_utest.c index f109cd6629..dec5c0a9cc 100644 --- a/test/unit-test/FreeRTOS_DNS_Networking/FreeRTOS_DNS_Networking_utest.c +++ b/test/unit-test/FreeRTOS_DNS_Networking/FreeRTOS_DNS_Networking_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOSIPConfig.h index 5b740c2828..66ecda5bf8 100644 --- a/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOS_DNS_Parser_stubs.c b/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOS_DNS_Parser_stubs.c index 63926601e7..1358f95ace 100644 --- a/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOS_DNS_Parser_stubs.c +++ b/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOS_DNS_Parser_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOS_DNS_Parser_utest.c b/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOS_DNS_Parser_utest.c index cee6d148a6..d61d57819f 100644 --- a/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOS_DNS_Parser_utest.c +++ b/test/unit-test/FreeRTOS_DNS_Parser/FreeRTOS_DNS_Parser_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -997,7 +997,7 @@ void test_DNS_TreatNBNS_Fail_BufferAllocation1( void ) usChar2u16_ExpectAnyArgsAndReturn( dnsNBNS_TYPE_NET_BIOS ); /* usType */ usChar2u16_ExpectAnyArgsAndReturn( dnsNBNS_FLAGS_OPCODE_QUERY ); - catch_assert( DNS_TreatNBNS( pucPayload, uxBufferLength, 1234 ) ); + DNS_TreatNBNS( pucPayload, uxBufferLength, 1234 ); ASSERT_DNS_QUERY_HOOK_CALLED(); } @@ -2855,6 +2855,275 @@ void test_DNS_ParseDNSReply_answer_lmmnr_reply_valid_new_netbuffer3( void ) ASSERT_DNS_QUERY_HOOK_CALLED(); } +/** + * @brief ensures that when the re-use network buffer is reused when xBufferAllocFixedSize + * is set, then packet is sent over the network. + */ +void test_DNS_ParseDNSReply_answer_lmmnr_reply_valid_fixed_buffer( void ) +{ + uint32_t ret; + uint8_t udp_buffer[ ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ] = { 0 }; + uint8_t * pucUDPPayloadBuffer = ( ( uint8_t * ) udp_buffer ) + ipUDP_PAYLOAD_OFFSET_IPv4; + size_t uxBufferLength = 250; + struct freertos_addrinfo * pxAddressInfo; + uint16_t usPort = 80; + NetworkEndPoint_t xEndPoint = { 0 }; + + memset( pucUDPPayloadBuffer, 0x00, uxBufferLength ); + + xBufferAllocFixedSize = pdTRUE; + + NetworkBufferDescriptor_t pxNetworkBuffer = { 0 }; + xEndPoint.ipv4_settings.ulIPAddress = 0xABCD1234; + pxNetworkBuffer.pucEthernetBuffer = udp_buffer; + pxNetworkBuffer.xDataLength = uxBufferLength; + pxNetworkBuffer.pxEndPoint = &xEndPoint; + + UDPPacket_t * pxUDPPacket; + IPHeader_t * pxIPHeader; + UDPHeader_t * pxUDPHeader; + + pxUDPPacket = ( ( UDPPacket_t * ) + pxNetworkBuffer.pucEthernetBuffer ); + pxIPHeader = &pxUDPPacket->xIPHeader; + pxIPHeader->ucVersionHeaderLength = 0x0; + pxUDPHeader = &pxUDPPacket->xUDPHeader; + IPPacket_t * xIPPacket = ( ( IPPacket_t * ) pxNetworkBuffer.pucEthernetBuffer ); + + pxIPHeader->ulSourceIPAddress = 1234; + + NetworkBufferDescriptor_t pxNewBuffer; + pxNewBuffer.pucEthernetBuffer = udp_buffer; + pxNewBuffer.xDataLength = uxBufferLength; + + BaseType_t xExpected = pdFALSE; + size_t beg = sizeof( DNSMessage_t ); + + DNSMessage_t * dns_header; + + dns_header = ( DNSMessage_t * ) pucUDPPayloadBuffer; + + dns_header->usQuestions = FreeRTOS_htons( 1 ); + dns_header->usAnswers = FreeRTOS_htons( 2 ); + dns_header->usFlags = dnsDNS_PORT; + + pucUDPPayloadBuffer[ beg ] = 38; + beg++; + strcpy( pucUDPPayloadBuffer + beg, "FreeRTOSbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" ); + beg += 38; + + beg += sizeof( uint32_t ); + + pucUDPPayloadBuffer[ beg ] = 38; + beg++; + strcpy( pucUDPPayloadBuffer + beg, "FreeRTOSbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" ); + beg += 38; + + pucUDPPayloadBuffer[ beg ] = 38; + beg++; + strcpy( pucUDPPayloadBuffer + beg, "FreeRTOSbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" ); + beg += 38; + + uxIPHeaderSizePacket_IgnoreAndReturn( ipSIZE_OF_IPv4_HEADER ); + usChar2u16_ExpectAnyArgsAndReturn( dnsTYPE_AAAA_HOST ); /* usType */ + usChar2u16_ExpectAnyArgsAndReturn( dnsCLASS_IN ); /* usClass */ + hook_return = pdTRUE; + pxUDPPayloadBuffer_to_NetworkBuffer_ExpectAnyArgsAndReturn( &pxNetworkBuffer ); + + usGenerateChecksum_ExpectAnyArgsAndReturn( 555 ); + usGenerateProtocolChecksum_ExpectAnyArgsAndReturn( 444 ); + vReturnEthernetFrame_Expect( &pxNetworkBuffer, pdFALSE ); + + ret = DNS_ParseDNSReply( pucUDPPayloadBuffer, + uxBufferLength, + &pxAddressInfo, + xExpected, + usPort ); + + TEST_ASSERT_EQUAL( pdFALSE, ret ); + ASSERT_DNS_QUERY_HOOK_CALLED(); +} + +/** + * @brief ensures that when the re-use network buffer is reused when xBufferAllocFixedSize + * is set, but packet is not sent over the network due to buffer overflow. + */ +void test_DNS_ParseDNSReply_answer_lmmnr_reply_fixed_buffer_full_content( void ) +{ + uint32_t ret; + uint8_t udp_buffer[ ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER ] = { 0 }; + uint8_t * pucUDPPayloadBuffer = ( ( uint8_t * ) udp_buffer ) + ipUDP_PAYLOAD_OFFSET_IPv4; + /* Maximum UDP payload length is 1500 + 14 - 42 = 1472. */ + size_t uxBufferLength = ipconfigNETWORK_MTU + ipSIZE_OF_ETH_HEADER - ipUDP_PAYLOAD_OFFSET_IPv4; + struct freertos_addrinfo * pxAddressInfo; + uint16_t usPort = 80; + NetworkEndPoint_t xEndPoint = { 0 }; + int i; + + memset( pucUDPPayloadBuffer, 0x00, uxBufferLength ); + + xBufferAllocFixedSize = pdTRUE; + + NetworkBufferDescriptor_t pxNetworkBuffer = { 0 }; + xEndPoint.ipv4_settings.ulIPAddress = 0xABCD1234; + pxNetworkBuffer.pucEthernetBuffer = udp_buffer; + pxNetworkBuffer.xDataLength = uxBufferLength; + pxNetworkBuffer.pxEndPoint = &xEndPoint; + + UDPPacket_t * pxUDPPacket; + IPHeader_t * pxIPHeader; + UDPHeader_t * pxUDPHeader; + + pxUDPPacket = ( ( UDPPacket_t * ) + pxNetworkBuffer.pucEthernetBuffer ); + pxIPHeader = &pxUDPPacket->xIPHeader; + pxIPHeader->ucVersionHeaderLength = 0x0; + pxUDPHeader = &pxUDPPacket->xUDPHeader; + IPPacket_t * xIPPacket = ( ( IPPacket_t * ) pxNetworkBuffer.pucEthernetBuffer ); + + pxIPHeader->ulSourceIPAddress = 1234; + + NetworkBufferDescriptor_t pxNewBuffer; + pxNewBuffer.pucEthernetBuffer = udp_buffer; + pxNewBuffer.xDataLength = uxBufferLength; + + BaseType_t xExpected = pdFALSE; + size_t beg = sizeof( DNSMessage_t ); + + DNSMessage_t * dns_header; + + dns_header = ( DNSMessage_t * ) pucUDPPayloadBuffer; + + dns_header->usQuestions = FreeRTOS_htons( 6 ); + dns_header->usAnswers = FreeRTOS_htons( 0 ); + dns_header->usFlags = dnsDNS_PORT; + + /* First 5 queries have maximum length. */ + + /* DNS name field format requirements: + * - First two bits must be zero to indicate real length + * - Maximum length of a single label is 63 bytes (due to first two bits requirement) + * - Total DNS name is set to 254 bytes to match ipconfigDNS_CACHE_NAME_LENGTH + * + * Format breakdown: + * [label1].[label2].[label3].[label4][\0] + * where: + * - label1, label2, label3: 63 bytes each + * - label4: 61 bytes + * - Total: 63 + 63 + 63 + 61 + 4 (length) + 1 (null terminator) = 255 bytes + */ + for( i = 0; i < 5; i++ ) + { + pucUDPPayloadBuffer[ beg ] = 63; + beg++; + strcpy( pucUDPPayloadBuffer + beg, + "FreeRTOSFreeRTOSFree" /* 20 */ + "FreeRTOSFreeRTOSFree" /* 40 */ + "FreeRTOSFreeRTOSFree" /* 60 */ + "Fre" ); /* 63 */ + beg += 63; + pucUDPPayloadBuffer[ beg ] = 63; + beg++; + strcpy( pucUDPPayloadBuffer + beg, + "FreeRTOSFreeRTOSFree" /* 20 */ + "FreeRTOSFreeRTOSFree" /* 40 */ + "FreeRTOSFreeRTOSFree" /* 60 */ + "Fre" ); /* 63 */ + beg += 63; + pucUDPPayloadBuffer[ beg ] = 63; + beg++; + strcpy( pucUDPPayloadBuffer + beg, + "FreeRTOSFreeRTOSFree" /* 20 */ + "FreeRTOSFreeRTOSFree" /* 40 */ + "FreeRTOSFreeRTOSFree" /* 60 */ + "Fre" ); /* 63 */ + beg += 63; + pucUDPPayloadBuffer[ beg ] = 61; + beg++; + strcpy( pucUDPPayloadBuffer + beg, + "FreeRTOSFreeRTOSFree" /* 20 */ + "FreeRTOSFreeRTOSFree" /* 40 */ + "FreeRTOSFreeRTOSFree" /* 60 */ + "F" ); /* 61 */ + beg += 61; + pucUDPPayloadBuffer[ beg++ ] = '\0'; + + /* Skip query's type and class. */ + beg += sizeof( uint32_t ); + } + + /* Memory layout of DNS message till here: + * - Header: 12 bytes + * - Query section: (255 + 4) * 5 bytes = 1295 bytes + * - Total used: 1307 bytes + * + * Available space in UDP payload: + * - Total UDP payload: 1472 bytes + * - Used space: 1307 bytes + * - Remaining space: 165 bytes + */ + + /* Last query to fill the remaining 165 bytes. Reserve 4 bytes for type and class fields. + * + * Format breakdown: + * [label1].[label2].[label3][\0] + * where: + * - label1, label2: 63 bytes each + * - label3: 31 bytes + * - Total: 63 + 63 + 31 + 3 (length) + 1 (null terminator) = 161 bytes */ + pucUDPPayloadBuffer[ beg ] = 63; + beg++; + strcpy( pucUDPPayloadBuffer + beg, + "FreeRTOSFreeRTOSFree" /* 20 */ + "FreeRTOSFreeRTOSFree" /* 40 */ + "FreeRTOSFreeRTOSFree" /* 60 */ + "Fre" ); /* 63 */ + beg += 63; + pucUDPPayloadBuffer[ beg ] = 63; + beg++; + strcpy( pucUDPPayloadBuffer + beg, + "FreeRTOSFreeRTOSFree" /* 20 */ + "FreeRTOSFreeRTOSFree" /* 40 */ + "FreeRTOSFreeRTOSFree" /* 60 */ + "Fre" ); /* 63 */ + beg += 63; + pucUDPPayloadBuffer[ beg ] = 31; + beg++; + strcpy( pucUDPPayloadBuffer + beg, + "FreeRTOSFreeRTOSFree" /* 20 */ + "FreeRTOSFre" ); /* 31 */ + beg += 31; + pucUDPPayloadBuffer[ beg++ ] = '\0'; + + /* Skip query's type and class. */ + beg += sizeof( uint32_t ); + + usChar2u16_ExpectAnyArgsAndReturn( dnsTYPE_AAAA_HOST ); /* usType */ + usChar2u16_ExpectAnyArgsAndReturn( dnsCLASS_IN ); /* usClass */ + usChar2u16_ExpectAnyArgsAndReturn( dnsTYPE_AAAA_HOST ); /* usType */ + usChar2u16_ExpectAnyArgsAndReturn( dnsCLASS_IN ); /* usClass */ + usChar2u16_ExpectAnyArgsAndReturn( dnsTYPE_AAAA_HOST ); /* usType */ + usChar2u16_ExpectAnyArgsAndReturn( dnsCLASS_IN ); /* usClass */ + usChar2u16_ExpectAnyArgsAndReturn( dnsTYPE_AAAA_HOST ); /* usType */ + usChar2u16_ExpectAnyArgsAndReturn( dnsCLASS_IN ); /* usClass */ + usChar2u16_ExpectAnyArgsAndReturn( dnsTYPE_AAAA_HOST ); /* usType */ + usChar2u16_ExpectAnyArgsAndReturn( dnsCLASS_IN ); /* usClass */ + usChar2u16_ExpectAnyArgsAndReturn( dnsTYPE_AAAA_HOST ); /* usType */ + usChar2u16_ExpectAnyArgsAndReturn( dnsCLASS_IN ); /* usClass */ + uxIPHeaderSizePacket_IgnoreAndReturn( ipSIZE_OF_IPv4_HEADER ); + hook_return = pdTRUE; + pxUDPPayloadBuffer_to_NetworkBuffer_ExpectAnyArgsAndReturn( &pxNetworkBuffer ); + + ret = DNS_ParseDNSReply( pucUDPPayloadBuffer, + uxBufferLength, + &pxAddressInfo, + xExpected, + usPort ); + + TEST_ASSERT_EQUAL( pdFALSE, ret ); + ASSERT_DNS_QUERY_HOOK_CALLED(); +} + /** * @brief ensures that when the number of answers is zero no packet is sent over * the network diff --git a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_stubs.c b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_stubs.c index 102afab0a5..dd27a0b59b 100644 --- a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_stubs.c +++ b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c index b51b26a220..2ffb988d36 100644 --- a/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c +++ b/test/unit-test/FreeRTOS_ICMP/FreeRTOS_ICMP_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_ICMP/ICMP_list_macros.h b/test/unit-test/FreeRTOS_ICMP/ICMP_list_macros.h index a4d9ab6401..d1b05b0482 100644 --- a/test/unit-test/FreeRTOS_ICMP/ICMP_list_macros.h +++ b/test/unit-test/FreeRTOS_ICMP/ICMP_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h index acbe4822de..b0f508f26d 100644 --- a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_stubs.c b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_stubs.c index e792908f52..15d0bf43ea 100644 --- a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_stubs.c +++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c index abe55e10c7..0b8caaae87 100644 --- a/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c +++ b/test/unit-test/FreeRTOS_ICMP_wo_assert/FreeRTOS_ICMP_wo_assert_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_stubs.c b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_stubs.c index 117d487d18..5993496f18 100644 --- a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_stubs.c +++ b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c index ead009d052..f59afb0148 100644 --- a/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c +++ b/test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP/IP_list_macros.h b/test/unit-test/FreeRTOS_IP/IP_list_macros.h index cc7e4a53e9..6372318571 100644 --- a/test/unit-test/FreeRTOS_IP/IP_list_macros.h +++ b/test/unit-test/FreeRTOS_IP/IP_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h index cb963647ed..a69b42cadd 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSIPConfig.h index f9da2bf5a7..6f6dec7f99 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_stubs.c b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_stubs.c index 9a9ea5162b..7529d866ee 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_stubs.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c index b9dce4a0b0..f0f0bf0211 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOS_IP_DiffConfig_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/IP_DiffConfig_list_macros.h b/test/unit-test/FreeRTOS_IP_DiffConfig/IP_DiffConfig_list_macros.h index 610158737c..c7018ee966 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig/IP_DiffConfig_list_macros.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig/IP_DiffConfig_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOSIPConfig.h index 4aa2dee504..4ea44d45e0 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_stubs.c b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_stubs.c index 2d454be482..b0cc758b3f 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_stubs.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c index 8bfbc625b4..f2b4688fb0 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOS_IP_DiffConfig1_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/IP_DiffConfig1_list_macros.h b/test/unit-test/FreeRTOS_IP_DiffConfig1/IP_DiffConfig1_list_macros.h index 7196bb7ce0..b58b9a6797 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig1/IP_DiffConfig1_list_macros.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig1/IP_DiffConfig1_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSConfig.h index cb963647ed..a69b42cadd 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSIPConfig.h index 45964ca96a..e7c0f98db9 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_stubs.c b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_stubs.c index 641b42e4b7..18c2b15887 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_stubs.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c index 25cf53b60e..31c213b00f 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOS_IP_DiffConfig2_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/IP_DiffConfig2_list_macros.h b/test/unit-test/FreeRTOS_IP_DiffConfig2/IP_DiffConfig2_list_macros.h index 7ea81ca87c..8bebe16a54 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig2/IP_DiffConfig2_list_macros.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig2/IP_DiffConfig2_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSConfig.h index cb963647ed..a69b42cadd 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSIPConfig.h index 9454ff172a..ec35606cdf 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_stubs.c b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_stubs.c index 938937b617..3fde253a9d 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_stubs.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c index 492831170d..70d32443c6 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c +++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOS_IP_DiffConfig3_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/IP_DiffConfig3_list_macros.h b/test/unit-test/FreeRTOS_IP_DiffConfig3/IP_DiffConfig3_list_macros.h index 89bd5c16a5..4ee73963bf 100644 --- a/test/unit-test/FreeRTOS_IP_DiffConfig3/IP_DiffConfig3_list_macros.h +++ b/test/unit-test/FreeRTOS_IP_DiffConfig3/IP_DiffConfig3_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_stubs.c b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_stubs.c index 11feca0715..8ed2329478 100644 --- a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_stubs.c +++ b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c index a261219517..a2aba8fc18 100644 --- a/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c +++ b/test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Timers/IP_Timers_list_macros.h b/test/unit-test/FreeRTOS_IP_Timers/IP_Timers_list_macros.h index 97d8b2136e..ce7bea2908 100644 --- a/test/unit-test/FreeRTOS_IP_Timers/IP_Timers_list_macros.h +++ b/test/unit-test/FreeRTOS_IP_Timers/IP_Timers_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOSIPConfig.h index 3662a23487..2491606f91 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_stubs.c b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_stubs.c index 36bc696f2b..21475896ae 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_stubs.c +++ b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c index 22b4b97fc4..7209812b2b 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c +++ b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Utils/IP_Utils_list_macros.h b/test/unit-test/FreeRTOS_IP_Utils/IP_Utils_list_macros.h index 97d8b2136e..ce7bea2908 100644 --- a/test/unit-test/FreeRTOS_IP_Utils/IP_Utils_list_macros.h +++ b/test/unit-test/FreeRTOS_IP_Utils/IP_Utils_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSConfig.h index acbe4822de..b0f508f26d 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSIPConfig.h index bb6766856f..1e394e7465 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_stubs.c b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_stubs.c index 9415d64743..d2d71e4165 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_stubs.c +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c index 8d2ff7080e..1896e48b2a 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/IP_Utils_DiffConfig_list_macros.h b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/IP_Utils_DiffConfig_list_macros.h index cdfb1e7224..93c7a2bce6 100644 --- a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/IP_Utils_DiffConfig_list_macros.h +++ b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/IP_Utils_DiffConfig_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c b/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c index d571040a9b..93d5df659e 100644 --- a/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c +++ b/test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4/IPv4_list_macros.h b/test/unit-test/FreeRTOS_IPv4/IPv4_list_macros.h index f4abfd314c..6f798e891f 100644 --- a/test/unit-test/FreeRTOS_IPv4/IPv4_list_macros.h +++ b/test/unit-test/FreeRTOS_IPv4/IPv4_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSConfig.h index cb963647ed..a69b42cadd 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSIPConfig.h index 6eb551d56d..c754f756ca 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c index 412ba9d5fb..5a6646af46 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/IPv4_DiffConfig_list_macros.h b/test/unit-test/FreeRTOS_IPv4_DiffConfig/IPv4_DiffConfig_list_macros.h index 6b1356a4c1..9b03c46962 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig/IPv4_DiffConfig_list_macros.h +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig/IPv4_DiffConfig_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSConfig.h index f28d75ade7..2087f254fd 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSIPConfig.h index 2ad3ba3c2e..0803873708 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c index 76a9254e5d..00644273ee 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOS_IPv4_DiffConfig1_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/IPv4_DiffConfig1_list_macros.h b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/IPv4_DiffConfig1_list_macros.h index 4176f018b5..da7c3dc5d8 100644 --- a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/IPv4_DiffConfig1_list_macros.h +++ b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/IPv4_DiffConfig1_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4_Sockets/FreeRTOS_IPv4_Sockets_stubs.c b/test/unit-test/FreeRTOS_IPv4_Sockets/FreeRTOS_IPv4_Sockets_stubs.c index e73550c1a7..a1c1806747 100644 --- a/test/unit-test/FreeRTOS_IPv4_Sockets/FreeRTOS_IPv4_Sockets_stubs.c +++ b/test/unit-test/FreeRTOS_IPv4_Sockets/FreeRTOS_IPv4_Sockets_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4_Sockets/FreeRTOS_IPv4_Sockets_utest.c b/test/unit-test/FreeRTOS_IPv4_Sockets/FreeRTOS_IPv4_Sockets_utest.c index c81179ba8b..7658a53c79 100644 --- a/test/unit-test/FreeRTOS_IPv4_Sockets/FreeRTOS_IPv4_Sockets_utest.c +++ b/test/unit-test/FreeRTOS_IPv4_Sockets/FreeRTOS_IPv4_Sockets_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv4_Utils/FreeRTOS_IPv4_Utils_utest.c b/test/unit-test/FreeRTOS_IPv4_Utils/FreeRTOS_IPv4_Utils_utest.c index 6d01b4435b..666f0eef86 100644 --- a/test/unit-test/FreeRTOS_IPv4_Utils/FreeRTOS_IPv4_Utils_utest.c +++ b/test/unit-test/FreeRTOS_IPv4_Utils/FreeRTOS_IPv4_Utils_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv6/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IPv6/FreeRTOSConfig.h index c9dcbd2206..b38d060df6 100644 --- a/test/unit-test/FreeRTOS_IPv6/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IPv6/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_IPv6/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv6/FreeRTOSIPConfig.h index 6b4f63f1fc..a9114e86c0 100644 --- a/test/unit-test/FreeRTOS_IPv6/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IPv6/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_stubs.c b/test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_stubs.c index 5767d82acb..5fca165ae8 100644 --- a/test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_stubs.c +++ b/test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_utest.c b/test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_utest.c index edcfab7656..6a9dd7a39a 100644 --- a/test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -68,6 +68,7 @@ void test_prvAllowIPPacketIPv6_SourceUnspecifiedAddress() memset( &xIPv6Address, 0, sizeof( xIPv6Address ) ); memcpy( xIPv6Address.xDestinationAddress.ucBytes, xIPAddressFive.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); memcpy( xIPv6Address.xSourceAddress.ucBytes, FreeRTOS_in6addr_any.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); + xIPv6Address.ucVersionTrafficClass = 0x60U; eResult = prvAllowIPPacketIPv6( &xIPv6Address, NULL, 0U ); TEST_ASSERT_EQUAL( eReleaseBuffer, eResult ); @@ -85,6 +86,7 @@ void test_prvAllowIPPacketIPv6_DestinationUnspecifiedAddress() memset( &xIPv6Address, 0, sizeof( xIPv6Address ) ); memcpy( xIPv6Address.xDestinationAddress.ucBytes, FreeRTOS_in6addr_any.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); memcpy( xIPv6Address.xSourceAddress.ucBytes, xIPAddressFive.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); + xIPv6Address.ucVersionTrafficClass = 0x60U; eResult = prvAllowIPPacketIPv6( &xIPv6Address, NULL, 0U ); TEST_ASSERT_EQUAL( eReleaseBuffer, eResult ); @@ -100,6 +102,8 @@ void test_prvAllowIPPacketIPv6_HappyPath() NetworkBufferDescriptor_t * pxNetworkBuffer = prvInitializeNetworkDescriptor(); TCPPacket_IPv6_t * pxTCPPacket = ( TCPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; + FreeRTOS_FindEndPointOnMAC_ExpectAndReturn( &pxTCPPacket->xEthernetHeader.xSourceAddress, NULL, NULL ); usGenerateProtocolChecksum_ExpectAndReturn( pxNetworkBuffer->pucEthernetBuffer, pxNetworkBuffer->xDataLength, pdFALSE, ipCORRECT_CRC ); @@ -118,6 +122,7 @@ void test_prvAllowIPPacketIPv6_MulticastAddress() /* Multicast IPv6 address is FF02::1 */ IPv6_Address_t xMCIPAddress = { 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; memcpy( pxTCPPacket->xIPHeader.xDestinationAddress.ucBytes, xMCIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); FreeRTOS_FindEndPointOnIP_IPv6_ExpectAndReturn( &( pxTCPPacket->xIPHeader.xSourceAddress ), pxNetworkBuffer->pxEndPoint ); @@ -139,6 +144,7 @@ void test_prvAllowIPPacketIPv6_LoopbackAddress() TCPPacket_IPv6_t * pxTCPPacket = ( TCPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer; NetworkEndPoint_t xEndPoint; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; memcpy( pxTCPPacket->xIPHeader.xSourceAddress.ucBytes, FreeRTOS_in6addr_loopback.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); memcpy( pxTCPPacket->xIPHeader.xDestinationAddress.ucBytes, FreeRTOS_in6addr_loopback.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); @@ -163,6 +169,7 @@ void test_prvAllowIPPacketIPv6_LoopbackNotMatchDest() NetworkBufferDescriptor_t * pxNetworkBuffer = prvInitializeNetworkDescriptor(); TCPPacket_IPv6_t * pxTCPPacket = ( TCPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; pxTCPPacket->xIPHeader.xDestinationAddress.ucBytes[ 15 ] = 0x11; FreeRTOS_FindEndPointOnIP_IPv6_ExpectAndReturn( &pxTCPPacket->xIPHeader.xSourceAddress, pxNetworkBuffer->pxEndPoint ); @@ -185,6 +192,7 @@ void test_prvAllowIPPacketIPv6_LoopbackNotMatchSrc() TCPPacket_IPv6_t * pxTCPPacket = ( TCPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer; NetworkEndPoint_t xEndPoint; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; memcpy( pxTCPPacket->xIPHeader.xDestinationAddress.ucBytes, FreeRTOS_in6addr_loopback.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); FreeRTOS_FindEndPointOnIP_IPv6_ExpectAndReturn( &pxTCPPacket->xIPHeader.xSourceAddress, &xEndPoint ); @@ -206,6 +214,8 @@ void test_prvAllowIPPacketIPv6_NetworkDown() pxNetworkBuffer->pxEndPoint = NULL; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; + FreeRTOS_FindEndPointOnIP_IPv6_ExpectAndReturn( &pxTCPPacket->xIPHeader.xSourceAddress, NULL ); FreeRTOS_IsNetworkUp_IgnoreAndReturn( 0 ); FreeRTOS_FindEndPointOnMAC_ExpectAndReturn( &pxTCPPacket->xEthernetHeader.xSourceAddress, NULL, NULL ); @@ -225,6 +235,8 @@ void test_prvAllowIPPacketIPv6_SelfSend() NetworkBufferDescriptor_t * pxNetworkBuffer = prvInitializeNetworkDescriptor(); TCPPacket_IPv6_t * pxTCPPacket = ( TCPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; + FreeRTOS_FindEndPointOnMAC_ExpectAndReturn( &pxTCPPacket->xEthernetHeader.xSourceAddress, NULL, pxNetworkBuffer->pxEndPoint ); eResult = prvAllowIPPacketIPv6( &pxTCPPacket->xIPHeader, pxNetworkBuffer, 0U ); @@ -241,6 +253,8 @@ void test_prvAllowIPPacketIPv6_ChecksumError() NetworkBufferDescriptor_t * pxNetworkBuffer = prvInitializeNetworkDescriptor(); TCPPacket_IPv6_t * pxTCPPacket = ( TCPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; + FreeRTOS_FindEndPointOnMAC_ExpectAndReturn( &pxTCPPacket->xEthernetHeader.xSourceAddress, NULL, NULL ); usGenerateProtocolChecksum_ExpectAndReturn( pxNetworkBuffer->pucEthernetBuffer, pxNetworkBuffer->xDataLength, pdFALSE, ipWRONG_CRC ); @@ -260,6 +274,8 @@ void test_prvAllowIPPacketIPv6_InvalidPacket() pxNetworkBuffer->pxEndPoint = NULL; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; + FreeRTOS_FindEndPointOnIP_IPv6_ExpectAndReturn( &pxTCPPacket->xIPHeader.xSourceAddress, NULL ); FreeRTOS_IsNetworkUp_IgnoreAndReturn( 1 ); @@ -285,6 +301,8 @@ void test_prvAllowIPPacketIPv6_EndpointDifferentAddress() memcpy( xEndpoint.ipv6_settings.xIPAddress.ucBytes, xDiffIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); pxNetworkBuffer->pxEndPoint = &xEndpoint; + pxTCPPacket->xIPHeader.ucVersionTrafficClass = 0x60U; + FreeRTOS_FindEndPointOnIP_IPv6_ExpectAndReturn( &( pxTCPPacket->xIPHeader.xSourceAddress ), NULL ); FreeRTOS_IsNetworkUp_IgnoreAndReturn( 1 ); diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSConfig.h index c9dcbd2206..b38d060df6 100644 --- a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSIPConfig.h index 61009fb7e0..57fbe8b4a3 100644 --- a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_stubs.c b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_stubs.c index 4001eb25ed..401e6a0f09 100644 --- a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_stubs.c +++ b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_utest.c b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_utest.c index 7bc71efce0..8a9f8c9b94 100644 --- a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_utest.c +++ b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOSIPConfig.h index dbd9c417f8..7d48b11b40 100644 --- a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_stubs.c b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_stubs.c index d5da988477..222a2d93e9 100644 --- a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_stubs.c +++ b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c index 12b731ab07..5c1d78323f 100644 --- a/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c +++ b/test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -131,7 +131,7 @@ void test_prvChecksumIPv6Checks_IncompleteIPv6Packet( void ) BaseType_t usReturn; uint8_t pucEthernetBuffer[ ipconfigTCPv6_MSS ]; IPHeader_IPv6_t * pxIPv6Packet; - size_t uxBufferLength = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER; + size_t uxBufferLength = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + 4; struct xPacketSummary xSet; memset( pucEthernetBuffer, 0, ipconfigTCPv6_MSS ); @@ -205,6 +205,47 @@ void test_prvChecksumIPv6Checks_LargeExtensionHeader( void ) TEST_ASSERT_EQUAL( 3, usReturn ); } +/** + * @brief Prepare a packet with large extension header length. + * - ipIPv6_EXT_HEADER_ROUTING_HEADER + * - ipIPv6_EXT_HEADER_HOP_BY_HOP + * - ipPROTOCOL_TCP + */ +void test_prvChecksumIPv6Checks_IncorrectPayloadLength( void ) +{ + BaseType_t usReturn; + struct xPacketSummary xSet; + NetworkBufferDescriptor_t * pxNetworkBuffer = prvInitializeNetworkDescriptorWithExtensionHeader( ipPROTOCOL_TCP ); + IPHeader_IPv6_t * pxIPv6Header = ( IPHeader_IPv6_t * ) &( pxNetworkBuffer->pucEthernetBuffer[ ipSIZE_OF_ETH_HEADER ] ); + size_t uxIndex = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER; + + /* Modify the extension header */ + pxIPv6Header->ucNextHeader = ipIPv6_EXT_HEADER_HOP_BY_HOP; + pxNetworkBuffer->pucEthernetBuffer[ uxIndex ] = ipIPv6_EXT_HEADER_ROUTING_HEADER; + pxNetworkBuffer->pucEthernetBuffer[ uxIndex + 1 ] = 5U; /* Extension header length is set to 200*8 + 8, which is larger than buffer size. */ + uxIndex += 8; + pxNetworkBuffer->pucEthernetBuffer[ uxIndex ] = ipPROTOCOL_TCP; + pxNetworkBuffer->pucEthernetBuffer[ uxIndex + 1 ] = 0; + uxIndex += 8; + + xSet.pxIPPacket_IPv6 = ( ( const IPHeader_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer ); + IPHeader_IPv6_t * pxIPPacket_IPv6 = ( IPHeader_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer; + + /* Incorrect payload length */ + pxIPPacket_IPv6->usPayloadLength = FreeRTOS_ntohs( 20 ); + + xGetExtensionOrder_ExpectAndReturn( ipIPv6_EXT_HEADER_HOP_BY_HOP, 0U, 1 ); + xGetExtensionOrder_ExpectAndReturn( ipIPv6_EXT_HEADER_HOP_BY_HOP, ipIPv6_EXT_HEADER_ROUTING_HEADER, 1 ); + xGetExtensionOrder_ExpectAndReturn( ipIPv6_EXT_HEADER_ROUTING_HEADER, ipPROTOCOL_TCP, 2 ); + xGetExtensionOrder_ExpectAndReturn( ipIPv6_EXT_HEADER_ROUTING_HEADER, ipPROTOCOL_TCP, 2 ); + + usReturn = prvChecksumIPv6Checks( pxNetworkBuffer->pucEthernetBuffer, pxNetworkBuffer->xDataLength, &xSet ); + + TEST_ASSERT_EQUAL( 4, usReturn ); +} + + + /** * @brief Prepare a packet have extension with following order. * - ipIPv6_EXT_HEADER_ROUTING_HEADER diff --git a/test/unit-test/FreeRTOS_ND/FreeRTOS_ND_utest.c b/test/unit-test/FreeRTOS_ND/FreeRTOS_ND_utest.c index fb30cb402f..fe8d59849e 100644 --- a/test/unit-test/FreeRTOS_ND/FreeRTOS_ND_utest.c +++ b/test/unit-test/FreeRTOS_ND/FreeRTOS_ND_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT @@ -114,18 +114,53 @@ void test_eNDGetCacheEntry_MulticastEndPoint( void ) IPv6_Address_t xIPAddress; NetworkEndPoint_t xEndPoint, * pxEndPoint = &xEndPoint; + xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; ( void ) memcpy( xIPAddress.ucBytes, xMultiCastIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); xIsIPv6AllowedMulticast_ExpectAnyArgsAndReturn( pdTRUE ); vSetMultiCastIPv6MacAddress_ExpectAnyArgs(); - FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( NULL ); + FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( &xEndPoint ); + xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_LinkLocal ); eResult = eNDGetCacheEntry( &xIPAddress, &xMACAddress, &pxEndPoint ); TEST_ASSERT_EQUAL( eResolutionCacheHit, eResult ); } +/** + * @brief This function find the MAC-address of a multicast IPv6 address + * with a multiple endpoints endpoint. + */ +void test_eNDGetCacheEntry_MulticastEndPoint_NoEP( void ) +{ + eResolutionLookupResult_t eResult; + MACAddress_t xMACAddress; + IPv6_Address_t xIPAddress; + NetworkEndPoint_t xEndPoint, xEndPoint2, * pxEndPoint = &xEndPoint; + + xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; + xEndPoint2.bits.bIPv6 = pdFALSE_UNSIGNED; + ( void ) memcpy( xIPAddress.ucBytes, xMultiCastIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); + + xIsIPv6AllowedMulticast_ExpectAnyArgsAndReturn( pdTRUE ); + vSetMultiCastIPv6MacAddress_ExpectAnyArgs(); + + FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( NULL ); + xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_LinkLocal ); + + FreeRTOS_FindEndPointOnIP_IPv6_ExpectAnyArgsAndReturn( NULL ); + + FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( pxEndPoint ); + xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_Global ); + FreeRTOS_NextEndPoint_ExpectAnyArgsAndReturn( NULL ); + + eResult = eNDGetCacheEntry( &xIPAddress, &xMACAddress, &pxEndPoint ); + + TEST_ASSERT_EQUAL( eResolutionCacheMiss, eResult ); +} + + /** * @brief This function find the MAC-address of a multicast IPv6 address * with a valid endpoint. @@ -166,17 +201,49 @@ void test_eNDGetCacheEntry_Multicast_InvalidEndPoint( void ) eResolutionLookupResult_t eResult; MACAddress_t xMACAddress; IPv6_Address_t xIPAddress; + NetworkEndPoint_t xEndPoint, * pxEndPoint = &xEndPoint; ( void ) memcpy( xIPAddress.ucBytes, xMultiCastIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); xIsIPv6AllowedMulticast_ExpectAnyArgsAndReturn( pdTRUE ); vSetMultiCastIPv6MacAddress_ExpectAnyArgs(); + xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_Multicast ); + FreeRTOS_FindEndPointOnIP_IPv6_ExpectAnyArgsAndReturn( pxEndPoint ); + eResult = eNDGetCacheEntry( &xIPAddress, &xMACAddress, ppxEndPoint ); - TEST_ASSERT_EQUAL( eResolutionCacheHit, eResult ); + TEST_ASSERT_EQUAL( eResolutionCacheMiss, eResult ); } + +/** + * @brief This function find the MAC-address of a multicast IPv6 address + * with a NULL endpoint, but no active IPv6 endpoints. + */ +void test_eNDGetCacheEntry_Multicast_InvalidEndPoint_NoEP( void ) +{ + NetworkEndPoint_t ** ppxEndPoint = NULL; + eResolutionLookupResult_t eResult; + MACAddress_t xMACAddress; + IPv6_Address_t xIPAddress; + NetworkEndPoint_t xEndPoint, * pxEndPoint = &xEndPoint, xEndPoint1; + + ( void ) memcpy( xIPAddress.ucBytes, xMultiCastIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); + + xIsIPv6AllowedMulticast_ExpectAnyArgsAndReturn( pdTRUE ); + vSetMultiCastIPv6MacAddress_ExpectAnyArgs(); + + xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_Multicast ); + FreeRTOS_FindEndPointOnIP_IPv6_ExpectAnyArgsAndReturn( NULL ); + FreeRTOS_FindGateWay_ExpectAnyArgsAndReturn( &xEndPoint1 ); + + eResult = eNDGetCacheEntry( &xIPAddress, &xMACAddress, ppxEndPoint ); + + TEST_ASSERT_EQUAL( eResolutionCacheMiss, eResult ); +} + + /** * @brief This function find the MAC-address of an IPv6 address which is * not multi cast address, but the entry is present on the ND Cache, @@ -1188,6 +1255,29 @@ void test_prvProcessICMPMessage_IPv6_EP( void ) pxNetworkBuffer->pxEndPoint = &xEndPoint; xEndPoint.bits.bIPv6 = pdFALSE_UNSIGNED; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; + pxNetworkBuffer->xDataLength = sizeof( ICMPPacket_IPv6_t ); + + eReturn = prvProcessICMPMessage_IPv6( pxNetworkBuffer ); + + TEST_ASSERT_EQUAL( eReturn, eReleaseBuffer ); +} + +/** + * @brief This function process ICMP message when message has size + * less than ICMPv6 header size + */ +void test_prvProcessICMPMessage_IPv6_PacketSizeBelowHeaderSize( void ) +{ + NetworkBufferDescriptor_t xNetworkBuffer, * pxNetworkBuffer = &xNetworkBuffer; + ICMPPacket_IPv6_t xICMPPacket; + NetworkEndPoint_t xEndPoint; + eFrameProcessingResult_t eReturn; + + xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; + xICMPPacket.xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_DEST_UNREACHABLE_IPv6; + pxNetworkBuffer->pxEndPoint = &xEndPoint; + pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; + pxNetworkBuffer->xDataLength = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + 2U; eReturn = prvProcessICMPMessage_IPv6( pxNetworkBuffer ); @@ -1209,6 +1299,7 @@ void test_prvProcessICMPMessage_IPv6_ipICMP_DEST_UNREACHABLE_IPv6( void ) xICMPPacket.xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_DEST_UNREACHABLE_IPv6; pxNetworkBuffer->pxEndPoint = &xEndPoint; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; + pxNetworkBuffer->xDataLength = sizeof( ICMPPacket_IPv6_t ); eReturn = prvProcessICMPMessage_IPv6( pxNetworkBuffer ); @@ -1437,7 +1528,7 @@ void test_prvProcessICMPMessage_IPv6_ipICMP_PING_REPLY_IPv6_eInvalidData( void ) uxICMPSize = ( size_t ) usICMPSize; uxNeededSize = ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxICMPSize ); /* Assign less size than expected */ - pxNetworkBuffer->xDataLength = uxICMPSize; + pxNetworkBuffer->xDataLength = ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxICMPSize ); pxNetworkBuffer->pxEndPoint = &xEndPoint; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; @@ -1448,6 +1539,48 @@ void test_prvProcessICMPMessage_IPv6_ipICMP_PING_REPLY_IPv6_eInvalidData( void ) TEST_ASSERT_EQUAL( eReturn, eReleaseBuffer ); } +/** + * @brief This function process ICMP message when message type is + * ipICMP_PING_REPLY_IPv6. + * It handles case where A reply was received to an outgoing + * ping but the payload of the reply was not correct. + */ +void test_prvProcessICMPMessage_IPv6_ipICMP_PING_REPLY_IPv6_IncorrectSize( void ) +{ + NetworkBufferDescriptor_t xNetworkBuffer, * pxNetworkBuffer = &xNetworkBuffer; + ICMPPacket_IPv6_t * pxICMPPacket; + ICMPHeader_IPv6_t * pxICMPHeader_IPv6; + ICMPEcho_IPv6_t * pxICMPEchoHeader; + uint8_t ucBuffer[ sizeof( ICMPPacket_IPv6_t ) + ipBUFFER_PADDING ], * pucByte; + NetworkEndPoint_t xEndPoint; + size_t uxDataLength; + eFrameProcessingResult_t eReturn; + + pxNetworkBuffer->pxEndPoint = &xEndPoint; + pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &ucBuffer; + pxNetworkBuffer->xDataLength = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + 5; + pxICMPPacket = ( ( ICMPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer ); + pxICMPPacket->xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_PING_REPLY_IPv6; + pxICMPPacket->xIPHeader.usPayloadLength = FreeRTOS_ntohs( ipBUFFER_PADDING ); + pxICMPHeader_IPv6 = ( ( ICMPHeader_IPv6_t * ) &( pxICMPPacket->xICMPHeaderIPv6 ) ); + pxICMPEchoHeader = ( ( ICMPEcho_IPv6_t * ) pxICMPHeader_IPv6 ); + xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; + + uxDataLength = ipNUMERIC_CAST( size_t, FreeRTOS_ntohs( pxICMPPacket->xIPHeader.usPayloadLength ) ); + uxDataLength = uxDataLength - sizeof( ICMPEcho_IPv6_t ); + + pucByte = ( ucBuffer + sizeof( EthernetHeader_t ) + sizeof( IPHeader_IPv6_t ) + sizeof( ICMPEcho_IPv6_t ) ); + + ( void ) memset( pucByte, ipECHO_DATA_FILL_BYTE, uxDataLength ); + + /* vApplicationPingReplyHook_Expect( eSuccess, pxICMPEchoHeader->usIdentifier ); */ + + eReturn = prvProcessICMPMessage_IPv6( pxNetworkBuffer ); + + TEST_ASSERT_EQUAL( eReturn, eReleaseBuffer ); +} + + /** * @brief This function process ICMP message when message type is * ipICMP_PING_REPLY_IPv6. @@ -1467,6 +1600,7 @@ void test_prvProcessICMPMessage_IPv6_ipICMP_PING_REPLY_IPv6_eSuccess( void ) pxNetworkBuffer->pxEndPoint = &xEndPoint; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &ucBuffer; + pxNetworkBuffer->xDataLength = sizeof( ucBuffer ); pxICMPPacket = ( ( ICMPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer ); pxICMPPacket->xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_PING_REPLY_IPv6; pxICMPPacket->xIPHeader.usPayloadLength = FreeRTOS_ntohs( ipBUFFER_PADDING ); @@ -1531,7 +1665,7 @@ void test_prvProcessICMPMessage_IPv6_NeighborSolicitationIncorrectLen( void ) xICMPPacket.xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_NEIGHBOR_SOLICITATION_IPv6; pxNetworkBuffer->pxEndPoint = &xEndPoint; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; - pxNetworkBuffer->xDataLength = 0; + pxNetworkBuffer->xDataLength = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + 5; FreeRTOS_InterfaceEPInSameSubnet_IPv6_ExpectAnyArgsAndReturn( &xEndPoint ); @@ -1576,6 +1710,32 @@ void test_prvProcessICMPMessage_IPv6_NeighborSolicitation( void ) TEST_ASSERT_EQUAL( xICMPPacket.xIPHeader.ucHopLimit, 255U ); } +/** + * @brief This function process ICMP message when message type is + * ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6. + * It handles case buffer size is less than expected. + */ +void test_prvProcessICMPMessage_IPv6_NeighborAdvertisement0( void ) +{ + NetworkBufferDescriptor_t xNetworkBuffer, * pxNetworkBuffer = &xNetworkBuffer; + ICMPPacket_IPv6_t xICMPPacket; + ICMPHeader_IPv6_t * pxICMPHeader_IPv6 = ( ( ICMPHeader_IPv6_t * ) &( xICMPPacket.xICMPHeaderIPv6 ) ); + NetworkEndPoint_t xEndPoint; + eFrameProcessingResult_t eReturn; + + xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; + pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; + pxNetworkBuffer->pxEndPoint = &xEndPoint; + pxNetworkBuffer->xDataLength = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + 5; + xICMPPacket.xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6; + pxNDWaitingNetworkBuffer = NULL; + + + eReturn = prvProcessICMPMessage_IPv6( pxNetworkBuffer ); + + TEST_ASSERT_EQUAL( eReturn, eReleaseBuffer ); +} + /** * @brief This function process ICMP message when message type is * ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6. @@ -1592,6 +1752,7 @@ void test_prvProcessICMPMessage_IPv6_NeighborAdvertisement1( void ) xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; pxNetworkBuffer->pxEndPoint = &xEndPoint; + pxNetworkBuffer->xDataLength = sizeof( ICMPPacket_IPv6_t ); xICMPPacket.xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6; pxNDWaitingNetworkBuffer = NULL; @@ -1618,6 +1779,7 @@ void test_prvProcessICMPMessage_IPv6_NeighborAdvertisement2( void ) xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; pxNetworkBuffer->pxEndPoint = &xEndPoint; + pxNetworkBuffer->xDataLength = sizeof( ICMPPacket_IPv6_t ); xICMPPacket.xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6; pxNDWaitingNetworkBuffer = &xNDWaitingNetworkBuffer; @@ -1684,6 +1846,7 @@ void test_prvProcessICMPMessage_IPv6_NeighborAdvertisement4( void ) xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; pxNetworkBuffer->pxEndPoint = &xEndPoint; + pxNetworkBuffer->xDataLength = sizeof( ICMPPacket_IPv6_t ); xICMPPacket.xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6; ( void ) memcpy( pxICMPHeader_IPv6->xIPv6Address.ucBytes, xDefaultIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); ( void ) memcpy( pxIPHeader->xSourceAddress.ucBytes, xDefaultIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); @@ -1724,6 +1887,7 @@ void test_prvProcessICMPMessage_IPv6_NeighborAdvertisement5( void ) xEndPoint.bits.bIPv6 = pdTRUE_UNSIGNED; pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &xICMPPacket; pxNetworkBuffer->pxEndPoint = &xEndPoint; + pxNetworkBuffer->xDataLength = sizeof( ICMPPacket_IPv6_t ); xICMPPacket.xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_NEIGHBOR_ADVERTISEMENT_IPv6; ( void ) memcpy( pxICMPHeader_IPv6->xIPv6Address.ucBytes, xDefaultIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); ( void ) memcpy( pxIPHeader->xSourceAddress.ucBytes, xDefaultIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS ); @@ -2058,6 +2222,8 @@ void test_xCheckRequiresNDResolution_Hit( void ) ( void ) memset( xNDCache, 0, sizeof( xNDCache ) ); + xEndPoint.bits.bIPv6 = pdTRUE; + pxNetworkBuffer = &xNetworkBuffer; pxNetworkBuffer->pxEndPoint = &xEndPoint; pxNetworkBuffer->pucEthernetBuffer = ucEthernetBuffer; @@ -2071,7 +2237,8 @@ void test_xCheckRequiresNDResolution_Hit( void ) xIsIPv6AllowedMulticast_ExpectAndReturn( pxIPAddress, pdTRUE ); vSetMultiCastIPv6MacAddress_Expect( pxIPAddress, NULL ); vSetMultiCastIPv6MacAddress_IgnoreArg_pxMACAddress(); - FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( NULL ); + FreeRTOS_FirstEndPoint_ExpectAnyArgsAndReturn( &xEndPoint ); + xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_LinkLocal ); xResult = xCheckRequiresNDResolution( pxNetworkBuffer ); TEST_ASSERT_EQUAL( pdFALSE, xResult ); @@ -2083,15 +2250,17 @@ void test_xCheckRequiresNDResolution_Hit( void ) void test_xCheckRequiresNDResolution_Miss( void ) { struct xNetworkEndPoint xEndPoint, * pxEndPoint = &xEndPoint; - NetworkBufferDescriptor_t xNetworkBuffer, * pxNetworkBuffer; + NetworkBufferDescriptor_t xNetworkBuffer, * pxNetworkBuffer, * pxNewNetworkBuffer = &xNetworkBuffer; uint8_t ucEthernetBuffer[ ipconfigNETWORK_MTU ]; BaseType_t xResult; ( void ) memset( xNDCache, 0, sizeof( xNDCache ) ); + xEndPoint.bits.bIPv6 = pdTRUE; pxNetworkBuffer = &xNetworkBuffer; pxNetworkBuffer->pxEndPoint = &xEndPoint; pxNetworkBuffer->pucEthernetBuffer = ucEthernetBuffer; + pxNetworkBuffer->xDataLength = ipconfigNETWORK_MTU; IPPacket_IPv6_t * pxIPPacket_V6 = ( ( IPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer ); IPHeader_IPv6_t * pxIPHeader_V6 = &( pxIPPacket_V6->xIPHeader ); IPv6_Address_t * pxIPAddress = &( pxIPHeader_V6->xSourceAddress ); @@ -2103,19 +2272,29 @@ void test_xCheckRequiresNDResolution_Miss( void ) xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_LinkLocal ); FreeRTOS_FindEndPointOnIP_IPv6_ExpectAnyArgsAndReturn( pxEndPoint ); pxGetNetworkBufferWithDescriptor_ExpectAnyArgsAndReturn( pxNetworkBuffer ); - vReleaseNetworkBufferAndDescriptor_Expect( pxNetworkBuffer ); + usGenerateProtocolChecksum_ExpectAnyArgsAndReturn( 0 ); + vReturnEthernetFrame_ExpectAnyArgs(); xResult = xCheckRequiresNDResolution( pxNetworkBuffer ); TEST_ASSERT_EQUAL( pdTRUE, xResult ); + pxNetworkBuffer = &xNetworkBuffer; + pxNetworkBuffer->pxEndPoint = &xEndPoint; + pxNetworkBuffer->pucEthernetBuffer = ucEthernetBuffer; + pxNetworkBuffer->xDataLength = ipconfigNETWORK_MTU; + pxIPPacket_V6 = ( ( IPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer ); + pxIPHeader_V6 = &( pxIPPacket_V6->xIPHeader ); + pxIPAddress = &( pxIPHeader_V6->xSourceAddress ); + pxIPPacket_V6->xEthernetHeader.usFrameType = ipIPv6_FRAME_TYPE; + pxIPHeader_V6->ucNextHeader = ipPROTOCOL_TCP; xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_LinkLocal ); xIsIPv6AllowedMulticast_ExpectAndReturn( pxIPAddress, pdFALSE ); xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_LinkLocal ); FreeRTOS_FindEndPointOnIP_IPv6_ExpectAnyArgsAndReturn( pxEndPoint ); pxGetNetworkBufferWithDescriptor_ExpectAnyArgsAndReturn( NULL ); - xResult = xCheckRequiresNDResolution( pxNetworkBuffer ); + xResult = xCheckRequiresNDResolution( &xNetworkBuffer ); TEST_ASSERT_EQUAL( pdTRUE, xResult ); } diff --git a/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c b/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c index b82ae59832..b8a72662c8 100644 --- a/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c +++ b/test/unit-test/FreeRTOS_RA/FreeRTOS_RA_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Routing/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_Routing/FreeRTOSIPConfig.h index 594af2296a..da656145c3 100644 --- a/test/unit-test/FreeRTOS_Routing/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_Routing/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_stubs.c b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_stubs.c index cd7b72136e..84838374c4 100644 --- a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_stubs.c +++ b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c index 0322c26790..74e1f8010e 100644 --- a/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c +++ b/test/unit-test/FreeRTOS_Routing/FreeRTOS_Routing_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOSIPConfig.h index 1694370464..fb48bb7c9e 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c index 0ab121e620..e2a42df6a7 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c +++ b/test/unit-test/FreeRTOS_Routing_ConfigCompatibleWithSingle/FreeRTOS_Routing_ConfigCompatibleWithSingle_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOSIPConfig.h index ddc95ecdb2..fd6042f782 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c index ef5c802bbb..4f81f76da8 100644 --- a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c +++ b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOS_Routing_ConfigV4Only_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c index 7a21b22590..40240cc8a7 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c index 5880a45430..331e8761ee 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c index d321d49993..d688092ca3 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_UDP_API_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c index ad2e9754fc..04265a5650 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c index 2ac4847522..385d63c6dc 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h b/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h index 14e390baf4..f37a2cabf7 100644 --- a/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h +++ b/test/unit-test/FreeRTOS_Sockets/Sockets_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSConfig.h index acbe4822de..b0f508f26d 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSIPConfig.h index 1d50c302eb..f7209f3918 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c index 0c61574b04..74024c9edf 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_privates_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_stubs.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_stubs.c index 5cb3093084..08cfbfa791 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_stubs.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/FreeRTOS_Sockets_DiffConfig_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig/Sockets_DiffConfig_list_macros.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig/Sockets_DiffConfig_list_macros.h index c976883918..a9091757ed 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig/Sockets_DiffConfig_list_macros.h +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig/Sockets_DiffConfig_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSConfig.h index b0ba377dbb..faf1dbd80c 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSIPConfig.h index da390dc439..76fa4913c2 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c index 9b43c4c6e1..2e885b1d98 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_GenericAPI_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c index 03b3687521..45384d8992 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_TCP_API_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c index af3ee7d8fc..66a2794486 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_UDP_API_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c index 752aef9c01..4c3b82cc7b 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/FreeRTOS_Sockets_DiffConfig1_privates_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/Sockets_DiffConfig1_list_macros.h b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/Sockets_DiffConfig1_list_macros.h index f05b2c60e7..c6ac520d1d 100644 --- a/test/unit-test/FreeRTOS_Sockets_DiffConfig1/Sockets_DiffConfig1_list_macros.h +++ b/test/unit-test/FreeRTOS_Sockets_DiffConfig1/Sockets_DiffConfig1_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_stubs.c b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_stubs.c index 4f7ffe493c..f0b9241deb 100644 --- a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_stubs.c +++ b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c index 8a3c26f5b6..49951a4a43 100644 --- a/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_Sockets_IPv6/FreeRTOS_Sockets_IPv6_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Sockets_IPv6/Sockets_IPv6_list_macros.h b/test/unit-test/FreeRTOS_Sockets_IPv6/Sockets_IPv6_list_macros.h index daa0513025..2d635638ff 100644 --- a/test/unit-test/FreeRTOS_Sockets_IPv6/Sockets_IPv6_list_macros.h +++ b/test/unit-test/FreeRTOS_Sockets_IPv6/Sockets_IPv6_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c index 2fcb41c550..c19780b38c 100644 --- a/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c +++ b/test/unit-test/FreeRTOS_Stream_Buffer/FreeRTOS_Stream_Buffer_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Stream_Buffer/list_macros.h b/test/unit-test/FreeRTOS_Stream_Buffer/list_macros.h index a4d9ab6401..d1b05b0482 100644 --- a/test/unit-test/FreeRTOS_Stream_Buffer/list_macros.h +++ b/test/unit-test/FreeRTOS_Stream_Buffer/list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_IP/FreeRTOS_TCP_IP_stubs.c b/test/unit-test/FreeRTOS_TCP_IP/FreeRTOS_TCP_IP_stubs.c index e86827d7a4..bd25f35891 100644 --- a/test/unit-test/FreeRTOS_TCP_IP/FreeRTOS_TCP_IP_stubs.c +++ b/test/unit-test/FreeRTOS_TCP_IP/FreeRTOS_TCP_IP_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_IP/FreeRTOS_TCP_IP_utest.c b/test/unit-test/FreeRTOS_TCP_IP/FreeRTOS_TCP_IP_utest.c index 7eee3348c6..8b22c45de2 100644 --- a/test/unit-test/FreeRTOS_TCP_IP/FreeRTOS_TCP_IP_utest.c +++ b/test/unit-test/FreeRTOS_TCP_IP/FreeRTOS_TCP_IP_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_IP/TCP_IP_list_macros.h b/test/unit-test/FreeRTOS_TCP_IP/TCP_IP_list_macros.h index 0ed60a2064..fc14fb6d99 100644 --- a/test/unit-test/FreeRTOS_TCP_IP/TCP_IP_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_IP/TCP_IP_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSConfig.h b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSConfig.h index acbe4822de..b0f508f26d 100644 --- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSConfig.h +++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSIPConfig.h index 4815614c7a..48772bdef8 100644 --- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOS_TCP_IP_DiffConfig_stubs.c b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOS_TCP_IP_DiffConfig_stubs.c index 2bbc655912..a0e6423012 100644 --- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOS_TCP_IP_DiffConfig_stubs.c +++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOS_TCP_IP_DiffConfig_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOS_TCP_IP_DiffConfig_utest.c b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOS_TCP_IP_DiffConfig_utest.c index 04fb0d9069..c17d259765 100644 --- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOS_TCP_IP_DiffConfig_utest.c +++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/FreeRTOS_TCP_IP_DiffConfig_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/TCP_IP_DiffConfig_list_macros.h b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/TCP_IP_DiffConfig_list_macros.h index 8fe9c43060..9fbf9e40d3 100644 --- a/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/TCP_IP_DiffConfig_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_IP_DiffConfig/TCP_IP_DiffConfig_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Reception/FreeRTOS_TCP_Reception_stubs.c b/test/unit-test/FreeRTOS_TCP_Reception/FreeRTOS_TCP_Reception_stubs.c index d47b7317de..931446f151 100644 --- a/test/unit-test/FreeRTOS_TCP_Reception/FreeRTOS_TCP_Reception_stubs.c +++ b/test/unit-test/FreeRTOS_TCP_Reception/FreeRTOS_TCP_Reception_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Reception/FreeRTOS_TCP_Reception_utest.c b/test/unit-test/FreeRTOS_TCP_Reception/FreeRTOS_TCP_Reception_utest.c index 32df8586db..66340a4e91 100644 --- a/test/unit-test/FreeRTOS_TCP_Reception/FreeRTOS_TCP_Reception_utest.c +++ b/test/unit-test/FreeRTOS_TCP_Reception/FreeRTOS_TCP_Reception_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_stubs.c b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_stubs.c index a7d68bca12..a97f9cf278 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_stubs.c +++ b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c index 5b34820063..ef348a4145 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c +++ b/test/unit-test/FreeRTOS_TCP_State_Handling/FreeRTOS_TCP_State_Handling_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling/TCP_State_Handling_list_macros.h b/test/unit-test/FreeRTOS_TCP_State_Handling/TCP_State_Handling_list_macros.h index 5916a24a20..845d8ef3d6 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling/TCP_State_Handling_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_State_Handling/TCP_State_Handling_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/FreeRTOS_TCP_State_Handling_IPv4_utest.c b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/FreeRTOS_TCP_State_Handling_IPv4_utest.c index 03d81f9f32..42ca7381f1 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/FreeRTOS_TCP_State_Handling_IPv4_utest.c +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/FreeRTOS_TCP_State_Handling_IPv4_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/TCP_State_Handling_IPv4_list_macros.h b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/TCP_State_Handling_IPv4_list_macros.h index 018281ae4b..e3550debf4 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/TCP_State_Handling_IPv4_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv4/TCP_State_Handling_IPv4_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/FreeRTOS_TCP_State_Handling_IPv6_utest.c b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/FreeRTOS_TCP_State_Handling_IPv6_utest.c index 2c7b2499db..d9aa62922a 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/FreeRTOS_TCP_State_Handling_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/FreeRTOS_TCP_State_Handling_IPv6_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/TCP_State_Handling_IPv6_list_macros.h b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/TCP_State_Handling_IPv6_list_macros.h index 546c128447..1a1f7c34d9 100644 --- a/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/TCP_State_Handling_IPv6_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_State_Handling_IPv6/TCP_State_Handling_IPv6_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/FreeRTOS_TCP_Transmission_stubs.c b/test/unit-test/FreeRTOS_TCP_Transmission/FreeRTOS_TCP_Transmission_stubs.c index 14958490f5..24c0da33d3 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission/FreeRTOS_TCP_Transmission_stubs.c +++ b/test/unit-test/FreeRTOS_TCP_Transmission/FreeRTOS_TCP_Transmission_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/FreeRTOS_TCP_Transmission_utest.c b/test/unit-test/FreeRTOS_TCP_Transmission/FreeRTOS_TCP_Transmission_utest.c index bdfae76934..f54244f068 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission/FreeRTOS_TCP_Transmission_utest.c +++ b/test/unit-test/FreeRTOS_TCP_Transmission/FreeRTOS_TCP_Transmission_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Transmission/TCP_Transmission_list_macros.h b/test/unit-test/FreeRTOS_TCP_Transmission/TCP_Transmission_list_macros.h index 1db6ff4328..04545a1b6a 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission/TCP_Transmission_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_Transmission/TCP_Transmission_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_utest.c b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_utest.c index 31c4339ce7..0c3314669f 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/FreeRTOS_TCP_Transmission_IPv6_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/TCP_Transmission_IPv6_list_macros.h b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/TCP_Transmission_IPv6_list_macros.h index e721f55b85..aa4f09edd6 100644 --- a/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/TCP_Transmission_IPv6_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_Transmission_IPv6/TCP_Transmission_IPv6_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Utils/FreeRTOS_TCP_Utils_stubs.c b/test/unit-test/FreeRTOS_TCP_Utils/FreeRTOS_TCP_Utils_stubs.c index 816cb0bf1d..fd7206a8fd 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils/FreeRTOS_TCP_Utils_stubs.c +++ b/test/unit-test/FreeRTOS_TCP_Utils/FreeRTOS_TCP_Utils_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Utils/FreeRTOS_TCP_Utils_utest.c b/test/unit-test/FreeRTOS_TCP_Utils/FreeRTOS_TCP_Utils_utest.c index d8fb9b61a1..7ff5083e7c 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils/FreeRTOS_TCP_Utils_utest.c +++ b/test/unit-test/FreeRTOS_TCP_Utils/FreeRTOS_TCP_Utils_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Utils/TCP_Utils_list_macros.h b/test/unit-test/FreeRTOS_TCP_Utils/TCP_Utils_list_macros.h index ab0d234c8b..8b77562af0 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils/TCP_Utils_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_Utils/TCP_Utils_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/FreeRTOS_TCP_Utils_IPv6_utest.c b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/FreeRTOS_TCP_Utils_IPv6_utest.c index 991bbcbd45..75e12963c0 100644 --- a/test/unit-test/FreeRTOS_TCP_Utils_IPv6/FreeRTOS_TCP_Utils_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_TCP_Utils_IPv6/FreeRTOS_TCP_Utils_IPv6_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_list_macros.h b/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_list_macros.h index bbeddc4e56..6d697fbb33 100644 --- a/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_list_macros.h +++ b/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_utest.c b/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_utest.c index b6e8aa23ad..182890a978 100644 --- a/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_utest.c +++ b/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOSIPConfig.h index 28f657715e..509298f1ba 100644 --- a/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_utest.c b/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_utest.c index addc3aa41f..ba3d933971 100644 --- a/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_utest.c +++ b/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_list_macros.h b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_list_macros.h index 0342e9d1e1..024c5c3192 100644 --- a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_list_macros.h +++ b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c index 1a03e51db2..cf121081d7 100644 --- a/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c +++ b/test/unit-test/FreeRTOS_UDP_IP/FreeRTOS_UDP_IP_utest.c @@ -1,5 +1,5 @@ /** - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOSIPConfig.h index 52819c5ae8..7f1e3fc1c2 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_list_macros.h b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_list_macros.h index eb4901c77a..b9a2b3fc97 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_list_macros.h +++ b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_stubs.c b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_stubs.c index 1d6010e669..476b618736 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_stubs.c +++ b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_utest.c b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_utest.c index a41f28ae51..3aa26efec4 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_utest.c +++ b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOS_UDP_IPv4_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOSIPConfig.h index 86da706217..3e58fa2668 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOSIPConfig.h +++ b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOSIPConfig.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_list_macros.h b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_list_macros.h index 0f89f24675..8342d41525 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_list_macros.h +++ b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_list_macros.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_stubs.c b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_stubs.c index b7583260f0..9cb948a8d5 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_stubs.c +++ b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_stubs.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c index 4c1cc683a2..239b72c3fb 100644 --- a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c +++ b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOS_UDP_IPv6_utest.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/NTPDemo.c b/tools/tcp_utilities/NTPDemo.c index 5d8b5d17e3..0e2ffd3055 100644 --- a/tools/tcp_utilities/NTPDemo.c +++ b/tools/tcp_utilities/NTPDemo.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/date_and_time.c b/tools/tcp_utilities/date_and_time.c index 2d08557e8a..d60fd62981 100644 --- a/tools/tcp_utilities/date_and_time.c +++ b/tools/tcp_utilities/date_and_time.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/http_client_test.c b/tools/tcp_utilities/http_client_test.c index cd43fe43ab..845077b943 100644 --- a/tools/tcp_utilities/http_client_test.c +++ b/tools/tcp_utilities/http_client_test.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/include/NTPDemo.h b/tools/tcp_utilities/include/NTPDemo.h index cb4f13db4b..7635860b77 100644 --- a/tools/tcp_utilities/include/NTPDemo.h +++ b/tools/tcp_utilities/include/NTPDemo.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/include/date_and_time.h b/tools/tcp_utilities/include/date_and_time.h index 299afb47b9..9e5dd5aa01 100644 --- a/tools/tcp_utilities/include/date_and_time.h +++ b/tools/tcp_utilities/include/date_and_time.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/include/http_client_test.h b/tools/tcp_utilities/include/http_client_test.h index db367ceb77..5c7ebe05ed 100644 --- a/tools/tcp_utilities/include/http_client_test.h +++ b/tools/tcp_utilities/include/http_client_test.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/include/ntpClient.h b/tools/tcp_utilities/include/ntpClient.h index 437723400e..3320288e15 100644 --- a/tools/tcp_utilities/include/ntpClient.h +++ b/tools/tcp_utilities/include/ntpClient.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/include/plus_tcp_demo_cli.h b/tools/tcp_utilities/include/plus_tcp_demo_cli.h index 0982532ba9..bc9c827b28 100644 --- a/tools/tcp_utilities/include/plus_tcp_demo_cli.h +++ b/tools/tcp_utilities/include/plus_tcp_demo_cli.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/include/tcp_dump_packets.h b/tools/tcp_utilities/include/tcp_dump_packets.h index 0f58a81dd8..f038fbb3c5 100644 --- a/tools/tcp_utilities/include/tcp_dump_packets.h +++ b/tools/tcp_utilities/include/tcp_dump_packets.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/include/tcp_mem_stats.h b/tools/tcp_utilities/include/tcp_mem_stats.h index ec0d5bd69b..46be435061 100644 --- a/tools/tcp_utilities/include/tcp_mem_stats.h +++ b/tools/tcp_utilities/include/tcp_mem_stats.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/include/tcp_netstat.h b/tools/tcp_utilities/include/tcp_netstat.h index 85171543e7..fed359a6e8 100644 --- a/tools/tcp_utilities/include/tcp_netstat.h +++ b/tools/tcp_utilities/include/tcp_netstat.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/plus_tcp_demo_cli.c b/tools/tcp_utilities/plus_tcp_demo_cli.c index 37e00e72b4..95e6cd8799 100644 --- a/tools/tcp_utilities/plus_tcp_demo_cli.c +++ b/tools/tcp_utilities/plus_tcp_demo_cli.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/tcp_dump_packets.c b/tools/tcp_utilities/tcp_dump_packets.c index 5819eec647..f962bdf674 100644 --- a/tools/tcp_utilities/tcp_dump_packets.c +++ b/tools/tcp_utilities/tcp_dump_packets.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/tcp_mem_stats.c b/tools/tcp_utilities/tcp_mem_stats.c index 90c921e078..53a538a512 100644 --- a/tools/tcp_utilities/tcp_mem_stats.c +++ b/tools/tcp_utilities/tcp_mem_stats.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT diff --git a/tools/tcp_utilities/tcp_netstat.c b/tools/tcp_utilities/tcp_netstat.c index c0db5f0008..d9e603b430 100644 --- a/tools/tcp_utilities/tcp_netstat.c +++ b/tools/tcp_utilities/tcp_netstat.c @@ -1,5 +1,5 @@ /* - * FreeRTOS+TCP + * FreeRTOS+TCP V4.3.3 * Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * SPDX-License-Identifier: MIT