From 04cdccdb83db2646843bb98a69775b8b37fa50fc Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Wed, 27 Nov 2013 16:30:20 +0000 Subject: - Create/use several extended value_strings (sort associated value_string arrays as needed); - Use new VALUE_STRING_LIST mechanism/macros to create enums and value_string arrays for: WERR_errors, DOS_errors, SRV_errors, and HRD_errors; - Declare certain global value_string arrays as static (local) and use global extended value_strings to reference same; (e.g., ms_coiuntry_codes value_string_array) - Rename SMBE_... defs used in several different value_string arrays to prevent potential name collisions: ( e.g., for SRV_errors: SMBE_... ==> SMBE_SRV_...) Done for value_string arrays: DOS_errors, SRV_errors, HRD_errors; - WERR_errors value_string array: Note that WERR associated defs no longer exist in the latest samba doserr.h. (The WERR_errors defs were originally generated from the samba doserr.h). For now: WERR_errors kept as is. - ToDo: Fix PIDL-generated dcerpc dissectors to use NT_errors_ext and WERR_errors_ext extended value_strings. - Add editor modelines to a few files. - Make whitespace changes. svn path=/trunk/; revision=53614 --- epan/dissectors/packet-dcerpc-netlogon.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'epan/dissectors/packet-dcerpc-netlogon.c') diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 4b35195d04..de0ba211d4 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -4921,7 +4921,7 @@ netlogon_dissect_netrlogoncontrol2_reply(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_netlogon_werr_rc, &status); if (status != 0) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str(status, WERR_errors, "Unknown WERR error 0x%08x")); + col_append_fstr(pinfo->cinfo, COL_INFO, ", Error: %s", val_to_str_ext(status, &WERR_errors_ext, "Unknown WERR error 0x%08x")); return offset; @@ -8067,16 +8067,16 @@ proto_register_dcerpc_netlogon(void) NULL, 0x0, NULL, HFILL }}, { &hf_netlogon_rc, { - "Return code", "netlogon.rc", FT_UINT32, BASE_HEX, - VALS(NT_errors), 0x0, "Netlogon return code", HFILL }}, + "Return code", "netlogon.rc", FT_UINT32, BASE_HEX | BASE_EXT_STRING, + &NT_errors_ext, 0x0, "Netlogon return code", HFILL }}, { &hf_netlogon_dos_rc, { "DOS error code", "netlogon.dos.rc", FT_UINT32, - BASE_HEX, VALS(DOS_errors), 0x0, NULL, HFILL}}, + BASE_HEX | BASE_EXT_STRING, &DOS_errors_ext, 0x0, NULL, HFILL}}, { &hf_netlogon_werr_rc, { "WERR error code", "netlogon.werr.rc", FT_UINT32, - BASE_HEX, VALS(WERR_errors), 0x0, NULL, HFILL}}, + BASE_HEX | BASE_EXT_STRING, &WERR_errors_ext, 0x0, NULL, HFILL}}, { &hf_netlogon_param_ctrl, { "Param Ctrl", "netlogon.param_ctrl", FT_UINT32, BASE_HEX, @@ -8575,8 +8575,8 @@ proto_register_dcerpc_netlogon(void) NULL, 0x0, "Number of failed logins", HFILL }}, { &hf_netlogon_country, - { "Country", "netlogon.country", FT_UINT16, BASE_DEC, - VALS(ms_country_codes), 0x0, "Country setting for this account", HFILL }}, + { "Country", "netlogon.country", FT_UINT16, BASE_DEC | BASE_EXT_STRING, + &ms_country_codes_ext, 0x0, "Country setting for this account", HFILL }}, { &hf_netlogon_codepage, { "Codepage", "netlogon.codepage", FT_UINT16, BASE_DEC, -- cgit v1.2.3