aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-btavdtp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-btavdtp.c')
-rw-r--r--epan/dissectors/packet-btavdtp.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c
index aae85ae0a6..d76fdedc85 100644
--- a/epan/dissectors/packet-btavdtp.c
+++ b/epan/dissectors/packet-btavdtp.c
@@ -234,9 +234,9 @@ static dissector_handle_t bta2dp_handle;
static dissector_handle_t btvdp_handle;
static dissector_handle_t rtp_handle;
-static emem_tree_t *sep_list = NULL;
-static emem_tree_t *sep_open = NULL;
-static emem_tree_t *cid_to_type_table = NULL;
+static wmem_tree_t *sep_list = NULL;
+static wmem_tree_t *sep_open = NULL;
+static wmem_tree_t *cid_to_type_table = NULL;
/* A2DP declarations */
static int proto_bta2dp = -1;
@@ -414,7 +414,7 @@ static const char *
get_sep_type(guint32 frame_number, guint seid)
{
sep_entry_t *sep;
- emem_tree_key_t key[3];
+ wmem_tree_key_t key[3];
guint32 t_seid;
guint32 t_frame_number;
@@ -428,7 +428,7 @@ get_sep_type(guint32 frame_number, guint seid)
key[2].length = 0;
key[2].key = NULL;
- sep = (sep_entry_t *)se_tree_lookup32_array_le(sep_list, key);
+ sep = (sep_entry_t *)wmem_tree_lookup32_array_le(sep_list, key);
if (sep && sep->seid == seid) {
return val_to_str_const(sep->type, sep_type_vals, "unknown");
}
@@ -440,7 +440,7 @@ static const char *
get_sep_media_type(guint32 frame_number, guint seid)
{
sep_entry_t *sep;
- emem_tree_key_t key[3];
+ wmem_tree_key_t key[3];
guint32 t_seid;
guint32 t_frame_number;
@@ -454,7 +454,7 @@ get_sep_media_type(guint32 frame_number, guint seid)
key[2].length = 0;
key[2].key = NULL;
- sep = (sep_entry_t *)se_tree_lookup32_array_le(sep_list, key);
+ sep = (sep_entry_t *)wmem_tree_lookup32_array_le(sep_list, key);
if (sep && sep->seid == seid) {
return val_to_str_const(sep->media_type, media_type_vals, "unknown");
}
@@ -475,7 +475,7 @@ dissect_sep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
guint in_use;
guint items;
sep_entry_t *sep_data;
- emem_tree_key_t key[3];
+ wmem_tree_key_t key[3];
guint32 t_seid;
guint32 t_frame_number;
@@ -523,7 +523,7 @@ dissect_sep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
sep_data->state = SEP_STATE_FREE;
}
- se_tree_insert32_array(sep_list, key, sep_data);
+ wmem_tree_insert32_array(sep_list, key, sep_data);
}
offset += 1;
@@ -932,7 +932,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint message_type = 0;
gint signal_id = 0;
guint delay;
- emem_tree_key_t key[4];
+ wmem_tree_key_t key[4];
guint32 t_type;
guint32 t_cid;
guint32 t_frame_number;
@@ -983,7 +983,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* It is AVDTP Signaling rsp side */
cid_type_data->type = STREAM_TYPE_SIGNAL;
} else {
- sep = (sep_entry_t *)se_tree_lookup32_le(sep_open, pinfo->fd->num);
+ sep = (sep_entry_t *)wmem_tree_lookup32_le(sep_open, pinfo->fd->num);
if (sep && sep->state == SEP_STATE_OPEN) {
sep->state = SEP_STATE_IN_USE;
@@ -1004,7 +1004,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
key[3].length = 0;
key[3].key = NULL;
- se_tree_insert32_array(cid_to_type_table, key, cid_type_data);
+ wmem_tree_insert32_array(cid_to_type_table, key, cid_type_data);
}
@@ -1022,7 +1022,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
key[3].length = 0;
key[3].key = NULL;
- cid_type_data = (cid_type_data_t *)se_tree_lookup32_array_le(cid_to_type_table, key);
+ cid_type_data = (cid_type_data_t *)wmem_tree_lookup32_array_le(cid_to_type_table, key);
if (cid_type_data && cid_type_data->type == STREAM_TYPE_MEDIA && cid_type_data->cid == l2cap_data->cid) {
/* AVDTP Media */
@@ -1137,7 +1137,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
key[2].length = 0;
key[2].key = NULL;
- sep = (sep_entry_t *)se_tree_lookup32_array_le(sep_list, key);
+ sep = (sep_entry_t *)wmem_tree_lookup32_array_le(sep_list, key);
if (sep && sep->seid == seid) {
sep->codec = codec;
}
@@ -1177,7 +1177,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
key[2].length = 0;
key[2].key = NULL;
- sep = (sep_entry_t *)se_tree_lookup32_array_le(sep_list, key);
+ sep = (sep_entry_t *)wmem_tree_lookup32_array_le(sep_list, key);
if (sep && sep->seid == seid) {
sep->codec = codec;
}
@@ -1205,12 +1205,12 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
key[2].length = 0;
key[2].key = NULL;
- sep = (sep_entry_t *)se_tree_lookup32_array_le(sep_list, key);
+ sep = (sep_entry_t *)wmem_tree_lookup32_array_le(sep_list, key);
if (sep && sep->seid == seid) {
sep->state = SEP_STATE_OPEN;
}
- se_tree_insert32(sep_open, pinfo->fd->num, sep);
+ wmem_tree_insert32(sep_open, pinfo->fd->num, sep);
break;
}
if (message_type == MESSAGE_TYPE_REJECT) {
@@ -1942,9 +1942,9 @@ proto_register_btavdtp(void)
"Force decoding as AVDTP Signaling",
&force_avdtp);
- sep_list = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "btavdtp sep list");
- sep_open = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "btavdtp open seps");
- cid_to_type_table = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "btavdtp cid to type");
+ sep_list = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
+ sep_open = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
+ cid_to_type_table = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); /* cid: type */
}
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 09:15:52 +0000