Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Misc request-response fixes #375

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Misc request-response fixes #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9a76b8
Install request-response headers
bretambrose Sep 18, 2024
e26a55f
Add some error codes
bretambrose Sep 19, 2024
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
26 changes: 16 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,39 +39,44 @@ include(AwsFindPackage)

file(GLOB AWS_MQTT_HEADERS
"include/aws/mqtt/*.h"
)
)

file(GLOB AWS_MQTT5_HEADERS
"include/aws/mqtt/v5/*.h"
)
)

file(GLOB AWS_MQTT_RR_HEADERS
"include/aws/mqtt/request-response/*.h"
)

file(GLOB AWS_MQTT_PRIV_HEADERS
"include/aws/mqtt/private/*.h"
"include/aws/mqtt/private/request-response/*.h"
"include/aws/mqtt/private/v5/*.h"
)
)

file(GLOB AWS_MQTT_PRIV_EXPOSED_HEADERS
"include/aws/mqtt/private/mqtt_client_test_helper.h"
)
)

file(GLOB AWS_MQTT_SRC
"source/*.c"
"source/v5/*.c"
"source/request-response/*.c"
)
)

file(GLOB MQTT_HEADERS
${AWS_MQTT_HEADERS}
${AWS_MQTT_PRIV_HEADERS}
)
)

file(GLOB AWS_MQTT5_HEADERS
${AWS_MQTT5_HEADERS}
)
)

file(GLOB MQTT_SRC
${AWS_MQTT_SRC}
)
)

add_library(${PROJECT_NAME} ${MQTT_HEADERS} ${MQTT_SRC})
aws_set_common_properties(${PROJECT_NAME})
Expand All @@ -94,13 +99,14 @@ aws_prepare_shared_lib_exports(${PROJECT_NAME})

install(FILES ${AWS_MQTT_HEADERS} DESTINATION "include/aws/mqtt" COMPONENT Development)
install(FILES ${AWS_MQTT5_HEADERS} DESTINATION "include/aws/mqtt/v5" COMPONENT Development)
install(FILES ${AWS_MQTT_RR_HEADERS} DESTINATION "include/aws/mqtt/request-response" COMPONENT Development)
install(FILES ${AWS_MQTT_TESTING_HEADERS} DESTINATION "include/aws/testing/mqtt" COMPONENT Development)
install(FILES ${AWS_MQTT_PRIV_EXPOSED_HEADERS} DESTINATION "include/aws/mqtt/private" COMPONENT Development)

if (BUILD_SHARED_LIBS)
set (TARGET_DIR "shared")
set (TARGET_DIR "shared")
else()
set (TARGET_DIR "static")
set (TARGET_DIR "static")
endif()

install(EXPORT "${PROJECT_NAME}-targets"
Expand Down
3 changes: 3 additions & 0 deletions include/aws/mqtt/mqtt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ enum aws_mqtt_error {
AWS_ERROR_MQTT_REQUEST_RESPONSE_INTERNAL_ERROR,
AWS_ERROR_MQTT_REQUEST_RESPONSE_PUBLISH_FAILURE,
AWS_ERROR_MQTT_REUQEST_RESPONSE_STREAM_ALREADY_ACTIVATED,
AWS_ERROR_MQTT_REQUEST_RESPONSE_MODELED_SERVICE_ERROR,
AWS_ERROR_MQTT_REQUEST_RESPONSE_PAYLOAD_PARSE_ERROR,
AWS_ERROR_MQTT_REQUEST_RESPONSE_INVALID_RESPONSE_PATH,

AWS_ERROR_END_MQTT_RANGE = AWS_ERROR_ENUM_END_RANGE(AWS_C_MQTT_PACKAGE_ID),
};
Expand Down
11 changes: 10 additions & 1 deletion source/mqtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,16 @@ bool aws_mqtt_is_valid_topic_filter(const struct aws_byte_cursor *topic_filter)
"Request-response operation failed because the associated publish failed synchronously."),
AWS_DEFINE_ERROR_INFO_MQTT(
AWS_ERROR_MQTT_REUQEST_RESPONSE_STREAM_ALREADY_ACTIVATED,
"Streaming operation activation failed because the operaation had already been activated."),
"Streaming operation activation failed because the operation had already been activated."),
AWS_DEFINE_ERROR_INFO_MQTT(
AWS_ERROR_MQTT_REQUEST_RESPONSE_MODELED_SERVICE_ERROR,
"Request-response operation failed with a modeled service error."),
AWS_DEFINE_ERROR_INFO_MQTT(
AWS_ERROR_MQTT_REQUEST_RESPONSE_PAYLOAD_PARSE_ERROR,
"Request-response operation failed due to an inability to parse the payload."),
AWS_DEFINE_ERROR_INFO_MQTT(
AWS_ERROR_MQTT_REQUEST_RESPONSE_INVALID_RESPONSE_PATH,
"Request-response operation failed due to arrival on an unknown response path"),
};
/* clang-format on */
#undef AWS_DEFINE_ERROR_INFO_MQTT
Expand Down
Loading