ctdbd_conn: Pass "ev" through ctdbd_socket_readable

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 471a67095c3424bc12805a551aa77a852cf89fb9..4e7c1b05ddd98815488c2e3e1128c9bdf11bafa3 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -42,7 +42,8 @@ int ctdbd_setup_fde(struct ctdbd_connection *conn, struct tevent_context *ev);
 uint32_t ctdbd_vnn(const struct ctdbd_connection *conn);
 
 int ctdbd_conn_get_fd(struct ctdbd_connection *conn);
-void ctdbd_socket_readable(struct ctdbd_connection *conn);
+void ctdbd_socket_readable(struct tevent_context *ev,
+                          struct ctdbd_connection *conn);
 
 int ctdbd_messaging_send_iov(struct ctdbd_connection *conn,
                             uint32_t dst_vnn, uint64_t dst_srvid,

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 17658f4c7e743afb9be94a501621e23849efa074..bab489e71dd7056d6056bab0afd858c08775e568 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -593,7 +593,8 @@ static int ctdb_handle_message(struct tevent_context *ev,
        return 0;
 }
 
-void ctdbd_socket_readable(struct ctdbd_connection *conn)
+void ctdbd_socket_readable(struct tevent_context *ev,
+                          struct ctdbd_connection *conn)
 {
        struct ctdb_req_header *hdr = NULL;
        int ret;
@@ -604,7 +605,7 @@ void ctdbd_socket_readable(struct ctdbd_connection *conn)
                cluster_fatal("ctdbd died\n");
        }
 
-       ret = ctdb_handle_message(NULL, conn, hdr);
+       ret = ctdb_handle_message(ev, conn, hdr);
 
        TALLOC_FREE(hdr);
 

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 10696ac09df2ba511190f53decb753c8513ab797..48d54886dd615fc8d00aed8b603593be27413dda 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -174,7 +174,7 @@ static void messaging_ctdbd_readable(struct tevent_context *ev,
        if ((flags & TEVENT_FD_READ) == 0) {
                return;
        }
-       ctdbd_socket_readable(conn);
+       ctdbd_socket_readable(ev, conn);
 }
 
 static int messaging_ctdbd_init_internal(struct messaging_context *msg_ctx,