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-tpncp.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-tpncp.c')
| -rw-r--r-- | epan/dissectors/packet-tpncp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index f75cbf6a50..a1c8f34ccb 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -155,7 +155,7 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_item *item, case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8: if ((g_str_len = current_tpncp_data_field_info->tpncp_data_field_array_dim)) { /* add char array */ - g_str_len = MIN(g_str_len, tvb_length_remaining(tvb, *offset)); + g_str_len = MIN(g_str_len, tvb_captured_length_remaining(tvb, *offset)); proto_tree_add_item(ltree, current_tpncp_data_field_info->tpncp_data_field_descr, tvb, *offset, g_str_len, ENC_NA|ENC_ASCII); (*offset) += g_str_len; @@ -220,7 +220,7 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_item *item, break; } current_tpncp_data_field_info = current_tpncp_data_field_info->p_next; - if (tvb_length_remaining(tvb, *offset) <= 0) { + if (tvb_captured_length_remaining(tvb, *offset) <= 0) { break; } } @@ -319,7 +319,7 @@ static int dissect_tpncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo } } - return tvb_length(tvb); + return tvb_captured_length(tvb); } /*-------------------------------------------------------------------------------------------------------------------------------------------*/ @@ -345,7 +345,7 @@ static int dissect_tpncp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Otherwise use the regular dissector (might not give correct dissection). */ dissect_tpncp(tvb, pinfo, tree, data); - return tvb_length(tvb); + return tvb_captured_length(tvb); } /*-------------------------------------------------------------------------------------------------------------------------------------------*/ |