diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-19 13:51:52 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-19 13:51:52 +0000 |
| commit | d31620a7bf42c2bb561188f0611af3097e0e8173 (patch) | |
| tree | 3391bc5742ede5e33903a77c4b1e5585c5a396d5 /epan/dissectors/packet-bthci_acl.c | |
| parent | 26ddabf0d787402f3413b945e3a68190d6c68f61 (diff) | |
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from Bluetooth dissectors and switch to wmem API
svn path=/trunk/; revision=48414
Diffstat (limited to 'epan/dissectors/packet-bthci_acl.c')
| -rw-r--r-- | epan/dissectors/packet-bthci_acl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index ee1fc0963b..f10d0bb7ae 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -86,6 +86,8 @@ static const value_string bc_flag_vals[] = { { 0, NULL } }; +void proto_register_bthci_acl(void); +void proto_reg_handoff_bthci_acl(void); /* Code to actually dissect the packets */ static void @@ -132,7 +134,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; hci_data = (hci_data_t *) pinfo->private_data; - acl_data = ep_new(bthci_acl_data_t); + acl_data = wmem_new(wmem_packet_scope(), bthci_acl_data_t); acl_data->interface_id = hci_data->interface_id; acl_data->adapter_id = hci_data->adapter_id; @@ -349,11 +351,11 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!(pb_flag & 0x01)) { /* first fragment */ if (!pinfo->fd->flags.visited) { - mfp = se_new(multi_fragment_pdu_t); + mfp = (multi_fragment_pdu_t *) wmem_new(wmem_file_scope(), multi_fragment_pdu_t); mfp->first_frame = pinfo->fd->num; mfp->last_frame = 0; mfp->tot_len = l2cap_length + 4; - mfp->reassembled = (char *)se_alloc(mfp->tot_len); + mfp->reassembled = (char *) wmem_alloc(wmem_file_scope(), mfp->tot_len); len = tvb_length_remaining(tvb, offset); if (len <= mfp->tot_len) { tvb_memcpy(tvb, (guint8 *) mfp->reassembled, offset, len); |