aboutsummaryrefslogtreecommitdiffstats
path: root/smb.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-05-09 10:03:41 +0000
committerGuy Harris <guy@alum.mit.edu>2004-05-09 10:03:41 +0000
commit15af0f656fcd75bfcacb975476aab614e7ed8dd3 (patch)
tree96fab6287a112ff9379ebf012a7a939884b62ec1 /smb.h
parentb964421aec471b54755db1ab9ebc768467b6fdd5 (diff)
From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build libethereal.dll or not; remove "./wiretap" from PATH to prevent problems due to wrongly-loaded files; build dissector.lib with MSVC; move "print.c" and "ps.c" to the dissector helpers, as "print.c" imports variables from packet-frame.c and packet-data.c, which are in libethereal; move "g711.c" out of the dissector helpers, as they're used only by Ethereal in a tap, not in Tethereal or in any dissector; add a .def file for libethereal; arrange to declare global variables exported from libethereal with "__declspec(dllimport)" when building programs that import those variables; update the NSIS installer. Make the "configure" script define ETH_VAR_IMPORT as "extern". svn path=/trunk/; revision=10834
Diffstat (limited to 'smb.h')
-rw-r--r--smb.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/smb.h b/smb.h
index 8663fb5e43..6724974a31 100644
--- a/smb.h
+++ b/smb.h
@@ -2,7 +2,7 @@
* Defines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: smb.h,v 1.54 2003/12/18 00:18:55 guy Exp $
+ * $Id: smb.h,v 1.55 2004/05/09 10:03:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -26,12 +26,15 @@
#ifndef _SMB_H
#define _SMB_H
-extern gboolean sid_name_snooping;
+ETH_VAR_IMPORT gboolean sid_name_snooping;
+
+/* SMB command codes, from the SNIA CIFS spec. With MSVC and a
+ * libethereal.dll, we need a special declaration.
+ */
+ETH_VAR_IMPORT const value_string smb_cmd_vals[];
+ETH_VAR_IMPORT const value_string trans2_cmd_vals[];
+ETH_VAR_IMPORT const value_string nt_cmd_vals[];
-/* SMB command codes, from the SNIA CIFS spec. */
-extern const value_string smb_cmd_vals[];
-extern const value_string trans2_cmd_vals[];
-extern const value_string nt_cmd_vals[];
#define SMB_COM_CREATE_DIRECTORY 0x00
#define SMB_COM_DELETE_DIRECTORY 0x01