From 966b9314395d655f7fea8db90e47ae089d81ee6f Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Thu, 26 Sep 2013 21:14:59 +0000 Subject: QPID-5173 QPID-5045 QPID-5181 - Major refactor of the routing data structure in preparation for multi-router operation. - Fixed the CMake bug in QPID-5173 - Added Dynamic assignment of routable addresses for outbound links (QPID-5181) - Changed the indentation of the Python code from 2 spaces to 4 spaces. - Reduced the default log level to make the console less chatty. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1526694 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/extras/dispatch/src/python_embedded.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'qpid/extras/dispatch/src/python_embedded.c') diff --git a/qpid/extras/dispatch/src/python_embedded.c b/qpid/extras/dispatch/src/python_embedded.c index 0b0cc11025..2db8f583de 100644 --- a/qpid/extras/dispatch/src/python_embedded.c +++ b/qpid/extras/dispatch/src/python_embedded.c @@ -402,7 +402,7 @@ typedef struct { } IoAdapter; -static void dx_io_rx_handler(void *context, dx_message_t *msg) +static void dx_io_rx_handler(void *context, dx_message_t *msg, int link_id) { IoAdapter *self = (IoAdapter*) context; @@ -454,9 +454,10 @@ static void dx_io_rx_handler(void *context, dx_message_t *msg) PyObject *pAP = dx_field_to_py(ap_map); PyObject *pBody = dx_field_to_py(body_map); - PyObject *pArgs = PyTuple_New(2); + PyObject *pArgs = PyTuple_New(3); PyTuple_SetItem(pArgs, 0, pAP); PyTuple_SetItem(pArgs, 1, pBody); + PyTuple_SetItem(pArgs, 2, PyInt_FromLong((long) link_id)); PyObject *pValue = PyObject_CallObject(self->handler_rx_call, pArgs); Py_DECREF(pArgs); @@ -507,10 +508,10 @@ static PyObject* dx_python_send(PyObject *self, PyObject *args) field = dx_compose(DX_PERFORMATIVE_DELIVERY_ANNOTATIONS, field); dx_compose_start_map(field); - dx_compose_insert_string(field, "qdx.ingress"); + dx_compose_insert_string(field, DX_DA_INGRESS); dx_compose_insert_string(field, dx_router_id(ioa->dx)); - dx_compose_insert_string(field, "qdx.trace"); + dx_compose_insert_string(field, DX_DA_TRACE); dx_compose_start_list(field); dx_compose_insert_string(field, dx_router_id(ioa->dx)); dx_compose_end_list(field); -- cgit v1.2.1