Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Bump coreMQTT and update project files to use new location of transport_interface.h file #2657

Merged
merged 7 commits into from
Oct 29, 2020
Merged

Bump coreMQTT and update project files to use new location of transport_interface.h file #2657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5a9189
Bump coreMQTT submodule, and update all project files to use coreMQTT…
aggarw13 Oct 29, 2020
83f7299
Merge remote-tracking branch 'origin/release-candidate' into update-t…
aggarw13 Oct 29, 2020
497fe60
Merge remote-tracking branch 'origin/release-candidate' into update-t…
aggarw13 Oct 29, 2020
220a78b
Re-update project files for file path of transport_interface.h as und…
aggarw13 Oct 29, 2020
b136745
Remove duplicate transport_interface.h file
aggarw13 Oct 29, 2020
cbddeac
Remove the platform/transport_interface.h file from projects files
aggarw13 Oct 29, 2020
017190e
Fix CMake failures by removing another CMake target dependency on pla…
aggarw13 Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libraries/abstractions/platform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ afr_module_sources(
"${inc_dir}/platform/iot_clock.h"
"${inc_dir}/platform/iot_network.h"
"${inc_dir}/platform/iot_threads.h"
"${inc_dir}/platform/transport_interface.h"
"${inc_dir}/types/iot_platform_types.h"
"${src_dir}/iot_clock_freertos.c"
"${src_dir}/iot_threads_freertos.c"
Expand All @@ -36,7 +35,6 @@ if(TARGET AFR::secure_sockets::mcu_port)
${AFR_CURRENT_MODULE}
PRIVATE
"${inc_dir}/platform/iot_metrics.h"
"${inc_dir}/platform/transport_interface.h"
"${src_dir}/iot_metrics.c"
"${src_dir}/iot_network_freertos.c"
"${src_dir}/include/platform/iot_network_freertos.h"
Expand Down
203 changes: 0 additions & 203 deletions libraries/abstractions/platform/include/platform/transport_interface.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions libraries/abstractions/transport/transport_interface.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# to choose coreHTTP instead of coreMQTT. In this case, it is necessary to check
# for the existence of the file in the downloaded software package.
if( EXISTS ${AFR_MODULES_DIR}/coreMQTT/source )
set(transport_interface_dir "${AFR_MODULES_DIR}/coreMQTT/source/portable")
set(transport_interface_dir "${AFR_MODULES_DIR}/coreMQTT/source/interface")
elseif( EXISTS ${AFR_MODULES_DIR}/coreHTTP/source )
set(transport_interface_dir "${AFR_MODULES_DIR}/coreHTTP/source/portable")
set(transport_interface_dir "${AFR_MODULES_DIR}/coreHTTP/source/interface")
else()
message( FATAL_ERROR "No transport_interface.h exists for this included interface.")
endif()
2 changes: 1 addition & 1 deletion libraries/coreMQTT
Open in desktop
Submodule coreMQTT updated 57 files
+1 −1 .github/workflows/ci.yml
+1 −1 docs/doxygen/config.doxyfile
+1 −1 mqttFilePaths.cmake
+0 −0 source/interface/transport_interface.h
+5 −1 test/cbmc/.gitignore
+1 −1 test/cbmc/aws-templates-for-cbmc-proofs
+1 −1 test/cbmc/litani
+1 −0 test/cbmc/proofs/MQTT_Connect/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_Connect/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_DeserializeAck/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_DeserializeAck/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_DeserializePublish/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_DeserializePublish/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_Disconnect/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_Disconnect/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_GetIncomingPacketTypeAndLength/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_GetIncomingPacketTypeAndLength/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_GetPacketId/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_GetPacketId/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_GetSubAckStatusCodes/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_GetSubAckStatusCodes/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_Init/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_Init/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_MatchTopic/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_MatchTopic/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_Ping/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_Ping/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_ProcessLoop/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_ProcessLoop/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_Publish/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_Publish/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_ReceiveLoop/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_ReceiveLoop/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_SerializeAck/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_SerializeAck/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_SerializeConnect/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_SerializeConnect/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_SerializeDisconnect/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_SerializeDisconnect/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_SerializePingreq/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_SerializePingreq/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_SerializePublish/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_SerializePublish/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_SerializePublishHeader/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_SerializePublishHeader/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_SerializeSubscribe/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_SerializeSubscribe/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_SerializeUnsubscribe/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_SerializeUnsubscribe/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_Subscribe/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_Subscribe/wellspring.txt
+1 −0 test/cbmc/proofs/MQTT_Unsubscribe/cbmc-proof.txt
+0 −1 test/cbmc/proofs/MQTT_Unsubscribe/wellspring.txt
+6 −4 test/cbmc/proofs/Makefile-project-defines
+0 −1 test/cbmc/proofs/prepare.py
+47 −68 test/cbmc/proofs/run-cbmc-proofs.py
+21 −28 test/unit-test/core_mqtt_utest.c
4 changes: 2 additions & 2 deletions projects/cypress/CY8CKIT_064S0S2_4343W/mtb/aws_demos/afr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,14 @@ INCLUDES+=\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/mqtt/src\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/mqtt/src/private\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/include\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/portable\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/interface\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/serializer\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/serializer/include\
$(CY_AFR_ROOT)/libraries/c_sdk/aws/shadow/include\
$(CY_AFR_ROOT)/libraries/c_sdk/aws/shadow/include/types\
$(CY_AFR_ROOT)/libraries/c_sdk/aws/defender/include\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/include\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/portable\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/interface\
$(CY_AFR_ROOT)/libraries/device_shadow_for_aws_iot_embedded_sdk/source/include\
$(CY_AFR_ROOT)/libraries/coreJSON/source/include\

Expand Down
4 changes: 2 additions & 2 deletions projects/cypress/CY8CKIT_064S0S2_4343W/mtb/aws_tests/afr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ INCLUDES+=\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/mqtt/test/mock\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/mqtt/test/access\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/include\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/portable\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/interface\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/ble/include\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/serializer\
$(CY_AFR_ROOT)/libraries/c_sdk/standard/serializer/include\
Expand All @@ -363,7 +363,7 @@ INCLUDES+=\
$(CY_AFR_ROOT)/libraries/c_sdk/aws/defender/src\
$(CY_AFR_ROOT)/libraries/c_sdk/aws/defender/src/private\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/include\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/portable\
$(CY_AFR_ROOT)/libraries/coreMQTT/source/interface\
$(CY_AFR_ROOT)/libraries/device_shadow_for_aws_iot_embedded_sdk/source/include\
$(CY_AFR_ROOT)/libraries/coreJSON/source/include\

Expand Down
2 changes: 1 addition & 1 deletion projects/infineon/xmc4800_iotkit/dave4/aws_demos/.cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/aws/defender/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/portable"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/interface"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/retry_utils"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/transport/secure_sockets"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/serializer/include"/>
Expand Down
9 changes: 2 additions & 7 deletions projects/infineon/xmc4800_iotkit/dave4/aws_demos/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,11 +548,6 @@
<type>1</type>
<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/iot_threads.h</locationURI>
</link>
<link>
<name>libraries/abstractions/platform/include/platform/transport_interface.h</name>
<type>1</type>
<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/transport_interface.h</locationURI>
</link>
<link>
<name>libraries/abstractions/platform/include/types/iot_platform_types.h</name>
<type>1</type>
Expand Down Expand Up @@ -864,9 +859,9 @@
<locationURI>AFR_HOME/libraries/coreMQTT/source/include/core_mqtt_state.h</locationURI>
</link>
<link>
<name>libraries/coreMQTT/source/portable/transport_interface.h</name>
<name>libraries/coreMQTT/source/interface/transport_interface.h</name>
<type>1</type>
<locationURI>AFR_HOME/libraries/coreMQTT/source/portable/transport_interface.h</locationURI>
<locationURI>AFR_HOME/libraries/coreMQTT/source/interface/transport_interface.h</locationURI>
</link>
<link>
<name>libraries/core_mqtt_demo_dependencies.cmake</name>
Expand Down
2 changes: 1 addition & 1 deletion projects/infineon/xmc4800_iotkit/dave4/aws_tests/.cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/src"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/portable"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/interface"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/retry_utils"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/transport/secure_sockets"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/serializer/include"/>
Expand Down
9 changes: 2 additions & 7 deletions projects/infineon/xmc4800_iotkit/dave4/aws_tests/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,11 +538,6 @@
<type>1</type>
<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/iot_threads.h</locationURI>
</link>
<link>
<name>libraries/abstractions/platform/include/platform/transport_interface.h</name>
<type>1</type>
<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/transport_interface.h</locationURI>
</link>
<link>
<name>libraries/abstractions/platform/include/types/iot_platform_types.h</name>
<type>1</type>
Expand Down Expand Up @@ -854,9 +849,9 @@
<locationURI>AFR_HOME/libraries/coreMQTT/source/include/core_mqtt_state.h</locationURI>
</link>
<link>
<name>libraries/coreMQTT/source/portable/transport_interface.h</name>
<name>libraries/coreMQTT/source/interface/transport_interface.h</name>
<type>1</type>
<locationURI>AFR_HOME/libraries/coreMQTT/source/portable/transport_interface.h</locationURI>
<locationURI>AFR_HOME/libraries/coreMQTT/source/interface/transport_interface.h</locationURI>
</link>
<link>
<name>libraries/core_mqtt_demo_dependencies.cmake</name>
Expand Down
2 changes: 1 addition & 1 deletion projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_demos/.cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/aws/defender/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/portable"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/interface"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/retry_utils"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/transport/secure_sockets"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/serializer/include"/>
Expand Down
9 changes: 2 additions & 7 deletions projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_demos/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,11 +1103,6 @@
<type>1</type>
<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/iot_threads.h</locationURI>
</link>
<link>
<name>libraries/abstractions/platform/include/platform/transport_interface.h</name>
<type>1</type>
<locationURI>AFR_HOME/libraries/abstractions/platform/include/platform/transport_interface.h</locationURI>
</link>
<link>
<name>libraries/abstractions/platform/include/types/iot_platform_types.h</name>
<type>1</type>
Expand Down Expand Up @@ -1404,9 +1399,9 @@
<locationURI>AFR_HOME/libraries/coreMQTT/source/include/core_mqtt_state.h</locationURI>
</link>
<link>
<name>libraries/coreMQTT/source/portable/transport_interface.h</name>
<name>libraries/coreMQTT/source/interface/transport_interface.h</name>
<type>1</type>
<locationURI>AFR_HOME/libraries/coreMQTT/source/portable/transport_interface.h</locationURI>
<locationURI>AFR_HOME/libraries/coreMQTT/source/interface/transport_interface.h</locationURI>
</link>
<link>
<name>libraries/core_mqtt_demo_dependencies.cmake</name>
Expand Down
2 changes: 1 addition & 1 deletion projects/infineon/xmc4800_plus_optiga_trust_x/dave4/aws_tests/.cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/mqtt/src"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/include"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/portable"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/coreMQTT/source/interface"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/retry_utils"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/abstractions/transport/secure_sockets"/>
<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../../libraries/c_sdk/standard/serializer/include"/>
Expand Down
Loading