Add a request/response flag to the "struct smb_info" structure, and use

that rather than passing another copy of that flag to dissectors of
particular messages.

Pass that structure to the pipe subdissector by making "pi.private"
point to it, rather than by passing it as an explicit argument.

Change more of the

	if (dirn == 1) {
		...
	}
	if (dirn == 0) {
		...
	}

stuff to

	if (dirn == 1) {
		...
	} else {
		...
	}

and then, as per the first paragraph, check the "request" flag in the
"smb_info" structure rather than checking a "dirn" flag.

Set "last_transact2_command" to -1 in the "smb_request_val" structures
for TRANSACTION requests, as it doesn't apply to those requests.

As "dissect_transact_params()" doesn't do any work if the "TransactName"
argument is null, don't bother calling it for a reply if we don't have an
"smb_request_val" for the corresponding request, as that means we can't
find out the value to pass as the "TransactName" argument.

svn path=/trunk/; revision=3822

1 files changed, 5 insertions, 4 deletions

diff --git a/smb.h b/smb.h
index 4824d766c0..7163a6203b 100644
--- a/smb.h
+++ b/smb.h
@@ -2,10 +2,10 @@
  * Defines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: smb.h,v 1.8 2001/08/04 10:17:24 guy Exp $
+ * $Id: smb.h,v 1.9 2001/08/05 00:16:36 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998, 1999 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -638,10 +638,11 @@ struct smb_request_val {
 };
 
 struct smb_info {
-  int tid, uid, mid, pid;   /* Any more?  */
+  int tid, uid, mid, pid;	/* Any more? */
   conversation_t *conversation;
   struct smb_request_val *request_val;
-  int unicode;
+  gboolean unicode;		/* Are strings in this SMB Unicode? */
+  gboolean request;		/* Is this a request? */
 };
 
 #endif