From 763fe4216b600f4b1e1db61dbd7e3b7579790970 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 12 Dec 2011 14:15:03 +0100 Subject: [PATCH] s3:smb2_server: use sconn->ev_ctx instead of sconn->smb2.event_ctx metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Mon Dec 12 16:08:59 CET 2011 on sn-devel-104 --- source3/smbd/globals.h | 1 - source3/smbd/smb2_break.c | 2 +- source3/smbd/smb2_create.c | 6 +++--- source3/smbd/smb2_find.c | 2 +- source3/smbd/smb2_flush.c | 2 +- source3/smbd/smb2_getinfo.c | 2 +- source3/smbd/smb2_ioctl.c | 4 ++-- source3/smbd/smb2_lock.c | 2 +- source3/smbd/smb2_notify.c | 4 ++-- source3/smbd/smb2_read.c | 2 +- source3/smbd/smb2_server.c | 16 +++++++--------- source3/smbd/smb2_setinfo.c | 2 +- source3/smbd/smb2_write.c | 2 +- 13 files changed, 22 insertions(+), 25 deletions(-) diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 7b7389ae5b6..0e4e9e8f066 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -584,7 +584,6 @@ struct smbd_server_connection { } locks; } smb1; struct { - struct tevent_context *event_ctx; struct tevent_queue *recv_queue; struct tevent_queue *send_queue; struct tstream_context *stream; diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c index 9899d92602a..310b24bb393 100644 --- a/source3/smbd/smb2_break.c +++ b/source3/smbd/smb2_break.c @@ -69,7 +69,7 @@ NTSTATUS smbd_smb2_request_process_break(struct smbd_smb2_request *req) } subreq = smbd_smb2_oplock_break_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_oplock_level, in_file_id_volatile); diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 6d7d4ac5dbf..302cfd7035a 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -227,7 +227,7 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req) } tsubreq = smbd_smb2_create_send(smb2req, - smb2req->sconn->smb2.event_ctx, + smb2req->sconn->ev_ctx, smb2req, in_oplock_level, in_impersonation_level, @@ -1095,7 +1095,7 @@ void schedule_deferred_open_message_smb2( (unsigned long long)mid )); tevent_schedule_immediate(state->im, - smb2req->sconn->smb2.event_ctx, + smb2req->sconn->ev_ctx, smbd_smb2_create_request_dispatch_immediate, smb2req); } @@ -1215,7 +1215,7 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req, &end_time, true) )); - state->te = event_add_timed(smb2req->sconn->smb2.event_ctx, + state->te = tevent_add_timer(smb2req->sconn->ev_ctx, state, end_time, smb2_deferred_open_timer, diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c index 9b1179f1f6f..671b5f5a75c 100644 --- a/source3/smbd/smb2_find.c +++ b/source3/smbd/smb2_find.c @@ -122,7 +122,7 @@ NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req) } subreq = smbd_smb2_find_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_file_info_class, in_flags, diff --git a/source3/smbd/smb2_flush.c b/source3/smbd/smb2_flush.c index 3464c58ca6b..fecce45fb4e 100644 --- a/source3/smbd/smb2_flush.c +++ b/source3/smbd/smb2_flush.c @@ -56,7 +56,7 @@ NTSTATUS smbd_smb2_request_process_flush(struct smbd_smb2_request *req) } subreq = smbd_smb2_flush_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_file_id_volatile); if (subreq == NULL) { diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c index 81d781a49ad..340130e2a5b 100644 --- a/source3/smbd/smb2_getinfo.c +++ b/source3/smbd/smb2_getinfo.c @@ -104,7 +104,7 @@ NTSTATUS smbd_smb2_request_process_getinfo(struct smbd_smb2_request *req) } subreq = smbd_smb2_getinfo_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_info_type, in_file_info_class, diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c index b7b45928215..56d9a3267f6 100644 --- a/source3/smbd/smb2_ioctl.c +++ b/source3/smbd/smb2_ioctl.c @@ -98,7 +98,7 @@ NTSTATUS smbd_smb2_request_process_ioctl(struct smbd_smb2_request *req) } subreq = smbd_smb2_ioctl_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_ctl_code, in_file_id_volatile, @@ -555,7 +555,7 @@ static void smbd_smb2_ioctl_pipe_write_done(struct tevent_req *subreq) TALLOC_FREE(subreq); subreq = np_read_send(state->smbreq->conn, - state->smb2req->sconn->smb2.event_ctx, + state->smb2req->sconn->ev_ctx, state->fsp->fake_file_handle, state->out_output.data, state->out_output.length); diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index 3bd7686ecef..8f4df3d25ab 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -122,7 +122,7 @@ NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req) } subreq = smbd_smb2_lock_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_smbpid, in_file_id_volatile, diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c index 5375e214566..0ea0b096364 100644 --- a/source3/smbd/smb2_notify.c +++ b/source3/smbd/smb2_notify.c @@ -84,7 +84,7 @@ NTSTATUS smbd_smb2_request_process_notify(struct smbd_smb2_request *req) } subreq = smbd_smb2_notify_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_flags, in_output_buffer_length, @@ -347,7 +347,7 @@ static void smbd_smb2_notify_reply(struct smb_request *smbreq, * being arround after calling this function */ tevent_schedule_immediate(state->im, - state->smb2req->sconn->smb2.event_ctx, + state->smb2req->sconn->ev_ctx, smbd_smb2_notify_reply_trigger, req); } diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 24ec3e12fc2..358d3074275 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -87,7 +87,7 @@ NTSTATUS smbd_smb2_request_process_read(struct smbd_smb2_request *req) } subreq = smbd_smb2_read_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_smbpid, in_file_id_volatile, diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index d4147a1f0f5..a51e26ddb9b 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -98,8 +98,6 @@ static NTSTATUS smbd_initialize_smb2(struct smbd_server_connection *sconn) TALLOC_FREE(sconn->smb1.fde); - sconn->smb2.event_ctx = sconn->ev_ctx; - sconn->smb2.recv_queue = tevent_queue_create(sconn, "smb2 recv queue"); if (sconn->smb2.recv_queue == NULL) { return NT_STATUS_NO_MEMORY; @@ -803,7 +801,7 @@ static NTSTATUS smb2_send_async_interim_response(const struct smbd_smb2_request print_req_vectors(nreq); } nreq->subreq = tstream_writev_queue_send(nreq, - nreq->sconn->smb2.event_ctx, + nreq->sconn->ev_ctx, nreq->sconn->smb2.stream, nreq->sconn->smb2.send_queue, nreq->out.vector, @@ -963,7 +961,7 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req, } defer_endtime = timeval_current_ofs_usec(defer_time); - req->async_te = tevent_add_timer(req->sconn->smb2.event_ctx, + req->async_te = tevent_add_timer(req->sconn->ev_ctx, req, defer_endtime, smbd_smb2_request_pending_timer, req); @@ -1084,7 +1082,7 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev, } subreq = tstream_writev_queue_send(state, - state->sconn->smb2.event_ctx, + state->sconn->ev_ctx, state->sconn->smb2.stream, state->sconn->smb2.send_queue, state->vector, @@ -1850,7 +1848,7 @@ static NTSTATUS smbd_smb2_request_reply(struct smbd_smb2_request *req) return NT_STATUS_NO_MEMORY; } tevent_schedule_immediate(im, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, smbd_smb2_request_dispatch_immediate, req); return NT_STATUS_OK; @@ -1890,7 +1888,7 @@ static NTSTATUS smbd_smb2_request_reply(struct smbd_smb2_request *req) } subreq = tstream_writev_queue_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req->sconn->smb2.stream, req->sconn->smb2.send_queue, req->out.vector, @@ -2167,7 +2165,7 @@ NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn, SBVAL(body, 0x10, file_id_volatile); subreq = tstream_writev_queue_send(state, - sconn->smb2.event_ctx, + sconn->ev_ctx, sconn->smb2.stream, sconn->smb2.send_queue, &state->vector, 1); @@ -2606,7 +2604,7 @@ static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *s } /* ask for the next request */ - subreq = smbd_smb2_request_read_send(sconn, sconn->smb2.event_ctx, sconn); + subreq = smbd_smb2_request_read_send(sconn, sconn->ev_ctx, sconn); if (subreq == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c index 1aae3525077..ac6adc3d8fc 100644 --- a/source3/smbd/smb2_setinfo.c +++ b/source3/smbd/smb2_setinfo.c @@ -92,7 +92,7 @@ NTSTATUS smbd_smb2_request_process_setinfo(struct smbd_smb2_request *req) } subreq = smbd_smb2_setinfo_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_info_type, in_file_info_class, diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c index 27113350c65..23e344f6a0e 100644 --- a/source3/smbd/smb2_write.c +++ b/source3/smbd/smb2_write.c @@ -95,7 +95,7 @@ NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req) } subreq = smbd_smb2_write_send(req, - req->sconn->smb2.event_ctx, + req->sconn->ev_ctx, req, in_smbpid, in_file_id_volatile,