You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2016/06/08 12:19:46 UTC
[2/3] qpid-dispatch git commit: DISPATCH-365 - Don't handle
inter-router link detaches on non inter-router connections.
DISPATCH-365 - Don't handle inter-router link detaches on non inter-router connections.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/2661d282
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/2661d282
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/2661d282
Branch: refs/heads/master
Commit: 2661d282dcaceaba45958c8160d1e2f08673d8aa
Parents: 3dcf334
Author: Ted Ross <tr...@redhat.com>
Authored: Tue Jun 7 14:31:36 2016 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed Jun 8 08:16:17 2016 -0400
----------------------------------------------------------------------
src/router_core/connections.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2661d282/src/router_core/connections.c
----------------------------------------------------------------------
diff --git a/src/router_core/connections.c b/src/router_core/connections.c
index cedf115..b352d92 100644
--- a/src/router_core/connections.c
+++ b/src/router_core/connections.c
@@ -1295,13 +1295,16 @@ static void qdr_link_inbound_detach_CT(qdr_core_t *core, qdr_action_t *action, b
break;
case QD_LINK_CONTROL:
- qdr_del_link_ref(&core->hello_addr->rlinks, link, QDR_LINK_LIST_CLASS_ADDRESS);
- core->control_links_by_mask_bit[conn->mask_bit] = 0;
- qdr_post_link_lost_CT(core, conn->mask_bit);
+ if (conn->role == QDR_ROLE_INTER_ROUTER) {
+ qdr_del_link_ref(&core->hello_addr->rlinks, link, QDR_LINK_LIST_CLASS_ADDRESS);
+ core->control_links_by_mask_bit[conn->mask_bit] = 0;
+ qdr_post_link_lost_CT(core, conn->mask_bit);
+ }
break;
case QD_LINK_ROUTER:
- core->data_links_by_mask_bit[conn->mask_bit] = 0;
+ if (conn->role == QDR_ROLE_INTER_ROUTER)
+ core->data_links_by_mask_bit[conn->mask_bit] = 0;
break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org