osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2016-11-02 18:57:12 -07:00
parent 46160ff039
commit eb56b7172d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-dcerpc.c
View File

@ -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,