From Ulf Lamping: change some #define names to avoid name collisions on
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 29 Aug 2002 19:05:41 +0000 (19:05 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 29 Aug 2002 19:05:41 +0000 (19:05 +0000)
Windows that cause compiler warnings.

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

AUTHORS
packet-dcerpc-reg.c
packet-dcerpc-reg.h
packet-dcerpc-spoolss.c
packet-dcerpc-spoolss.h
packet-gtp.c
packet-smb.c

diff --git a/AUTHORS b/AUTHORS
index 02986b2b7a8484cf74ff0b7746770d65f805c364..1ceaf64f2f63b1caad78c667af7b8455e0609acf 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1395,6 +1395,8 @@ Ulf Lamping <ulf.lamping[AT]web.de> {
        Put the source and destination MAC addresses into the top-level
            item for Ethernet
        Added more information to progress dialog box
+       Change some #define names to avoid name collisions on Windows
+           that cause compiler warnings
 }
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
index 86a47904c9b8e0c01455b6628c4b73e22362e937..79da7c69c53745076d0fa33babbc29f19f65c203 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\winreg packet disassembly
  * Copyright 2001, 2002 Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-reg.c,v 1.11 2002/08/28 21:00:10 jmayer Exp $
+ * $Id: packet-dcerpc-reg.c,v 1.12 2002/08/29 19:05:40 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -602,18 +602,18 @@ RegFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
 /* Registry data types */
 
 const value_string reg_datatypes[] = {
-       { REG_NONE, "REG_NONE" },
-       { REG_SZ, "REG_SZ" },
-       { REG_EXPAND_SZ, "REG_EXPAND_SZ" },
-       { REG_BINARY, "REG_BINARY" },
-       { REG_DWORD, "REG_DWORD" },
-       { REG_DWORD_LE, "REG_DWORD_LE" },
-       { REG_DWORD_BE, "REG_DWORD_BE" },
-       { REG_LINK, "REG_LINK" },
-       { REG_MULTI_SZ, "REG_MULTI_SZ" },
-       { REG_RESOURCE_LIST, "REG_RESOURCE_LIST" },
-       { REG_FULL_RESOURCE_DESCRIPTOR, "REG_FULL_RESOURCE_DESCRIPTOR" },
-       { REG_RESOURCE_REQUIREMENTS_LIST, "REG_RESOURCE_REQUIREMENTS_LIST" },
+       { DCERPC_REG_NONE, "REG_NONE" },
+       { DCERPC_REG_SZ, "REG_SZ" },
+       { DCERPC_REG_EXPAND_SZ, "REG_EXPAND_SZ" },
+       { DCERPC_REG_BINARY, "REG_BINARY" },
+       { DCERPC_REG_DWORD, "REG_DWORD" },
+       { DCERPC_REG_DWORD_LE, "REG_DWORD_LE" },
+       { DCERPC_REG_DWORD_BE, "REG_DWORD_BE" },
+       { DCERPC_REG_LINK, "REG_LINK" },
+       { DCERPC_REG_MULTI_SZ, "REG_MULTI_SZ" },
+       { DCERPC_REG_RESOURCE_LIST, "REG_RESOURCE_LIST" },
+       { DCERPC_REG_FULL_RESOURCE_DESCRIPTOR, "REG_FULL_RESOURCE_DESCRIPTOR" },
+       { DCERPC_REG_RESOURCE_REQUIREMENTS_LIST, "REG_RESOURCE_REQUIREMENTS_LIST" },
        {0, NULL }
 };
 
@@ -655,7 +655,7 @@ static dcerpc_sub_dissector dcerpc_reg_dissectors[] = {
         { _REG_UNK_17, "Unknown17", NULL, NULL },
         { REG_SHUTDOWN, "Shutdown", NULL, NULL },
         { REG_ABORT_SHUTDOWN, "AbortShutdown", NULL, NULL },
-        { REG_UNK_1A, "Unknown1A", RegUnknown1A_q, RegUnknown1A_r },
+        { _REG_UNK_1A, "Unknown1A", RegUnknown1A_q, RegUnknown1A_r },
 
         { 0, NULL, NULL,  NULL }
 };
@@ -687,7 +687,7 @@ static const value_string reg_opnum_vals[] = {
         { _REG_UNK_17, "Unknown17" },
         { REG_SHUTDOWN, "Shutdown" },
         { REG_ABORT_SHUTDOWN, "AbortShutdown" },
-        { REG_UNK_1A, "Unknown1A" },
+        { _REG_UNK_1A, "Unknown1A" },
        { 0, NULL }
 };
 
index 11a538d096e99217d818e95051c2c89dab054aa0..399bf156ea601743947ab1f65bb7bbf884d8e636 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\winreg packet disassembly
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-reg.h,v 1.5 2002/08/28 21:00:10 jmayer Exp $
+ * $Id: packet-dcerpc-reg.h,v 1.6 2002/08/29 19:05:40 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 #define        _REG_UNK_17             0x17
 #define REG_SHUTDOWN           0x18
 #define REG_ABORT_SHUTDOWN     0x19
-#define REG_UNK_1A             0x1a
+#define _REG_UNK_1A            0x1a
 
 /* Registry data types */
 
-#define REG_NONE                       0
-#define REG_SZ                        1
-#define REG_EXPAND_SZ                  2
-#define REG_BINARY                    3
-#define REG_DWORD                     4
-#define REG_DWORD_LE                  4        /* DWORD, little endian */
-#define REG_DWORD_BE                  5        /* DWORD, big endian */
-#define REG_LINK                       6
-#define REG_MULTI_SZ                  7
-#define REG_RESOURCE_LIST              8
-#define REG_FULL_RESOURCE_DESCRIPTOR   9
-#define REG_RESOURCE_REQUIREMENTS_LIST 10
+#define DCERPC_REG_NONE                       0
+#define DCERPC_REG_SZ                         1
+#define DCERPC_REG_EXPAND_SZ                  2
+#define DCERPC_REG_BINARY                     3
+#define DCERPC_REG_DWORD                      4
+#define DCERPC_REG_DWORD_LE                   4        /* DWORD, little endian */
+#define DCERPC_REG_DWORD_BE                   5        /* DWORD, big endian */
+#define DCERPC_REG_LINK                       6
+#define DCERPC_REG_MULTI_SZ                   7
+#define DCERPC_REG_RESOURCE_LIST              8
+#define DCERPC_REG_FULL_RESOURCE_DESCRIPTOR   9
+#define DCERPC_REG_RESOURCE_REQUIREMENTS_LIST 10
 
 extern const value_string reg_datatypes[];
 
index 3786c1e1da6bb5113c9ced5c07a3106e06cc42c1..748e2d5ba1297547a4488960d4c9b24f6332d669 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\spoolss packet disassembly
  * Copyright 2001-2002, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-spoolss.c,v 1.52 2002/08/28 21:00:10 jmayer Exp $
+ * $Id: packet-dcerpc-spoolss.c,v 1.53 2002/08/29 19:05:40 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -433,11 +433,11 @@ static const true_false_string tfs_job_status_user_intervention = {
 static int hf_spoolss_setprinter_cmd = -1;
 
 static const value_string setprinter_cmd_vals[] = {
-       { PRINTER_CONTROL_UNPAUSE, "Unpause" },
-       { PRINTER_CONTROL_PAUSE, "Pause" },
-       { PRINTER_CONTROL_RESUME, "Resume" },
-       { PRINTER_CONTROL_PURGE, "Purge" },
-       { PRINTER_CONTROL_SET_STATUS, "Set status" },
+       { SPOOLSS_PRINTER_CONTROL_UNPAUSE, "Unpause" },
+       { SPOOLSS_PRINTER_CONTROL_PAUSE, "Pause" },
+       { SPOOLSS_PRINTER_CONTROL_RESUME, "Resume" },
+       { SPOOLSS_PRINTER_CONTROL_PURGE, "Purge" },
+       { SPOOLSS_PRINTER_CONTROL_SET_STATUS, "Set status" },
        { 0, NULL }
 };
 
@@ -2493,19 +2493,19 @@ static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset,
                flags_subtree, hf_spoolss_rffpcnex_flags_add_printer, tvb,
                offset - 4, 4, flags);
 
-       if (flags & PRINTER_CHANGE_PRINTER)
+       if (flags & SPOOLSS_PRINTER_CHANGE_PRINTER)
                proto_item_append_text(flags_item, ", change printer");
 
-       if (flags & PRINTER_CHANGE_JOB)
+       if (flags & SPOOLSS_PRINTER_CHANGE_JOB)
                proto_item_append_text(flags_item, ", change job");
 
-       if (flags & PRINTER_CHANGE_FORM)
+       if (flags & SPOOLSS_PRINTER_CHANGE_FORM)
                proto_item_append_text(flags_item, ", change form");
 
-       if (flags & PRINTER_CHANGE_PORT)
+       if (flags & SPOOLSS_PRINTER_CHANGE_PORT)
                proto_item_append_text(flags_item, ", change port");
 
-       if (flags & PRINTER_CHANGE_PRINTER_DRIVER)
+       if (flags & SPOOLSS_PRINTER_CHANGE_PRINTER_DRIVER)
                proto_item_append_text(flags_item, ", change printer driver");
 
        offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
@@ -2962,9 +2962,9 @@ static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static const value_string form_type_vals[] =
 {
-       { FORM_USER, "User" },
-       { FORM_BUILTIN, "Builtin" },
-       { FORM_PRINTER, "Printer" },
+       { SPOOLSS_FORM_USER, "User" },
+       { SPOOLSS_FORM_BUILTIN, "Builtin" },
+       { SPOOLSS_FORM_PRINTER, "Printer" },
        { 0, NULL }
 };
 
@@ -6269,103 +6269,103 @@ proto_register_dcerpc_spoolss(void)
                { &hf_spoolss_rffpcnex_flags_add_printer,
                  { "Add printer", "spoolss.rffpcnex.flags.add_printer",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_printer),
-                   PRINTER_CHANGE_ADD_PRINTER, "Add printer", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_ADD_PRINTER, "Add printer", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_set_printer,
                  { "Set printer", "spoolss.rffpcnex.flags.set_printer",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_printer),
-                   PRINTER_CHANGE_SET_PRINTER, "Set printer", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_SET_PRINTER, "Set printer", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_delete_printer,
                  { "Delete printer", "spoolss.rffpcnex.flags.delete_printer",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_printer),
-                   PRINTER_CHANGE_DELETE_PRINTER, "Delete printer", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER, "Delete printer", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_add_job,
                  { "Add job", "spoolss.rffpcnex.flags.add_job",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_job),
-                   PRINTER_CHANGE_ADD_JOB, "Add job", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_ADD_JOB, "Add job", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_set_job,
                  { "Set job", "spoolss.rffpcnex.flags.set_job",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_job),
-                   PRINTER_CHANGE_SET_JOB, "Set job", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_SET_JOB, "Set job", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_delete_job,
                  { "Delete job", "spoolss.rffpcnex.flags.delete_job",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_job),
-                   PRINTER_CHANGE_DELETE_JOB, "Delete job", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_DELETE_JOB, "Delete job", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_write_job,
                  { "Write job", "spoolss.rffpcnex.flags.write_job",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_write_job),
-                   PRINTER_CHANGE_WRITE_JOB, "Write job", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_WRITE_JOB, "Write job", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_add_form,
                  { "Add form", "spoolss.rffpcnex.flags.add_form",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_form),
-                   PRINTER_CHANGE_ADD_FORM, "Add form", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_ADD_FORM, "Add form", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_set_form,
                  { "Set form", "spoolss.rffpcnex.flags.set_form",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_form),
-                   PRINTER_CHANGE_SET_FORM, "Set form", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_SET_FORM, "Set form", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_delete_form,
                  { "Delete form", "spoolss.rffpcnex.flags.delete_form",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_form),
-                   PRINTER_CHANGE_DELETE_FORM, "Delete form", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_DELETE_FORM, "Delete form", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_add_port,
                  { "Add port", "spoolss.rffpcnex.flags.add_port",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_port),
-                   PRINTER_CHANGE_ADD_PORT, "Add port", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_ADD_PORT, "Add port", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_configure_port,
                  { "Configure port", "spoolss.rffpcnex.flags.configure_port",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_configure_port),
-                   PRINTER_CHANGE_CONFIGURE_PORT, "Configure port", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_CONFIGURE_PORT, "Configure port", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_delete_port,
                  { "Delete port", "spoolss.rffpcnex.flags.delete_port",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_port),
-                   PRINTER_CHANGE_DELETE_PORT, "Delete port", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_DELETE_PORT, "Delete port", HFILL }},
 
 
                { &hf_spoolss_rffpcnex_flags_add_print_processor,
                  { "Add processor", "spoolss.rffpcnex.flags.add_processor",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_print_processor),
-                   PRINTER_CHANGE_ADD_PRINT_PROCESSOR, "Add processor", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_ADD_PRINT_PROCESSOR, "Add processor", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_delete_print_processor,
                  { "Delete processor", "spoolss.rffpcnex.flags.delete_processor",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_print_processor),
-                   PRINTER_CHANGE_DELETE_PRINT_PROCESSOR, "Delete processor", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_DELETE_PRINT_PROCESSOR, "Delete processor", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_add_driver,
                  { "Add driver", "spoolss.rffpcnex.flags.add_driver",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_driver),
-                   PRINTER_CHANGE_ADD_PRINTER_DRIVER, "Add driver", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_ADD_PRINTER_DRIVER, "Add driver", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_set_driver,
                  { "Set driver", "spoolss.rffpcnex.flags.set_driver",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_driver),
-                   PRINTER_CHANGE_SET_PRINTER_DRIVER, "Set driver", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_SET_PRINTER_DRIVER, "Set driver", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_delete_driver,
                  { "Delete driver", "spoolss.rffpcnex.flags.delete_driver",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_driver),
-                   PRINTER_CHANGE_DELETE_PRINTER_DRIVER, "Delete driver", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER_DRIVER, "Delete driver", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_timeout,
                  { "Timeout", "spoolss.rffpcnex.flags.timeout",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_timeout),
-                   PRINTER_CHANGE_TIMEOUT, "Timeout", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_TIMEOUT, "Timeout", HFILL }},
 
                { &hf_spoolss_rffpcnex_flags_failed_printer_connection,
                  { "Failed printer connection", "spoolss.rffpcnex.flags.failed_connection_printer",
                    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_failed_connection_printer),
-                   PRINTER_CHANGE_FAILED_CONNECTION_PRINTER, "Failed printer connection", HFILL }},
+                   SPOOLSS_PRINTER_CHANGE_FAILED_CONNECTION_PRINTER, "Failed printer connection", HFILL }},
 
                { &hf_spoolss_notify_options_version,
                  { "Version", "spoolss.notify_options.version", FT_UINT32, BASE_DEC,
index dbd1f98098ab590d02403d5c3d79c57caa85c588..489d658f7ea605e931d1d2b5f76768ce813cae13 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\spoolss packet disassembly
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-spoolss.h,v 1.13 2002/08/28 21:00:11 jmayer Exp $
+ * $Id: packet-dcerpc-spoolss.h,v 1.14 2002/08/29 19:05:40 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 
 /* Form types */
 
-#define FORM_USER    0
-#define FORM_BUILTIN 1
-#define FORM_PRINTER 2
+#define SPOOLSS_FORM_USER    0
+#define SPOOLSS_FORM_BUILTIN 1
+#define SPOOLSS_FORM_PRINTER 2
 
 /* Printer change notification flags */
 
-#define PRINTER_CHANGE_ADD_PRINTER                     0x00000001
-#define PRINTER_CHANGE_SET_PRINTER                     0x00000002
-#define PRINTER_CHANGE_DELETE_PRINTER                  0x00000004
-#define PRINTER_CHANGE_FAILED_CONNECTION_PRINTER       0x00000008
-#define PRINTER_CHANGE_PRINTER (PRINTER_CHANGE_ADD_PRINTER | \
-                                PRINTER_CHANGE_SET_PRINTER | \
-                                PRINTER_CHANGE_DELETE_PRINTER | \
-                                PRINTER_CHANGE_FAILED_CONNECTION_PRINTER )
-#define PRINTER_CHANGE_ADD_JOB                         0x00000100
-#define PRINTER_CHANGE_SET_JOB                         0x00000200
-#define PRINTER_CHANGE_DELETE_JOB                      0x00000400
-#define PRINTER_CHANGE_WRITE_JOB                       0x00000800
-#define PRINTER_CHANGE_JOB     (PRINTER_CHANGE_ADD_JOB | \
-                                PRINTER_CHANGE_SET_JOB | \
-                                PRINTER_CHANGE_DELETE_JOB | \
-                                PRINTER_CHANGE_WRITE_JOB )
-#define PRINTER_CHANGE_ADD_FORM                                0x00010000
-#define PRINTER_CHANGE_SET_FORM                                0x00020000
-#define PRINTER_CHANGE_DELETE_FORM                     0x00040000
-#define PRINTER_CHANGE_FORM    (PRINTER_CHANGE_ADD_FORM | \
-                                PRINTER_CHANGE_SET_FORM | \
-                                PRINTER_CHANGE_DELETE_FORM )
-
-#define PRINTER_CHANGE_ADD_PORT                                0x00100000
-#define PRINTER_CHANGE_CONFIGURE_PORT                  0x00200000
-#define PRINTER_CHANGE_DELETE_PORT                     0x00400000
-#define PRINTER_CHANGE_PORT    (PRINTER_CHANGE_ADD_PORT | \
-                                PRINTER_CHANGE_CONFIGURE_PORT | \
-                                PRINTER_CHANGE_DELETE_PORT )
-
-#define PRINTER_CHANGE_ADD_PRINT_PROCESSOR             0x01000000
-#define PRINTER_CHANGE_DELETE_PRINT_PROCESSOR          0x04000000
-#define PRINTER_CHANGE_PRINT_PROCESSOR (PRINTER_CHANGE_ADD_PRINT_PROCESSOR | \
-                                        PRINTER_CHANGE_DELETE_PRINT_PROCESSOR )
-
-#define PRINTER_CHANGE_ADD_PRINTER_DRIVER              0x10000000
-#define PRINTER_CHANGE_SET_PRINTER_DRIVER              0x20000000
-#define PRINTER_CHANGE_DELETE_PRINTER_DRIVER           0x40000000
-#define PRINTER_CHANGE_PRINTER_DRIVER  (PRINTER_CHANGE_ADD_PRINTER_DRIVER | \
-                                        PRINTER_CHANGE_SET_PRINTER_DRIVER | \
-                                        PRINTER_CHANGE_DELETE_PRINTER_DRIVER )
-
-#define PRINTER_CHANGE_TIMEOUT                         0x80000000
-#define PRINTER_CHANGE_ALL     (PRINTER_CHANGE_JOB | \
-                                PRINTER_CHANGE_FORM | \
-                                PRINTER_CHANGE_PORT | \
-                                PRINTER_CHANGE_PRINT_PROCESSOR | \
-                                PRINTER_CHANGE_PRINTER_DRIVER )
+#define SPOOLSS_PRINTER_CHANGE_ADD_PRINTER                     0x00000001
+#define SPOOLSS_PRINTER_CHANGE_SET_PRINTER                     0x00000002
+#define SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER                  0x00000004
+#define SPOOLSS_PRINTER_CHANGE_FAILED_CONNECTION_PRINTER       0x00000008
+#define SPOOLSS_PRINTER_CHANGE_PRINTER (SPOOLSS_PRINTER_CHANGE_ADD_PRINTER | \
+                                SPOOLSS_PRINTER_CHANGE_SET_PRINTER | \
+                                SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER | \
+                                SPOOLSS_PRINTER_CHANGE_FAILED_CONNECTION_PRINTER )
+#define SPOOLSS_PRINTER_CHANGE_ADD_JOB                         0x00000100
+#define SPOOLSS_PRINTER_CHANGE_SET_JOB                         0x00000200
+#define SPOOLSS_PRINTER_CHANGE_DELETE_JOB                      0x00000400
+#define SPOOLSS_PRINTER_CHANGE_WRITE_JOB                       0x00000800
+#define SPOOLSS_PRINTER_CHANGE_JOB     (SPOOLSS_PRINTER_CHANGE_ADD_JOB | \
+                                SPOOLSS_PRINTER_CHANGE_SET_JOB | \
+                                SPOOLSS_PRINTER_CHANGE_DELETE_JOB | \
+                                SPOOLSS_PRINTER_CHANGE_WRITE_JOB )
+#define SPOOLSS_PRINTER_CHANGE_ADD_FORM                                0x00010000
+#define SPOOLSS_PRINTER_CHANGE_SET_FORM                                0x00020000
+#define SPOOLSS_PRINTER_CHANGE_DELETE_FORM                     0x00040000
+#define SPOOLSS_PRINTER_CHANGE_FORM    (SPOOLSS_PRINTER_CHANGE_ADD_FORM | \
+                                SPOOLSS_PRINTER_CHANGE_SET_FORM | \
+                                SPOOLSS_PRINTER_CHANGE_DELETE_FORM )
+
+#define SPOOLSS_PRINTER_CHANGE_ADD_PORT                                0x00100000
+#define SPOOLSS_PRINTER_CHANGE_CONFIGURE_PORT                  0x00200000
+#define SPOOLSS_PRINTER_CHANGE_DELETE_PORT                     0x00400000
+#define SPOOLSS_PRINTER_CHANGE_PORT    (SPOOLSS_PRINTER_CHANGE_ADD_PORT | \
+                                SPOOLSS_PRINTER_CHANGE_CONFIGURE_PORT | \
+                                SPOOLSS_PRINTER_CHANGE_DELETE_PORT )
+
+#define SPOOLSS_PRINTER_CHANGE_ADD_PRINT_PROCESSOR             0x01000000
+#define SPOOLSS_PRINTER_CHANGE_DELETE_PRINT_PROCESSOR          0x04000000
+#define SPOOLSS_PRINTER_CHANGE_PRINT_PROCESSOR (SPOOLSS_PRINTER_CHANGE_ADD_PRINT_PROCESSOR | \
+                                        SPOOLSS_PRINTER_CHANGE_DELETE_PRINT_PROCESSOR )
+
+#define SPOOLSS_PRINTER_CHANGE_ADD_PRINTER_DRIVER              0x10000000
+#define SPOOLSS_PRINTER_CHANGE_SET_PRINTER_DRIVER              0x20000000
+#define SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER_DRIVER           0x40000000
+#define SPOOLSS_PRINTER_CHANGE_PRINTER_DRIVER  (SPOOLSS_PRINTER_CHANGE_ADD_PRINTER_DRIVER | \
+                                        SPOOLSS_PRINTER_CHANGE_SET_PRINTER_DRIVER | \
+                                        SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER_DRIVER )
+
+#define SPOOLSS_PRINTER_CHANGE_TIMEOUT                         0x80000000
+#define SPOOLSS_PRINTER_CHANGE_ALL     (SPOOLSS_PRINTER_CHANGE_JOB | \
+                                SPOOLSS_PRINTER_CHANGE_FORM | \
+                                SPOOLSS_PRINTER_CHANGE_PORT | \
+                                SPOOLSS_PRINTER_CHANGE_PRINT_PROCESSOR | \
+                                SPOOLSS_PRINTER_CHANGE_PRINTER_DRIVER )
 
 /* Printer notify option types */
 
 
 /* Setprinter control commands */
 
-#define PRINTER_CONTROL_UNPAUSE                0x00000000
-#define PRINTER_CONTROL_PAUSE          0x00000001
-#define PRINTER_CONTROL_RESUME         0x00000002
-#define PRINTER_CONTROL_PURGE          0x00000003
-#define PRINTER_CONTROL_SET_STATUS     0x00000004
+#define SPOOLSS_PRINTER_CONTROL_UNPAUSE                0x00000000
+#define SPOOLSS_PRINTER_CONTROL_PAUSE          0x00000001
+#define SPOOLSS_PRINTER_CONTROL_RESUME         0x00000002
+#define SPOOLSS_PRINTER_CONTROL_PURGE          0x00000003
+#define SPOOLSS_PRINTER_CONTROL_SET_STATUS     0x00000004
 
 /* Specific access rights */
 
index 10d8b3fca1f713181d707ddea3d3a2dd219555cb..1c7191d79de649a97b4ffb2a180139161f10957a 100644 (file)
@@ -4,7 +4,7 @@
  * Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
  *                 Nicolas Balkota <balkota@mac.com>
  *
- * $Id: packet-gtp.c,v 1.36 2002/08/28 21:00:14 jmayer Exp $
+ * $Id: packet-gtp.c,v 1.37 2002/08/29 19:05:41 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -57,9 +57,9 @@
 #define GTP_PRIME_HDR_LENGTH 6
 
 /* for function checking compliance with ETSI  */
-#define MANDATORY      1
-#define OPTIONAL       2
-#define CONDITIONAL    4
+#define GTP_MANDATORY  1
+#define GTP_OPTIONAL   2
+#define GTP_CONDITIONAL        4
 
 static int g_gtpv0_port                        = GTPv0_PORT;
 static int g_gtpv1c_port               = GTPv1C_PORT;
@@ -1744,14 +1744,14 @@ static _gtp_mess_items gprs_mess_items[] = {
 
 {
        GTP_MSG_ECHO_REQ, {
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_ECHO_RESP, {
-               { GTP_EXT_RECOVER,      MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_RECOVER,      GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
@@ -1762,302 +1762,302 @@ static _gtp_mess_items gprs_mess_items[] = {
 },
 {
        GTP_MSG_NODE_ALIVE_REQ, {
-               { GTP_EXT_NODE_ADDR,    MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_NODE_ADDR,    GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_NODE_ALIVE_RESP, {
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_REDIR_REQ, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_NODE_ADDR,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_NODE_ADDR,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_REDIR_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_CREATE_PDP_REQ, {
-               { GTP_EXT_QOS_GPRS,     MANDATORY },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_SEL_MODE,     MANDATORY },
-               { GTP_EXT_FLOW_LABEL,   MANDATORY },
-               { GTP_EXT_FLOW_SIG,     MANDATORY },
-               { GTP_EXT_MSISDN,       MANDATORY },
-               { GTP_EXT_USER_ADDR,    MANDATORY },
-               { GTP_EXT_APN,          MANDATORY },
-               { GTP_EXT_PROTO_CONF,   OPTIONAL },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_QOS_GPRS,     GTP_MANDATORY },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_SEL_MODE,     GTP_MANDATORY },
+               { GTP_EXT_FLOW_LABEL,   GTP_MANDATORY },
+               { GTP_EXT_FLOW_SIG,     GTP_MANDATORY },
+               { GTP_EXT_MSISDN,       GTP_MANDATORY },
+               { GTP_EXT_USER_ADDR,    GTP_MANDATORY },
+               { GTP_EXT_APN,          GTP_MANDATORY },
+               { GTP_EXT_PROTO_CONF,   GTP_OPTIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_CREATE_PDP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_QOS_GPRS,     CONDITIONAL },
-               { GTP_EXT_REORDER,      CONDITIONAL },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_FLOW_LABEL,   CONDITIONAL },
-               { GTP_EXT_FLOW_SIG,     CONDITIONAL },
-               { GTP_EXT_CHRG_ID,      CONDITIONAL },
-               { GTP_EXT_USER_ADDR,    CONDITIONAL },
-               { GTP_EXT_PROTO_CONF,   OPTIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_CHRG_ADDR,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_QOS_GPRS,     GTP_CONDITIONAL },
+               { GTP_EXT_REORDER,      GTP_CONDITIONAL },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_FLOW_LABEL,   GTP_CONDITIONAL },
+               { GTP_EXT_FLOW_SIG,     GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ID,      GTP_CONDITIONAL },
+               { GTP_EXT_USER_ADDR,    GTP_CONDITIONAL },
+               { GTP_EXT_PROTO_CONF,   GTP_OPTIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ADDR,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_UPDATE_PDP_REQ, {
-               { GTP_EXT_QOS_GPRS,     MANDATORY },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_FLOW_LABEL,   MANDATORY },
-               { GTP_EXT_FLOW_SIG,     MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_QOS_GPRS,     GTP_MANDATORY },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_FLOW_LABEL,   GTP_MANDATORY },
+               { GTP_EXT_FLOW_SIG,     GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 },
        }
 },
 {
        GTP_MSG_UPDATE_PDP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_QOS_GPRS,     CONDITIONAL },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_FLOW_LABEL,   CONDITIONAL },
-               { GTP_EXT_FLOW_SIG,     CONDITIONAL },
-               { GTP_EXT_CHRG_ID,      CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_CHRG_ADDR,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_QOS_GPRS,     GTP_CONDITIONAL },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_FLOW_LABEL,   GTP_CONDITIONAL },
+               { GTP_EXT_FLOW_SIG,     GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ID,      GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ADDR,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_DELETE_PDP_REQ, {
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_DELETE_PDP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 },
        }
 },
 {
        GTP_MSG_CREATE_AA_PDP_REQ, {
-               { GTP_EXT_QOS_GPRS,     MANDATORY },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_SEL_MODE,     MANDATORY },
-               { GTP_EXT_FLOW_LABEL,   MANDATORY },
-               { GTP_EXT_FLOW_SIG,     MANDATORY },
-               { GTP_EXT_USER_ADDR,    MANDATORY },
-               { GTP_EXT_APN,          MANDATORY },
-               { GTP_EXT_PROTO_CONF,   OPTIONAL },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_QOS_GPRS,     GTP_MANDATORY },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_SEL_MODE,     GTP_MANDATORY },
+               { GTP_EXT_FLOW_LABEL,   GTP_MANDATORY },
+               { GTP_EXT_FLOW_SIG,     GTP_MANDATORY },
+               { GTP_EXT_USER_ADDR,    GTP_MANDATORY },
+               { GTP_EXT_APN,          GTP_MANDATORY },
+               { GTP_EXT_PROTO_CONF,   GTP_OPTIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_CREATE_AA_PDP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_QOS_GPRS,     CONDITIONAL },
-               { GTP_EXT_REORDER,      CONDITIONAL },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_FLOW_LABEL,   CONDITIONAL },
-               { GTP_EXT_FLOW_SIG,     CONDITIONAL },
-               { GTP_EXT_CHRG_ID,      CONDITIONAL },
-               { GTP_EXT_USER_ADDR,    CONDITIONAL },
-               { GTP_EXT_PROTO_CONF,   OPTIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_CHRG_ADDR,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_QOS_GPRS,     GTP_CONDITIONAL },
+               { GTP_EXT_REORDER,      GTP_CONDITIONAL },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_FLOW_LABEL,   GTP_CONDITIONAL },
+               { GTP_EXT_FLOW_SIG,     GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ID,      GTP_CONDITIONAL },
+               { GTP_EXT_USER_ADDR,    GTP_CONDITIONAL },
+               { GTP_EXT_PROTO_CONF,   GTP_OPTIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ADDR,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_DELETE_AA_PDP_REQ, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_DELETE_AA_PDP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_ERR_IND, {
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_PDU_NOTIFY_REQ, {
-               { GTP_EXT_USER_ADDR,    MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_USER_ADDR,    GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_PDU_NOTIFY_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_PDU_NOTIFY_REJ_REQ, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_USER_ADDR,    MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_USER_ADDR,    GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_PDU_NOTIFY_REJ_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SEND_ROUT_INFO_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SEND_ROUT_INFO_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_MAP_CAUSE,    OPTIONAL },
-               { GTP_EXT_MS_REASON,    OPTIONAL },
-               { GTP_EXT_GSN_ADDR,     OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_MAP_CAUSE,    GTP_OPTIONAL },
+               { GTP_EXT_MS_REASON,    GTP_OPTIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FAIL_REP_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FAIL_REP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_MAP_CAUSE,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_MAP_CAUSE,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_MS_PRESENT_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_MS_PRESENT_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_IDENT_REQ, {
-               { GTP_EXT_RAI,          MANDATORY },
-               { GTP_EXT_PTMSI,        MANDATORY },
-               { GTP_EXT_PTMSI_SIG,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_RAI,          GTP_MANDATORY },
+               { GTP_EXT_PTMSI,        GTP_MANDATORY },
+               { GTP_EXT_PTMSI_SIG,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_IDENT_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_IMSI,         CONDITIONAL },
-               { GTP_EXT_AUTH_TRI,     OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_IMSI,         GTP_CONDITIONAL },
+               { GTP_EXT_AUTH_TRI,     GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SGSN_CNTXT_REQ, {
-               { GTP_EXT_IMSI,         CONDITIONAL },
-               { GTP_EXT_RAI,          MANDATORY },
-               { GTP_EXT_TLLI,         MANDATORY },
-               { GTP_EXT_PTMSI_SIG,    OPTIONAL },
-               { GTP_EXT_MS_VALID,     OPTIONAL },
-               { GTP_EXT_FLOW_SIG,     MANDATORY },
+               { GTP_EXT_IMSI,         GTP_CONDITIONAL },
+               { GTP_EXT_RAI,          GTP_MANDATORY },
+               { GTP_EXT_TLLI,         GTP_MANDATORY },
+               { GTP_EXT_PTMSI_SIG,    GTP_OPTIONAL },
+               { GTP_EXT_MS_VALID,     GTP_OPTIONAL },
+               { GTP_EXT_FLOW_SIG,     GTP_MANDATORY },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SGSN_CNTXT_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_IMSI,         CONDITIONAL },
-               { GTP_EXT_FLOW_SIG,     CONDITIONAL },
-               { GTP_EXT_MM_CNTXT,     CONDITIONAL },
-               { GTP_EXT_PDP_CNTXT,    CONDITIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_IMSI,         GTP_CONDITIONAL },
+               { GTP_EXT_FLOW_SIG,     GTP_CONDITIONAL },
+               { GTP_EXT_MM_CNTXT,     GTP_CONDITIONAL },
+               { GTP_EXT_PDP_CNTXT,    GTP_CONDITIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SGSN_CNTXT_ACK, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_FLOW_II,      CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_FLOW_II,      GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_DATA_TRANSF_REQ, {
-               { GTP_EXT_TR_COMM,      MANDATORY },
-               { GTP_EXT_DATA_REQ,     CONDITIONAL },
-               { GTP_EXT_REL_PACK,     CONDITIONAL },
-               { GTP_EXT_CAN_PACK,     CONDITIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_TR_COMM,      GTP_MANDATORY },
+               { GTP_EXT_DATA_REQ,     GTP_CONDITIONAL },
+               { GTP_EXT_REL_PACK,     GTP_CONDITIONAL },
+               { GTP_EXT_CAN_PACK,     GTP_CONDITIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_DATA_TRANSF_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_DATA_RESP,    MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_DATA_RESP,    GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
@@ -2075,14 +2075,14 @@ static _gtp_mess_items umts_mess_items[] = {
 
 {
        GTP_MSG_ECHO_REQ, {
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_ECHO_RESP, {
-               { GTP_EXT_RECOVER,      MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_RECOVER,      GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
@@ -2093,22 +2093,22 @@ static _gtp_mess_items umts_mess_items[] = {
 },
 {
        GTP_MSG_NODE_ALIVE_REQ, {
-               { GTP_EXT_NODE_ADDR,    MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_NODE_ADDR,    GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_NODE_ALIVE_RESP, {
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_REDIR_REQ, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_NODE_ADDR,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_NODE_ADDR,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
@@ -2119,314 +2119,314 @@ static _gtp_mess_items umts_mess_items[] = {
 },
 {
        GTP_MSG_CREATE_PDP_REQ, {
-               { GTP_EXT_IMSI,         CONDITIONAL },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_SEL_MODE,     CONDITIONAL },
-               { GTP_EXT_TEID,         MANDATORY },
-               { GTP_EXT_TEID_CP,      CONDITIONAL },
-               { GTP_EXT_NSAPI,        MANDATORY },
-               { GTP_EXT_NSAPI,        CONDITIONAL },
-               { GTP_EXT_CHRG_CHAR,    OPTIONAL },
-               { GTP_EXT_TRACE_REF,    OPTIONAL },
-               { GTP_EXT_TRACE_TYPE,   OPTIONAL },
-               { GTP_EXT_USER_ADDR,    CONDITIONAL },
-               { GTP_EXT_APN,          CONDITIONAL },
-               { GTP_EXT_PROTO_CONF,   CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_MSISDN,       CONDITIONAL },
-               { GTP_EXT_QOS_UMTS,     MANDATORY },
-               { GTP_EXT_TFT,          CONDITIONAL },
-               { GTP_EXT_TRIGGER_ID,   OPTIONAL },
-               { GTP_EXT_OMC_ID,       OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_CONDITIONAL },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_SEL_MODE,     GTP_CONDITIONAL },
+               { GTP_EXT_TEID,         GTP_MANDATORY },
+               { GTP_EXT_TEID_CP,      GTP_CONDITIONAL },
+               { GTP_EXT_NSAPI,        GTP_MANDATORY },
+               { GTP_EXT_NSAPI,        GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_CHAR,    GTP_OPTIONAL },
+               { GTP_EXT_TRACE_REF,    GTP_OPTIONAL },
+               { GTP_EXT_TRACE_TYPE,   GTP_OPTIONAL },
+               { GTP_EXT_USER_ADDR,    GTP_CONDITIONAL },
+               { GTP_EXT_APN,          GTP_CONDITIONAL },
+               { GTP_EXT_PROTO_CONF,   GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_MSISDN,       GTP_CONDITIONAL },
+               { GTP_EXT_QOS_UMTS,     GTP_MANDATORY },
+               { GTP_EXT_TFT,          GTP_CONDITIONAL },
+               { GTP_EXT_TRIGGER_ID,   GTP_OPTIONAL },
+               { GTP_EXT_OMC_ID,       GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_CREATE_PDP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_REORDER,      CONDITIONAL },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_TEID,         CONDITIONAL },
-               { GTP_EXT_TEID_CP,      CONDITIONAL },
-               { GTP_EXT_CHRG_ID,      CONDITIONAL },
-               { GTP_EXT_USER_ADDR,    CONDITIONAL },
-               { GTP_EXT_PROTO_CONF,   OPTIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_QOS_UMTS,     CONDITIONAL },
-               { GTP_EXT_CHRG_ADDR,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_REORDER,      GTP_CONDITIONAL },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_TEID,         GTP_CONDITIONAL },
+               { GTP_EXT_TEID_CP,      GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ID,      GTP_CONDITIONAL },
+               { GTP_EXT_USER_ADDR,    GTP_CONDITIONAL },
+               { GTP_EXT_PROTO_CONF,   GTP_OPTIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_QOS_UMTS,     GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ADDR,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {      /* checked, SGSN -> GGSN */
        GTP_MSG_UPDATE_PDP_REQ, {
-               { GTP_EXT_IMSI,         CONDITIONAL },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_TEID,         MANDATORY },
-               { GTP_EXT_TEID_CP,      CONDITIONAL },
-               { GTP_EXT_NSAPI,        MANDATORY },
-               { GTP_EXT_TRACE_REF,    OPTIONAL },
-               { GTP_EXT_TRACE_TYPE,   OPTIONAL },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_QOS_UMTS,     MANDATORY },
-               { GTP_EXT_TFT,          OPTIONAL },
-               { GTP_EXT_TRIGGER_ID,   OPTIONAL },
-               { GTP_EXT_OMC_ID,       OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_CONDITIONAL },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_TEID,         GTP_MANDATORY },
+               { GTP_EXT_TEID_CP,      GTP_CONDITIONAL },
+               { GTP_EXT_NSAPI,        GTP_MANDATORY },
+               { GTP_EXT_TRACE_REF,    GTP_OPTIONAL },
+               { GTP_EXT_TRACE_TYPE,   GTP_OPTIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_QOS_UMTS,     GTP_MANDATORY },
+               { GTP_EXT_TFT,          GTP_OPTIONAL },
+               { GTP_EXT_TRIGGER_ID,   GTP_OPTIONAL },
+               { GTP_EXT_OMC_ID,       GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {      /* checked, GGSN -> SGSN */
        GTP_MSG_UPDATE_PDP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_RECOVER,      OPTIONAL },
-               { GTP_EXT_TEID,         CONDITIONAL },
-               { GTP_EXT_TEID_CP,      CONDITIONAL },
-               { GTP_EXT_CHRG_ID,      CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_QOS_UMTS,     CONDITIONAL },
-               { GTP_EXT_CHRG_ADDR,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_RECOVER,      GTP_OPTIONAL },
+               { GTP_EXT_TEID,         GTP_CONDITIONAL },
+               { GTP_EXT_TEID_CP,      GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ID,      GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_QOS_UMTS,     GTP_CONDITIONAL },
+               { GTP_EXT_CHRG_ADDR,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_DELETE_PDP_REQ, {
-               { GTP_EXT_TEAR_IND,     CONDITIONAL },
-               { GTP_EXT_NSAPI,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_TEAR_IND,     GTP_CONDITIONAL },
+               { GTP_EXT_NSAPI,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_DELETE_PDP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_ERR_IND, {
-               { GTP_EXT_TEID,         MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_TEID,         GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_PDU_NOTIFY_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_TEID_CP,      MANDATORY },
-               { GTP_EXT_USER_ADDR,    MANDATORY },
-               { GTP_EXT_APN,          MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_TEID_CP,      GTP_MANDATORY },
+               { GTP_EXT_USER_ADDR,    GTP_MANDATORY },
+               { GTP_EXT_APN,          GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_PDU_NOTIFY_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_PDU_NOTIFY_REJ_REQ, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_TEID_CP,      MANDATORY },
-               { GTP_EXT_USER_ADDR,    MANDATORY },
-               { GTP_EXT_APN,          MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_TEID_CP,      GTP_MANDATORY },
+               { GTP_EXT_USER_ADDR,    GTP_MANDATORY },
+               { GTP_EXT_APN,          GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_PDU_NOTIFY_REJ_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SUPP_EXT_HDR, {
-               { GTP_EXT_HDR_LIST,     MANDATORY },
+               { GTP_EXT_HDR_LIST,     GTP_MANDATORY },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SEND_ROUT_INFO_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SEND_ROUT_INFO_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_MAP_CAUSE,    OPTIONAL },
-               { GTPv1_EXT_MS_REASON,  OPTIONAL },
-               { GTP_EXT_GSN_ADDR,     OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_MAP_CAUSE,    GTP_OPTIONAL },
+               { GTPv1_EXT_MS_REASON,  GTP_OPTIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FAIL_REP_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FAIL_REP_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_MAP_CAUSE,    OPTIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_MAP_CAUSE,    GTP_OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_MS_PRESENT_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_MS_PRESENT_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_IDENT_REQ, {
-               { GTP_EXT_RAI,          MANDATORY },
-               { GTP_EXT_PTMSI,        MANDATORY },
-               { GTP_EXT_PTMSI_SIG,    CONDITIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_RAI,          GTP_MANDATORY },
+               { GTP_EXT_PTMSI,        GTP_MANDATORY },
+               { GTP_EXT_PTMSI_SIG,    GTP_CONDITIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_IDENT_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_IMSI,         CONDITIONAL },
-               { GTP_EXT_AUTH_TRI,     CONDITIONAL },
-               { GTP_EXT_AUTH_QUI,     CONDITIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_IMSI,         GTP_CONDITIONAL },
+               { GTP_EXT_AUTH_TRI,     GTP_CONDITIONAL },
+               { GTP_EXT_AUTH_QUI,     GTP_CONDITIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SGSN_CNTXT_REQ, {
-               { GTP_EXT_IMSI,         CONDITIONAL },
-               { GTP_EXT_RAI,          MANDATORY },
-               { GTP_EXT_TLLI,         CONDITIONAL },
-               { GTP_EXT_PTMSI,        CONDITIONAL },
-               { GTP_EXT_PTMSI_SIG,    CONDITIONAL },
-               { GTP_EXT_MS_VALID,     OPTIONAL },
-               { GTP_EXT_TEID_CP,      MANDATORY },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_CONDITIONAL },
+               { GTP_EXT_RAI,          GTP_MANDATORY },
+               { GTP_EXT_TLLI,         GTP_CONDITIONAL },
+               { GTP_EXT_PTMSI,        GTP_CONDITIONAL },
+               { GTP_EXT_PTMSI_SIG,    GTP_CONDITIONAL },
+               { GTP_EXT_MS_VALID,     GTP_OPTIONAL },
+               { GTP_EXT_TEID_CP,      GTP_MANDATORY },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SGSN_CNTXT_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_IMSI,         CONDITIONAL },
-               { GTP_EXT_TEID_CP,      CONDITIONAL },
-               { GTP_EXT_RP_SMS,       OPTIONAL },
-               { GTP_EXT_RP,           OPTIONAL },
-               { GTP_EXT_PKT_FLOW_ID,  OPTIONAL },
-               { GTP_EXT_MM_CNTXT,     CONDITIONAL },
-               { GTP_EXT_PDP_CNTXT,    CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_IMSI,         GTP_CONDITIONAL },
+               { GTP_EXT_TEID_CP,      GTP_CONDITIONAL },
+               { GTP_EXT_RP_SMS,       GTP_OPTIONAL },
+               { GTP_EXT_RP,           GTP_OPTIONAL },
+               { GTP_EXT_PKT_FLOW_ID,  GTP_OPTIONAL },
+               { GTP_EXT_MM_CNTXT,     GTP_CONDITIONAL },
+               { GTP_EXT_PDP_CNTXT,    GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_SGSN_CNTXT_ACK, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_TEID_II,      CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_TEID_II,      GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FORW_RELOC_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_TEID_CP,      MANDATORY },
-               { GTP_EXT_RANAP_CAUSE,  MANDATORY },
-               { GTP_EXT_MM_CNTXT,     MANDATORY },
-               { GTP_EXT_PDP_CNTXT,    CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     MANDATORY },
-               { GTP_EXT_TARGET_ID,    MANDATORY },
-               { GTP_EXT_UTRAN_CONT,   MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_TEID_CP,      GTP_MANDATORY },
+               { GTP_EXT_RANAP_CAUSE,  GTP_MANDATORY },
+               { GTP_EXT_MM_CNTXT,     GTP_MANDATORY },
+               { GTP_EXT_PDP_CNTXT,    GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_MANDATORY },
+               { GTP_EXT_TARGET_ID,    GTP_MANDATORY },
+               { GTP_EXT_UTRAN_CONT,   GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FORW_RELOC_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_TEID_CP,      CONDITIONAL },
-               { GTP_EXT_RANAP_CAUSE,  CONDITIONAL },
-               { GTP_EXT_GSN_ADDR,     CONDITIONAL },
-               { GTP_EXT_UTRAN_CONT,   OPTIONAL },
-               { GTP_EXT_RAB_SETUP,    CONDITIONAL },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_TEID_CP,      GTP_CONDITIONAL },
+               { GTP_EXT_RANAP_CAUSE,  GTP_CONDITIONAL },
+               { GTP_EXT_GSN_ADDR,     GTP_CONDITIONAL },
+               { GTP_EXT_UTRAN_CONT,   GTP_OPTIONAL },
+               { GTP_EXT_RAB_SETUP,    GTP_CONDITIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FORW_RELOC_COMP, {
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_RELOC_CANCEL_REQ, {
-               { GTP_EXT_IMSI,         MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_IMSI,         GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_RELOC_CANCEL_RESP, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FORW_RELOC_ACK, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FORW_SRNS_CNTXT, {
-               { GTP_EXT_RAB_CNTXT,    MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_RAB_CNTXT,    GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
 {
        GTP_MSG_FORW_SRNS_CNTXT_ACK, {
-               { GTP_EXT_CAUSE,        MANDATORY },
-               { GTP_EXT_PRIV_EXT,     OPTIONAL },
+               { GTP_EXT_CAUSE,        GTP_MANDATORY },
+               { GTP_EXT_PRIV_EXT,     GTP_OPTIONAL },
                { 0,                    0 }
        }
 },
@@ -2462,7 +2462,7 @@ check_field_presence(guint8 message, guint8 field, int *position) {
                                        (*position)++;
                                        return 0;
                                } else {
-                               if (mess_items[i].fields[*position].presence == MANDATORY) {
+                               if (mess_items[i].fields[*position].presence == GTP_MANDATORY) {
                                        return mess_items[i].fields[(*position)++].code;
                                } else {
                                        (*position)++;
index db1c05b753d312613b0193962fe03409b9e4223c..2e1838176a6e111ba397f406f2f4a341d1560a84 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  * 2001  Rewrite by Ronnie Sahlberg and Guy Harris
  *
- * $Id: packet-smb.c,v 1.286 2002/08/29 05:26:45 sharpe Exp $
+ * $Id: packet-smb.c,v 1.287 2002/08/29 19:05:41 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1434,32 +1434,32 @@ dissect_access(tvbuff_t *tvb, proto_tree *parent_tree, int offset, char *type)
        return offset;
 }
 
-#define FILE_ATTRIBUTE_READ_ONLY               0x00000001
-#define FILE_ATTRIBUTE_HIDDEN                  0x00000002
-#define FILE_ATTRIBUTE_SYSTEM                  0x00000004
-#define FILE_ATTRIBUTE_VOLUME                  0x00000008
-#define FILE_ATTRIBUTE_DIRECTORY               0x00000010
-#define FILE_ATTRIBUTE_ARCHIVE                 0x00000020
-#define FILE_ATTRIBUTE_DEVICE                  0x00000040
-#define FILE_ATTRIBUTE_NORMAL                  0x00000080
-#define FILE_ATTRIBUTE_TEMPORARY               0x00000100
-#define FILE_ATTRIBUTE_SPARSE                  0x00000200
-#define FILE_ATTRIBUTE_REPARSE                 0x00000400
-#define FILE_ATTRIBUTE_COMPRESSED              0x00000800
-#define FILE_ATTRIBUTE_OFFLINE                 0x00001000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED     0x00002000
-#define FILE_ATTRIBUTE_ENCRYPTED               0x00004000
+#define SMB_FILE_ATTRIBUTE_READ_ONLY           0x00000001
+#define SMB_FILE_ATTRIBUTE_HIDDEN                      0x00000002
+#define SMB_FILE_ATTRIBUTE_SYSTEM                      0x00000004
+#define SMB_FILE_ATTRIBUTE_VOLUME                      0x00000008
+#define SMB_FILE_ATTRIBUTE_DIRECTORY           0x00000010
+#define SMB_FILE_ATTRIBUTE_ARCHIVE                     0x00000020
+#define SMB_FILE_ATTRIBUTE_DEVICE                      0x00000040
+#define SMB_FILE_ATTRIBUTE_NORMAL                      0x00000080
+#define SMB_FILE_ATTRIBUTE_TEMPORARY           0x00000100
+#define SMB_FILE_ATTRIBUTE_SPARSE                      0x00000200
+#define SMB_FILE_ATTRIBUTE_REPARSE                     0x00000400
+#define SMB_FILE_ATTRIBUTE_COMPRESSED          0x00000800
+#define SMB_FILE_ATTRIBUTE_OFFLINE                     0x00001000
+#define SMB_FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000
+#define SMB_FILE_ATTRIBUTE_ENCRYPTED           0x00004000
 
 /*
  * These are flags to be used in NT Create operations.
  */
-#define FILE_ATTRIBUTE_WRITE_THROUGH           0x80000000
-#define FILE_ATTRIBUTE_NO_BUFFERING            0x20000000
-#define FILE_ATTRIBUTE_RANDOM_ACCESS           0x10000000
-#define FILE_ATTRIBUTE_SEQUENTIAL_SCAN         0x08000000
-#define FILE_ATTRIBUTE_DELETE_ON_CLOSE         0x04000000
-#define FILE_ATTRIBUTE_BACKUP_SEMANTICS                0x02000000
-#define FILE_ATTRIBUTE_POSIX_SEMANTICS         0x01000000
+#define SMB_FILE_ATTRIBUTE_WRITE_THROUGH               0x80000000
+#define SMB_FILE_ATTRIBUTE_NO_BUFFERING                0x20000000
+#define SMB_FILE_ATTRIBUTE_RANDOM_ACCESS               0x10000000
+#define SMB_FILE_ATTRIBUTE_SEQUENTIAL_SCAN             0x08000000
+#define SMB_FILE_ATTRIBUTE_DELETE_ON_CLOSE             0x04000000
+#define SMB_FILE_ATTRIBUTE_BACKUP_SEMANTICS            0x02000000
+#define SMB_FILE_ATTRIBUTE_POSIX_SEMANTICS             0x01000000
 
 static const true_false_string tfs_file_attribute_write_through = {
        "This object requires WRITE THROUGH",
@@ -16136,87 +16136,87 @@ proto_register_smb(void)
 
        { &hf_smb_file_attr_read_only_16bit,
                { "Read Only", "smb.file_attribute.read_only", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_read_only), FILE_ATTRIBUTE_READ_ONLY, "READ ONLY file attribute", HFILL }},
+               TFS(&tfs_file_attribute_read_only), SMB_FILE_ATTRIBUTE_READ_ONLY, "READ ONLY file attribute", HFILL }},
 
        { &hf_smb_file_attr_read_only_8bit,
                { "Read Only", "smb.file_attribute.read_only", FT_BOOLEAN, 8,
-               TFS(&tfs_file_attribute_read_only), FILE_ATTRIBUTE_READ_ONLY, "READ ONLY file attribute", HFILL }},
+               TFS(&tfs_file_attribute_read_only), SMB_FILE_ATTRIBUTE_READ_ONLY, "READ ONLY file attribute", HFILL }},
 
        { &hf_smb_file_attr_hidden_16bit,
                { "Hidden", "smb.file_attribute.hidden", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_hidden), FILE_ATTRIBUTE_HIDDEN, "HIDDEN file attribute", HFILL }},
+               TFS(&tfs_file_attribute_hidden), SMB_FILE_ATTRIBUTE_HIDDEN, "HIDDEN file attribute", HFILL }},
 
        { &hf_smb_file_attr_hidden_8bit,
                { "Hidden", "smb.file_attribute.hidden", FT_BOOLEAN, 8,
-               TFS(&tfs_file_attribute_hidden), FILE_ATTRIBUTE_HIDDEN, "HIDDEN file attribute", HFILL }},
+               TFS(&tfs_file_attribute_hidden), SMB_FILE_ATTRIBUTE_HIDDEN, "HIDDEN file attribute", HFILL }},
 
        { &hf_smb_file_attr_system_16bit,
                { "System", "smb.file_attribute.system", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_system), FILE_ATTRIBUTE_SYSTEM, "SYSTEM file attribute", HFILL }},
+               TFS(&tfs_file_attribute_system), SMB_FILE_ATTRIBUTE_SYSTEM, "SYSTEM file attribute", HFILL }},
 
        { &hf_smb_file_attr_system_8bit,
                { "System", "smb.file_attribute.system", FT_BOOLEAN, 8,
-               TFS(&tfs_file_attribute_system), FILE_ATTRIBUTE_SYSTEM, "SYSTEM file attribute", HFILL }},
+               TFS(&tfs_file_attribute_system), SMB_FILE_ATTRIBUTE_SYSTEM, "SYSTEM file attribute", HFILL }},
 
        { &hf_smb_file_attr_volume_16bit,
                { "Volume ID", "smb.file_attribute.volume", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_volume), FILE_ATTRIBUTE_VOLUME, "VOLUME file attribute", HFILL }},
+               TFS(&tfs_file_attribute_volume), SMB_FILE_ATTRIBUTE_VOLUME, "VOLUME file attribute", HFILL }},
 
        { &hf_smb_file_attr_volume_8bit,
                { "Volume ID", "smb.file_attribute.volume", FT_BOOLEAN, 8,
-               TFS(&tfs_file_attribute_volume), FILE_ATTRIBUTE_VOLUME, "VOLUME ID file attribute", HFILL }},
+               TFS(&tfs_file_attribute_volume), SMB_FILE_ATTRIBUTE_VOLUME, "VOLUME ID file attribute", HFILL }},
 
        { &hf_smb_file_attr_directory_16bit,
                { "Directory", "smb.file_attribute.directory", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_directory), FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY file attribute", HFILL }},
+               TFS(&tfs_file_attribute_directory), SMB_FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY file attribute", HFILL }},
 
        { &hf_smb_file_attr_directory_8bit,
                { "Directory", "smb.file_attribute.directory", FT_BOOLEAN, 8,
-               TFS(&tfs_file_attribute_directory), FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY file attribute", HFILL }},
+               TFS(&tfs_file_attribute_directory), SMB_FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY file attribute", HFILL }},
 
        { &hf_smb_file_attr_archive_16bit,
                { "Archive", "smb.file_attribute.archive", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_archive), FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE file attribute", HFILL }},
+               TFS(&tfs_file_attribute_archive), SMB_FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE file attribute", HFILL }},
 
        { &hf_smb_file_attr_archive_8bit,
                { "Archive", "smb.file_attribute.archive", FT_BOOLEAN, 8,
-               TFS(&tfs_file_attribute_archive), FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE file attribute", HFILL }},
+               TFS(&tfs_file_attribute_archive), SMB_FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE file attribute", HFILL }},
 
        { &hf_smb_file_attr_device,
                { "Device", "smb.file_attribute.device", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_device), FILE_ATTRIBUTE_DEVICE, "Is this file a device?", HFILL }},
+               TFS(&tfs_file_attribute_device), SMB_FILE_ATTRIBUTE_DEVICE, "Is this file a device?", HFILL }},
 
        { &hf_smb_file_attr_normal,
                { "Normal", "smb.file_attribute.normal", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_normal), FILE_ATTRIBUTE_NORMAL, "Is this a normal file?", HFILL }},
+               TFS(&tfs_file_attribute_normal), SMB_FILE_ATTRIBUTE_NORMAL, "Is this a normal file?", HFILL }},
 
        { &hf_smb_file_attr_temporary,
                { "Temporary", "smb.file_attribute.temporary", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_temporary), FILE_ATTRIBUTE_TEMPORARY, "Is this a temporary file?", HFILL }},
+               TFS(&tfs_file_attribute_temporary), SMB_FILE_ATTRIBUTE_TEMPORARY, "Is this a temporary file?", HFILL }},
 
        { &hf_smb_file_attr_sparse,
                { "Sparse", "smb.file_attribute.sparse", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_sparse), FILE_ATTRIBUTE_SPARSE, "Is this a sparse file?", HFILL }},
+               TFS(&tfs_file_attribute_sparse), SMB_FILE_ATTRIBUTE_SPARSE, "Is this a sparse file?", HFILL }},
 
        { &hf_smb_file_attr_reparse,
                { "Reparse Point", "smb.file_attribute.reparse", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_reparse), FILE_ATTRIBUTE_REPARSE, "Does this file have an associated reparse point?", HFILL }},
+               TFS(&tfs_file_attribute_reparse), SMB_FILE_ATTRIBUTE_REPARSE, "Does this file have an associated reparse point?", HFILL }},
 
        { &hf_smb_file_attr_compressed,
                { "Compressed", "smb.file_attribute.compressed", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_compressed), FILE_ATTRIBUTE_COMPRESSED, "Is this file compressed?", HFILL }},
+               TFS(&tfs_file_attribute_compressed), SMB_FILE_ATTRIBUTE_COMPRESSED, "Is this file compressed?", HFILL }},
 
        { &hf_smb_file_attr_offline,
                { "Offline", "smb.file_attribute.offline", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_offline), FILE_ATTRIBUTE_OFFLINE, "Is this file offline?", HFILL }},
+               TFS(&tfs_file_attribute_offline), SMB_FILE_ATTRIBUTE_OFFLINE, "Is this file offline?", HFILL }},
 
        { &hf_smb_file_attr_not_content_indexed,
                { "Content Indexed", "smb.file_attribute.not_content_indexed", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_not_content_indexed), FILE_ATTRIBUTE_NOT_CONTENT_INDEXED, "May this file be indexed by the content indexing service", HFILL }},
+               TFS(&tfs_file_attribute_not_content_indexed), SMB_FILE_ATTRIBUTE_NOT_CONTENT_INDEXED, "May this file be indexed by the content indexing service", HFILL }},
 
        { &hf_smb_file_attr_encrypted,
                { "Encrypted", "smb.file_attribute.encrypted", FT_BOOLEAN, 16,
-               TFS(&tfs_file_attribute_encrypted), FILE_ATTRIBUTE_ENCRYPTED, "Is this file encrypted?", HFILL }},
+               TFS(&tfs_file_attribute_encrypted), SMB_FILE_ATTRIBUTE_ENCRYPTED, "Is this file encrypted?", HFILL }},
 
        { &hf_smb_file_size,
                { "File Size", "smb.file_size", FT_UINT32, BASE_DEC,
@@ -16224,27 +16224,27 @@ proto_register_smb(void)
 
        { &hf_smb_search_attribute_read_only,
                { "Read Only", "smb.search.attribute.read_only", FT_BOOLEAN, 16,
-               TFS(&tfs_search_attribute_read_only), FILE_ATTRIBUTE_READ_ONLY, "READ ONLY search attribute", HFILL }},
+               TFS(&tfs_search_attribute_read_only), SMB_FILE_ATTRIBUTE_READ_ONLY, "READ ONLY search attribute", HFILL }},
 
        { &hf_smb_search_attribute_hidden,
                { "Hidden", "smb.search.attribute.hidden", FT_BOOLEAN, 16,
-               TFS(&tfs_search_attribute_hidden), FILE_ATTRIBUTE_HIDDEN, "HIDDEN search attribute", HFILL }},
+               TFS(&tfs_search_attribute_hidden), SMB_FILE_ATTRIBUTE_HIDDEN, "HIDDEN search attribute", HFILL }},
 
        { &hf_smb_search_attribute_system,
                { "System", "smb.search.attribute.system", FT_BOOLEAN, 16,
-               TFS(&tfs_search_attribute_system), FILE_ATTRIBUTE_SYSTEM, "SYSTEM search attribute", HFILL }},
+               TFS(&tfs_search_attribute_system), SMB_FILE_ATTRIBUTE_SYSTEM, "SYSTEM search attribute", HFILL }},
 
        { &hf_smb_search_attribute_volume,
                { "Volume ID", "smb.search.attribute.volume", FT_BOOLEAN, 16,
-               TFS(&tfs_search_attribute_volume), FILE_ATTRIBUTE_VOLUME, "VOLUME ID search attribute", HFILL }},
+               TFS(&tfs_search_attribute_volume), SMB_FILE_ATTRIBUTE_VOLUME, "VOLUME ID search attribute", HFILL }},
 
        { &hf_smb_search_attribute_directory,
                { "Directory", "smb.search.attribute.directory", FT_BOOLEAN, 16,
-               TFS(&tfs_search_attribute_directory), FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY search attribute", HFILL }},
+               TFS(&tfs_search_attribute_directory), SMB_FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY search attribute", HFILL }},
 
        { &hf_smb_search_attribute_archive,
                { "Archive", "smb.search.attribute.archive", FT_BOOLEAN, 16,
-               TFS(&tfs_search_attribute_archive), FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE search attribute", HFILL }},
+               TFS(&tfs_search_attribute_archive), SMB_FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE search attribute", HFILL }},
 
        { &hf_smb_access_mode,
                { "Access Mode", "smb.access.mode", FT_UINT16, BASE_DEC,
@@ -16999,91 +16999,91 @@ proto_register_smb(void)
 
        { &hf_smb_file_eattr_read_only,
                { "Read Only", "smb.file_attribute.read_only", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_read_only), FILE_ATTRIBUTE_READ_ONLY, "READ ONLY file attribute", HFILL }},
+               TFS(&tfs_file_attribute_read_only), SMB_FILE_ATTRIBUTE_READ_ONLY, "READ ONLY file attribute", HFILL }},
 
        { &hf_smb_file_eattr_hidden,
                { "Hidden", "smb.file_attribute.hidden", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_hidden), FILE_ATTRIBUTE_HIDDEN, "HIDDEN file attribute", HFILL }},
+               TFS(&tfs_file_attribute_hidden), SMB_FILE_ATTRIBUTE_HIDDEN, "HIDDEN file attribute", HFILL }},
 
        { &hf_smb_file_eattr_system,
                { "System", "smb.file_attribute.system", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_system), FILE_ATTRIBUTE_SYSTEM, "SYSTEM file attribute", HFILL }},
+               TFS(&tfs_file_attribute_system), SMB_FILE_ATTRIBUTE_SYSTEM, "SYSTEM file attribute", HFILL }},
 
        { &hf_smb_file_eattr_volume,
                { "Volume ID", "smb.file_attribute.volume", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_volume), FILE_ATTRIBUTE_VOLUME, "VOLUME file attribute", HFILL }},
+               TFS(&tfs_file_attribute_volume), SMB_FILE_ATTRIBUTE_VOLUME, "VOLUME file attribute", HFILL }},
 
        { &hf_smb_file_eattr_directory,
                { "Directory", "smb.file_attribute.directory", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_directory), FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY file attribute", HFILL }},
+               TFS(&tfs_file_attribute_directory), SMB_FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY file attribute", HFILL }},
 
        { &hf_smb_file_eattr_archive,
                { "Archive", "smb.file_attribute.archive", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_archive), FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE file attribute", HFILL }},
+               TFS(&tfs_file_attribute_archive), SMB_FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE file attribute", HFILL }},
 
        { &hf_smb_file_eattr_device,
                { "Device", "smb.file_attribute.device", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_device), FILE_ATTRIBUTE_DEVICE, "Is this file a device?", HFILL }},
+               TFS(&tfs_file_attribute_device), SMB_FILE_ATTRIBUTE_DEVICE, "Is this file a device?", HFILL }},
 
        { &hf_smb_file_eattr_normal,
                { "Normal", "smb.file_attribute.normal", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_normal), FILE_ATTRIBUTE_NORMAL, "Is this a normal file?", HFILL }},
+               TFS(&tfs_file_attribute_normal), SMB_FILE_ATTRIBUTE_NORMAL, "Is this a normal file?", HFILL }},
 
        { &hf_smb_file_eattr_temporary,
                { "Temporary", "smb.file_attribute.temporary", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_temporary), FILE_ATTRIBUTE_TEMPORARY, "Is this a temporary file?", HFILL }},
+               TFS(&tfs_file_attribute_temporary), SMB_FILE_ATTRIBUTE_TEMPORARY, "Is this a temporary file?", HFILL }},
 
        { &hf_smb_file_eattr_sparse,
                { "Sparse", "smb.file_attribute.sparse", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_sparse), FILE_ATTRIBUTE_SPARSE, "Is this a sparse file?", HFILL }},
+               TFS(&tfs_file_attribute_sparse), SMB_FILE_ATTRIBUTE_SPARSE, "Is this a sparse file?", HFILL }},
 
        { &hf_smb_file_eattr_reparse,
                { "Reparse Point", "smb.file_attribute.reparse", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_reparse), FILE_ATTRIBUTE_REPARSE, "Does this file have an associated reparse point?", HFILL }},
+               TFS(&tfs_file_attribute_reparse), SMB_FILE_ATTRIBUTE_REPARSE, "Does this file have an associated reparse point?", HFILL }},
 
        { &hf_smb_file_eattr_compressed,
                { "Compressed", "smb.file_attribute.compressed", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_compressed), FILE_ATTRIBUTE_COMPRESSED, "Is this file compressed?", HFILL }},
+               TFS(&tfs_file_attribute_compressed), SMB_FILE_ATTRIBUTE_COMPRESSED, "Is this file compressed?", HFILL }},
 
        { &hf_smb_file_eattr_offline,
                { "Offline", "smb.file_attribute.offline", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_offline), FILE_ATTRIBUTE_OFFLINE, "Is this file offline?", HFILL }},
+               TFS(&tfs_file_attribute_offline), SMB_FILE_ATTRIBUTE_OFFLINE, "Is this file offline?", HFILL }},
 
        { &hf_smb_file_eattr_not_content_indexed,
                { "Content Indexed", "smb.file_attribute.not_content_indexed", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_not_content_indexed), FILE_ATTRIBUTE_NOT_CONTENT_INDEXED, "May this file be indexed by the content indexing service", HFILL }},
+               TFS(&tfs_file_attribute_not_content_indexed), SMB_FILE_ATTRIBUTE_NOT_CONTENT_INDEXED, "May this file be indexed by the content indexing service", HFILL }},
 
        { &hf_smb_file_eattr_encrypted,
                { "Encrypted", "smb.file_attribute.encrypted", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_encrypted), FILE_ATTRIBUTE_ENCRYPTED, "Is this file encrypted?", HFILL }},
+               TFS(&tfs_file_attribute_encrypted), SMB_FILE_ATTRIBUTE_ENCRYPTED, "Is this file encrypted?", HFILL }},
 
        { &hf_smb_file_eattr_write_through,
                { "Write Through", "smb.file_attribute.write_through", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_write_through), FILE_ATTRIBUTE_WRITE_THROUGH, "Does this object need write through?", HFILL }},
+               TFS(&tfs_file_attribute_write_through), SMB_FILE_ATTRIBUTE_WRITE_THROUGH, "Does this object need write through?", HFILL }},
 
        { &hf_smb_file_eattr_no_buffering,
                { "No Buffering", "smb.file_attribute.no_buffering", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_no_buffering), FILE_ATTRIBUTE_NO_BUFFERING, "May the server buffer this object?", HFILL }},
+               TFS(&tfs_file_attribute_no_buffering), SMB_FILE_ATTRIBUTE_NO_BUFFERING, "May the server buffer this object?", HFILL }},
 
        { &hf_smb_file_eattr_random_access,
                { "Random Access", "smb.file_attribute.random_access", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_random_access), FILE_ATTRIBUTE_RANDOM_ACCESS, "Optimize for random access", HFILL }},
+               TFS(&tfs_file_attribute_random_access), SMB_FILE_ATTRIBUTE_RANDOM_ACCESS, "Optimize for random access", HFILL }},
 
        { &hf_smb_file_eattr_sequential_scan,
                { "Sequential Scan", "smb.file_attribute.sequential_scan", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_sequential_scan), FILE_ATTRIBUTE_SEQUENTIAL_SCAN, "Optimize for sequential scan", HFILL }},
+               TFS(&tfs_file_attribute_sequential_scan), SMB_FILE_ATTRIBUTE_SEQUENTIAL_SCAN, "Optimize for sequential scan", HFILL }},
 
        { &hf_smb_file_eattr_delete_on_close,
                { "Delete on Close", "smb.file_attribute.delete_on_close", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_delete_on_close), FILE_ATTRIBUTE_DELETE_ON_CLOSE, "Should this object be deleted on close?", HFILL }},
+               TFS(&tfs_file_attribute_delete_on_close), SMB_FILE_ATTRIBUTE_DELETE_ON_CLOSE, "Should this object be deleted on close?", HFILL }},
 
        { &hf_smb_file_eattr_backup_semantics,
                { "Backup", "smb.file_attribute.backup_semantics", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_backup_semantics), FILE_ATTRIBUTE_BACKUP_SEMANTICS, "Does this object need/support backup semantics", HFILL }},
+               TFS(&tfs_file_attribute_backup_semantics), SMB_FILE_ATTRIBUTE_BACKUP_SEMANTICS, "Does this object need/support backup semantics", HFILL }},
 
        { &hf_smb_file_eattr_posix_semantics,
                { "Posix", "smb.file_attribute.posix_semantics", FT_BOOLEAN, 32,
-               TFS(&tfs_file_attribute_posix_semantics), FILE_ATTRIBUTE_POSIX_SEMANTICS, "Does this object need/support POSIX semantics?", HFILL }},
+               TFS(&tfs_file_attribute_posix_semantics), SMB_FILE_ATTRIBUTE_POSIX_SEMANTICS, "Does this object need/support POSIX semantics?", HFILL }},
 
        { &hf_smb_sec_desc_len,
                { "NT Security Descriptor Length", "smb.sec_desc_len", FT_UINT32, BASE_DEC,