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

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>
This commit is contained in:
Stig Bjørlykke 2018-01-05 09:45:20 +01:00
parent 4690aa119c
commit fb9abcf2d4
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-btatt.c
View File

@ -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);