diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-05-13 19:44:44 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-05-13 19:44:44 +0000 |
| commit | fbd05f0fce6a10a1f3059c40628962bc056e10ef (patch) | |
| tree | 8bae6539c4a0282bdb37ac62df2b5ecc5f3f72cb /plugins | |
| parent | 6d2afb455adb12a7deb9c677fce39561e5c5be1c (diff) | |
Apply some of the patches from:
http://wiki.wireshark.org/Development/Optimization
svn path=/trunk/; revision=28355
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/irda/packet-sir.c | 3 | ||||
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 4 | ||||
| -rw-r--r-- | plugins/wimax/mac_hd_generic_decoder.c | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index 18a6a9d43b..b8803562a3 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -85,9 +85,8 @@ unescape_data(tvbuff_t *tvb, packet_info *pinfo) *dst++ = c; } - next_tvb = tvb_new_real_data(data, (guint) (dst-data), (guint) (dst-data)); + next_tvb = tvb_new_child_real_data(tvb, data, (guint) (dst-data), (guint) (dst-data)); tvb_set_free_cb(next_tvb, g_free); - tvb_set_child_real_data_tvbuff(tvb, next_tvb); add_new_data_source(pinfo, next_tvb, "Unescaped SIR"); return next_tvb; } diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index d00ff7f57e..27fa8dbd79 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -684,9 +684,7 @@ static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint { pdu_length = pdu_frag->len; /* create the new tvb for defraged frame */ - pdu_tvb = tvb_new_real_data(pdu_frag->data, pdu_length, pdu_length); - /* attach the pdu_tvb to tvb so that it will be cleaned up when tvb is cleaned up */ - tvb_set_child_real_data_tvbuff(tvb, pdu_tvb); + pdu_tvb = tvb_new_child_real_data(tvb, pdu_frag->data, pdu_length, pdu_length); /* add the defragmented data to the data source list */ add_new_data_source(pinfo, pdu_tvb, "Reassembled WiMax PDU Frame"); } diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index 4356ea855e..a56020acde 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -1896,9 +1896,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto { /* defragmented completely */ payload_length = payload_frag->len; /* create the new tvb for defragmented frame */ - payload_tvb = tvb_new_real_data(payload_frag->data, payload_length, payload_length); - /* attach the payload_tvb to tvb so that it will be cleaned up when tvb is cleaned up */ - tvb_set_child_real_data_tvbuff(tvb, payload_tvb); + payload_tvb = tvb_new_child_real_data(tvb, payload_frag->data, payload_length, payload_length); /* add the defragmented data to the data source list */ add_new_data_source(pinfo, payload_tvb, "Reassembled WiMax MAC payload"); /* save the tvb langth */ |