diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-09-19 22:23:27 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-09-20 11:59:25 +0000 |
| commit | 06237e487885387591087646b788925ff38e773b (patch) | |
| tree | 07dc54c02e926b8b8a2238676699b4234e518d71 /epan/dissectors/packet-dcerpc-rfr.c | |
| parent | 1e47e050dcdf30eced478e6909408d79548975c6 (diff) | |
proto_tree_add_text -> proto_tree_add_subtree[_format] for DCE/RPC dissectors.
Change-Id: I84755d059ef70ca98b0e7626b6425360daf0529d
Reviewed-on: https://code.wireshark.org/review/4199
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dcerpc-rfr.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-rfr.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c index 86d184a5ea..2eef4c9c99 100644 --- a/epan/dissectors/packet-dcerpc-rfr.c +++ b/epan/dissectors/packet-dcerpc-rfr.c @@ -32,15 +32,15 @@ static gint ett_dcerpc_rfr = -1; /* Header field declarations */ static gint hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN = -1; +static gint hf_rfr_MAPISTATUS_status = -1; +static gint hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags = -1; static gint hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN = -1; static gint hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN = -1; -static gint hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags = -1; +static gint hf_rfr_RfrGetNewDSA_ulFlags = -1; static gint hf_rfr_RfrGetNewDSA_pUserDN = -1; -static gint hf_rfr_RfrGetNewDSA_ppszUnused = -1; -static gint hf_rfr_opnum = -1; -static gint hf_rfr_MAPISTATUS_status = -1; static gint hf_rfr_RfrGetNewDSA_ppszServer = -1; -static gint hf_rfr_RfrGetNewDSA_ulFlags = -1; +static gint hf_rfr_opnum = -1; +static gint hf_rfr_RfrGetNewDSA_ppszUnused = -1; static gint proto_dcerpc_rfr = -1; /* Version information */ @@ -315,9 +315,9 @@ rfr_dissect_element_RfrGetNewDSA_ppszServer__(tvbuff_t *tvb _U_, int offset _U_, /* IDL: MAPISTATUS RfrGetNewDSA( */ /* IDL: [in] uint32 ulFlags, */ -/* IDL: [ref] [charset(DOS)] [in] uint8 *pUserDN, */ -/* IDL: [out] [unique(1)] [in] [charset(DOS)] uint8 **ppszUnused, */ -/* IDL: [charset(DOS)] [in] [out] [unique(1)] uint8 **ppszServer */ +/* IDL: [in] [ref] [charset(DOS)] uint8 *pUserDN, */ +/* IDL: [charset(DOS)] [unique(1)] [out] [in] uint8 **ppszUnused, */ +/* IDL: [charset(DOS)] [unique(1)] [out] [in] uint8 **ppszServer */ /* IDL: ); */ static int @@ -418,9 +418,9 @@ rfr_dissect_element_RfrGetFQDNFromLegacyDN_ppszServerFQDN__(tvbuff_t *tvb _U_, i /* IDL: MAPISTATUS RfrGetFQDNFromLegacyDN( */ /* IDL: [in] uint32 ulFlags, */ -/* IDL: [range(10,1024)] [in] uint32 cbMailboxServerDN, */ -/* IDL: [size_is(cbMailboxServerDN)] [in] [ref] [charset(DOS)] uint8 *szMailboxServerDN, */ -/* IDL: [out] [ref] [charset(DOS)] uint8 **ppszServerFQDN */ +/* IDL: [in] [range(10,1024)] uint32 cbMailboxServerDN, */ +/* IDL: [size_is(cbMailboxServerDN)] [charset(DOS)] [ref] [in] uint8 *szMailboxServerDN, */ +/* IDL: [out] [charset(DOS)] [ref] uint8 **ppszServerFQDN */ /* IDL: ); */ static int @@ -465,25 +465,25 @@ void proto_register_dcerpc_rfr(void) { static hf_register_info hf[] = { { &hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN, - { "Szmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.szMailboxServerDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { "Szmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.szMailboxServerDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_rfr_MAPISTATUS_status, + { "MAPISTATUS", "rfr.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(rfr_MAPISTATUS_vals), 0, NULL, HFILL }}, + { &hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags, + { "Ulflags", "rfr.RfrGetFQDNFromLegacyDN.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN, - { "Cbmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.cbMailboxServerDN", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { "Cbmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.cbMailboxServerDN", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN, - { "Ppszserverfqdn", "rfr.RfrGetFQDNFromLegacyDN.ppszServerFQDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags, - { "Ulflags", "rfr.RfrGetFQDNFromLegacyDN.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { "Ppszserverfqdn", "rfr.RfrGetFQDNFromLegacyDN.ppszServerFQDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_rfr_RfrGetNewDSA_ulFlags, + { "Ulflags", "rfr.RfrGetNewDSA.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_rfr_RfrGetNewDSA_pUserDN, - { "Puserdn", "rfr.RfrGetNewDSA.pUserDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_rfr_RfrGetNewDSA_ppszUnused, - { "Ppszunused", "rfr.RfrGetNewDSA.ppszUnused", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_rfr_opnum, - { "Operation", "rfr.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_rfr_MAPISTATUS_status, - { "MAPISTATUS", "rfr.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(rfr_MAPISTATUS_vals), 0, NULL, HFILL }}, + { "Puserdn", "rfr.RfrGetNewDSA.pUserDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_rfr_RfrGetNewDSA_ppszServer, - { "Ppszserver", "rfr.RfrGetNewDSA.ppszServer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_rfr_RfrGetNewDSA_ulFlags, - { "Ulflags", "rfr.RfrGetNewDSA.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { "Ppszserver", "rfr.RfrGetNewDSA.ppszServer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_rfr_opnum, + { "Operation", "rfr.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_rfr_RfrGetNewDSA_ppszUnused, + { "Ppszunused", "rfr.RfrGetNewDSA.ppszUnused", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, }; |