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

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sun Sep 18 07:04:05 CEST 2011 on sn-devel-104

diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index def7f57d451a9a89c05e240de2bf3d668d8a037b..f8b2f6e5df54e2e30ce21b87236929f66d70e8e2 100644 (file)
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -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) {

diff --git a/source3/libsmb/smb2cli_base.h b/source3/libsmb/smb2cli_base.h
index 595665d7182d1ef8db39a61de9f08492bb798886..105f8ebe1ccd6e72bfa9ef29154d6d1f72cdff3d 100644 (file)
--- a/source3/libsmb/smb2cli_base.h
+++ b/source3/libsmb/smb2cli_base.h
@@ -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,

diff --git a/source3/libsmb/smb2cli_close.c b/source3/libsmb/smb2cli_close.c
index 3567449ee97dc5ef1b4e88cd39c09b284a3b0168..ccd96eacc2af56d44bd3f2dfcf596e07728cd907 100644 (file)
--- a/source3/libsmb/smb2cli_close.c
+++ b/source3/libsmb/smb2cli_close.c
@@ -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,

diff --git a/source3/libsmb/smb2cli_create.c b/source3/libsmb/smb2cli_create.c
index eaabf6843164a56888b754b3ce385e131b2d4c2e..a0df7dafdefd0e194e1d0ebe6e1e92e3b914a541 100644 (file)
--- a/source3/libsmb/smb2cli_create.c
+++ b/source3/libsmb/smb2cli_create.c
@@ -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,

diff --git a/source3/libsmb/smb2cli_flush.c b/source3/libsmb/smb2cli_flush.c
index 6f3de14787b5bc1b2e6d0a6a1bbb03011bdb447e..ea15f25e208ae220aeb66839bcaa59f1c0c858eb 100644 (file)
--- a/source3/libsmb/smb2cli_flush.c
+++ b/source3/libsmb/smb2cli_flush.c
@@ -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,

diff --git a/source3/libsmb/smb2cli_negprot.c b/source3/libsmb/smb2cli_negprot.c
index ea983a9ff9a99f0e34f4da9f2f1590700f06b3bf..dec6c4c99807d661c46e199333a2f386e0b9f3ad 100644 (file)
--- a/source3/libsmb/smb2cli_negprot.c
+++ b/source3/libsmb/smb2cli_negprot.c
@@ -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),

diff --git a/source3/libsmb/smb2cli_query_directory.c b/source3/libsmb/smb2cli_query_directory.c
index f2101abd377ed61df04cd005c577f29edbbf1548..2d2c4658a1feba0371e31b0b7e000c965d4c78dc 100644 (file)
--- a/source3/libsmb/smb2cli_query_directory.c
+++ b/source3/libsmb/smb2cli_query_directory.c
@@ -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,

diff --git a/source3/libsmb/smb2cli_read.c b/source3/libsmb/smb2cli_read.c
index 7e2b53471b18bbeb708e35aed79cd5bc9f7be535..75754fe6b1dc9dfa4bd9839f2d32e807c6db685b 100644 (file)
--- a/source3/libsmb/smb2cli_read.c
+++ b/source3/libsmb/smb2cli_read.c
@@ -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,

diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c
index 2a00593ed0e1d142e4580648072666f4d010e527..28b8f91b1b4c72c7dca8a19dc9b33f9bc108b704 100644 (file)
--- a/source3/libsmb/smb2cli_session.c
+++ b/source3/libsmb/smb2cli_session.c
@@ -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,

diff --git a/source3/libsmb/smb2cli_tcon.c b/source3/libsmb/smb2cli_tcon.c
index dee9140ce61c021961b217d55a3f5c251cbc3148..d501838bf64271f4e315699929b3a8aae127e40e 100644 (file)
--- a/source3/libsmb/smb2cli_tcon.c
+++ b/source3/libsmb/smb2cli_tcon.c
@@ -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,

diff --git a/source3/libsmb/smb2cli_write.c b/source3/libsmb/smb2cli_write.c
index 149a0655d2da0e0fb7668fbf065bf10bc6bdbe1b..a6373899a7314f9d4679d5df5c52bcc9263547ca 100644 (file)
--- a/source3/libsmb/smb2cli_write.c
+++ b/source3/libsmb/smb2cli_write.c
@@ -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,