diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-01-09 22:18:49 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-01-10 06:19:37 +0000 |
commit | 7cd6906056922e4b8f68f1216d94eaa0809896fe (patch) | |
tree | 5a8c793f188ddda7f36a50369d00ff0de8f563e5 /epan/dissectors/packet-igrp.c | |
parent | 2a3b2360e15d49defde55240a5c1e171c7cade89 (diff) |
Rename tvb_new_subset() to tvb_new_subset_length_caplen().
This emphasizes that there is no such thing as *the* routine to
construct a subset tvbuff; you need to choose one of
tvb_new_subset_remaining() (if you want a new tvbuff that contains
everything past a certain point in an existing tvbuff),
tvb_new_subset_length() (if you want a subset that contains everything
past a certain point, for some number of bytes, in an existing tvbuff),
and tvb_new_subset_length_caplen() (for all other cases).
Many of the calls to tvb_new_subset_length_caplen() should really be
calling one of the other routines; that's the next step. (This also
makes it easier to find the calls that need fixing.)
Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b
Reviewed-on: https://code.wireshark.org/review/19597
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-igrp.c')
-rw-r--r-- | epan/dissectors/packet-igrp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index e1bcb32eed..78beb8a249 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -126,7 +126,7 @@ static int dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi ti = proto_tree_add_item(igrp_tree, hf_igrp_interior_routes, tvb, 4, 2, ENC_BIG_ENDIAN); for( ; ninterior>0 ; ninterior-- ) { igrp_vektor_tree = proto_item_add_subtree(ti,ett_igrp_vektor); - next_tvb = tvb_new_subset(tvb, offset, IGRP_ENTRY_LENGTH, -1); + next_tvb = tvb_new_subset_length_caplen(tvb, offset, IGRP_ENTRY_LENGTH, -1); dissect_vektor_igrp (next_tvb,igrp_vektor_tree,network); offset+=IGRP_ENTRY_LENGTH; } @@ -134,7 +134,7 @@ static int dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi ti = proto_tree_add_item(igrp_tree, hf_igrp_system_routes, tvb, 6, 2, ENC_BIG_ENDIAN); for( ; nsystem>0 ; nsystem-- ) { igrp_vektor_tree = proto_item_add_subtree(ti,ett_igrp_vektor); - next_tvb = tvb_new_subset(tvb, offset, IGRP_ENTRY_LENGTH, -1); + next_tvb = tvb_new_subset_length_caplen(tvb, offset, IGRP_ENTRY_LENGTH, -1); dissect_vektor_igrp (next_tvb,igrp_vektor_tree,0); offset+=IGRP_ENTRY_LENGTH; } @@ -142,7 +142,7 @@ static int dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi ti = proto_tree_add_item(igrp_tree, hf_igrp_exterior_routes, tvb, 8, 2, ENC_BIG_ENDIAN); for( ; nexterior>0 ; nexterior-- ) { igrp_vektor_tree = proto_item_add_subtree(ti,ett_igrp_vektor); - next_tvb = tvb_new_subset(tvb, offset, IGRP_ENTRY_LENGTH, -1); + next_tvb = tvb_new_subset_length_caplen(tvb, offset, IGRP_ENTRY_LENGTH, -1); dissect_vektor_igrp (next_tvb,igrp_vektor_tree,0); offset+=IGRP_ENTRY_LENGTH; } |