osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use tvb_new_chain with the tvbuffs from a reassembly. 

svn path=/trunk/; revision=50585
This commit is contained in:
Guy Harris 2013-07-14 17:34:16 +00:00
parent 976cca3f98
commit b161d15f0e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/m2m/packet-m2m.c
View File

@ -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");
}

4
plugins/profinet/packet-pn-rt.c
View File

@ -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 */

4
plugins/wimax/mac_hd_generic_decoder.c
View File

@ -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 */