sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s3:smb2cli: pass timeout to smb2cli_req_create/send()

Browse Source 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sun Sep 18 07:04:05 CEST 2011 on sn-devel-104
This commit is contained in:
Stefan Metzmacher 2011-09-17 19:56:50 +02:00
parent 271f78a9bb
commit 5f237763f8
11 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/libsmb/smb2cli_base.c
View File

@ -178,6 +178,7 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
uint16_t cmd,
uint32_t additional_flags,
uint32_t clear_flags,
unsigned int timeout,
uint32_t pid,
uint32_t tid,
uint64_t uid,
@ -223,6 +224,15 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
SIVAL(state->hdr, SMB2_HDR_TID, tid);
SBVAL(state->hdr, SMB2_HDR_SESSION_ID, uid);
if (timeout > 0) {
struct timeval endtime;
endtime = timeval_current_ofs_msec(timeout);
if (!tevent_req_set_endtime(req, ev, endtime)) {
return req;
}
}
return req;
}
@ -333,6 +343,7 @@ struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
uint16_t cmd,
uint32_t additional_flags,
uint32_t clear_flags,
unsigned int timeout,
uint32_t pid,
uint32_t tid,
uint64_t uid,
@ -346,6 +357,7 @@ struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
req = smb2cli_req_create(mem_ctx, ev, cli, cmd,
additional_flags, clear_flags,
timeout,
pid, tid, uid,
fixed, fixed_len, dyn, dyn_len);
if (req == NULL) {

2
source3/libsmb/smb2cli_base.h
View File

@ -26,6 +26,7 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
uint16_t cmd,
uint32_t additional_flags,
uint32_t clear_flags,
unsigned int timeout,
uint32_t pid,
uint32_t tid,
uint64_t uid,
@ -47,6 +48,7 @@ struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
uint16_t cmd,
uint32_t additional_flags,
uint32_t clear_flags,
unsigned int timeout,
uint32_t pid,
uint32_t tid,
uint64_t uid,

1
source3/libsmb/smb2cli_close.c
View File

@ -55,6 +55,7 @@ struct tevent_req *smb2cli_close_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_CLOSE,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
cli->smb2.tid,
cli->smb2.uid,

1
source3/libsmb/smb2cli_create.c
View File

@ -138,6 +138,7 @@ struct tevent_req *smb2cli_create_send(
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_CREATE,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
cli->smb2.tid,
cli->smb2.uid,

1
source3/libsmb/smb2cli_flush.c
View File

@ -53,6 +53,7 @@ struct tevent_req *smb2cli_flush_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_FLUSH,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
cli->smb2.tid,
cli->smb2.uid,

1
source3/libsmb/smb2cli_negprot.c
View File

@ -68,6 +68,7 @@ struct tevent_req *smb2cli_negprot_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_NEGPROT,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
0, 0, /* tid, uid */
state->fixed, sizeof(state->fixed),

1
source3/libsmb/smb2cli_query_directory.c
View File

@ -88,6 +88,7 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_FIND,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
cli->smb2.tid,
cli->smb2.uid,

1
source3/libsmb/smb2cli_read.c
View File

@ -67,6 +67,7 @@ struct tevent_req *smb2cli_read_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_READ,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
cli->smb2.tid,
cli->smb2.uid,

2
source3/libsmb/smb2cli_session.c
View File

@ -75,6 +75,7 @@ static struct tevent_req *smb2cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_SESSSETUP,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
0, /* tid */
cli->smb2.uid,
@ -355,6 +356,7 @@ struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_LOGOFF,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
0, /* tid */
cli->smb2.uid,

2
source3/libsmb/smb2cli_tcon.c
View File

@ -83,6 +83,7 @@ struct tevent_req *smb2cli_tcon_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_TCON,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
0, /* tid */
cli->smb2.uid,
@ -190,6 +191,7 @@ struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_TDIS,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
cli->smb2.tid,
cli->smb2.uid,

1
source3/libsmb/smb2cli_write.c
View File

@ -76,6 +76,7 @@ struct tevent_req *smb2cli_write_send(TALLOC_CTX *mem_ctx,
subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_WRITE,
0, 0, /* flags */
cli->timeout,
cli->smb2.pid,
cli->smb2.tid,
cli->smb2.uid,