You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2020/08/05 16:30:48 UTC
[qpid-dispatch] branch dev-protocol-adaptors updated:
DISPATCH-1742: Added receive_complete parameter to qd_message_compose_3()
and qd_message_compose_3() in message.c
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch dev-protocol-adaptors
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/dev-protocol-adaptors by this push:
new b81458c DISPATCH-1742: Added receive_complete parameter to qd_message_compose_3() and qd_message_compose_3() in message.c
b81458c is described below
commit b81458c726985847fc3b828640fb79f31c82c207
Author: Ganesh Murthy <gm...@apache.org>
AuthorDate: Wed Aug 5 12:30:07 2020 -0400
DISPATCH-1742: Added receive_complete parameter to qd_message_compose_3() and qd_message_compose_3() in message.c
---
include/qpid/dispatch/message.h | 6 +++---
src/message.c | 10 +++++-----
src/router_core/core_client_api.c | 6 +++---
src/router_core/management_agent.c | 2 +-
.../modules/address_lookup_server/address_lookup_server.c | 2 +-
.../modules/edge_addr_tracking/edge_addr_tracking.c | 2 +-
src/router_core/modules/mobile_sync/mobile.c | 6 +++---
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/qpid/dispatch/message.h b/include/qpid/dispatch/message.h
index f409302..d3dadb6 100644
--- a/include/qpid/dispatch/message.h
+++ b/include/qpid/dispatch/message.h
@@ -276,9 +276,9 @@ ssize_t qd_message_field_copy(qd_message_t *msg, qd_message_field_t field, char
// Convenience Functions
void qd_message_compose_1(qd_message_t *msg, const char *to, qd_buffer_list_t *buffers);
-void qd_message_compose_2(qd_message_t *msg, qd_composed_field_t *content, bool complete);
-void qd_message_compose_3(qd_message_t *msg, qd_composed_field_t *content1, qd_composed_field_t *content2);
-void qd_message_compose_4(qd_message_t *msg, qd_composed_field_t *content1, qd_composed_field_t *content2, qd_composed_field_t *content3);
+void qd_message_compose_2(qd_message_t *msg, qd_composed_field_t *content, bool receive_complete);
+void qd_message_compose_3(qd_message_t *msg, qd_composed_field_t *content1, qd_composed_field_t *content2, bool receive_complete);
+void qd_message_compose_4(qd_message_t *msg, qd_composed_field_t *content1, qd_composed_field_t *content2, qd_composed_field_t *content3, bool receive_complete);
/**
* qd_message_extend
diff --git a/src/message.c b/src/message.c
index 364ec21..24aa928 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2239,10 +2239,10 @@ void qd_message_compose_2(qd_message_t *msg, qd_composed_field_t *field, bool co
}
-void qd_message_compose_3(qd_message_t *msg, qd_composed_field_t *field1, qd_composed_field_t *field2)
+void qd_message_compose_3(qd_message_t *msg, qd_composed_field_t *field1, qd_composed_field_t *field2, bool receive_complete)
{
qd_message_content_t *content = MSG_CONTENT(msg);
- content->receive_complete = true;
+ content->receive_complete = receive_complete;
qd_buffer_list_t *field1_buffers = qd_compose_buffers(field1);
qd_buffer_list_t *field2_buffers = qd_compose_buffers(field2);
@@ -2252,10 +2252,10 @@ void qd_message_compose_3(qd_message_t *msg, qd_composed_field_t *field1, qd_com
}
-void qd_message_compose_4(qd_message_t *msg, qd_composed_field_t *field1, qd_composed_field_t *field2, qd_composed_field_t *field3)
+void qd_message_compose_4(qd_message_t *msg, qd_composed_field_t *field1, qd_composed_field_t *field2, qd_composed_field_t *field3, bool receive_complete)
{
- qd_message_content_t *content = MSG_CONTENT(msg);
- content->receive_complete = true;
+ qd_message_content_t *content = MSG_CONTENT(msg);
+ content->receive_complete = receive_complete;
qd_buffer_list_t *field1_buffers = qd_compose_buffers(field1);
qd_buffer_list_t *field2_buffers = qd_compose_buffers(field2);
qd_buffer_list_t *field3_buffers = qd_compose_buffers(field3);
diff --git a/src/router_core/core_client_api.c b/src/router_core/core_client_api.c
index 5b52929..d2801e8 100644
--- a/src/router_core/core_client_api.c
+++ b/src/router_core/core_client_api.c
@@ -681,11 +681,11 @@ static qd_message_t *_create_message_CT(qdrc_client_t *client,
qd_message_t *message = qd_message();
if (req->app_properties && req->body) {
- qd_message_compose_4(message, fld, req->app_properties, req->body);
+ qd_message_compose_4(message, fld, req->app_properties, req->body, true);
} else if (req->body) {
- qd_message_compose_3(message, fld, req->body);
+ qd_message_compose_3(message, fld, req->body, true);
} else if (req->app_properties) {
- qd_message_compose_3(message, fld, req->app_properties);
+ qd_message_compose_3(message, fld, req->app_properties, true);
} else {
qd_message_compose_2(message, fld, true);
}
diff --git a/src/router_core/management_agent.c b/src/router_core/management_agent.c
index 8dbaf98..2918185 100644
--- a/src/router_core/management_agent.c
+++ b/src/router_core/management_agent.c
@@ -216,7 +216,7 @@ static void qd_manage_response_handler(void *context, const qd_amqp_error_t *sta
qd_set_response_status(status, &fld);
// Finally, compose and send the message.
- qd_message_compose_3(ctx->msg, fld, ctx->field);
+ qd_message_compose_3(ctx->msg, fld, ctx->field, true);
qdr_send_to1(ctx->core, ctx->msg, reply_to, true, false);
diff --git a/src/router_core/modules/address_lookup_server/address_lookup_server.c b/src/router_core/modules/address_lookup_server/address_lookup_server.c
index cd29ccb..f466647 100644
--- a/src/router_core/modules/address_lookup_server/address_lookup_server.c
+++ b/src/router_core/modules/address_lookup_server/address_lookup_server.c
@@ -103,7 +103,7 @@ static uint64_t _send_reply(_endpoint_ref_t *epr,
qd_message_t *msg = qd_message();
- qd_message_compose_3(msg, fld, body);
+ qd_message_compose_3(msg, fld, body, true);
qdr_in_process_send_to_CT(_server_state.core, reply_to, msg, true, false);
qd_message_free(msg);
qd_compose_free(fld);
diff --git a/src/router_core/modules/edge_addr_tracking/edge_addr_tracking.c b/src/router_core/modules/edge_addr_tracking/edge_addr_tracking.c
index dfc11e9..1120c2c 100644
--- a/src/router_core/modules/edge_addr_tracking/edge_addr_tracking.c
+++ b/src/router_core/modules/edge_addr_tracking/edge_addr_tracking.c
@@ -70,7 +70,7 @@ static qd_message_t *qdcm_edge_create_address_dlv(qdr_core_t *core, qdr_address_
qd_compose_end_list(body);
// Finally, compose and retuen the message so it can be sent out.
- qd_message_compose_3(msg, fld, body);
+ qd_message_compose_3(msg, fld, body, true);
qd_compose_free(body);
qd_compose_free(fld);
diff --git a/src/router_core/modules/mobile_sync/mobile.c b/src/router_core/modules/mobile_sync/mobile.c
index c5ccd47..948bc38 100644
--- a/src/router_core/modules/mobile_sync/mobile.c
+++ b/src/router_core/modules/mobile_sync/mobile.c
@@ -252,7 +252,7 @@ static qd_message_t *qcm_mobile_sync_compose_differential_mau(qdrm_mobile_sync_t
qd_compose_end_map(body);
- qd_message_compose_3(msg, headers, body);
+ qd_message_compose_3(msg, headers, body, true);
qd_compose_free(headers);
qd_compose_free(body);
return msg;
@@ -320,7 +320,7 @@ static qd_message_t *qcm_mobile_sync_compose_absolute_mau(qdrm_mobile_sync_t *ms
}
qd_compose_end_list(body);
qd_compose_end_map(body);
- qd_message_compose_3(msg, headers, body);
+ qd_message_compose_3(msg, headers, body, true);
qd_compose_free(headers);
qd_compose_free(body);
return msg;
@@ -348,7 +348,7 @@ static qd_message_t *qcm_mobile_sync_compose_mar(qdrm_mobile_sync_t *msync, qdr_
qd_compose_end_map(body);
- qd_message_compose_3(msg, headers, body);
+ qd_message_compose_3(msg, headers, body, true);
qd_compose_free(headers);
qd_compose_free(body);
return msg;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org