From db84e7a27790f688dbb9d325622761fbf25b0646 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 1 Jun 2017 17:49:56 +0200 Subject: [PATCH] ctdbd_conn: Pass "ev" through ctdbd_msg_call_back Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme --- source3/lib/ctdbd_conn.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index fe4e0bc07b3..633c5e1db95 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -179,7 +179,8 @@ int register_with_ctdbd(struct ctdbd_connection *conn, uint64_t srvid, return 0; } -static int ctdbd_msg_call_back(struct ctdbd_connection *conn, +static int ctdbd_msg_call_back(struct tevent_context *ev, + struct ctdbd_connection *conn, struct ctdb_req_message_old *msg) { uint32_t msg_len; @@ -206,7 +207,7 @@ static int ctdbd_msg_call_back(struct ctdbd_connection *conn, if ((cb->srvid == msg->srvid) && (cb->cb != NULL)) { int ret; - ret = cb->cb(NULL, + ret = cb->cb(ev, msg->hdr.srcnode, msg->hdr.destnode, msg->srvid, msg->data, msg->datalen, cb->private_data); @@ -414,7 +415,7 @@ static int ctdb_read_req(struct ctdbd_connection *conn, uint32_t reqid, if (hdr->operation == CTDB_REQ_MESSAGE) { struct ctdb_req_message_old *msg = (struct ctdb_req_message_old *)hdr; - ret = ctdbd_msg_call_back(conn, msg); + ret = ctdbd_msg_call_back(NULL, conn, msg); if (ret != 0) { TALLOC_FREE(hdr); return ret; @@ -586,7 +587,7 @@ static int ctdb_handle_message(struct ctdbd_connection *conn, msg = (struct ctdb_req_message_old *)hdr; - ctdbd_msg_call_back(conn, msg); + ctdbd_msg_call_back(NULL, conn, msg); return 0; } -- 2.34.1