Move the specific rights dissection function and name into a structure

instead of passing them around as separate parameters.  This is a
prelude to adding generic and standard mapping to the access mask
dissection.

svn path=/trunk/; revision=7591

1 files changed, 10 insertions, 5 deletions

diff --git a/packet-smb-common.h b/packet-smb-common.h
index d96c7dd409..a42254397d 100644
--- a/packet-smb-common.h
+++ b/packet-smb-common.h
@@ -2,7 +2,7 @@
  * Routines for SMB packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb-common.h,v 1.20 2003/04/03 05:43:59 tpot Exp $
+ * $Id: packet-smb-common.h,v 1.21 2003/04/28 04:44:54 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -58,20 +58,25 @@ int dissect_smb_64bit_time(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_d
 int dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, 
 		   char *name, char **sid_str);
 
+/* Stuff for dissecting NT access masks */
+
 typedef void (nt_access_mask_fn_t)(tvbuff_t *tvb, gint offset,
 				   proto_tree *tree, guint32 access);
 
+struct access_mask_info {
+	char *specific_rights_name;
+	nt_access_mask_fn_t *specific_rights_fn;
+};
+
 int
 dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 		       proto_tree *tree, char *drep, int hfindex,
-		       nt_access_mask_fn_t *specific_rights_fn,
-		       char *specific_rights_name);
+		       struct access_mask_info *ami);
 
 int
 dissect_nt_sec_desc(tvbuff_t *tvb, int offset, packet_info *pinfo,
 		    proto_tree *parent_tree, char *drep, int len, 
-		    nt_access_mask_fn_t *specific_rights_fn,
-		    char *specific_rights_name);
+		    struct access_mask_info *ami);
 
 extern const value_string share_type_vals[];