sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

s3:smb2_server: use xconn->transport.fde also for smb2

Browse Source 
This prepares the structures for multi-channel support.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-05-23 09:36:24 +02:00 committed by Michael Adam
parent 3afdd77bea
commit 3e236983df
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/smbd/globals.h
View File

@ -788,7 +788,6 @@ struct smbd_server_connection {
} request_read_state;
struct smbd_smb2_send_queue *send_queue;
size_t send_queue_len;
struct tevent_fd *fde;
bool negprot_2ff;
struct {
/* The event that makes us process our blocking lock queue */

22
source3/smbd/smb2_server.c
View File

@ -216,13 +216,13 @@ static NTSTATUS smbd_initialize_smb2(struct smbd_server_connection *sconn)
return NT_STATUS_NO_MEMORY;
}
sconn->smb2.fde = tevent_add_fd(sconn->ev_ctx,
xconn->transport.fde = tevent_add_fd(sconn->ev_ctx,
sconn,
xconn->transport.sock,
TEVENT_FD_READ,
smbd_smb2_connection_handler,
sconn);
if (sconn->smb2.fde == NULL) {
if (xconn->transport.fde == NULL) {
return NT_STATUS_NO_MEMORY;
}
@ -2994,7 +2994,7 @@ static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *s
state->req->sconn = sconn;
state->min_recv_size = lp_min_receive_file_size();
TEVENT_FD_READABLE(sconn->smb2.fde);
TEVENT_FD_READABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
@ -3106,7 +3106,7 @@ static NTSTATUS smbd_smb2_flush_send_queue(struct smbd_server_connection *sconn)
bool retry;
if (sconn->smb2.send_queue == NULL) {
TEVENT_FD_NOT_WRITEABLE(sconn->smb2.fde);
TEVENT_FD_NOT_WRITEABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
@ -3161,7 +3161,7 @@ static NTSTATUS smbd_smb2_flush_send_queue(struct smbd_server_connection *sconn)
err = socket_error_from_errno(ret, errno, &retry);
if (retry) {
/* retry later */
TEVENT_FD_WRITEABLE(sconn->smb2.fde);
TEVENT_FD_WRITEABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
if (err != 0) {
@ -3196,7 +3196,7 @@ static NTSTATUS smbd_smb2_flush_send_queue(struct smbd_server_connection *sconn)
if (e->count > 0) {
/* we have more to write */
TEVENT_FD_WRITEABLE(sconn->smb2.fde);
TEVENT_FD_WRITEABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
@ -3225,8 +3225,8 @@ static NTSTATUS smbd_smb2_io_handler(struct smbd_server_connection *sconn,
/*
* we're not supposed to do any io
*/
TEVENT_FD_NOT_READABLE(sconn->smb2.fde);
TEVENT_FD_NOT_WRITEABLE(sconn->smb2.fde);
TEVENT_FD_NOT_READABLE(xconn->transport.fde);
TEVENT_FD_NOT_WRITEABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
@ -3242,7 +3242,7 @@ static NTSTATUS smbd_smb2_io_handler(struct smbd_server_connection *sconn,
}
if (state->req == NULL) {
TEVENT_FD_NOT_READABLE(sconn->smb2.fde);
TEVENT_FD_NOT_READABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
@ -3262,7 +3262,7 @@ again:
err = socket_error_from_errno(ret, errno, &retry);
if (retry) {
/* retry later */
TEVENT_FD_READABLE(sconn->smb2.fde);
TEVENT_FD_READABLE(xconn->transport.fde);
return NT_STATUS_OK;
}
if (err != 0) {
@ -3276,7 +3276,7 @@ again:
state->vector.iov_base = (void *)base;
state->vector.iov_len -= ret;
/* we have more to read */
TEVENT_FD_READABLE(sconn->smb2.fde);
TEVENT_FD_READABLE(xconn->transport.fde);
return NT_STATUS_OK;
}