sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

s3:libsmb: add SMB2 support to cli_push*

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2013-08-13 16:33:30 +02:00
parent 80758e4b07
commit 6896bf0b28
1 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
source3/libsmb/clireadwrite.c
View File

@ -1120,7 +1120,11 @@ struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
state->priv = priv;
state->next_offset = start_offset;
state->chunk_size = cli_write_max_bufsize(cli, mode, 14);
if (smbXcli_conn_protocol(state->cli->conn) >= PROTOCOL_SMB2_02) {
state->chunk_size = smb2cli_conn_max_write_size(cli->conn);
} else {
state->chunk_size = cli_write_max_bufsize(cli, mode, 14);
}
if (state->chunk_size > page_size) {
state->chunk_size &= ~(page_size - 1);
}
@ -1257,21 +1261,47 @@ static void cli_push_chunk_ship(struct cli_push_chunk *chunk)
ofs = chunk->ofs + chunk->tmp_size;
size = chunk->total_size - chunk->tmp_size;
ok = smb1cli_conn_req_possible(state->cli->conn);
if (!ok) {
return;
}
if (smbXcli_conn_protocol(state->cli->conn) >= PROTOCOL_SMB2_02) {
uint32_t max_size;
chunk->subreq = cli_write_andx_send(chunk,
state->ev,
state->cli,
state->fnum,
state->mode,
buf,
ofs,
size);
if (tevent_req_nomem(chunk->subreq, req)) {
return;
ok = smb2cli_conn_req_possible(state->cli->conn, &max_size);
if (!ok) {
return;
}
/*
* downgrade depending on the available credits
*/
size = MIN(max_size, size);
chunk->subreq = cli_smb2_write_send(chunk,
state->ev,
state->cli,
state->fnum,
state->mode,
buf,
ofs,
size);
if (tevent_req_nomem(chunk->subreq, req)) {
return;
}
} else {
ok = smb1cli_conn_req_possible(state->cli->conn);
if (!ok) {
return;
}
chunk->subreq = cli_write_andx_send(chunk,
state->ev,
state->cli,
state->fnum,
state->mode,
buf,
ofs,
size);
if (tevent_req_nomem(chunk->subreq, req)) {
return;
}
}
tevent_req_set_callback(chunk->subreq,
cli_push_chunk_done,
@ -1296,7 +1326,11 @@ static void cli_push_chunk_done(struct tevent_req *subreq)
chunk->subreq = NULL;
status = cli_write_andx_recv(subreq, &written);
if (smbXcli_conn_protocol(state->cli->conn) >= PROTOCOL_SMB2_02) {
status = cli_smb2_write_recv(subreq, &written);
} else {
status = cli_write_andx_recv(subreq, &written);
}
TALLOC_FREE(subreq);
if (tevent_req_nterror(req, status)) {
return;