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-ipsec.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (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-ipsec.c')
| -rw-r--r-- | epan/dissectors/packet-ipsec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 3576b146c0..5e19f94dfb 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1145,7 +1145,7 @@ dissect_esp_authentication(proto_tree *tree, tvbuff_t *tvb, gint len, gint esp_a else { /* Truncated so just display what we have */ - item = proto_tree_add_text(tree, tvb, len - esp_auth_len, esp_auth_len - (len - tvb_length(tvb)), + item = proto_tree_add_text(tree, tvb, len - esp_auth_len, esp_auth_len - (len - tvb_captured_length(tvb)), "Authentication Data (truncated)"); bad = TRUE; } @@ -1296,7 +1296,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(get_address_ok) { /* Get the SPI */ - if (tvb_length(tvb) >= 4) + if (tvb_captured_length(tvb) >= 4) { spi = tvb_get_ntohl(tvb, 0); } @@ -2087,7 +2087,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { /* Truncated so just display what we have */ - proto_tree_add_text(esp_tree, tvb, len - 12, 12 - (len - tvb_length(tvb)), + proto_tree_add_text(esp_tree, tvb, len - 12, 12 - (len - tvb_captured_length(tvb)), "Authentication Data (truncated)"); } } @@ -2154,7 +2154,7 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * CPIs, we don't know the algorithm beforehand; if we get it * wrong, tvb_uncompress() returns NULL and nothing is displayed. */ - decomp = tvb_child_uncompress(data, data, 0, tvb_length(data)); + decomp = tvb_child_uncompress(data, data, 0, tvb_captured_length(data)); if (decomp) { add_new_data_source(pinfo, decomp, "IPcomp inflated data"); saved_match_uint = pinfo->match_uint; |