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

Get rid of Boolean "flags" that don't have any bit set. 

And tweak the Pidl generator for Wireshark not to generate "flags" like
that.

(The generator also does field name and true/false strings' case
differently, so I didn't use it to regenerate the dissectors; that needs
to be looked at.)

Change-Id: Ie1657a782ebdb107e58792cedd29bbaa79b17bd4
Reviewed-on: https://code.wireshark.org/review/18695
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-11-06 11:02:51 -08:00
parent a5a179dd49
commit 5ae9af9e50
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-dcerpc-eventlog.c
View File

@ -40,7 +40,6 @@ static gint hf_eventlog_eventlogEventTypes_EVENTLOG_AUDIT_FAILURE = -1;
static gint hf_eventlog_eventlogEventTypes_EVENTLOG_AUDIT_SUCCESS = -1;
static gint hf_eventlog_eventlogEventTypes_EVENTLOG_ERROR_TYPE = -1;
static gint hf_eventlog_eventlogEventTypes_EVENTLOG_INFORMATION_TYPE = -1;
static gint hf_eventlog_eventlogEventTypes_EVENTLOG_SUCCESS = -1;
static gint hf_eventlog_eventlogEventTypes_EVENTLOG_WARNING_TYPE = -1;
static gint hf_eventlog_eventlogReadFlags_EVENTLOG_BACKWARDS_READ = -1;
static gint hf_eventlog_eventlogReadFlags_EVENTLOG_FORWARDS_READ = -1;
@ -150,10 +149,6 @@ static const true_false_string eventlogReadFlags_EVENTLOG_BACKWARDS_READ_tfs = {
"EVENTLOG_BACKWARDS_READ is SET",
"EVENTLOG_BACKWARDS_READ is NOT SET",
};
static const true_false_string eventlogEventTypes_EVENTLOG_SUCCESS_tfs = {
"EVENTLOG_SUCCESS is SET",
"EVENTLOG_SUCCESS is NOT SET",
};
static const true_false_string eventlogEventTypes_EVENTLOG_ERROR_TYPE_tfs = {
"EVENTLOG_ERROR_TYPE is SET",
"EVENTLOG_ERROR_TYPE is NOT SET",
@ -422,7 +417,6 @@ eventlog_dissect_bitmap_eventlogEventTypes(tvbuff_t *tvb _U_, int offset _U_, pa
{
proto_item *item;
static const int * eventlog_eventlogEventTypes_fields[] = {
&hf_eventlog_eventlogEventTypes_EVENTLOG_SUCCESS,
&hf_eventlog_eventlogEventTypes_EVENTLOG_ERROR_TYPE,
&hf_eventlog_eventlogEventTypes_EVENTLOG_WARNING_TYPE,
&hf_eventlog_eventlogEventTypes_EVENTLOG_INFORMATION_TYPE,
@ -2195,8 +2189,6 @@ void proto_register_dcerpc_eventlog(void)
{ "EVENTLOG ERROR TYPE", "eventlog.eventlogEventTypes.EVENTLOG_ERROR_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_ERROR_TYPE_tfs), ( 0x0001 ), NULL, HFILL }},
{ &hf_eventlog_eventlogEventTypes_EVENTLOG_INFORMATION_TYPE,
{ "EVENTLOG INFORMATION TYPE", "eventlog.eventlogEventTypes.EVENTLOG_INFORMATION_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_INFORMATION_TYPE_tfs), ( 0x0004 ), NULL, HFILL }},
{ &hf_eventlog_eventlogEventTypes_EVENTLOG_SUCCESS,
{ "EVENTLOG SUCCESS", "eventlog.eventlogEventTypes.EVENTLOG_SUCCESS", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_SUCCESS_tfs), ( 0x0000 ), NULL, HFILL }},
{ &hf_eventlog_eventlogEventTypes_EVENTLOG_WARNING_TYPE,
{ "EVENTLOG WARNING TYPE", "eventlog.eventlogEventTypes.EVENTLOG_WARNING_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_WARNING_TYPE_tfs), ( 0x0002 ), NULL, HFILL }},
{ &hf_eventlog_eventlogReadFlags_EVENTLOG_BACKWARDS_READ,

8
epan/dissectors/packet-dcerpc-witness.c
View File

@ -56,7 +56,6 @@ static gint hf_witness_witness_RegisterEx_client_computer_name = -1;
static gint hf_witness_witness_RegisterEx_context_handle = -1;
static gint hf_witness_witness_RegisterEx_flags = -1;
static gint hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_IP_NOTIFICATION = -1;
static gint hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_NONE = -1;
static gint hf_witness_witness_RegisterEx_ip_address = -1;
static gint hf_witness_witness_RegisterEx_net_name = -1;
static gint hf_witness_witness_RegisterEx_share_name = -1;
@ -182,10 +181,6 @@ static int witness_dissect_element_notifyResponse_message_data(tvbuff_t *tvb _U_
static int witness_dissect_element_notifyResponse_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint32 *type);
static int witness_dissect_element_notifyResponse_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
static int witness_dissect_element_notifyResponse_num(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
static const true_false_string witness_RegisterEx_flags_WITNESS_REGISTER_NONE_tfs = {
"WITNESS_REGISTER_NONE is SET",
"WITNESS_REGISTER_NONE is NOT SET",
};
static const true_false_string witness_RegisterEx_flags_WITNESS_REGISTER_IP_NOTIFICATION_tfs = {
"WITNESS_REGISTER_IP_NOTIFICATION is SET",
"WITNESS_REGISTER_IP_NOTIFICATION is NOT SET",
@ -961,7 +956,6 @@ witness_dissect_bitmap_RegisterEx_flags(tvbuff_t *tvb _U_, int offset _U_, packe
{
proto_item *item;
static const int * witness_witness_RegisterEx_flags_fields[] = {
&hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_NONE,
&hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_IP_NOTIFICATION,
NULL
};
@ -1478,8 +1472,6 @@ void proto_register_dcerpc_witness(void)
{ "Flags", "witness.witness_RegisterEx.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_IP_NOTIFICATION,
{ "WITNESS REGISTER IP NOTIFICATION", "witness.witness_RegisterEx_flags.WITNESS_REGISTER_IP_NOTIFICATION", FT_BOOLEAN, 32, TFS(&witness_RegisterEx_flags_WITNESS_REGISTER_IP_NOTIFICATION_tfs), ( 0x01 ), NULL, HFILL }},
{ &hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_NONE,
{ "WITNESS REGISTER NONE", "witness.witness_RegisterEx_flags.WITNESS_REGISTER_NONE", FT_BOOLEAN, 32, TFS(&witness_RegisterEx_flags_WITNESS_REGISTER_NONE_tfs), ( 0x00 ), NULL, HFILL }},
{ &hf_witness_witness_RegisterEx_ip_address,
{ "Ip Address", "witness.witness_RegisterEx.ip_address", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_witness_witness_RegisterEx_net_name,

29
tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
View File

@ -226,8 +226,10 @@ sub Bitmap($$$$)
my $hf_bitname = "hf_$ifname\_$name\_$1";
$ev =~ s/[()\s]//g;
$total_ev += hex($ev);
$self->pidl_code("&$hf_bitname,");
if (hex($ev) != 0) {
$total_ev += hex($ev);
$self->pidl_code("&$hf_bitname,");
}
}
$self->pidl_code("NULL");
$self->deindent;
@ -267,18 +269,21 @@ sub Bitmap($$$$)
$self->{hf_used}->{$hf_bitname} = 1;
$self->register_hf_field($hf_bitname, field2name($en), $filtername, "FT_BOOLEAN", $e->{ALIGN} * 8, "TFS(&$name\_$en\_tfs)", $ev, "");
$ev =~ s/[()\s]//g;
if (hex($ev) != 0) {
$self->register_hf_field($hf_bitname, field2name($en), $filtername, "FT_BOOLEAN", $e->{ALIGN} * 8, "TFS(&$name\_$en\_tfs)", "( $ev )", "");
$self->pidl_def("static const true_false_string $name\_$en\_tfs = {");
if (defined($self->{conformance}->{tfs}->{$hf_bitname})) {
$self->pidl_def(" $self->{conformance}->{tfs}->{$hf_bitname}->{TRUE_STRING},");
$self->pidl_def(" $self->{conformance}->{tfs}->{$hf_bitname}->{FALSE_STRING},");
$self->{conformance}->{tfs}->{$hf_bitname}->{USED} = 1;
} else {
$self->pidl_def(" \"$en is SET\",");
$self->pidl_def(" \"$en is NOT SET\",");
$self->pidl_def("static const true_false_string $name\_$en\_tfs = {");
if (defined($self->{conformance}->{tfs}->{$hf_bitname})) {
$self->pidl_def(" $self->{conformance}->{tfs}->{$hf_bitname}->{TRUE_STRING},");
$self->pidl_def(" $self->{conformance}->{tfs}->{$hf_bitname}->{FALSE_STRING},");
$self->{conformance}->{tfs}->{$hf_bitname}->{USED} = 1;
} else {
$self->pidl_def(" \"$en is SET\",");
$self->pidl_def(" \"$en is NOT SET\",");
}
$self->pidl_def("};");
}
$self->pidl_def("};");
}
if ($element_count > 0) {