[qpid-dispatch] branch main updated: DISPATCH-2240: strip annotations should be true by default

[kg...@apache.org]

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

kgiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/main by this push:
     new 89557ff  DISPATCH-2240: strip annotations should be true by default
89557ff is described below

commit 89557ffa012a3ecb186e600d9894e87aa8110b66
Author: Kenneth Giusti <kg...@apache.org>
AuthorDate: Sun Aug 29 20:31:38 2021 -0400

    DISPATCH-2240: strip annotations should be true by default
    
    This closes #1359
---
 src/router_core/forwarder.c | 4 +++-
 src/router_node.c           | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/router_core/forwarder.c b/src/router_core/forwarder.c
index 7354e74..49099c3 100644
--- a/src/router_core/forwarder.c
+++ b/src/router_core/forwarder.c
@@ -1036,7 +1036,9 @@ void qdr_forward_link_direct_CT(qdr_core_t       *core,
     out_link->attach_count   = 1;
     out_link->core_ticks     = conn->core->uptime_ticks;
     out_link->zero_credit_time = core->uptime_ticks;
-
+    out_link->strip_annotations_in  = conn->strip_annotations_in;
+    out_link->strip_annotations_out = conn->strip_annotations_out;
+    
     if (strip) {
         out_link->strip_prefix = strip;
     }
diff --git a/src/router_node.c b/src/router_node.c
index 8c42676..de9c70a 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -260,8 +260,8 @@ static void qd_router_connection_get_config(const qd_connection_t  *conn,
     if (conn) {
         const qd_server_config_t *cf = qd_connection_config(conn);
 
-        *strip_annotations_in  = cf ? cf->strip_inbound_annotations  : false;
-        *strip_annotations_out = cf ? cf->strip_outbound_annotations : false;
+        *strip_annotations_in  = cf ? cf->strip_inbound_annotations  : true;
+        *strip_annotations_out = cf ? cf->strip_outbound_annotations : true;
         *link_capacity         = cf ? cf->link_capacity : 1;
 
         if (cf && (strcmp(cf->role, router_role) == 0)) {

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