git.samba.org / mat / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
libcli/smb: add smb2cli_tcon_is_encryption_on()
[mat/samba.git] / libcli / smb / smbXcli_base.h
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index a105c8278b434d995455d8ce5ce164faa05060d7..852fc7143ab6ccbe85e3d61dd31140755bee92a2 100644 (file)
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -26,6 +26,9 @@ struct smbXcli_session;
 struct smbXcli_tcon;
 struct smb_trans_enc_state;
 struct GUID;
+struct iovec;
+struct smb2_create_blobs;
+struct smb2_create_returns;
 
 struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx,
                                         int fd,
@@ -66,6 +69,7 @@ bool smbXcli_req_set_pending(struct tevent_req *req);
 
 uint32_t smb1cli_conn_capabilities(struct smbXcli_conn *conn);
 uint32_t smb1cli_conn_max_xmit(struct smbXcli_conn *conn);
+bool smb1cli_conn_req_possible(struct smbXcli_conn *conn);
 uint32_t smb1cli_conn_server_session_key(struct smbXcli_conn *conn);
 const uint8_t *smb1cli_conn_server_challenge(struct smbXcli_conn *conn);
 uint16_t smb1cli_conn_server_security_mode(struct smbXcli_conn *conn);
@@ -185,6 +189,17 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn,
                uint8_t **rparam, uint32_t min_rparam, uint32_t *num_rparam,
                uint8_t **rdata, uint32_t min_rdata, uint32_t *num_rdata);
 
+struct tevent_req *smb1cli_echo_send(TALLOC_CTX *mem_ctx,
+                                    struct tevent_context *ev,
+                                    struct smbXcli_conn *conn,
+                                    uint32_t timeout_msec,
+                                    uint16_t num_echos,
+                                    DATA_BLOB data);
+NTSTATUS smb1cli_echo_recv(struct tevent_req *req);
+NTSTATUS smb1cli_echo(struct smbXcli_conn *conn, uint32_t timeout_msec,
+                     uint16_t num_echos, DATA_BLOB data);
+
+bool smb2cli_conn_req_possible(struct smbXcli_conn *conn, uint32_t *max_dyn_len);
 uint32_t smb2cli_conn_server_capabilities(struct smbXcli_conn *conn);
 uint16_t smb2cli_conn_server_security_mode(struct smbXcli_conn *conn);
 uint32_t smb2cli_conn_max_trans_size(struct smbXcli_conn *conn);
@@ -200,13 +215,13 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
                                      uint32_t additional_flags,
                                      uint32_t clear_flags,
                                      uint32_t timeout_msec,
-                                     uint32_t pid,
-                                     uint32_t tid,
+                                     struct smbXcli_tcon *tcon,
                                      struct smbXcli_session *session,
                                      const uint8_t *fixed,
                                      uint16_t fixed_len,
                                      const uint8_t *dyn,
-                                     uint32_t dyn_len);
+                                     uint32_t dyn_len,
+                                     uint32_t max_dyn_len);
 void smb2cli_req_set_notify_async(struct tevent_req *req);
 NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
                                     int num_reqs);
@@ -224,13 +239,13 @@ struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
                                    uint32_t additional_flags,
                                    uint32_t clear_flags,
                                    uint32_t timeout_msec,
-                                   uint32_t pid,
-                                   uint32_t tid,
+                                   struct smbXcli_tcon *tcon,
                                    struct smbXcli_session *session,
                                    const uint8_t *fixed,
                                    uint16_t fixed_len,
                                    const uint8_t *dyn,
-                                   uint32_t dyn_len);
+                                   uint32_t dyn_len,
+                                   uint32_t max_dyn_len);
 NTSTATUS smb2cli_req_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                          struct iovec **piov,
                          const struct smb2cli_req_expected_response *expected,
@@ -250,18 +265,25 @@ NTSTATUS smbXcli_negprot(struct smbXcli_conn *conn,
 
 struct smbXcli_session *smbXcli_session_create(TALLOC_CTX *mem_ctx,
                                               struct smbXcli_conn *conn);
+struct smbXcli_session *smbXcli_session_copy(TALLOC_CTX *mem_ctx,
+                                              struct smbXcli_session *src);
+NTSTATUS smbXcli_session_application_key(struct smbXcli_session *session,
+                                        TALLOC_CTX *mem_ctx,
+                                        DATA_BLOB *key);
+void smbXcli_session_set_disconnect_expired(struct smbXcli_session *session);
 uint16_t smb1cli_session_current_id(struct smbXcli_session* session);
 void smb1cli_session_set_id(struct smbXcli_session* session,
                            uint16_t session_id);
+NTSTATUS smb1cli_session_set_session_key(struct smbXcli_session *session,
+                                        const DATA_BLOB _session_key);
+NTSTATUS smb1cli_session_protect_session_key(struct smbXcli_session *session);
 uint8_t smb2cli_session_security_mode(struct smbXcli_session *session);
 uint64_t smb2cli_session_current_id(struct smbXcli_session *session);
 uint16_t smb2cli_session_get_flags(struct smbXcli_session *session);
-NTSTATUS smb2cli_session_application_key(struct smbXcli_session *session,
-                                        TALLOC_CTX *mem_ctx,
-                                        DATA_BLOB *key);
 void smb2cli_session_set_id_and_flags(struct smbXcli_session *session,
                                      uint64_t session_id,
                                      uint16_t session_flags);
+void smb2cli_session_increment_channel_sequence(struct smbXcli_session *session);
 NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
                                         const DATA_BLOB session_key,
                                         const struct iovec *recv_iov);
@@ -272,6 +294,7 @@ NTSTATUS smb2cli_session_create_channel(TALLOC_CTX *mem_ctx,
 NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session,
                                         const DATA_BLOB channel_key,
                                         const struct iovec *recv_iov);
+NTSTATUS smb2cli_session_encryption_on(struct smbXcli_session *session);
 
 struct smbXcli_tcon *smbXcli_tcon_create(TALLOC_CTX *mem_ctx);
 uint16_t smb1cli_tcon_current_id(struct smbXcli_tcon *tcon);
@@ -284,12 +307,15 @@ bool smb1cli_tcon_set_values(struct smbXcli_tcon *tcon,
                             const char *service,
                             const char *fs_type);
 uint32_t smb2cli_tcon_current_id(struct smbXcli_tcon *tcon);
+uint32_t smb2cli_tcon_capabilities(struct smbXcli_tcon *tcon);
 void smb2cli_tcon_set_values(struct smbXcli_tcon *tcon,
+                            struct smbXcli_session *session,
                             uint32_t tcon_id,
                             uint8_t type,
                             uint32_t flags,
                             uint32_t capabilities,
                             uint32_t maximal_access);
+bool smb2cli_tcon_is_encryption_on(struct smbXcli_tcon *tcon);
 
 struct tevent_req *smb2cli_session_setup_send(TALLOC_CTX *mem_ctx,
                                struct tevent_context *ev,
@@ -322,7 +348,7 @@ struct tevent_req *smb2cli_create_send(
        struct smbXcli_conn *conn,
        uint32_t timeout_msec,
        struct smbXcli_session *session,
-       uint32_t tcon_id,
+       struct smbXcli_tcon *tcon,
        const char *filename,
        uint8_t  oplock_level,          /* SMB2_OPLOCK_LEVEL_* */
        uint32_t impersonation_level,   /* SMB2_IMPERSONATION_* */
@@ -334,11 +360,12 @@ struct tevent_req *smb2cli_create_send(
        struct smb2_create_blobs *blobs);
 NTSTATUS smb2cli_create_recv(struct tevent_req *req,
                             uint64_t *fid_persistent,
-                            uint64_t *fid_volatile);
+                            uint64_t *fid_volatile,
+                            struct smb2_create_returns *cr);
 NTSTATUS smb2cli_create(struct smbXcli_conn *conn,
                        uint32_t timeout_msec,
                        struct smbXcli_session *session,
-                       uint32_t tcon_id,
+                       struct smbXcli_tcon *tcon,
                        const char *filename,
                        uint8_t  oplock_level,       /* SMB2_OPLOCK_LEVEL_* */
                        uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */
@@ -349,14 +376,15 @@ NTSTATUS smb2cli_create(struct smbXcli_conn *conn,
                        uint32_t create_options,
                        struct smb2_create_blobs *blobs,
                        uint64_t *fid_persistent,
-                       uint64_t *fid_volatile);
+                       uint64_t *fid_volatile,
+                       struct smb2_create_returns *cr);
 
 struct tevent_req *smb2cli_close_send(TALLOC_CTX *mem_ctx,
                                      struct tevent_context *ev,
                                      struct smbXcli_conn *conn,
                                      uint32_t timeout_msec,
                                      struct smbXcli_session *session,
-                                     uint32_t tcon_id,
+                                     struct smbXcli_tcon *tcon,
                                      uint16_t flags,
                                      uint64_t fid_persistent,
                                      uint64_t fid_volatile);
@@ -364,7 +392,7 @@ NTSTATUS smb2cli_close_recv(struct tevent_req *req);
 NTSTATUS smb2cli_close(struct smbXcli_conn *conn,
                       uint32_t timeout_msec,
                       struct smbXcli_session *session,
-                      uint32_t tcon_id,
+                      struct smbXcli_tcon *tcon,
                       uint16_t flags,
                       uint64_t fid_persistent,
                       uint64_t fid_volatile);
@@ -374,7 +402,7 @@ struct tevent_req *smb2cli_read_send(TALLOC_CTX *mem_ctx,
                                     struct smbXcli_conn *conn,
                                     uint32_t timeout_msec,
                                     struct smbXcli_session *session,
-                                    uint32_t tcon_id,
+                                    struct smbXcli_tcon *tcon,
                                     uint32_t length,
                                     uint64_t offset,
                                     uint64_t fid_persistent,
@@ -386,7 +414,7 @@ NTSTATUS smb2cli_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 NTSTATUS smb2cli_read(struct smbXcli_conn *conn,
                      uint32_t timeout_msec,
                      struct smbXcli_session *session,
-                     uint32_t tcon_id,
+                     struct smbXcli_tcon *tcon,
                      uint32_t length,
                      uint64_t offset,
                      uint64_t fid_persistent,
@@ -402,7 +430,7 @@ struct tevent_req *smb2cli_write_send(TALLOC_CTX *mem_ctx,
                                      struct smbXcli_conn *conn,
                                      uint32_t timeout_msec,
                                      struct smbXcli_session *session,
-                                     uint32_t tcon_id,
+                                     struct smbXcli_tcon *tcon,
                                      uint32_t length,
                                      uint64_t offset,
                                      uint64_t fid_persistent,
@@ -410,32 +438,34 @@ struct tevent_req *smb2cli_write_send(TALLOC_CTX *mem_ctx,
                                      uint32_t remaining_bytes,
                                      uint32_t flags,
                                      const uint8_t *data);
-NTSTATUS smb2cli_write_recv(struct tevent_req *req);
+NTSTATUS smb2cli_write_recv(struct tevent_req *req,
+                       uint32_t *written);
 NTSTATUS smb2cli_write(struct smbXcli_conn *conn,
                       uint32_t timeout_msec,
                       struct smbXcli_session *session,
-                      uint32_t tcon_id,
+                      struct smbXcli_tcon *tcon,
                       uint32_t length,
                       uint64_t offset,
                       uint64_t fid_persistent,
                       uint64_t fid_volatile,
                       uint32_t remaining_bytes,
                       uint32_t flags,
-                      const uint8_t *data);
+                      const uint8_t *data,
+                      uint32_t *written);
 
 struct tevent_req *smb2cli_flush_send(TALLOC_CTX *mem_ctx,
                                      struct tevent_context *ev,
                                      struct smbXcli_conn *conn,
                                      uint32_t timeout_msec,
                                      struct smbXcli_session *session,
-                                     uint32_t tcon_id,
+                                     struct smbXcli_tcon *tcon,
                                      uint64_t fid_persistent,
                                      uint64_t fid_volatile);
 NTSTATUS smb2cli_flush_recv(struct tevent_req *req);
 NTSTATUS smb2cli_flush(struct smbXcli_conn *conn,
                       uint32_t timeout_msec,
                       struct smbXcli_session *session,
-                      uint32_t tcon_id,
+                      struct smbXcli_tcon *tcon,
                       uint64_t fid_persistent,
                       uint64_t fid_volatile);
 
@@ -444,7 +474,7 @@ struct tevent_req *smb2cli_set_info_send(TALLOC_CTX *mem_ctx,
                                         struct smbXcli_conn *conn,
                                         uint32_t timeout_msec,
                                         struct smbXcli_session *session,
-                                        uint32_t tcon_id,
+                                        struct smbXcli_tcon *tcon,
                                         uint8_t in_info_type,
                                         uint8_t in_file_info_class,
                                         const DATA_BLOB *in_input_buffer,
@@ -453,22 +483,22 @@ struct tevent_req *smb2cli_set_info_send(TALLOC_CTX *mem_ctx,
                                         uint64_t in_fid_volatile);
 NTSTATUS smb2cli_set_info_recv(struct tevent_req *req);
 NTSTATUS smb2cli_set_info(struct smbXcli_conn *conn,
-                           uint32_t timeout_msec,
-                           struct smbXcli_session *session,
-                           uint32_t tcon_id,
-                           uint8_t in_info_type,
-                           uint8_t in_file_info_class,
-                           const DATA_BLOB *in_input_buffer,
-                           uint32_t in_additional_info,
-                           uint64_t in_fid_persistent,
-                           uint64_t in_fid_volatile);
+                         uint32_t timeout_msec,
+                         struct smbXcli_session *session,
+                         struct smbXcli_tcon *tcon,
+                         uint8_t in_info_type,
+                         uint8_t in_file_info_class,
+                         const DATA_BLOB *in_input_buffer,
+                         uint32_t in_additional_info,
+                         uint64_t in_fid_persistent,
+                         uint64_t in_fid_volatile);
 
 struct tevent_req *smb2cli_query_info_send(TALLOC_CTX *mem_ctx,
                                           struct tevent_context *ev,
                                           struct smbXcli_conn *conn,
                                           uint32_t timeout_msec,
                                           struct smbXcli_session *session,
-                                          uint32_t tcon_id,
+                                          struct smbXcli_tcon *tcon,
                                           uint8_t in_info_type,
                                           uint8_t in_file_info_class,
                                           uint32_t in_max_output_length,
@@ -483,7 +513,7 @@ NTSTATUS smb2cli_query_info_recv(struct tevent_req *req,
 NTSTATUS smb2cli_query_info(struct smbXcli_conn *conn,
                            uint32_t timeout_msec,
                            struct smbXcli_session *session,
-                           uint32_t tcon_id,
+                           struct smbXcli_tcon *tcon,
                            uint8_t in_info_type,
                            uint8_t in_file_info_class,
                            uint32_t in_max_output_length,
@@ -500,7 +530,7 @@ struct tevent_req *smb2cli_query_directory_send(TALLOC_CTX *mem_ctx,
                                                struct smbXcli_conn *conn,
                                                uint32_t timeout_msec,
                                                struct smbXcli_session *session,
-                                               uint32_t tcon_id,
+                                               struct smbXcli_tcon *tcon,
                                                uint8_t level,
                                                uint8_t flags,
                                                uint32_t file_index,
@@ -515,7 +545,7 @@ NTSTATUS smb2cli_query_directory_recv(struct tevent_req *req,
 NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn,
                                 uint32_t timeout_msec,
                                 struct smbXcli_session *session,
-                                uint32_t tcon_id,
+                                struct smbXcli_tcon *tcon,
                                 uint8_t level,
                                 uint8_t flags,
                                 uint32_t file_index,
@@ -532,7 +562,7 @@ struct tevent_req *smb2cli_ioctl_send(TALLOC_CTX *mem_ctx,
                                      struct smbXcli_conn *conn,
                                      uint32_t timeout_msec,
                                      struct smbXcli_session *session,
-                                     uint32_t tcon_id,
+                                     struct smbXcli_tcon *tcon,
                                      uint64_t in_fid_persistent,
                                      uint64_t in_fid_volatile,
                                      uint32_t in_ctl_code,
@@ -548,7 +578,7 @@ NTSTATUS smb2cli_ioctl_recv(struct tevent_req *req,
 NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
                       uint32_t timeout_msec,
                       struct smbXcli_session *session,
-                      uint32_t tcon_id,
+                      struct smbXcli_tcon *tcon,
                       uint64_t in_fid_persistent,
                       uint64_t in_fid_volatile,
                       uint32_t in_ctl_code,
@@ -561,4 +591,12 @@ NTSTATUS smb2cli_ioctl(struct smbXcli_conn *conn,
                       DATA_BLOB *out_input_buffer,
                       DATA_BLOB *out_output_buffer);
 
+struct tevent_req *smb2cli_echo_send(TALLOC_CTX *mem_ctx,
+                                    struct tevent_context *ev,
+                                    struct smbXcli_conn *conn,
+                                    uint32_t timeout_msec);
+NTSTATUS smb2cli_echo_recv(struct tevent_req *req);
+NTSTATUS smb2cli_echo(struct smbXcli_conn *conn,
+                     uint32_t timeout_msec);
+
 #endif /* _SMBXCLI_BASE_H_ */
Default public repo for matthieu