qpid-dispatch git commit: DISPATCH-784: Delivery annotations are not propagated by router

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

qpid-dispatch git commit: DISPATCH-784: Delivery annotations are not propagated by router

chug
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 18d7b2c0b -> 595277845


DISPATCH-784: Delivery annotations are not propagated by router

This is not an issue if forwarded messages have no delivery annotations.
With delivery annotations then random bytes are placed in output
message.


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/59527784
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/59527784
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/59527784

Branch: refs/heads/master
Commit: 595277845cf13dd8fd7b804c99d0054f897c8481
Parents: 18d7b2c
Author: Chuck Rolke <[hidden email]>
Authored: Fri Jun 9 17:42:27 2017 -0400
Committer: Chuck Rolke <[hidden email]>
Committed: Fri Jun 9 17:47:32 2017 -0400

----------------------------------------------------------------------
 src/message.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/59527784/src/message.c
----------------------------------------------------------------------
diff --git a/src/message.c b/src/message.c
index e7ff208..706458d 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1190,6 +1190,17 @@ void qd_message_send(qd_message_t *in_msg,
     }
 
     //
+    // Send delivery annotation if present
+    //
+    if (content->section_delivery_annotation.length > 0) {
+        buf    = content->section_delivery_annotation.buffer;
+        cursor = content->section_delivery_annotation.offset + qd_buffer_base(buf);
+        advance(&cursor, &buf,
+                content->section_delivery_annotation.length + content->section_delivery_annotation.hdr_length,
+                send_handler, (void*) pnl);
+    }
+
+    //
     // Send new message annotations
     //
     qd_buffer_t *da_buf = DEQ_HEAD(new_ma);


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Loading...