Revert "source3/smbd"

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

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index af83c0a9a3eb2a10467513cc3f32b1b951937dfe..b3ddba3ffd3dee949a0ff5ebcd6b463d504209b3 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -387,10 +387,12 @@ NTSTATUS smbXsrv_open_create(struct smbXsrv_connection *conn,
                                NTTIME now,
                                struct smbXsrv_open **_open);
 NTSTATUS smbXsrv_open_update(struct smbXsrv_open *_open);
+
 NTSTATUS smb1srv_open_table_init(struct smbXsrv_connection *conn);
 NTSTATUS smb1srv_open_lookup(struct smbXsrv_open_table *table,
                                uint16_t vuid, NTTIME now,
                                struct smbXsrv_open **_open);
+
 NTSTATUS smb2srv_open_table_init(struct smbXsrv_connection *conn);
 NTSTATUS smb2srv_open_lookup(struct smbXsrv_open_table *table,
                                uint64_t open_id, NTTIME now,
@@ -490,10 +492,8 @@ struct smbd_smb2_session {
        uint64_t vuid;
        struct gensec_security *gensec_security;
        struct auth_session_info *session_info;
-       //DATA_BLOB session_key;
-       //bool do_signing;
-
-       struct smbXsrv_session *smbXsrv;
+       DATA_BLOB session_key;
+       bool do_signing;
 
        user_struct *compat_vuser;
 
@@ -543,9 +543,11 @@ struct smbd_server_connection {
        size_t num_files;
        struct files_struct *files;
 
+       struct bitmap *file_bmap;
        int real_max_open_files;
        struct fsp_singleton_cache fsp_fi_cache;
        unsigned long file_gen_counter;
+       int first_file;
 
        struct pending_message_list *deferred_open_queue;
 
@@ -648,6 +650,14 @@ struct smbd_server_connection {
                struct tstream_context *stream;
                bool negprot_2ff;
                struct {
+                       /* an id tree used to allocate vuids */
+                       /* this holds info on session vuids that are already
+                        * validated for this VC */
+                       struct idr_context *idtree;
+
+                       /* this is the limit of vuid values for this connection */
+                       uint64_t limit;
+
                        struct smbd_smb2_session *list;
                } sessions;
                struct {
@@ -665,8 +675,6 @@ struct smbd_server_connection {
                bool supports_multicredit;
                struct bitmap *credits_bitmap;
                bool compound_related_in_progress;
-               DATA_BLOB serverguid;
-               uint32_t capabilities;
        } smb2;
 
        struct smbXsrv_connection *conn;