diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-02-19 23:17:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-02-19 23:17:07 +0000 |
| commit | 29715ccc8f78d9a2f791437f49d6718615795c15 (patch) | |
| tree | 36c72f6cae5e8e8ed09086eef9249eac9a65ca04 /epan/dissectors/packet-umts_mac.c | |
| parent | 5a5d872639a9e20893f82079af06f4caec980277 (diff) | |
How can I get a new tvbuff that starts at an offset within a given
tvbuff and runs to the end of the tvbuff? Let me count the ways....
Replace a bunch of different ways of doing that (some incorrect, in that
they're not properly handling tvbuffs where the captured and reported
lengths are different) with tvb_new_subset_remaining().
svn path=/trunk/; revision=47751
Diffstat (limited to 'epan/dissectors/packet-umts_mac.c')
| -rw-r--r-- | epan/dissectors/packet-umts_mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 58498f1683..3767e95414 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -406,7 +406,7 @@ static void dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree * channel_type = proto_tree_add_uint(fach_tree, hf_mac_channel, tvb, 0, 0, MAC_CCCH); PROTO_ITEM_SET_GENERATED(channel_type); /* CCCH over FACH is always octet aligned */ - next_tvb = tvb_new_subset(tvb, 1, tvb_length_remaining(tvb, 1), -1); + next_tvb = tvb_new_subset_remaining(tvb, 1); call_dissector(rlc_ccch_handle, next_tvb, pinfo, tree); break; case TCTF_DCCH_DTCH_FACH_FDD: @@ -448,7 +448,7 @@ static void dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree * channel_type = proto_tree_add_uint(fach_tree, hf_mac_channel, tvb, 0, 0, MAC_CTCH); PROTO_ITEM_SET_GENERATED(channel_type); /* CTCH over FACH is always octet aligned */ - next_tvb = tvb_new_subset(tvb, 1, tvb_length_remaining(tvb, 1), -1); + next_tvb = tvb_new_subset_remaining(tvb, 1); call_dissector(rlc_ctch_handle, next_tvb, pinfo, tree); break; /* july 5: Added support for BCCH*/ |