diff options
author | Evan Huus <eapache@gmail.com> | 2015-06-23 11:24:48 -0700 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2015-06-23 18:25:52 +0000 |
commit | 8bc294c0d12e742d8c539177a683eff16653b31b (patch) | |
tree | 3a309f71e73889bbe39d1df18417c250fa6a686b /epan/dissectors/packet-nbd.c | |
parent | d7b286c7941bb0adf0566844637ffcc245bf1db1 (diff) |
Replace more deprecated tvb_length calls
The return values of new-style dissectors always use the captured length, so
replace those automagically with sed.
Change-Id: Ic43072ee4a80d433cd4264444583a0e670adc26a
Reviewed-on: https://code.wireshark.org/review/9065
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-nbd.c')
-rw-r--r-- | epan/dissectors/packet-nbd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index caac7cd8ce..90f4e004bc 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -109,7 +109,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { /* No, so just return the rest of the current packet */ - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* * Do we have a state structure for this conv @@ -117,7 +117,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U nbd_info = (nbd_conv_info_t *)conversation_get_proto_data(conversation, proto_nbd); if (!nbd_info) { /* No, so just return the rest of the current packet */ - return tvb_length(tvb); + return tvb_captured_length(tvb); } if(!pinfo->fd->flags.visited){ /* @@ -131,7 +131,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U nbd_trans=(nbd_transaction_t *)wmem_tree_lookup32_array(nbd_info->unacked_pdus, hkey); if(!nbd_trans){ /* No, so just return the rest of the current packet */ - return tvb_length(tvb); + return tvb_captured_length(tvb); } } else { /* @@ -148,7 +148,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U nbd_trans=(nbd_transaction_t *)wmem_tree_lookup32_array(nbd_info->acked_pdus, hkey); if(!nbd_trans){ /* No, so just return the rest of the current packet */ - return tvb_length(tvb); + return tvb_captured_length(tvb); } } /* If this is a read response we must add the datalen to @@ -364,7 +364,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, break; } - return tvb_length(tvb); + return tvb_captured_length(tvb); } static gboolean |