diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-14 17:27:57 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-14 17:27:57 +0000 |
| commit | 976cca3f9873c7f5c1c82aebc0b00d825c38e6a7 (patch) | |
| tree | d88b16fb2bd62816a1647f35a55321c39552c972 /plugins/m2m | |
| parent | a1ca4be5ef0814212fd0185245e4f1370e743820 (diff) | |
| download | wireshark-976cca3f9873c7f5c1c82aebc0b00d825c38e6a7.tar.gz | |
A fragment_data structure now contains a pointer to a tvbuff to the
fragment or reassembled data, not a pointer to the data itself; instead
of having to construct a tvbuffs for the reassembled data, we can now
just use the existing tvbuff.
Spell out "fragment" and "fragmentation" in comments while we're at it.
svn path=/trunk/; revision=50584
Diffstat (limited to 'plugins/m2m')
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index f1811895f5..540e806a89 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -456,12 +456,12 @@ static void pdu_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint pdu_tvb = tvb_new_subset(tvb, offset, length, length); } else /* fragmented PDU */ - { /* add the frag */ + { /* add the fragment */ 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) { - /* create the new tvb for defraged frame */ - pdu_tvb = tvb_new_child_real_data(tvb, pdu_frag->data, pdu_frag->len, pdu_frag->len); + /* get the new tvb for defragmented frame */ + pdu_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"); } |