diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
| commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
| tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-p_mul.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
| download | wireshark-246fe2ca4c67d8c98caa84e2f57694f6322e2f96.tar.gz | |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-p_mul.c')
| -rw-r--r-- | epan/dissectors/packet-p_mul.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 6ad31e47db..373ff2029a 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -913,7 +913,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v /* Checksum */ en = proto_tree_add_item (p_mul_tree, hf_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); checksum_tree = proto_item_add_subtree (en, ett_checksum); - len = tvb_length (tvb); + len = tvb_captured_length (tvb); value = (guint8 *)tvb_memdup (wmem_packet_scope(), tvb, 0, len); checksum1 = checksum (value, len, offset); checksum2 = tvb_get_ntohs (tvb, offset); @@ -1059,7 +1059,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v case Data_PDU: /* Fragment of Data (variable length) */ - data_len = tvb_length_remaining (tvb, offset); + data_len = tvb_captured_length_remaining (tvb, offset); proto_tree_add_none_format (p_mul_tree, hf_data_fragment, tvb, offset, data_len, "Fragment %d of Data (%d byte%s)", seq_no, data_len, @@ -1174,7 +1174,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v } proto_item_append_text (ti, ", Count of Ack: %u", count); - if (tvb_length_remaining (tvb, offset) >= 8) { + if (tvb_captured_length_remaining (tvb, offset) >= 8) { /* Timestamp Option (in units of 100ms) */ guint64 timestamp; @@ -1303,7 +1303,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_item_append_text (len_en, " (incorrect, should be: %d)", offset + data_len); expert_add_info(pinfo, len_en, &ei_length); - } else if ((len = tvb_length_remaining (tvb, pdu_length)) > 0) { + } else if ((len = tvb_captured_length_remaining (tvb, pdu_length)) > 0) { proto_item_append_text (len_en, " (more data in packet: %d)", len); expert_add_info(pinfo, len_en, &ei_more_data); } |