s3:smbd: move global oplocks vars to smbd_server_connection

[samba.git] / source3 / smbd / globals.h

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 24c17cae9f1ab7398d22aab843f942935adb64e8..f49cdbb473988447311cca2d938b8b3bc19f9f81 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -108,9 +108,6 @@ extern struct vfs_init_function_entry *backends;
 extern char *sparse_buf;
 extern char *LastDir;
 
-/* Current number of oplocks we have outstanding. */
-extern int32_t exclusive_oplocks_open;
-extern int32_t level_II_oplocks_open;
 extern struct kernel_oplocks *koplocks;
 
 struct smbd_parent_context;
@@ -258,6 +255,9 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
 struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req);
 void remove_smb2_chained_fsp(files_struct *fsp);
 
+NTSTATUS smbd_smb2_request_verify_creditcharge(struct smbd_smb2_request *req,
+                                              uint32_t data_length);
+
 NTSTATUS smbd_smb2_request_verify_sizes(struct smbd_smb2_request *req,
                                        size_t expected_body_size);
 
@@ -323,6 +323,41 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
                        char *private_data,
                        size_t priv_len);
 
+struct smbXsrv_connection {
+       struct smbd_server_connection *sconn;
+
+       const struct tsocket_address *local_address;
+       const struct tsocket_address *remote_address;
+       const char *remote_hostname;
+
+       struct tevent_context *ev_ctx;
+       struct messaging_context *msg_ctx;
+
+       enum protocol_types protocol;
+
+       struct {
+               struct {
+                       uint32_t capabilities;
+                       struct GUID guid;
+                       uint16_t security_mode;
+                       uint16_t num_dialects;
+                       uint16_t *dialects;
+               } client;
+               struct {
+                       uint32_t capabilities;
+                       struct GUID guid;
+                       uint16_t security_mode;
+                       uint16_t dialect;
+                       uint32_t max_trans;
+                       uint32_t max_read;
+                       uint32_t max_write;
+               } server;
+       } smb2;
+};
+
+NTSTATUS smbXsrv_connection_init_tables(struct smbXsrv_connection *conn,
+                                       enum protocol_types protocol);
+
 struct smbd_smb2_request {
        struct smbd_smb2_request *prev, *next;
 
@@ -446,32 +481,29 @@ struct smbd_server_connection {
        const char *remote_hostname;
        struct tevent_context *ev_ctx;
        struct messaging_context *msg_ctx;
+       struct sys_notify_context *sys_notify_ctx;
+       struct notify_context *notify_ctx;
        struct {
                bool got_session;
        } nbt;
        bool using_smb2;
        int trans_num;
 
-       /*
-        * Cache for calling poll(2) to avoid allocations in our
-        * central event loop
-        */
-       struct pollfd *pfds;
+       size_t num_users;
+       struct user_struct *users;
+
+       size_t num_connections;
+       struct connection_struct *connections;
 
+       size_t num_files;
        struct files_struct *files;
+
        struct bitmap *file_bmap;
        int real_max_open_files;
-       int files_used;
        struct fsp_singleton_cache fsp_fi_cache;
        unsigned long file_gen_counter;
        int first_file;
 
-       /* Try GENSEC hook */
-       bool use_gensec_hook;
-
-       /* number of open connections (tcons) */
-       int num_tcons_open;
-
        struct pending_message_list *deferred_open_queue;
 
 
@@ -484,6 +516,12 @@ struct smbd_server_connection {
 
        uint64_t num_requests;
 
+       /* Current number of oplocks we have outstanding. */
+       struct {
+               int32_t exclusive_open;
+               int32_t level_II_open;
+       } oplocks;
+
        struct {
                struct fd_event *fde;
 
@@ -514,7 +552,7 @@ struct smbd_server_connection {
                struct {
                        bool encrypted_passwords;
                        bool spnego;
-                       struct auth_context *auth_context;
+                       struct auth4_context *auth_context;
                        bool done;
                        /*
                         * Size of the data we can receive. Set by us.
@@ -540,20 +578,13 @@ struct smbd_server_connection {
                        int max_send;
                        uint16_t last_session_tag;
 
-                       /* users from session setup */
-                       char *session_userlist;
-                       /* workgroup from session setup. */
-                       char *session_workgroup;
                        /*
                         * this holds info on user ids that are already
                         * validated for this VC
                         */
-                       user_struct *validated_users;
                        uint16_t next_vuid;
-                       int num_validated_vuids;
                } sessions;
                struct {
-                       connection_struct *Connections;
                        /* number of open connections */
                        struct bitmap *bmap;
                } tcons;
@@ -602,11 +633,14 @@ struct smbd_server_connection {
                uint32_t max_trans;
                uint32_t max_read;
                uint32_t max_write;
+               bool supports_multicredit;
                struct bitmap *credits_bitmap;
                bool compound_related_in_progress;
        } smb2;
+
+       struct smbXsrv_connection *conn;
 };
 
-extern struct smbd_server_connection *smbd_server_conn;
+extern struct smbXsrv_connection *global_smbXsrv_connection;
 
 void smbd_init_globals(void);