diff options
Diffstat (limited to 'epan/dissectors/packet-ppp.c')
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index c2e225f558..31a6e26901 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -1608,7 +1608,7 @@ static const ip_tcp_opt ipv6cp_opts[] = { static guint16 fcs16(tvbuff_t *tvbuff) { - guint len = tvb_length(tvbuff) - 2; + guint len = tvb_captured_length(tvbuff) - 2; /* Check for Invalid Length */ if (len == 0) @@ -1624,7 +1624,7 @@ fcs16(tvbuff_t *tvbuff) static guint32 fcs32(tvbuff_t *tvbuff) { - guint len = tvb_length(tvbuff) - 4; + guint len = tvb_captured_length(tvbuff) - 4; /* Check for invalid Length */ if (len == 0) @@ -1654,7 +1654,7 @@ decode_fcs(tvbuff_t *tvb, proto_tree *fh_tree, int fcs_decode, int proto_offset) /* * Do we have the entire packet, and does it include a 2-byte FCS? */ - len = tvb_length_remaining(tvb, proto_offset); + len = tvb_captured_length_remaining(tvb, proto_offset); reported_len = tvb_reported_length_remaining(tvb, proto_offset); if (reported_len < 2 || len < 0) { /* @@ -1706,7 +1706,7 @@ decode_fcs(tvbuff_t *tvb, proto_tree *fh_tree, int fcs_decode, int proto_offset) /* * Do we have the entire packet, and does it include a 4-byte FCS? */ - len = tvb_length_remaining(tvb, proto_offset); + len = tvb_captured_length_remaining(tvb, proto_offset); reported_len = tvb_reported_length_remaining(tvb, proto_offset); if (reported_len < 4) { /* @@ -4266,7 +4266,7 @@ dissect_bcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (!(flags & BCP_IS_BCONTROL)) { - captured_length = tvb_length_remaining(tvb, offset); + captured_length = tvb_captured_length_remaining(tvb, offset); reported_length = tvb_reported_length_remaining(tvb, offset); pad_length = flags & BCP_PADS_MASK; if (reported_length >= pad_length) { @@ -5070,7 +5070,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if (tree) proto_tree_add_text(bs_tree, tvb, offset, -1, "PPP Fragment"); offset++; - length = tvb_length_remaining(tvb,offset); + length = tvb_captured_length_remaining(tvb,offset); ppp_tvb = remove_escape_chars(tvb, pinfo, offset,length); if (ppp_tvb != NULL) { add_new_data_source(pinfo, ppp_tvb, "PPP Fragment"); @@ -5110,7 +5110,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) if (tree) proto_tree_add_text(bs_tree, tvb, offset, -1, "PPP Fragment"); offset++; - length = tvb_length_remaining(tvb, offset); + length = tvb_captured_length_remaining(tvb, offset); ppp_tvb = remove_escape_chars(tvb, pinfo, offset, length); if (ppp_tvb != NULL) { add_new_data_source(pinfo, ppp_tvb, "PPP Fragment"); |