Skip to content

Support changes in req-resp operations #651

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support changes in req-resp operations #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae325a8
Update aws-c-mqtt
sfodagain Apr 30, 2025
aca159c
Fix incoming publish callback
sfodagain Apr 30, 2025
149166c
Add assert
sfodagain Apr 30, 2025
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: 1 addition & 1 deletion crt/aws-c-mqtt
Open in desktop
Submodule aws-c-mqtt updated 13 files
+14 −19 bin/elastishadow/main.c
+5 −5 include/aws/mqtt/exports.h
+2 −11 include/aws/mqtt/private/request-response/protocol_adapter.h
+1 −1 include/aws/mqtt/private/request-response/request_response_client.h
+140 −0 include/aws/mqtt/private/request-response/request_response_subscription_set.h
+20 −7 include/aws/mqtt/request-response/request_response_client.h
+11 −2 source/request-response/protocol_adapter.c
+57 −212 source/request-response/request_response_client.c
+336 −0 source/request-response/request_response_subscription_set.c
+15 −0 tests/CMakeLists.txt
+3 −2 tests/request-response/protocol_adapter_tests.c
+1,120 −64 tests/request-response/request_response_client_tests.c
+1 −1 tests/v3/mqtt_mock_server_handler.h
28 changes: 14 additions & 14 deletions source/mqtt_request_response.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,7 @@ static void s_aws_mqtt_make_request_binding_destroy(struct aws_mqtt_make_request
}

static void s_on_mqtt_request_complete(
const struct aws_byte_cursor *response_topic,
const struct aws_byte_cursor *payload,
const struct aws_mqtt_rr_incoming_publish_event *publish_event,
int error_code,
void *user_data) {

Expand All @@ -368,10 +367,10 @@ static void s_on_mqtt_request_complete(
request_binding->on_request_complete_callback,
"(is#y#)",
/* i */ error_code,
/* s */ response_topic ? response_topic->ptr : NULL,
/* # */ response_topic ? response_topic->len : 0,
/* y */ payload ? payload->ptr : NULL,
/* # */ payload ? payload->len : 0);
/* s */ publish_event ? publish_event->topic.ptr : NULL,
/* # */ publish_event ? publish_event->topic.len : 0,
/* y */ publish_event ? publish_event->payload.ptr : NULL,
/* # */ publish_event ? publish_event->payload.len : 0);
if (!result) {
PyErr_WriteUnraisable(PyErr_Occurred());
}
Expand Down Expand Up @@ -467,7 +466,7 @@ PyObject *aws_py_mqtt_request_response_client_make_request(PyObject *self, PyObj
};

if (aws_mqtt_request_response_client_submit_request(client_binding->native, &request_options)) {
s_on_mqtt_request_complete(NULL, NULL, aws_last_error(), request_binding);
s_on_mqtt_request_complete(NULL, aws_last_error(), request_binding);
}
}

Expand Down Expand Up @@ -551,10 +550,11 @@ static void s_aws_mqtt_streaming_operation_subscription_status_callback_python(
}

static void s_aws_mqtt_streaming_operation_incoming_publish_callback_python(
struct aws_byte_cursor payload,
struct aws_byte_cursor topic,
const struct aws_mqtt_rr_incoming_publish_event *publish_event,
void *user_data) {

AWS_FATAL_ASSERT(publish_event != NULL);

struct mqtt_streaming_operation_binding *stream_binding = user_data;

PyGILState_STATE state;
Expand All @@ -565,10 +565,10 @@ static void s_aws_mqtt_streaming_operation_incoming_publish_callback_python(
PyObject *result = PyObject_CallFunction(
stream_binding->incoming_publish_callable,
"(s#y#)",
/* s */ topic.ptr,
/* # */ topic.len,
/* y */ payload.ptr,
/* # */ payload.len);
/* s */ publish_event->topic.ptr,
/* # */ publish_event->topic.len,
/* y */ publish_event->payload.ptr,
/* # */ publish_event->payload.len);
if (!result) {
PyErr_WriteUnraisable(PyErr_Occurred());
}
Expand Down Expand Up @@ -673,4 +673,4 @@ struct aws_mqtt_rr_client_operation *aws_py_get_mqtt_streaming_operation(PyObjec
s_capsule_name_mqtt_streaming_operation,
"StreamingOperation",
mqtt_streaming_operation_binding);
}
}