smbd: replace xconn->ev_ctx with xconn->client->raw_ev_ctx

This is the same pointer and we don't have a lot of callers,
so we can just use one pointer.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 057645bedeebe2be918c1dde3c98990b6252a85f..4f4519465b0436257e89ce5243d25fe834ce2fb2 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -364,12 +364,10 @@ struct smbXsrv_connection {
 
        struct smbXsrv_client *client;
 
-
        const struct tsocket_address *local_address;
        const struct tsocket_address *remote_address;
        const char *remote_hostname;
 
-       struct tevent_context *ev_ctx;
        struct messaging_context *msg_ctx;
 
        enum protocol_types protocol;

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 0f95bb013984cb559460f24cf0c646cbb3b95d17..6d37f35babe7c7efcf172ef8ee1c666e1f1beba7 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -576,7 +576,8 @@ NTSTATUS downgrade_lease(struct smbXsrv_connection *xconn,
                        lck->data->modified = true;
                }
 
-               tevent_schedule_immediate(state->im, xconn->ev_ctx,
+               tevent_schedule_immediate(state->im,
+                                         xconn->client->raw_ev_ctx,
                                          downgrade_lease_additional_trigger,
                                          state);
        }

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 581fd605e72e6c910bfa9154aa5fb6f597edbe29..48425a979ba29a1f8f1d42ed7f2fdd94fd21df82 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2738,8 +2738,10 @@ static int release_ip(struct tevent_context *ev,
                 * as we might be called from within ctdbd_migrate(),
                 * we need to defer our action to the next event loop
                 */
-               tevent_schedule_immediate(state->im, xconn->ev_ctx,
-                                         smbd_release_ip_immediate, state);
+               tevent_schedule_immediate(state->im,
+                                         xconn->client->raw_ev_ctx,
+                                         smbd_release_ip_immediate,
+                                         state);
 
                /*
                 * Make sure we don't get any io on the connection.
@@ -3388,14 +3390,16 @@ bool fork_echo_handler(struct smbXsrv_connection *xconn)
                close(listener_pipe[0]);
                set_blocking(listener_pipe[1], false);
 
-               status = smbd_reinit_after_fork(xconn->msg_ctx, xconn->ev_ctx,
-                                               true, "smbd-echo");
+               status = smbd_reinit_after_fork(xconn->msg_ctx,
+                                               xconn->client->raw_ev_ctx,
+                                               true,
+                                               "smbd-echo");
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(1, ("reinit_after_fork failed: %s\n",
                                  nt_errstr(status)));
                        exit(1);
                }
-               initialize_password_db(true, xconn->ev_ctx);
+               initialize_password_db(true, xconn->client->raw_ev_ctx);
                smbd_echo_loop(xconn, listener_pipe[1]);
                exit(0);
        }
@@ -3409,7 +3413,8 @@ bool fork_echo_handler(struct smbXsrv_connection *xconn)
         * Without smb signing this is the same as the normal smbd
         * listener. This needs to change once signing comes in.
         */
-       xconn->smb1.echo_handler.trusted_fde = tevent_add_fd(xconn->ev_ctx,
+       xconn->smb1.echo_handler.trusted_fde = tevent_add_fd(
+                                       xconn->client->raw_ev_ctx,
                                        xconn,
                                        xconn->smb1.echo_handler.trusted_fd,
                                        TEVENT_FD_READ,
@@ -3697,7 +3702,6 @@ NTSTATUS smbd_add_connection(struct smbXsrv_client *client, int sock_fd,
        }
        talloc_steal(frame, xconn);
 
-       xconn->ev_ctx = client->raw_ev_ctx;
        xconn->msg_ctx = client->msg_ctx;
        xconn->transport.sock = sock_fd;
        smbd_echo_init(xconn);

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index ed718b83958db23227b0451ea2f2b9c2f7fab2a5..b65172253b457c2cbdc7fc5f731df37e8759d95c 100644 (file)
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -227,7 +227,8 @@ static NTSTATUS smbd_initialize_smb2(struct smbXsrv_connection *xconn,
                return NT_STATUS_NO_MEMORY;
        }
 
-       xconn->transport.fde = tevent_add_fd(xconn->ev_ctx,
+       xconn->transport.fde = tevent_add_fd(
+                                       xconn->client->raw_ev_ctx,
                                        xconn,
                                        xconn->transport.sock,
                                        TEVENT_FD_READ,