diff options
Diffstat (limited to 'epan/dissectors/packet-assa_r3.c')
-rw-r--r-- | epan/dissectors/packet-assa_r3.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 3dcbf82725..1ebd66b8ef 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -4172,7 +4172,7 @@ dissect_r3_upstreammfgfield_iopins (tvbuff_t *tvb, guint32 start_offset, guint32 DISSECTOR_ASSERT(start_offset == 0); - len = MAX(0, tvb_length_remaining(tvb, start_offset)); + len = MAX(0, tvb_captured_length_remaining(tvb, start_offset)); if (len % 3 != 0) { expert_add_info_format(pinfo, proto_tree_get_parent (tree), &ei_r3_malformed_length, "IOPINS data length not modulo 3 == 0"); @@ -4251,7 +4251,7 @@ dissect_r3_upstreammfgfield_checkpointlog (tvbuff_t *tvb, guint32 start_offset, DISSECTOR_ASSERT(start_offset == 0); - len = tvb_length_remaining (tvb, 1); + len = tvb_captured_length_remaining (tvb, 1); proto_tree_add_item (tree, hf_r3_checkpointlog_entryptr, tvb, 0, 1, ENC_LITTLE_ENDIAN); cpl_item = proto_tree_add_text (tree, tvb, 1, -1, "Checkpoint Log"); @@ -4501,7 +4501,7 @@ dissect_r3_upstreammfgfield_taskflags (tvbuff_t *tvb, guint32 start_offset, guin DISSECTOR_ASSERT(start_offset == 0); - len = MAX(0, tvb_length_remaining (tvb, 0)); + len = MAX(0, tvb_captured_length_remaining (tvb, 0)); tfg_item = proto_tree_add_text (tree, tvb, 0, -1, "Task Flags (%u tasks)", len / 5); tfg_tree = proto_item_add_subtree (tfg_item, ett_r3taskflags); @@ -4529,7 +4529,7 @@ dissect_r3_upstreammfgfield_timerchain (tvbuff_t *tvb, guint32 start_offset, gui DISSECTOR_ASSERT(start_offset == 0); - len = tvb_length_remaining (tvb, 3); + len = tvb_captured_length_remaining (tvb, 3); proto_tree_add_item (tree, hf_r3_timerchain_newtick, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_timerchain_currentboundary, tvb, 2, 1, ENC_LITTLE_ENDIAN); @@ -4556,7 +4556,7 @@ dissect_r3_upstreammfgfield_peekpoke (tvbuff_t *tvb, guint32 start_offset, guint DISSECTOR_ASSERT(start_offset == 0); - len = tvb_length_remaining (tvb, 0); + len = tvb_captured_length_remaining (tvb, 0); for (i = 0; i < len; i += 3) { @@ -4696,7 +4696,7 @@ dissect_r3_upstreammfgfield_capabilities (tvbuff_t *tvb, guint32 start_offset, g DISSECTOR_ASSERT(start_offset == 0); - len = MAX(0, tvb_length_remaining (tvb, 0)); + len = MAX(0, tvb_captured_length_remaining (tvb, 0)); items = 0; i = 0; @@ -4742,7 +4742,7 @@ dissect_r3_upstreammfgfield_dumpm41t81 (tvbuff_t *tvb, guint32 start_offset, gui { DISSECTOR_ASSERT(start_offset == 0); - if (tvb_length_remaining (tvb, 0) != 20) + if (tvb_captured_length_remaining (tvb, 0) != 20) { expert_add_info_format(pinfo, proto_tree_get_parent (tree), &ei_r3_malformed_length, "Length of M41T81 RTC register dump not 20 octets"); } @@ -4860,7 +4860,7 @@ dissect_r3_upstreammfgfield_checksumresults (tvbuff_t *tvb, guint32 start_offset DISSECTOR_ASSERT(start_offset == 0); - len = MAX(0, tvb_length_remaining(tvb, 0)); + len = MAX(0, tvb_captured_length_remaining(tvb, 0)); if (len % 3 != 0) { expert_add_info_format(pinfo, proto_tree_get_parent (tree), &ei_r3_malformed_length, "Checksum results data length not modulo 3 == 0"); @@ -4921,7 +4921,7 @@ dissect_r3_upstreammfgfield_mortisestatelog (tvbuff_t *tvb, guint32 start_offset DISSECTOR_ASSERT(start_offset == 0); - len = tvb_length_remaining (tvb, 3); + len = tvb_captured_length_remaining (tvb, 3); proto_tree_add_item (tree, hf_r3_mortisestatelog_pointer, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item (tree, hf_r3_mortisestatelog_mortisetype, tvb, 1, 1, ENC_LITTLE_ENDIAN); @@ -6266,7 +6266,7 @@ dissect_r3_cmdmfg_forceoptions (tvbuff_t *tvb, guint32 start_offset, guint32 len proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); start_offset += 2; - len = tvb_length_remaining (tvb, start_offset); + len = tvb_captured_length_remaining (tvb, start_offset); i = 0; while (i<len && (step=tvb_get_guint8(tvb, start_offset + i))>0) @@ -6373,7 +6373,7 @@ dissect_r3_cmdmfg_peekpoke (tvbuff_t *tvb, guint32 start_offset, guint32 length proto_tree_add_item (tree, hf_r3_commandmfg, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN); start_offset += 2; - len = tvb_length_remaining (tvb, start_offset); + len = tvb_captured_length_remaining (tvb, start_offset); for (i = 0; i < len; i += 3) { @@ -6759,7 +6759,7 @@ dissect_r3_message (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d dissect_r3_packet (tvb, pinfo, r3_tree); - return tvb_length(tvb); + return tvb_captured_length(tvb); } static guint @@ -6772,7 +6772,7 @@ static int dissect_r3 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { tcp_dissect_pdus (tvb, pinfo, tree, TRUE, 4, get_r3_message_len, dissect_r3_message, data); - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* |