diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-09-25 11:23:39 +0200 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2015-10-17 10:21:45 +0000 |
| commit | b271537c2465aa42bbef61a8c1b252400630ae3f (patch) | |
| tree | b725e053db6d21e9536c01af733902939609d152 /epan/dissectors | |
| parent | 8bb4fed753b05147166be2b8429be643ac88438e (diff) | |
Bluetooth: Fix expert info for undecoded data
Swap PI_* values avoid crashes (assert...) of expert info.
Change-Id: I5f5188c9358a4ac93565fc079a3a0e8ea4b7f965
Reviewed-on: https://code.wireshark.org/review/11019
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-btatt.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-bthci_cmd.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-bthci_evt.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-bthci_vendor.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index c2b81bdebd..318d1bcecd 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -10605,7 +10605,7 @@ proto_register_btatt(void) { &ei_btatt_opcode_invalid_request, { "btatt.opcode.invalid_request" , PI_PROTOCOL, PI_WARN, "Invalid request", EXPFILL }}, { &ei_btatt_opcode_invalid_response,{ "btatt.opcode.invalid_response", PI_PROTOCOL, PI_WARN, "Invalid response", EXPFILL }}, { &ei_btatt_unexpected_data, { "btatt.unexpected_data", PI_PROTOCOL, PI_WARN, "Unexpected Data", EXPFILL }}, - { &ei_btatt_undecoded, { "btatt.undecoded", PI_PROTOCOL, PI_UNDECODED, "Undecoded", EXPFILL }}, + { &ei_btatt_undecoded, { "btatt.undecoded", PI_UNDECODED, PI_NOTE, "Undecoded", EXPFILL }}, }; static build_valid_func btatt_handle_da_build_value[1] = {btatt_handle_value}; diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index c1265ca352..19e8fbe81c 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -4796,7 +4796,7 @@ proto_register_bthci_cmd(void) static ei_register_info ei[] = { { &ei_command_unknown_command, { "bthci_cmd.expert.command.unknown_command", PI_PROTOCOL, PI_WARN, "Unknown command", EXPFILL }}, { &ei_command_parameter_unexpected, { "bthci_cmd.expert.parameter.unexpected", PI_PROTOCOL, PI_WARN, "Unexpected command parameter", EXPFILL }}, - { &ei_command_undecoded, { "bthci_cmd.expert.command.undecoded", PI_PROTOCOL, PI_UNDECODED, "Command undecoded", EXPFILL }} + { &ei_command_undecoded, { "bthci_cmd.expert.command.undecoded", PI_UNDECODED, PI_NOTE, "Command undecoded", EXPFILL }} }; static gint *ett[] = { @@ -6132,7 +6132,7 @@ proto_register_btcommon(void) }; static ei_register_info ei[] = { - { &ei_eir_ad_undecoded, { "btcommon.eir_ad.undecoded", PI_PROTOCOL, PI_UNDECODED, "Undecoded", EXPFILL }}, + { &ei_eir_ad_undecoded, { "btcommon.eir_ad.undecoded", PI_UNDECODED, PI_NOTE, "Undecoded", EXPFILL }}, { &ei_eir_ad_unknown, { "btcommon.eir_ad.unknown", PI_PROTOCOL, PI_WARN, "Unknown data", EXPFILL }}, }; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 701bb83c8a..90f790df64 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -6100,7 +6100,7 @@ proto_register_bthci_evt(void) }; static ei_register_info ei[] = { - { &ei_event_undecoded, { "bthci_evt.expert.event.undecoded", PI_PROTOCOL, PI_UNDECODED, "Event undecoded", EXPFILL }}, + { &ei_event_undecoded, { "bthci_evt.expert.event.undecoded", PI_UNDECODED, PI_NOTE, "Event undecoded", EXPFILL }}, { &ei_event_unknown_event, { "bthci_evt.expert.event.unknown_event", PI_PROTOCOL, PI_WARN, "Unknown event", EXPFILL }}, { &ei_event_unknown_command, { "bthci_evt.expert.event.unknown_command", PI_PROTOCOL, PI_WARN, "Unknown command", EXPFILL }}, { &ei_manufacturer_data_changed, { "bthci_evt.expert.event.manufacturer_data_changed", PI_PROTOCOL, PI_WARN, "Manufacturer data changed", EXPFILL }} diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c index 813ee013ab..78c40ad617 100644 --- a/epan/dissectors/packet-bthci_vendor.c +++ b/epan/dissectors/packet-bthci_vendor.c @@ -1434,7 +1434,7 @@ proto_register_bthci_vendor_broadcom(void) }; static ei_register_info ei[] = { - { &ei_undecoded, { "bthci_vendor.broadcom.undecoded", PI_PROTOCOL, PI_UNDECODED, "Undecoded", EXPFILL }}, + { &ei_undecoded, { "bthci_vendor.broadcom.undecoded", PI_UNDECODED, PI_NOTE, "Undecoded", EXPFILL }}, { &ei_unexpected_parameter, { "bthci_vendor.broadcom.unexpected_parameter", PI_PROTOCOL, PI_WARN, "Unexpected parameter", EXPFILL }}, { &ei_unexpected_data, { "bthci_vendor.broadcom.unexpected_data", PI_PROTOCOL, PI_WARN, "Unexpected data", EXPFILL }}, }; |