s3/libsmb: Generalise cli_state in smb2 query_directory calls

[mat/samba.git] / source3 / libsmb / smb2cli_query_directory.c

diff --git a/source3/libsmb/smb2cli_query_directory.c b/source3/libsmb/smb2cli_query_directory.c
index 2d2c4658a1feba0371e31b0b7e000c965d4c78dc..32ff82969f8dc862598b9eeb8cdb7bf9cd7d7226 100644 (file)
--- a/source3/libsmb/smb2cli_query_directory.c
+++ b/source3/libsmb/smb2cli_query_directory.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "client.h"
 #include "async_smb.h"
-#include "smb2cli_base.h"
+#include "../libcli/smb/smbXcli_base.h"
 #include "smb2cli.h"
 #include "libsmb/proto.h"
 #include "lib/util/tevent_ntstatus.h"
@@ -37,7 +37,10 @@ static void smb2cli_query_directory_done(struct tevent_req *subreq);
 
 struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
                                                struct tevent_context *ev,
-                                               struct cli_state *cli,
+                                               struct smbXcli_conn *conn,
+                                               uint32_t timeout_msec,
+                                               struct smbXcli_session *session,
+                                               uint32_t tcon_id,
                                                uint8_t level,
                                                uint8_t flags,
                                                uint32_t file_index,
@@ -86,12 +89,12 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
                dyn_len = sizeof(state->dyn_pad);
        }
 
-       subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_FIND,
+       subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_FIND,
                                  0, 0, /* flags */
-                                 cli->timeout,
-                                 cli->smb2.pid,
-                                 cli->smb2.tid,
-                                 cli->smb2.uid,
+                                 timeout_msec,
+                                 0xFEFF, /* pid */
+                                 tcon_id,
+                                 session,
                                  state->fixed, sizeof(state->fixed),
                                  dyn, dyn_len);
        if (tevent_req_nomem(subreq, req)) {
@@ -158,7 +161,10 @@ NTSTATUS smb2cli_query_directory_recv(struct tevent_req *req,
        return NT_STATUS_OK;
 }
 
-NTSTATUS smb2cli_query_directory(struct cli_state *cli,
+NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
+                                uint32_t timeout_msec,
+                                struct smbXcli_session *session,
+                                uint32_t tcon_id,
                                 uint8_t level,
                                 uint8_t flags,
                                 uint32_t file_index,
@@ -175,7 +181,7 @@ NTSTATUS smb2cli_query_directory(struct cli_state *cli,
        struct tevent_req *req;
        NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       if (cli_has_async_calls(cli)) {
+       if (smbXcli_conn_has_async_calls(conn)) {
                /*
                 * Can't use sync call while an async call is in flight
                 */
@@ -186,7 +192,8 @@ NTSTATUS smb2cli_query_directory(struct cli_state *cli,
        if (ev == NULL) {
                goto fail;
        }
-       req = smb2cli_query_directory_send(frame, ev, cli, level, flags,
+       req = smb2cli_query_directory_send(frame, ev, conn, timeout_msec,
+                                          session, tcon_id, level, flags,
                                           file_index, fid_persistent,
                                           fid_volatile, mask, outbuf_len);
        if (req == NULL) {