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-dcp-etsi.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-dcp-etsi.c')
| -rw-r--r-- | epan/dissectors/packet-dcp-etsi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 2b30b1c8f4..71b5077801 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -175,7 +175,7 @@ dissect_dcp_etsi (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * * Don't accept this packet unless at least a full AF header present(10 bytes). * It should be possible to strengthen the heuristic further if need be. */ - if(tvb_length(tvb) < 11) + if(tvb_captured_length(tvb) < 11) return FALSE; word = tvb_get_ntohs(tvb,0); @@ -188,7 +188,7 @@ dissect_dcp_etsi (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * /* Clear out stuff in the info column */ col_clear(pinfo->cinfo, COL_INFO); col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP (ETSI)"); - /*col_append_fstr (pinfo->cinfo, COL_INFO, " tvb %d", tvb_length(tvb));*/ + /*col_append_fstr (pinfo->cinfo, COL_INFO, " tvb %d", tvb_captured_length(tvb));*/ if(tree) { proto_item *ti = NULL; @@ -338,11 +338,11 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, NULL, tree); } } - if(new_tvb && tvb_length(new_tvb) > 0) { + if(new_tvb && tvb_captured_length(new_tvb) > 0) { gboolean decoded; tvbuff_t *dtvb = NULL; const guint8 *input = tvb_get_ptr(new_tvb, 0, -1); - guint32 reassembled_size = tvb_length(new_tvb); + guint32 reassembled_size = tvb_captured_length(new_tvb); guint8 *deinterleaved = (guint8*) g_malloc (reassembled_size); guint8 *output = (guint8*) g_malloc (decoded_size); rs_deinterleave(input, deinterleaved, plen, fcount); @@ -503,7 +503,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) offset += 2; if (fcount > 1) { /* fragmented*/ gboolean save_fragmented = pinfo->fragmented; - guint16 real_len = tvb_length(tvb)-offset; + guint16 real_len = tvb_captured_length(tvb)-offset; proto_tree_add_item (pft_tree, hf_edcp_pft_payload, tvb, offset, real_len, ENC_NA); if(real_len != payload_len || real_len == 0) { proto_item_append_text(li, " (length error (%d))", real_len); @@ -551,7 +551,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) offset += 2; payload_len = tvb_get_ntohl(tvb, offset); if (tree) { - guint32 real_payload_len = tvb_length(tvb)-12; + guint32 real_payload_len = tvb_captured_length(tvb)-12; li = proto_tree_add_item (af_tree, hf_edcp_len, tvb, offset, 4, ENC_BIG_ENDIAN); if(real_payload_len < payload_len) { proto_item_append_text (li, " (wrong len claims %d is %d)", @@ -615,7 +615,7 @@ dissect_tpl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) ti = proto_tree_add_item (tree, proto_tpl, tvb, 0, -1, ENC_NA); tpl_tree = proto_item_add_subtree (ti, ett_tpl); - while(offset<tvb_length(tvb)) { + while(offset<tvb_captured_length(tvb)) { guint32 bits; guint32 bytes; char *tag = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII); offset += 4; |