aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-srvloc.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2014-06-17 17:45:00 +0200
committerAnders Broman <a.broman58@gmail.com>2014-06-18 14:14:58 +0000
commit246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch)
tree5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-srvloc.c
parent971ffd683ea23362bd8009567ff7860371e6e2cc (diff)
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-srvloc.c')
-rw-r--r--epan/dissectors/packet-srvloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index d3d73697b2..4132bb62ea 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -538,7 +538,7 @@ attr_list(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length,
while (offset+2<length) {
offset += 2;
/* If the length passed is longer then the actual payload then this must be an incomplete packet. */
- if (tvb_length_remaining(tvb, 4)<length) {
+ if (tvb_captured_length_remaining(tvb, 4)<length) {
proto_tree_add_text(tree, tvb, offset, -1, "Status: Too much data to pass inside this protocol. Resubmit request using a streaming protocol like TCP.");
proto_tree_add_text(tree, tvb, offset, -1, "Note: Protocol dissection is aborted due to packet overflow. See overflow flag.");
break;
@@ -1424,7 +1424,7 @@ dissect_srvloc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
srvloc_tree = proto_item_add_subtree(ti, ett_srvloc);
}
dissect_srvloc(tvb, pinfo, srvloc_tree, NULL);
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
static int
@@ -1440,7 +1440,7 @@ dissect_srvloc_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
*/
tcp_dissect_pdus(tvb, pinfo, tree, srvloc_desegment, 5, get_srvloc_pdu_len,
dissect_srvloc_pdu, data);
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
/* Register protocol with Wireshark. */