diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-14 17:34:16 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-14 17:34:16 +0000 |
| commit | b161d15f0e2d57e9f7a7464980329f9b844f9616 (patch) | |
| tree | 6df6e37bf72fe4c5fa0e1d5262b98677abcb8083 /plugins | |
| parent | 976cca3f9873c7f5c1c82aebc0b00d825c38e6a7 (diff) | |
Use tvb_new_chain with the tvbuffs from a reassembly.
svn path=/trunk/; revision=50585
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 4 | ||||
| -rw-r--r-- | plugins/profinet/packet-pn-rt.c | 4 | ||||
| -rw-r--r-- | plugins/wimax/mac_hd_generic_decoder.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index 540e806a89..81c43ecb9d 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -460,8 +460,8 @@ static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint pdu_frag = fragment_add_seq(&pdu_reassembly_table, tvb, offset, pinfo, burst_number, NULL, frag_number - 1, length, ((frag_type==TLV_LAST_FRAG)?0:1), 0); if(pdu_frag && frag_type == TLV_LAST_FRAG) { - /* get the new tvb for defragmented frame */ - pdu_tvb = pdu_frag->tvb_data; + /* create the new tvb for defragmented frame */ + pdu_tvb = tvb_new_chain(tvb, pdu_frag->tvb_data); /* add the defragmented data to the data source list */ add_new_data_source(pinfo, pdu_tvb, "Reassembled WiMax PDU Frame"); } diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index 4ab9a2c90b..c177e28568 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -452,8 +452,8 @@ dissect_FRAG_PDU_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void guint16 type; tvbuff_t *pdu_tvb; - /* get the new tvb for defragmented frame */ - pdu_tvb = pdu_frag->tvb_data; + /* create the new tvb for defragmented frame */ + pdu_tvb = tvb_new_chain(tvb, pdu_frag->tvb_data); /* add the defragmented data to the data source list */ add_new_data_source(pinfo, pdu_tvb, "Reassembled Profinet Frame"); /* PDU is complete: look for the Ethertype and give it to the appropriate dissection routine */ diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index 9ae8451faa..c5bedb040e 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -1089,8 +1089,8 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto if (payload_frag && frag_type == LAST_FRAG) { /* defragmented completely */ payload_length = payload_frag->len; - /* get the new tvb for defragmented frame */ - payload_tvb = payload_frag->tvb_data; + /* create the new tvb for defragmented frame */ + payload_tvb = tvb_new_chain(tvb, payload_frag->tvb_data); /* add the defragmented data to the data source list */ add_new_data_source(pinfo, payload_tvb, "Reassembled WiMax MAC payload"); /* save the tvb langth */ |