fixup SMB2 header and decode async commands correctly

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24321 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 9 insertions, 8 deletions

diff --git a/epan/dissectors/packet-smb2.h b/epan/dissectors/packet-smb2.h
index 899be07765..cf6e5206b8 100644
--- a/epan/dissectors/packet-smb2.h
+++ b/epan/dissectors/packet-smb2.h
@@ -64,14 +64,14 @@ typedef struct _smb2_tid_info_t {
 	char *name;
 } smb2_tid_info_t;
 
-typedef struct _smb2_uid_info_t {
-	guint64 uid;
+typedef struct _smb2_sesid_info_t {
+	guint64 sesid;
 	guint32 auth_frame;
 	char *acct_name;
 	char *domain_name;
 	char *host_name;
 	GHashTable *tids;
-} smb2_uid_info_t;
+} smb2_sesid_info_t;
 
 /* Structure to keep track of conversations and the hash tables.
  * There is one such structure for each conversation.
@@ -80,7 +80,7 @@ typedef struct _smb2_conv_info_t {
 	/* these two tables are used to match requests with responses */
 	GHashTable *unmatched;
 	GHashTable *matched;
-	GHashTable *uids;
+	GHashTable *sesids;
 } smb2_conv_info_t;
 
 /* This structure contains information from the SMB2 header
@@ -88,21 +88,22 @@ typedef struct _smb2_conv_info_t {
  * structures.
  */
 #define SMB2_FLAGS_RESPONSE	0x00000001
-#define SMB2_FLAGS_PID_VALID	0x00000002
-#define SMB2_FLAGS_ENDOFCHAIN	0x00000004
+#define SMB2_FLAGS_ASYNC_CMD	0x00000002
+#define SMB2_FLAGS_CHAINED	0x00000004
 #define SMB2_FLAGS_SIGNATURE	0x00000008
+#define SMB2_FLAGS_DFS_OP	0x10000000
 typedef struct _smb2_info_t {
 	guint16 opcode;
 	guint32 ioctl_function;
 	guint32 status;
 	guint32 tid;
-	guint64 uid;
+	guint64 sesid;
 	gint64  seqnum;
 	guint32 flags;
 	smb2_conv_info_t	*conv;
 	smb2_saved_info_t	*saved;
 	smb2_tid_info_t		*tree;
-	smb2_uid_info_t		*session;
+	smb2_sesid_info_t	*session;
 	proto_tree *top_tree;	
 } smb2_info_t;