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-epmd.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-epmd.c')
| -rw-r--r-- | epan/dissectors/packet-epmd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index 000b8322f1..7ab9fe8c86 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -147,7 +147,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_ASCII|ENC_NA); name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, name_length, ENC_ASCII); offset += 2 + name_length; - if (tvb_length_remaining(tvb, offset) >= 2) { + if (tvb_captured_length_remaining(tvb, offset) >= 2) { guint16 elen=0; elen = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_epmd_elen, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -159,7 +159,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree case EPMD_PORT_REQ: case EPMD_PORT2_REQ: - name_length = tvb_length_remaining(tvb, offset); + name_length = tvb_captured_length_remaining(tvb, offset); proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_ASCII|ENC_NA); name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, name_length, ENC_ASCII); break; @@ -167,7 +167,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree case EPMD_ALIVE_REQ: proto_tree_add_item(tree, hf_epmd_port_no, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - name_length = tvb_length_remaining(tvb, offset); + name_length = tvb_captured_length_remaining(tvb, offset); proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_ASCII|ENC_NA); name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, name_length, ENC_ASCII); break; @@ -250,7 +250,7 @@ dissect_epmd_response(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_ASCII|ENC_NA); name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, name_length, ENC_ASCII); offset += 2 + name_length; - if (tvb_length_remaining(tvb, offset) >= 2) { + if (tvb_captured_length_remaining(tvb, offset) >= 2) { guint16 elen=0; elen = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_epmd_elen, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -280,7 +280,7 @@ check_epmd(tvbuff_t *tvb) { * It's possible to start checking lengths but imho that * doesn't bring very much. */ - if (tvb_length(tvb) < 3) + if (tvb_captured_length(tvb) < 3) return (FALSE); type = tvb_get_guint8(tvb, 0); @@ -327,7 +327,7 @@ dissect_epmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ dissect_epmd_response(pinfo, tvb, 0, epmd_tree); } - return (tvb_length(tvb)); + return (tvb_captured_length(tvb)); } void |