Repository: qpid-dispatch Updated Branches: refs/heads/master 5e61dd9a9 -> a41a5c8fc
DISPATCH-390: refactor - amqp.h constants standard conditions Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/a41a5c8f Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/a41a5c8f Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/a41a5c8f Branch: refs/heads/master Commit: a41a5c8fcef66e5be5b49235a0a439f3b9001f5e Parents: 390ebe7 Author: Alan Conway <[email protected]> Authored: Thu Mar 30 19:04:21 2017 -0400 Committer: Alan Conway <[email protected]> Committed: Tue Apr 25 18:13:59 2017 -0400 ---------------------------------------------------------------------- src/container.c | 9 +++++---- src/policy.c | 9 +++------ 2 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a41a5c8f/src/container.c ---------------------------------------------------------------------- diff --git a/src/container.c b/src/container.c index b86bbef..1fb83a6 100644 --- a/src/container.c +++ b/src/container.c @@ -28,6 +28,7 @@ #include <proton/message.h> #include <proton/connection.h> #include <proton/event.h> +#include <qpid/dispatch/amqp.h> #include <qpid/dispatch/ctools.h> #include <qpid/dispatch/hash.h> #include <qpid/dispatch/threading.h> @@ -91,7 +92,7 @@ static void setup_outgoing_link(qd_container_t *container, pn_link_t *pn_link) if (node == 0) { pn_condition_t *cond = pn_link_condition(pn_link); - pn_condition_set_name(cond, "amqp:not-found"); + pn_condition_set_name(cond, QD_AMQP_COND_NOT_FOUND); pn_condition_set_description(cond, "Source node does not exist"); pn_link_close(pn_link); return; @@ -100,7 +101,7 @@ static void setup_outgoing_link(qd_container_t *container, pn_link_t *pn_link) qd_link_t *link = new_qd_link_t(); if (!link) { pn_condition_t *cond = pn_link_condition(pn_link); - pn_condition_set_name(cond, "amqp:internal-error"); + pn_condition_set_name(cond, QD_AMQP_COND_INTERNAL_ERROR); pn_condition_set_description(cond, "Insufficient memory"); pn_link_close(pn_link); return; @@ -127,7 +128,7 @@ static void setup_incoming_link(qd_container_t *container, pn_link_t *pn_link) if (node == 0) { pn_condition_t *cond = pn_link_condition(pn_link); - pn_condition_set_name(cond, "amqp:not-found"); + pn_condition_set_name(cond, QD_AMQP_COND_NOT_FOUND); pn_condition_set_description(cond, "Target node does not exist"); pn_link_close(pn_link); return; @@ -136,7 +137,7 @@ static void setup_incoming_link(qd_container_t *container, pn_link_t *pn_link) qd_link_t *link = new_qd_link_t(); if (!link) { pn_condition_t *cond = pn_link_condition(pn_link); - pn_condition_set_name(cond, "amqp:internal-error"); + pn_condition_set_name(cond, QD_AMQP_COND_INTERNAL_ERROR); pn_condition_set_description(cond, "Insufficient memory"); pn_link_close(pn_link); return; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a41a5c8f/src/policy.c ---------------------------------------------------------------------- diff --git a/src/policy.c b/src/policy.c index 182fc61..39ead3c 100644 --- a/src/policy.c +++ b/src/policy.c @@ -45,9 +45,6 @@ static int n_processed = 0; // // error conditions signaled to effect denial // -static char* RESOURCE_LIMIT_EXCEEDED = "amqp:resource-limit-exceeded"; -//static char* UNAUTHORIZED_ACCESS = "amqp:unauthorized-access"; -//static char* CONNECTION_FORCED = "amqp:connection:forced"; // // error descriptions signaled to effect denial @@ -379,7 +376,7 @@ void qd_policy_private_deny_amqp_connection(pn_connection_t *conn, const char *c void qd_policy_deny_amqp_session(pn_session_t *ssn, qd_connection_t *qd_conn) { pn_condition_t * cond = pn_session_condition(ssn); - (void) pn_condition_set_name( cond, RESOURCE_LIMIT_EXCEEDED); + (void) pn_condition_set_name( cond, QD_AMQP_COND_RESOURCE_LIMIT_EXCEEDED); (void) pn_condition_set_description(cond, SESSION_DISALLOWED); pn_session_close(ssn); qd_conn->policy_settings->denialCounts->sessionDenied++; @@ -438,7 +435,7 @@ void qd_policy_apply_session_settings(pn_session_t *ssn, qd_connection_t *qd_con void _qd_policy_deny_amqp_link(pn_link_t *link, qd_connection_t *qd_conn) { pn_condition_t * cond = pn_link_condition(link); - (void) pn_condition_set_name( cond, RESOURCE_LIMIT_EXCEEDED); + (void) pn_condition_set_name( cond, QD_AMQP_COND_RESOURCE_LIMIT_EXCEEDED); (void) pn_condition_set_description(cond, LINK_DISALLOWED); pn_link_close(link); } @@ -728,7 +725,7 @@ void qd_policy_amqp_open(void *context, bool discard) pn_connection_open(conn); policy_notify_opened(qd_conn->open_container, qd_conn, qd_conn->context); } else { - qd_policy_private_deny_amqp_connection(conn, RESOURCE_LIMIT_EXCEEDED, CONNECTION_DISALLOWED); + qd_policy_private_deny_amqp_connection(conn, QD_AMQP_COND_RESOURCE_LIMIT_EXCEEDED, CONNECTION_DISALLOWED); } } qd_connection_set_event_stall(qd_conn, false); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
