diff options
Diffstat (limited to 'epan/dissectors/packet-btl2cap.c')
-rw-r--r-- | epan/dissectors/packet-btl2cap.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index d18dd29aba..cb30450cee 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -795,12 +795,12 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, if (bt_uuid) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_service, tvb, 0, 0, bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (disconnect_in_frame < max_disconnect_in_frame) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_disconnect_in_frame, tvb, 0, 0, disconnect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -820,7 +820,7 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf proto_tree_add_item_ret_uint(command_tree, hf_btl2cap_le_psm, tvb, offset, 2, ENC_LITTLE_ENDIAN, &psm); if (psm < 0x80) { psm_item = proto_tree_add_item(command_tree, hf_btl2cap_psm, tvb, offset, 2, ENC_LITTLE_ENDIAN); - PROTO_ITEM_SET_GENERATED(psm_item); + proto_item_set_generated(psm_item); } offset += 2; @@ -948,12 +948,12 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf if (bt_uuid) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_service, tvb, 0, 0, bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (disconnect_in_frame < max_disconnect_in_frame) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_disconnect_in_frame, tvb, 0, 0, disconnect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -1908,17 +1908,17 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, if (psm > 0) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_psm, tvb, offset, 0, psm); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (bt_uuid) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_service, tvb, 0, 0, bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (connect_in_frame > 0) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_connect_in_frame, tvb, 0, 0, connect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } } @@ -1980,7 +1980,7 @@ dissect_b_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item_append_text(psm_item, ": %s", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown service")); } - PROTO_ITEM_SET_GENERATED(psm_item); + proto_item_set_generated(psm_item); /* call next dissector */ if (!dissector_try_uint_new(l2cap_cid_dissector_table, (guint32) cid, next_tvb, pinfo, tree, TRUE, l2cap_data)) { @@ -2096,7 +2096,7 @@ dissect_le_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item_append_text(psm_item, ": %s", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown service")); } - PROTO_ITEM_SET_GENERATED(psm_item); + proto_item_set_generated(psm_item); }/*psm*/ if (btl2cap_frame_data->first_fragment) { @@ -2229,7 +2229,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (mfp != NULL && mfp->last_frame) { proto_item *item; item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_reassembled_in, tvb, 0, 0, mfp->last_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_append_frame_number(pinfo, COL_INFO, "[Reassembled in #%u] ", mfp->last_frame); } } else { @@ -2254,7 +2254,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (mfp) { proto_item *item; item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_continuation_to, tvb, 0, 0, mfp->first_frame); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); col_append_fstr(pinfo->cinfo, COL_INFO, "[Continuation to #%u] ", mfp->first_frame); } } @@ -2304,7 +2304,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item_append_text(psm_item, " (%s)", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown service")); } - PROTO_ITEM_SET_GENERATED(psm_item); + proto_item_set_generated(psm_item); /* call next dissector */ if (!dissector_try_uint_new(l2cap_psm_dissector_table, (guint32) psm, next_tvb, pinfo, tree, TRUE, l2cap_data)) { @@ -2764,18 +2764,18 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (psm_data->connect_in_frame > 0 && psm_data->connect_in_frame < G_MAXUINT32) { sub_item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_connect_in_frame, tvb, 0, 0, psm_data->connect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (psm_data->disconnect_in_frame > 0 && psm_data->disconnect_in_frame < G_MAXUINT32) { sub_item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_disconnect_in_frame, tvb, 0, 0, psm_data->disconnect_in_frame); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } bt_uuid = get_service_uuid(pinfo, l2cap_data, psm_data->psm, psm_data->local_service); if (bt_uuid) { sub_item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_service, tvb, 0, 0, bt_uuid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); } if (config_data->mode == L2CAP_BASIC_MODE) { |