diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-22 17:19:23 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 00:19:41 +0000 |
| commit | 958cef5d68f4e18fc648a0bbb30408eb206fb0ef (patch) | |
| tree | f49f047e15a9bc811499efee611c99118ecd1e36 /epan/dissectors/packet-dnp.c | |
| parent | 67ab8a059c489022aebe0e27d1f937c7b6abad06 (diff) | |
Remove more deprecated tvb_length
Change-Id: Iac23a6c804ad3720d37186559477909b2ff33eb2
Reviewed-on: https://code.wireshark.org/review/9042
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dnp.c')
| -rw-r--r-- | epan/dissectors/packet-dnp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 2d8739f210..9653356e8f 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -1802,7 +1802,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, if (num_items < 0) { proto_item_append_text(range_item, " (bogus)"); expert_add_info(pinfo, range_item, &ei_dnp_num_items_neg); - return tvb_length(tvb); + return tvb_captured_length(tvb); } @@ -2839,7 +2839,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, default: /* In case of unknown object */ proto_tree_add_item(object_tree, hf_dnp3_unknown_data_chunk, tvb, offset, -1, ENC_NA); - offset = tvb_length(tvb); /* Finish decoding if unknown object is encountered... */ + offset = tvb_captured_length(tvb); /* Finish decoding if unknown object is encountered... */ break; } @@ -2848,7 +2848,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, } if (start_offset > offset) { expert_add_info(pinfo, point_item, &ei_dnp_invalid_length); - offset = tvb_length(tvb); /* Finish decoding if unknown object is encountered... */ + offset = tvb_captured_length(tvb); /* Finish decoding if unknown object is encountered... */ } } } @@ -2881,7 +2881,7 @@ dissect_dnp3_al(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nstime_set_zero (&al_cto); - data_len = tvb_length(tvb); + data_len = tvb_captured_length(tvb); /* Handle the control byte and function code */ al_ctl = tvb_get_guint8(tvb, offset); @@ -3433,7 +3433,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } } - return tvb_length(tvb); + return tvb_captured_length(tvb); } static gboolean |