[qpid-dispatch] 32/32: DISPATCH-1742 Dataplane: Fixups from rebase to master.

[tross]

This is an automated email from the ASF dual-hosted git repository.

tross pushed a commit to branch dev-protocol-adaptors
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git

commit bcc2ddff7e20c7c8981d91a8ebe388a6de15eb2f
Author: Ted Ross <tr...@apache.org>
AuthorDate: Tue Aug 4 13:45:12 2020 -0400

    DISPATCH-1742 Dataplane: Fixups from rebase to master.
---
 include/qpid/dispatch/protocol_adaptor.h | 3 +--
 src/adaptors/reference_adaptor.c         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/qpid/dispatch/protocol_adaptor.h 
b/include/qpid/dispatch/protocol_adaptor.h
index bbf2f27..865f454 100644
--- a/include/qpid/dispatch/protocol_adaptor.h
+++ b/include/qpid/dispatch/protocol_adaptor.h
@@ -851,11 +851,10 @@ qdr_delivery_t *qdr_link_deliver(qdr_link_t *link, 
qd_message_t *msg, qd_iterato
 qdr_delivery_t *qdr_link_deliver_to(qdr_link_t *link, qd_message_t *msg,
                                     qd_iterator_t *ingress, qd_iterator_t 
*addr,
                                     bool settled, qd_bitmask_t 
*link_exclusion, int ingress_index,
-                                    int64_t remote_disposition,
+                                    uint64_t remote_disposition,
                                     pn_data_t *remote_extension_state);
 qdr_delivery_t *qdr_link_deliver_to_routed_link(qdr_link_t *link, qd_message_t 
*msg, bool settled,
                                                 const uint8_t *tag, int 
tag_length,
-                                                uint64_t disposition, 
pn_data_t* disposition_state,
                                                 uint64_t remote_disposition,
                                                 pn_data_t 
*remote_extension_state);
 int qdr_link_process_deliveries(qdr_core_t *core, qdr_link_t *link, int 
credit);
diff --git a/src/adaptors/reference_adaptor.c b/src/adaptors/reference_adaptor.c
index 2a3a975..b6b0c1b 100644
--- a/src/adaptors/reference_adaptor.c
+++ b/src/adaptors/reference_adaptor.c
@@ -183,7 +183,7 @@ static void qdr_ref_flow(void *context, qdr_link_t *link, 
int credit)
         qd_message_compose_2(msg, props, true);
         qd_compose_free(props);
 
-        qdr_link_deliver(adaptor->out_link_1, msg, 0, false, 0, 0);
+        qdr_link_deliver(adaptor->out_link_1, msg, 0, false, 0, 0, 0, 0);
         // Keep return-protection delivery reference as the adaptor's reference
     } else if (link == adaptor->out_link_2) {
         //
@@ -205,7 +205,7 @@ static void qdr_ref_flow(void *context, qdr_link_t *link, 
int credit)
 
         printf("qdr_ref_flow: Starting a streaming delivery\n");
         adaptor->streaming_delivery =
-            qdr_link_deliver(adaptor->out_link_2, adaptor->streaming_message, 
0, false, 0, 0);
+            qdr_link_deliver(adaptor->out_link_2, adaptor->streaming_message, 
0, false, 0, 0, 0, 0);
         adaptor->stream_count = 0;
         // Keep return-protection delivery reference as the adaptor's reference
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org