diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2018-01-05 09:45:20 +0100 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2018-01-05 09:18:43 +0000 |
| commit | fb9abcf2d4c50c2ff528ee2ed5750fbab48743bf (patch) | |
| tree | 4ead96889312a7ebc600822af2c302129ee36c59 /epan | |
| parent | 4690aa119c4a94d85b18e34828cb9016574ecd77 (diff) | |
btatt: Avoid duplicate "Handle:" in COL_INFO
Do not add two "Handle:" in COL_INFO for opcode "Error Response".
Change-Id: I13dd5fc3bbef1762c2e868dfe885fa5d6437412e
Reviewed-on: https://code.wireshark.org/review/25152
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-btatt.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 51193e03b2..2bcae61596 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -9759,9 +9759,8 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) hfx_btatt_error_code = hf_btatt_error_code; } } - col_append_fstr(pinfo->cinfo, COL_INFO, " - %s, Handle: 0x%04x", - val_to_str_const(error_code, error_vals, "<unknown>"), - handle); + col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", + val_to_str_const(error_code, error_vals, "<unknown>")); col_append_info_by_handle(pinfo, handle, bluetooth_data); @@ -9845,8 +9844,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset += 2; proto_item_append_text(sub_item, ", Handle: 0x%04x, UUID: %s", - tvb_get_letohs(tvb, offset - 4), - print_uuid(&uuid)); + handle, print_uuid(&uuid)); save_handle(pinfo, uuid, handle, ATTRIBUTE_TYPE_OTHER, bluetooth_data); @@ -9866,8 +9864,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset += 16; proto_item_append_text(sub_item, ", Handle: 0x%04x, UUID: %s", - tvb_get_letohs(tvb, offset - 4), - print_uuid(&uuid)); + handle, print_uuid(&uuid)); save_handle(pinfo, uuid, handle, ATTRIBUTE_TYPE_OTHER, bluetooth_data); |