regenerate the pidl dissectors with the latest version of pidl so it will put the text representation of DOS errors in the decode as well.

(the hf field for doserrors did not come with the value_string)




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

1 files changed, 65 insertions, 47 deletions

diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c
index 102c34cf3e..79a65a90d1 100644
--- a/epan/dissectors/packet-dcerpc-initshutdown.c
+++ b/epan/dissectors/packet-dcerpc-initshutdown.c
@@ -1,6 +1,6 @@
 /* DO NOT EDIT
 	This filter was automatically generated
-	from librpc/idl/initshutdown.idl and librpc/idl/initshutdown.cnf.
+	from initshutdown.idl and initshutdown.cnf.
 	
 	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
 	It is maintained by the Samba team, not the Ethereal team.
@@ -30,24 +30,24 @@ static gint ett_initshutdown_initshutdown_String = -1;
 
 /* Header field declarations */
 static gint hf_initshutdown_initshutdown_String_name_len = -1;
-static gint hf_initshutdown_opnum = -1;
+static gint hf_initshutdown_initshutdown_Abort_server = -1;
+static gint hf_initshutdown_initshutdown_Init_message = -1;
 static gint hf_initshutdown_initshutdown_Init_hostname = -1;
-static gint hf_initshutdown_initshutdown_String_sub_name = -1;
-static gint hf_initshutdown_initshutdown_String_sub_name_size = -1;
+static gint hf_initshutdown_initshutdown_InitEx_reboot = -1;
 static gint hf_initshutdown_initshutdown_InitEx_reason = -1;
-static gint hf_initshutdown_initshutdown_InitEx_force_apps = -1;
-static gint hf_initshutdown_initshutdown_InitEx_timeout = -1;
-static gint hf_initshutdown_initshutdown_Init_timeout = -1;
 static gint hf_initshutdown_initshutdown_String_name_size = -1;
-static gint hf_initshutdown_initshutdown_Init_force_apps = -1;
+static gint hf_initshutdown_initshutdown_Init_timeout = -1;
 static gint hf_initshutdown_initshutdown_InitEx_hostname = -1;
-static gint hf_initshutdown_initshutdown_Init_reboot = -1;
-static gint hf_initshutdown_initshutdown_InitEx_reboot = -1;
-static gint hf_initshutdown_initshutdown_Init_message = -1;
-static gint hf_initshutdown_werror = -1;
 static gint hf_initshutdown_initshutdown_InitEx_message = -1;
-static gint hf_initshutdown_initshutdown_Abort_server = -1;
 static gint hf_initshutdown_initshutdown_String_name = -1;
+static gint hf_initshutdown_initshutdown_Init_reboot = -1;
+static gint hf_initshutdown_opnum = -1;
+static gint hf_initshutdown_initshutdown_Init_force_apps = -1;
+static gint hf_initshutdown_initshutdown_String_sub_name = -1;
+static gint hf_initshutdown_werror = -1;
+static gint hf_initshutdown_initshutdown_String_sub_name_size = -1;
+static gint hf_initshutdown_initshutdown_InitEx_force_apps = -1;
+static gint hf_initshutdown_initshutdown_InitEx_timeout = -1;
 
 static gint proto_dcerpc_initshutdown = -1;
 /* Version information */
@@ -262,7 +262,13 @@ initshutdown_dissect_element_Init_reboot(tvbuff_t *tvb, int offset, packet_info
 static int
 initshutdown_dissect_Init_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, NULL);
+	guint32 status;
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, &status);
+
+	if (status != 0 && check_col(pinfo->cinfo, COL_INFO))
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x"));
+
 	return offset;
 }
 
@@ -305,7 +311,13 @@ initshutdown_dissect_element_Abort_server_(tvbuff_t *tvb, int offset, packet_inf
 static int
 initshutdown_dissect_Abort_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, NULL);
+	guint32 status;
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, &status);
+
+	if (status != 0 && check_col(pinfo->cinfo, COL_INFO))
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x"));
+
 	return offset;
 }
 
@@ -393,7 +405,13 @@ initshutdown_dissect_element_InitEx_reason(tvbuff_t *tvb, int offset, packet_inf
 static int
 initshutdown_dissect_InitEx_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, NULL);
+	guint32 status;
+
+	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_initshutdown_werror, &status);
+
+	if (status != 0 && check_col(pinfo->cinfo, COL_INFO))
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, DOS_errors, "Unknown DOS error 0x%08x"));
+
 	return offset;
 }
 
@@ -430,43 +448,43 @@ void proto_register_dcerpc_initshutdown(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_initshutdown_initshutdown_String_name_len, 
-	  { "Name Len", "initshutdown.initshutdown_String.name_len", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_opnum, 
-	  { "Operation", "initshutdown.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Len", "initshutdown.initshutdown_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_Abort_server, 
+	  { "Server", "initshutdown.initshutdown_Abort.server", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_Init_message, 
+	  { "Message", "initshutdown.initshutdown_Init.message", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
 	{ &hf_initshutdown_initshutdown_Init_hostname, 
-	  { "Hostname", "initshutdown.initshutdown_Init.hostname", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_String_sub_name, 
-	  { "Name", "initshutdown.initshutdown_String_sub.name", FT_STRING, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_String_sub_name_size, 
-	  { "Name Size", "initshutdown.initshutdown_String_sub.name_size", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Hostname", "initshutdown.initshutdown_Init.hostname", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_InitEx_reboot, 
+	  { "Reboot", "initshutdown.initshutdown_InitEx.reboot", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_reason, 
-	  { "Reason", "initshutdown.initshutdown_InitEx.reason", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_InitEx_force_apps, 
-	  { "Force Apps", "initshutdown.initshutdown_InitEx.force_apps", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_InitEx_timeout, 
-	  { "Timeout", "initshutdown.initshutdown_InitEx.timeout", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_timeout, 
-	  { "Timeout", "initshutdown.initshutdown_Init.timeout", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Reason", "initshutdown.initshutdown_InitEx.reason", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
 	{ &hf_initshutdown_initshutdown_String_name_size, 
-	  { "Name Size", "initshutdown.initshutdown_String.name_size", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_force_apps, 
-	  { "Force Apps", "initshutdown.initshutdown_Init.force_apps", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Name Size", "initshutdown.initshutdown_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_Init_timeout, 
+	  { "Timeout", "initshutdown.initshutdown_Init.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_hostname, 
-	  { "Hostname", "initshutdown.initshutdown_InitEx.hostname", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_reboot, 
-	  { "Reboot", "initshutdown.initshutdown_Init.reboot", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_InitEx_reboot, 
-	  { "Reboot", "initshutdown.initshutdown_InitEx.reboot", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_message, 
-	  { "Message", "initshutdown.initshutdown_Init.message", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_werror, 
-	  { "Windows Error", "initshutdown.werror", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Hostname", "initshutdown.initshutdown_InitEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_message, 
-	  { "Message", "initshutdown.initshutdown_InitEx.message", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
-	{ &hf_initshutdown_initshutdown_Abort_server, 
-	  { "Server", "initshutdown.initshutdown_Abort.server", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Message", "initshutdown.initshutdown_InitEx.message", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
 	{ &hf_initshutdown_initshutdown_String_name, 
-	  { "Name", "initshutdown.initshutdown_String.name", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Name", "initshutdown.initshutdown_String.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_Init_reboot, 
+	  { "Reboot", "initshutdown.initshutdown_Init.reboot", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_opnum, 
+	  { "Operation", "initshutdown.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_Init_force_apps, 
+	  { "Force Apps", "initshutdown.initshutdown_Init.force_apps", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_String_sub_name, 
+	  { "Name", "initshutdown.initshutdown_String_sub.name", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_werror, 
+	  { "Windows Error", "initshutdown.werror", FT_UINT32, BASE_HEX, VALS(DOS_errors), 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_String_sub_name_size, 
+	  { "Name Size", "initshutdown.initshutdown_String_sub.name_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_InitEx_force_apps, 
+	  { "Force Apps", "initshutdown.initshutdown_InitEx.force_apps", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	{ &hf_initshutdown_initshutdown_InitEx_timeout, 
+	  { "Timeout", "initshutdown.initshutdown_InitEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
 	};