diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-08-26 13:13:57 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-08-28 07:07:37 +0000 |
| commit | 845b781dfb393e634a8b855adefc99292e12c906 (patch) | |
| tree | e4835b3e428bc70a2a114b25fa019951904b0b0b /epan/dissectors/packet-btle.c | |
| parent | 852493ad7ffca8ce87ea4613517b5acd2834b529 (diff) | |
Bluetooth: btle: Clear info column before use it
This fix "btle" over "ubertooth" dissector, so messeges from both
will not be merged.
Change-Id: I587b81a405f37d16e8ab417d94edfc633bfc14fc
Reviewed-on: https://code.wireshark.org/review/3877
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-btle.c')
| -rw-r--r-- | epan/dissectors/packet-btle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 2047557b00..288a9beeb1 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -510,11 +510,11 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x01: /* Continuation fragment of an L2CAP message, or an Empty PDU */ /* TODO: Try reassemble cases 0x01 and 0x02 */ if (length > 0) { - col_append_str(pinfo->cinfo, COL_INFO, "L2CAP Fragment"); + col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Fragment"); proto_tree_add_item(btle_tree, hf_l2cap_fragment, tvb, offset, length, ENC_NA); offset += length; } else { - col_append_str(pinfo->cinfo, COL_INFO, "Empty PDU"); + col_set_str(pinfo->cinfo, COL_INFO, "Empty PDU"); } break; @@ -522,13 +522,13 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (length > 0) { if (tvb_get_letohs(tvb, offset) > length) { /* TODO: Try reassemble cases 0x01 and 0x02 */ - col_append_str(pinfo->cinfo, COL_INFO, "L2CAP Fragment"); + col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Fragment"); proto_tree_add_item(btle_tree, hf_l2cap_fragment, tvb, offset, length, ENC_NA); offset += length; } else { bthci_acl_data_t *acl_data; - col_append_str(pinfo->cinfo, COL_INFO, "L2CAP Data"); + col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Data"); /* TODO: Temporary solution while chandle source/bd_addrs is unknown */ acl_data = wmem_new(wmem_packet_scope(), bthci_acl_data_t); acl_data->interface_id = interface_id; @@ -548,7 +548,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) control_opcode = tvb_get_guint8(tvb, offset); offset += 1; - col_append_fstr(pinfo->cinfo, COL_INFO, "Control Opcode: %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "Control Opcode: %s", val_to_str_ext_const(control_opcode, &control_opcode_vals_ext, "Unknown")); switch (control_opcode) { |