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/16 23:22:59 UTC
[1/3] qpid-dispatch git commit: DISPATCH-179 - Start outbound
connectors on configuration.
Repository: qpid-dispatch
Updated Branches:
refs/heads/tross-DISPATCH-179-1 c8f2c9df1 -> 8fb13f56c
DISPATCH-179 - Start outbound connectors on configuration.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/354e6916
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/354e6916
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/354e6916
Branch: refs/heads/tross-DISPATCH-179-1
Commit: 354e69165efbce24eb1400104b7526a07c7cd2ff
Parents: c8f2c9d
Author: Ted Ross <tr...@redhat.com>
Authored: Wed Mar 16 18:01:14 2016 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed Mar 16 18:01:14 2016 -0400
----------------------------------------------------------------------
src/connection_manager.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/354e6916/src/connection_manager.c
----------------------------------------------------------------------
diff --git a/src/connection_manager.c b/src/connection_manager.c
index 039202e..07c7d1e 100644
--- a/src/connection_manager.c
+++ b/src/connection_manager.c
@@ -230,16 +230,10 @@ qd_config_connector_t *qd_dispatch_configure_connector(qd_dispatch_t *qd, qd_ent
}
DEQ_ITEM_INIT(cc);
- if (strcmp(cc->configuration.role, "route-container") == 0) {
- DEQ_INSERT_TAIL(cm->on_demand_connectors, cc);
- qd_log(cm->log_source, QD_LOG_INFO, "Configured route-container connector: %s:%s name=%s",
- cc->configuration.host, cc->configuration.port,
- cc->configuration.name ? cc->configuration.name : "<none>");
- } else {
- DEQ_INSERT_TAIL(cm->config_connectors, cc);
- qd_log(cm->log_source, QD_LOG_INFO, "Configured Connector: %s:%s role=%s",
- cc->configuration.host, cc->configuration.port, cc->configuration.role);
- }
+ DEQ_INSERT_TAIL(cm->config_connectors, cc);
+ qd_log(cm->log_source, QD_LOG_INFO, "Configured Connector: %s:%s role=%s, name=%s",
+ cc->configuration.host, cc->configuration.port, cc->configuration.role,
+ cc->configuration.name ? cc->configuration.name : "<none>");
return cc;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-dispatch git commit: DISPATCH-179 - Added ingress and
egress phases for waypoint addresses.
Posted by tr...@apache.org.
DISPATCH-179 - Added ingress and egress phases for waypoint addresses.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/8fb13f56
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/8fb13f56
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/8fb13f56
Branch: refs/heads/tross-DISPATCH-179-1
Commit: 8fb13f56cc54c2a2c430ad9ac4ec5ced56d92965
Parents: de4413f
Author: Ted Ross <tr...@redhat.com>
Authored: Wed Mar 16 18:22:23 2016 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed Mar 16 18:22:23 2016 -0400
----------------------------------------------------------------------
src/router_core/connections.c | 13 +++++++++++--
src/router_core/route_control.c | 2 +-
src/router_core/router_core_private.h | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/8fb13f56/src/router_core/connections.c
----------------------------------------------------------------------
diff --git a/src/router_core/connections.c b/src/router_core/connections.c
index a07d11a..4f38dcb 100644
--- a/src/router_core/connections.c
+++ b/src/router_core/connections.c
@@ -530,7 +530,7 @@ static char qdr_prefix_for_dir(qd_direction_t dir)
}
-qd_address_treatment_t qdr_treatment_for_address_CT(qdr_core_t *core, qd_field_iterator_t *iter)
+qd_address_treatment_t qdr_treatment_for_address_CT(qdr_core_t *core, qd_field_iterator_t *iter, int *in_phase, int *out_phase)
{
qdr_address_config_t *addr = 0;
@@ -541,6 +541,9 @@ qd_address_treatment_t qdr_treatment_for_address_CT(qdr_core_t *core, qd_field_i
qd_address_iterator_override_prefix(iter, 'Z');
qd_hash_retrieve_prefix(core->addr_hash, iter, (void**) &addr);
qd_address_iterator_override_prefix(iter, '\0');
+ if (in_phase) *in_phase = addr ? addr->in_phase : 0;
+ if (out_phase) *out_phase = addr ? addr->out_phase : 0;
+
return addr ? addr->treatment : QD_TREATMENT_ANYCAST_CLOSEST;
}
@@ -680,7 +683,13 @@ static qdr_address_t *qdr_lookup_terminus_address_CT(qdr_core_t *core,
qd_address_iterator_override_prefix(iter, '\0'); // Cancel previous override
qd_hash_retrieve(core->addr_hash, iter, (void**) &addr);
if (!addr && create_if_not_found) {
- addr = qdr_address_CT(core, qdr_treatment_for_address_CT(core, iter));
+ int in_phase;
+ int out_phase;
+ int addr_phase;
+
+ addr = qdr_address_CT(core, qdr_treatment_for_address_CT(core, iter, &in_phase, &out_phase));
+ addr_phase = dir == QD_INCOMING ? in_phase : out_phase;
+ qd_address_iterator_set_phase(iter, addr_phase);
qd_hash_insert(core->addr_hash, iter, addr, &addr->hash_handle);
DEQ_INSERT_TAIL(core->addrs, addr);
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/8fb13f56/src/router_core/route_control.c
----------------------------------------------------------------------
diff --git a/src/router_core/route_control.c b/src/router_core/route_control.c
index 54f4573..9ddad29 100644
--- a/src/router_core/route_control.c
+++ b/src/router_core/route_control.c
@@ -234,7 +234,7 @@ qdr_auto_link_t *qdr_route_add_auto_link_CT(qdr_core_t *core,
qd_hash_retrieve(core->addr_hash, iter, (void*) &al->addr);
if (!al->addr) {
- al->addr = qdr_address_CT(core, qdr_treatment_for_address_CT(core, iter));
+ al->addr = qdr_address_CT(core, qdr_treatment_for_address_CT(core, iter, 0, 0));
DEQ_INSERT_TAIL(core->addrs, al->addr);
qd_hash_insert(core->addr_hash, iter, al->addr, &al->addr->hash_handle);
}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/8fb13f56/src/router_core/router_core_private.h
----------------------------------------------------------------------
diff --git a/src/router_core/router_core_private.h b/src/router_core/router_core_private.h
index 6956b67..1e5eb44 100644
--- a/src/router_core/router_core_private.h
+++ b/src/router_core/router_core_private.h
@@ -562,7 +562,7 @@ void qdr_check_addr_CT(qdr_core_t *core, qdr_address_t *addr, bool was_local);
qdr_delivery_t *qdr_forward_new_delivery_CT(qdr_core_t *core, qdr_delivery_t *peer, qdr_link_t *link, qd_message_t *msg);
void qdr_forward_deliver_CT(qdr_core_t *core, qdr_link_t *link, qdr_delivery_t *dlv);
void qdr_connection_activate_CT(qdr_core_t *core, qdr_connection_t *conn);
-qd_address_treatment_t qdr_treatment_for_address_CT(qdr_core_t *core, qd_field_iterator_t *iter);
+qd_address_treatment_t qdr_treatment_for_address_CT(qdr_core_t *core, qd_field_iterator_t *iter, int *in_phase, int *out_phase);
void qdr_connection_enqueue_work_CT(qdr_core_t *core,
qdr_connection_t *conn,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-dispatch git commit: DISPATCH-179 - Removed
QD_LINK_WAYPOINT link-type which is no longer used.
Posted by tr...@apache.org.
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/tross-DISPATCH-179-1
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