diff options
author | Stefan Metzmacher <metze@samba.org> | 2005-11-18 12:57:48 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:46:26 -0500 |
commit | ab33c314a489ab0571de3cb93d1de749e3459e3a (patch) | |
tree | fa136664b98f1b78a76c314967737f7286aa223a /source4/smb_server/smb_server.h | |
parent | 3f968be9d55986666c13f3ef4f54e8e1796b1539 (diff) | |
download | samba-ab33c314a489ab0571de3cb93d1de749e3459e3a.tar.gz samba-ab33c314a489ab0571de3cb93d1de749e3459e3a.tar.xz samba-ab33c314a489ab0571de3cb93d1de749e3459e3a.zip |
r11783: - make the VIUD field in smbsrv_session 64bit, as SMB2 needs it
- add an idtree_limit to limit the max VUID we give the clients
it's UINT16_MAX (0xffff) for the SMB protocol
- add auth_time to the smbsrv_session statistics
- use the session_info as marker for finished and non-finished
session setups
metze
(This used to be commit 7eb10048b2c4e5ee9c39750dc877514ed9235a76)
Diffstat (limited to 'source4/smb_server/smb_server.h')
-rw-r--r-- | source4/smb_server/smb_server.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h index 46a10c74bb2..f879845134e 100644 --- a/source4/smb_server/smb_server.h +++ b/source4/smb_server/smb_server.h @@ -38,21 +38,24 @@ struct smbsrv_session { struct smbsrv_connection *smb_conn; - /* the vuid is used to specify the security context for this - request. Note that this may not be the same vuid as we - received on the wire (for example, for share mode or guest - access) */ - uint16_t vuid; + /* + * an index passed over the wire: + * - 16 bit for smb + * - 64 bit for smb2 + */ + uint64_t vuid; struct gensec_security *gensec_ctx; struct auth_session_info *session_info; - /* Distinguish between a VUID allocated for the multi-pass - * extended secrity session setup and one that is finished */ - BOOL finished_sesssetup; - - struct timeval connect_time; + /* some statictics for the management tools */ + struct { + /* the time when the session setup started */ + struct timeval connect_time; + /* the time when the session setup was finished */ + struct timeval auth_time; + } statistics; }; /* we need a forward declaration of the ntvfs_ops strucutre to prevent @@ -242,13 +245,14 @@ struct smbsrv_connection { /* context associated with currently valid session setups */ struct { - int num_validated_vuids; - /* an id tree used to allocate vuids */ /* this holds info on session vuids that are already * validated for this VC */ struct idr_context *idtree_vuid; + /* this is the limit of vuid values for this connection */ + uint64_t idtree_limit; + /* also kept as a link list so it can be enumerated by the management code */ struct smbsrv_session *list; |