QSIG fully implemented

[obnox/wireshark/wip.git] / epan / dissectors / packet-smb-common.h

diff --git a/epan/dissectors/packet-smb-common.h b/epan/dissectors/packet-smb-common.h
index 94d0a4b889756b0ef258a6ead28258afe4a82d00..0188bf47cd32b036d50a6f73053b0aa113ccf66f 100644 (file)
--- a/epan/dissectors/packet-smb-common.h
+++ b/epan/dissectors/packet-smb-common.h
@@ -4,8 +4,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * Copied from packet-pop.c
@@ -28,94 +28,21 @@
 #ifndef __PACKET_SMB_COMMON_H__
 #define __PACKET_SMB_COMMON_H__
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-
-#include <time.h>
-#include <string.h>
-#include <glib.h>
-#include <ctype.h>
-#include <epan/packet.h>
-#include <epan/conversation.h>
-#include "smb.h"
-
-int dissect_smb_unknown(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset);
-
+/* **data is allocated with ephemeral scope and will be automatically freed
+ * when packet dissection completes.
+ * You do NOT need to g_free() that string.
+ */
 int display_unicode_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index, char **data);
 
 int display_ms_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index, char **data);
 
+int dissect_ms_compressed_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index,
+                                gboolean prepend_dot, char **data);
+
 const gchar *get_unicode_or_ascii_string(tvbuff_t *tvb, int *offsetp,
     gboolean useunicode, int *len, gboolean nopad, gboolean exactlen,
     guint16 *bcp);
 
-int dissect_smb_64bit_time(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_date);
-
-int dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, 
-                  char *name, char **sid_str, int hf_sid);
-
-/* 
- * Stuff for dissecting NT access masks 
- */
-
-typedef void (nt_access_mask_fn_t)(tvbuff_t *tvb, gint offset,
-                                  proto_tree *tree, guint32 access);
-
-/* Map generic access permissions to specific permissions */
-
-struct generic_mapping {
-       guint32 generic_read;
-       guint32 generic_write;
-       guint32 generic_execute;
-       guint32 generic_all;
-};
-
-/* Map standard access permissions to specific permissions */
-
-struct standard_mapping {
-       guint32 std_read;
-       guint32 std_write;
-       guint32 std_execute;
-       guint32 std_all;
-};
-
-struct access_mask_info {
-       char *specific_rights_name;
-       nt_access_mask_fn_t *specific_rights_fn;
-       struct generic_mapping *generic_mapping;
-       struct standard_mapping *standard_mapping;
-};
-
-int
-dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                      proto_tree *tree, guint8 *drep, int hfindex,
-                      struct access_mask_info *ami,
-                      guint32 *perms);
-
-int
-dissect_nt_sec_desc(tvbuff_t *tvb, int offset, packet_info *pinfo,
-                   proto_tree *parent_tree, guint8 *drep, int len, 
-                   struct access_mask_info *ami);
-
 extern const value_string share_type_vals[];
 
-/* Dissect a ntlmv2 response */
-
-int
-dissect_ntlmv2_response(tvbuff_t *tvb, proto_tree *ntlmssp_tree, int offset,
-                       int len);
-
-void register_smb_common(int proto_smb);
-
-extern const value_string ntlm_name_types[];
-
-#define NTLM_NAME_END        0x0000
-#define NTLM_NAME_NB_HOST    0x0001
-#define NTLM_NAME_NB_DOMAIN  0x0002
-#define NTLM_NAME_DNS_HOST   0x0003
-#define NTLM_NAME_DNS_DOMAIN 0x0004
-
 #endif