Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5CA70200D22 for ; Fri, 15 Sep 2017 21:06:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5B5631609C9; Fri, 15 Sep 2017 19:06:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9EBC71609D5 for ; Fri, 15 Sep 2017 21:06:38 +0200 (CEST) Received: (qmail 9173 invoked by uid 500); 15 Sep 2017 19:06:37 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 9089 invoked by uid 99); 15 Sep 2017 19:06:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Sep 2017 19:06:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 324DFF5804; Fri, 15 Sep 2017 19:06:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chug@apache.org To: commits@qpid.apache.org Date: Fri, 15 Sep 2017 19:06:41 -0000 Message-Id: <3432248680a0401ca6754415dfcf7f08@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/7] qpid-dispatch git commit: DISPATCH-807: Remove delivery arg from delivery_handler interface archived-at: Fri, 15 Sep 2017 19:06:39 -0000 DISPATCH-807: Remove delivery arg from delivery_handler interface Container delivery handler has a qd_link arg and from that the pn_link and the current pn_delivery may be derived. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/e8b1c057 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/e8b1c057 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/e8b1c057 Branch: refs/heads/master Commit: e8b1c057c3873e18c03d3922cb773817b72751dc Parents: 51e2bf8 Author: Chuck Rolke Authored: Thu Sep 14 10:33:50 2017 -0400 Committer: Chuck Rolke Committed: Fri Sep 15 14:50:33 2017 -0400 ---------------------------------------------------------------------- include/qpid/dispatch/container.h | 7 ++++--- src/container.c | 2 +- src/router_node.c | 6 +++++- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/e8b1c057/include/qpid/dispatch/container.h ---------------------------------------------------------------------- diff --git a/include/qpid/dispatch/container.h b/include/qpid/dispatch/container.h index bcb079c..844c32d 100644 --- a/include/qpid/dispatch/container.h +++ b/include/qpid/dispatch/container.h @@ -70,7 +70,8 @@ typedef enum { typedef struct qd_node_t qd_node_t; typedef struct qd_link_t qd_link_t; -typedef void (*qd_container_delivery_handler_t) (void *node_context, qd_link_t *link, pn_delivery_t *delivery); +typedef void (*qd_container_delivery_handler_t) (void *node_context, qd_link_t *link); +typedef void (*qd_container_disposition_handler_t) (void *node_context, qd_link_t *link, pn_delivery_t *pnd); typedef int (*qd_container_link_handler_t) (void *node_context, qd_link_t *link); typedef int (*qd_container_link_detach_handler_t) (void *node_context, qd_link_t *link, qd_detach_type_t dt); typedef void (*qd_container_node_handler_t) (void *type_context, qd_node_t *node); @@ -88,11 +89,11 @@ typedef struct { * @{ */ - /** Invoked when a new received delivery is avaliable for processing. */ + /** Invoked when a new or existing received delivery is avaliable for processing. */ qd_container_delivery_handler_t rx_handler; /** Invoked when an existing delivery changes disposition or settlement state. */ - qd_container_delivery_handler_t disp_handler; + qd_container_disposition_handler_t disp_handler; /** Invoked when an attach for a new incoming link is received. */ qd_container_link_handler_t incoming_handler; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/e8b1c057/src/container.c ---------------------------------------------------------------------- diff --git a/src/container.c b/src/container.c index 3c3bc49..a99ef35 100644 --- a/src/container.c +++ b/src/container.c @@ -172,7 +172,7 @@ static void do_receive(pn_delivery_t *pnd) if (link) { qd_node_t *node = link->node; if (node) { - node->ntype->rx_handler(node->context, link, pnd); + node->ntype->rx_handler(node->context, link); return; } } http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/e8b1c057/src/router_node.c ---------------------------------------------------------------------- diff --git a/src/router_node.c b/src/router_node.c index 3ed4eac..6672751 100644 --- a/src/router_node.c +++ b/src/router_node.c @@ -191,10 +191,14 @@ static qd_iterator_t *router_annotate_message(qd_router_t *router, /** * Inbound Delivery Handler */ -static void AMQP_rx_handler(void* context, qd_link_t *link, pn_delivery_t *pnd) +static void AMQP_rx_handler(void* context, qd_link_t *link) { qd_router_t *router = (qd_router_t*) context; pn_link_t *pn_link = qd_link_pn(link); + assert(pn_link); + pn_delivery_t *pnd = pn_link_current(pn_link); + if (!pnd) + return; qdr_link_t *rlink = (qdr_link_t*) qd_link_get_context(link); qd_connection_t *conn = qd_link_connection(link); const qd_server_config_t *cf = qd_connection_config(conn); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org