aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2016-07-10 13:32:33 +0200
committerAnders Broman <a.broman58@gmail.com>2016-07-10 15:09:40 +0000
commit4b83805412d84e8c32742df75317f76728c998ed (patch)
tree6dd3127e2b260a3783e2af9d50faac848a84e158
parentde796aa196b448d26aed4f1b65efebf3c98c0363 (diff)
mp2t: use tvb_new_subset_remaining() instead of tvb_new_proxy()
the latter is internal to the tvb code and not meant to be called from a dissector Change-Id: Iee5af3d59329aeef8156f0bbbd5c765cac4e314d Reviewed-on: https://code.wireshark.org/review/16364 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-mp2t.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index 268ac1e..f116c50 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -38,8 +38,6 @@
#include <epan/proto_data.h>
#include "packet-l2tp.h"
-#include <epan/tvbuff-int.h> /* XXX, for tvb_new_proxy() */
-
void proto_register_mp2t(void);
void proto_reg_handoff_mp2t(void);
@@ -481,7 +479,7 @@ mp2t_get_packet_length(tvbuff_t *tvb, guint offset, packet_info *pinfo,
len_tvb = tvb;
} else {
/* Create a composite tvb out of the two */
- frag_tvb = tvb_new_proxy(frag->tvb_data);
+ frag_tvb = tvb_new_subset_remaining(frag->tvb_data, 0);
len_tvb = tvb_new_composite();
tvb_composite_append(len_tvb, frag_tvb);