diff options
author | Evan Huus <eapache@gmail.com> | 2015-06-23 17:22:18 -0700 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2015-06-24 00:22:50 +0000 |
commit | f92fab41a5266cb380c443882ce5efd5a7ee3318 (patch) | |
tree | 13e190875507342a2c5847b2629a6dab44d2d61d /epan/dissectors/packet-ncp.c | |
parent | ad784bc7ce29c2d8ad64bca73e4863a6353c578f (diff) |
Remove a bunch more deprecated tvb_length calls
(getting really close!)
Change-Id: Ibf22a5f727c4dc0070b78144a4b0ab8e0c5e1bce
Reviewed-on: https://code.wireshark.org/review/9081
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ncp.c')
-rw-r--r-- | epan/dissectors/packet-ncp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 832251732d..ff3ff346d2 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -945,7 +945,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case NCP_ALLOCATE_SLOT: /* Allocate Slot Request */ - length_remaining = tvb_length_remaining(tvb, commhdr + 4); + length_remaining = tvb_reported_length_remaining(tvb, commhdr + 4); if (length_remaining > 4) { testvar = tvb_get_ntohl(tvb, commhdr+4); if (testvar == 0x4c495020) { @@ -973,7 +973,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch (header.type) { case NCP_ALLOCATE_SLOT: /* Allocate Slot Request */ - length_remaining = tvb_length_remaining(tvb, commhdr + 4); + length_remaining = tvb_reported_length_remaining(tvb, commhdr + 4); if (length_remaining > 4) { testvar = tvb_get_ntohl(tvb, commhdr+4); if (testvar == 0x4c495020) { @@ -1088,7 +1088,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * length of the packet, but that's arguably a * feature in this case. */ - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_captured_length_remaining(tvb, offset); if (length_remaining > data_len) length_remaining = data_len; if (data_len != 0) { @@ -1132,7 +1132,7 @@ get_ncp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U */ signature = tvb_get_ntohl(tvb, offset); if (signature != NCPIP_RQST && signature != NCPIP_RPLY) - return tvb_length_remaining(tvb, offset); + return tvb_captured_length_remaining(tvb, offset); /* * Get the length of the NCP-over-TCP packet. Strip off the "has |