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/03/19 00:06:53 UTC
[35/50] [abbrv] qpid-dispatch git commit: DISPATCH-179 - Removed
QD_LINK_WAYPOINT link-type which is no longer used.
DISPATCH-179 - Removed QD_LINK_WAYPOINT link-type which is no longer used.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/de4413fe
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/de4413fe
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/de4413fe
Branch: refs/heads/master
Commit: de4413fe69de2dd81d5d62d4b03e8f879549c7bc
Parents: 354e691
Author: Ted Ross <tr...@redhat.com>
Authored: Wed Mar 16 18:01:57 2016 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed Mar 16 18:01:57 2016 -0400
----------------------------------------------------------------------
include/qpid/dispatch/router_core.h | 1 -
src/router_core/agent_link.c | 1 -
src/router_core/connections.c | 24 +-----------------------
3 files changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/de4413fe/include/qpid/dispatch/router_core.h
----------------------------------------------------------------------
diff --git a/include/qpid/dispatch/router_core.h b/include/qpid/dispatch/router_core.h
index 271954b..6e5baa5 100644
--- a/include/qpid/dispatch/router_core.h
+++ b/include/qpid/dispatch/router_core.h
@@ -128,7 +128,6 @@ void qdr_send_to2(qdr_core_t *core, qd_message_t *msg, const char *addr,
typedef enum {
QD_LINK_ENDPOINT, ///< A link to a connected endpoint
- QD_LINK_WAYPOINT, ///< A link to a configured waypoint
QD_LINK_CONTROL, ///< A link to a peer router for control messages
QD_LINK_ROUTER ///< A link to a peer router for routed messages
} qd_link_type_t;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/de4413fe/src/router_core/agent_link.c
----------------------------------------------------------------------
diff --git a/src/router_core/agent_link.c b/src/router_core/agent_link.c
index b9f23c2..af06f6d 100644
--- a/src/router_core/agent_link.c
+++ b/src/router_core/agent_link.c
@@ -56,7 +56,6 @@ static const char *qd_link_type_name(qd_link_type_t lt)
{
switch (lt) {
case QD_LINK_ENDPOINT : return "endpoint";
- case QD_LINK_WAYPOINT : return "waypoint";
case QD_LINK_CONTROL : return "router-control";
case QD_LINK_ROUTER : return "inter-router";
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/de4413fe/src/router_core/connections.c
----------------------------------------------------------------------
diff --git a/src/router_core/connections.c b/src/router_core/connections.c
index fbce669..a07d11a 100644
--- a/src/router_core/connections.c
+++ b/src/router_core/connections.c
@@ -810,10 +810,8 @@ static void qdr_link_inbound_first_attach_CT(qdr_core_t *core, qdr_action_t *act
//
// Reject any attaches of inter-router links that arrive on connections that are not inter-router.
- // Reject any waypoint links. Waypoint links are always initiated by a router, not the remote container.
//
- if ((link->link_type == QD_LINK_WAYPOINT) ||
- ((link->link_type == QD_LINK_CONTROL || link->link_type == QD_LINK_ROUTER) && conn->role != QDR_ROLE_INTER_ROUTER)) {
+ if (((link->link_type == QD_LINK_CONTROL || link->link_type == QD_LINK_ROUTER) && conn->role != QDR_ROLE_INTER_ROUTER)) {
qdr_link_outbound_detach_CT(core, link, 0, QDR_CONDITION_FORBIDDEN);
qdr_terminus_free(source);
qdr_terminus_free(target);
@@ -870,10 +868,6 @@ static void qdr_link_inbound_first_attach_CT(qdr_core_t *core, qdr_action_t *act
break;
}
- case QD_LINK_WAYPOINT:
- // No action, waypoint links are rejected above.
- break;
-
case QD_LINK_CONTROL:
qdr_link_outbound_second_attach_CT(core, link, source, target);
qdr_link_issue_credit_CT(core, link, link->capacity);
@@ -923,10 +917,6 @@ static void qdr_link_inbound_first_attach_CT(qdr_core_t *core, qdr_action_t *act
break;
}
- case QD_LINK_WAYPOINT:
- // No action, waypoint links are rejected above.
- break;
-
case QD_LINK_CONTROL:
link->owning_addr = core->hello_addr;
qdr_add_link_ref(&core->hello_addr->rlinks, link, QDR_LINK_LIST_CLASS_ADDRESS);
@@ -998,9 +988,6 @@ static void qdr_link_inbound_second_attach_CT(qdr_core_t *core, qdr_action_t *ac
}
break;
- case QD_LINK_WAYPOINT:
- break;
-
case QD_LINK_CONTROL:
break;
@@ -1031,9 +1018,6 @@ static void qdr_link_inbound_second_attach_CT(qdr_core_t *core, qdr_action_t *ac
}
break;
- case QD_LINK_WAYPOINT:
- break;
-
case QD_LINK_CONTROL:
link->owning_addr = core->hello_addr;
qdr_add_link_ref(&core->hello_addr->rlinks, link, QDR_LINK_LIST_CLASS_ADDRESS);
@@ -1109,9 +1093,6 @@ static void qdr_link_inbound_detach_CT(qdr_core_t *core, qdr_action_t *action, b
qdr_del_link_ref(&addr->inlinks, link, QDR_LINK_LIST_CLASS_ADDRESS);
break;
- case QD_LINK_WAYPOINT:
- break;
-
case QD_LINK_CONTROL:
break;
@@ -1130,9 +1111,6 @@ static void qdr_link_inbound_detach_CT(qdr_core_t *core, qdr_action_t *action, b
}
break;
- case QD_LINK_WAYPOINT:
- 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org