Author: tross
Date: Tue Feb 10 19:03:48 2015
New Revision: 1658780
URL: http://svn.apache.org/r1658780
Log:
DISPATCH-6 - Return NO_PATH in more failure cases during link-attach routing.
Modified:
qpid/dispatch/trunk/src/router_node.c
Modified: qpid/dispatch/trunk/src/router_node.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_node.c?rev=1658780&r1=1658779&r2=1658780&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_node.c (original)
+++ qpid/dispatch/trunk/src/router_node.c Tue Feb 10 19:03:48 2015
@@ -626,7 +626,7 @@ static qd_field_iterator_t *router_annot
* Note also that this function does not perform any message validation. For
link-routing,
* there is no need to look into the transferred message.
*/
-static void router_do_link_route_LH(qd_router_link_t *peer_link, qd_delivery_t
*delivery, qd_message_t *msg)
+static void router_link_route_delivery_LH(qd_router_link_t *peer_link,
qd_delivery_t *delivery, qd_message_t *msg)
{
qd_routed_event_t *re = new_qd_routed_event_t();
@@ -802,7 +802,7 @@ static void router_rx_handler(void* cont
sys_mutex_lock(router->lock);
qd_router_link_t *clink = rlink->connected_link;
if (clink) {
- router_do_link_route_LH(clink, delivery, msg);
+ router_link_route_delivery_LH(clink, delivery, msg);
sys_mutex_unlock(router->lock);
return;
}
@@ -1255,8 +1255,10 @@ link_attach_result_t qd_router_link_rout
la->conn = out_conn;
la->credit = pn_link_credit(pn_link);
qd_connection_invoke_deferred(out_conn,
qd_router_attach_routed_link, la);
- }
- }
+ } else
+ return LINK_ATTACH_NO_PATH;
+ } else
+ return LINK_ATTACH_NO_PATH;
} else
return LINK_ATTACH_NO_PATH;
} else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
