sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

s3/smbd: enable processing SMB2 requests async internally

Browse Source 
The idea is to allow the implementation of an SMB2 request to tell the
main SMB2 processing engine that it wants to handle a requests
asynchronously internally.

This has two use cases:

- it allows (internal) async processing of compound requests that would
  otherwise be rejected by the SMB2 processing engine

- it preserves sync semantics at the SMB layer, some clients might not
  expect arbitrary SMB2 requests going async

Not used for now, will be used in laters commit for async SMB2 FIND
requests.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Ralph Boehme 2017-01-11 15:00:24 +01:00 committed by Jeremy Allison
parent d1f8d3e18b
commit 682f1b7d65
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/smbd/globals.h
View File

@ -276,6 +276,9 @@ NTSTATUS smbd_smb2_request_verify_creditcharge(struct smbd_smb2_request *req,
NTSTATUS smbd_smb2_request_verify_sizes(struct smbd_smb2_request *req,
size_t expected_body_size);
void smb2_request_set_async_internal(struct smbd_smb2_request *req,
bool async_internal);
enum protocol_types smbd_smb2_protocol_dialect_match(const uint8_t *indyn,
const int dialect_count,
uint16_t *dialect);
@ -707,6 +710,13 @@ struct smbd_smb2_request {
struct tevent_timer *async_te;
bool compound_related;
/*
* Give the implementation of an SMB2 req a way to tell the SMB2 request
* processing engine that the internal request is going async, while
* preserving synchronous SMB2 behaviour.
*/
bool async_internal;
/*
* the encryption key for the whole
* compound chain

18
source3/smbd/smb2_server.c
View File

@ -272,6 +272,12 @@ static int smbd_smb2_request_destructor(struct smbd_smb2_request *req)
return 0;
}
void smb2_request_set_async_internal(struct smbd_smb2_request *req,
bool async_internal)
{
req->async_internal = async_internal;
}
static struct smbd_smb2_request *smbd_smb2_request_allocate(TALLOC_CTX *mem_ctx)
{
TALLOC_CTX *mem_pool;
@ -1365,6 +1371,17 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
return NT_STATUS_OK;
}
if (req->async_internal) {
/*
* An SMB2 request implementation wants to handle the request
* asynchronously "internally" while keeping synchronous
* behaviour for the SMB2 request. This means we don't send an
* interim response and we can allow processing of compound SMB2
* requests (cf the subsequent check) for all cases.
*/
return NT_STATUS_OK;
}
if (req->in.vector_count > req->current_idx + SMBD_SMB2_NUM_IOV_PER_REQ) {
/*
* We're trying to go async in a compound request
@ -2292,6 +2309,7 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
encryption_required = x->global->encryption_flags & SMBXSRV_ENCRYPTION_REQUIRED;
}
req->async_internal = false;
req->do_signing = false;
req->do_encryption = false;
req->was_encrypted = false;