diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-11-02 18:57:12 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-11-03 01:58:16 +0000 |
| commit | eb56b7172d33605cbb969afd91beb302f89013ed (patch) | |
| tree | 5a4cd23b7fccc7e4266bd06e5e68ce1fdb6ef7a6 /epan | |
| parent | 46160ff0394c9aa1fe99c8ac34fb83d70b206460 (diff) | |
| download | wireshark-eb56b7172d33605cbb969afd91beb302f89013ed.tar.gz | |
RTS_FLAG_NONE is a flags field value, but it's not a flag bit.
It's the *absence* of flag bits, so you can't test whether it's set;
don't have a field for it. This gets rid of a dissector assertion.
Add some more URLs for information about DCE RPC and MS-RPC.
Change-Id: I53e8f11692c66e16ae2ec7fd4ba8eb90b0673da4
Reviewed-on: https://code.wireshark.org/review/18648
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dcerpc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index a9f931fbfc..206a6410f6 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -24,7 +24,13 @@ */ /* The DCE RPC specification can be found at: - * http://www.opengroup.org/dce/ + * + * http://www.opengroup.org/dce/ + * https://www2.opengroup.org/ogsys/catalog/c706 + * + * Microsoft extensions can be found at: + * + * https://msdn.microsoft.com/en-us/library/jj652470.aspx */ #include "config.h" @@ -487,7 +493,6 @@ static int hf_dcerpc_cn_cancel_count = -1; static int hf_dcerpc_cn_status = -1; static int hf_dcerpc_cn_deseg_req = -1; static int hf_dcerpc_cn_rts_flags = -1; -static int hf_dcerpc_cn_rts_flags_none = -1; static int hf_dcerpc_cn_rts_flags_ping = -1; static int hf_dcerpc_cn_rts_flags_other_cmd = -1; static int hf_dcerpc_cn_rts_flags_recycle_channel = -1; @@ -4926,7 +4931,6 @@ dissect_dcerpc_cn_rts(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint32 i; const char *info_str = NULL; static const int * flags[] = { - &hf_dcerpc_cn_rts_flags_none, &hf_dcerpc_cn_rts_flags_ping, &hf_dcerpc_cn_rts_flags_other_cmd, &hf_dcerpc_cn_rts_flags_recycle_channel, @@ -6782,8 +6786,6 @@ proto_register_dcerpc(void) { &hf_dcerpc_cn_rts_flags, { "RTS Flags", "dcerpc.cn_rts_flags", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_dcerpc_cn_rts_flags_none, - {"None", "dcerpc.cn_rts_flags.none", FT_BOOLEAN, 8, TFS(&tfs_set_notset), RTS_FLAG_NONE, NULL, HFILL }}, { &hf_dcerpc_cn_rts_flags_ping, { "Ping", "dcerpc.cn_rts.flags.ping", FT_BOOLEAN, 8, TFS(&tfs_set_notset), RTS_FLAG_PING, NULL, HFILL }}, { &hf_dcerpc_cn_rts_flags_other_cmd, |