diff options
-rw-r--r-- | epan/dissectors/packet-aodv.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-aol.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-aprs.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-ar_drone.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-armagetronad.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-asap.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-assa_r3.c | 26 |
7 files changed, 33 insertions, 33 deletions
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 5a278de637..eeefc8e250 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -745,7 +745,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ expert_add_info(pinfo, type_item, &ei_aodv_type); } - return tvb_length(tvb); + return tvb_reported_length(tvb); } diff --git a/epan/dissectors/packet-aol.c b/epan/dissectors/packet-aol.c index c7fba9716a..2d36d6c4bf 100644 --- a/epan/dissectors/packet-aol.c +++ b/epan/dissectors/packet-aol.c @@ -141,7 +141,7 @@ static guint dissect_aol_init(tvbuff_t *tvb, packet_info *pinfo _U_, guint offse guint16 win_ver = 0; /* Add the Data subtree */ - data_item = proto_tree_add_item(tree,hf_aol_init,tvb,offset,tvb_length_remaining(tvb,offset)-1,ENC_NA); + data_item = proto_tree_add_item(tree,hf_aol_init,tvb,offset,tvb_reported_length_remaining(tvb,offset)-1,ENC_NA); data_tree = proto_item_add_subtree(data_item,ett_aol_data); /* Now, parse the structure */ @@ -177,8 +177,8 @@ static guint dissect_aol_init(tvbuff_t *tvb, packet_info *pinfo _U_, guint offse proto_tree_add_item(data_tree,hf_aol_num_colors, tvb,offset,2,ENC_LITTLE_ENDIAN); offset += 2; /* 37b */ /* WAOL 1.5 (48b), >= 2.5 (49b) */ - if (tvb_length_remaining(tvb,offset) <= 13) { /* WAOL 1.5 - 3.0 */ - if (tvb_length_remaining(tvb,offset) == 13) { /* WAOL > 1.5 */ + if (tvb_reported_length_remaining(tvb,offset) <= 13) { /* WAOL 1.5 - 3.0 */ + if (tvb_reported_length_remaining(tvb,offset) == 13) { /* WAOL > 1.5 */ proto_tree_add_item(data_tree,hf_aol_filler,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; } @@ -249,7 +249,7 @@ static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (pdu_len > 0) { guint old_offset = offset; - if (tvb_length_remaining(tvb,offset) > pdu_len) { + if (tvb_reported_length_remaining(tvb,offset) > pdu_len) { /* Init packets are a special case */ if (pdu_type == AOL_P3_TYPE_INIT) { offset = dissect_aol_init(tvb,pinfo,offset,aol_tree); @@ -285,14 +285,14 @@ static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* End-of-Frame Marker */ - if (tvb_length_remaining(tvb,offset) >= 1) { + if (tvb_reported_length_remaining(tvb,offset) >= 1) { proto_tree_add_item(aol_tree,hf_aol_end,tvb,offset,1,ENC_NA);/* offset += 1;*/ } else { /* Malformed Packet */ expert_add_info(pinfo,ti,&ei_aol_end_missing); } - return tvb_length(tvb); + return tvb_reported_length(tvb); } /** @@ -300,11 +300,11 @@ static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ static int dissect_aol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { /* Ensure this really is an AOL packet */ - if (tvb_length(tvb) >= 1 && tvb_get_guint8(tvb,0) != AOL_P3_FRAME_START) return 0; + if (tvb_reported_length(tvb) >= 1 && tvb_get_guint8(tvb,0) != AOL_P3_FRAME_START) return 0; /* Dissect PDUs */ tcp_dissect_pdus(tvb,pinfo,tree,aol_desegment,9,get_aol_pdu_len,dissect_aol_pdu,data); - return tvb_length(tvb); + return tvb_reported_length(tvb); } /** diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c index a18420249b..d1b0375c91 100644 --- a/epan/dissectors/packet-aprs.c +++ b/epan/dissectors/packet-aprs.c @@ -701,7 +701,7 @@ dissect_mic_e( tvbuff_t *tvb, const guint8 *addr; const mic_e_dst_code_table_s *dst_code_entry; - data_len = tvb_length_remaining( tvb, offset ); + data_len = tvb_reported_length_remaining( tvb, offset ); new_offset = offset + data_len; info_buffer = (char *)wmem_alloc( wmem_packet_scope(), STRLEN ); @@ -888,7 +888,7 @@ dissect_aprs_weather( tvbuff_t *tvb, guint8 ch; - data_len = tvb_length_remaining( tvb, offset ); + data_len = tvb_reported_length_remaining( tvb, offset ); new_offset = offset + data_len; tc = proto_tree_add_item( parent_tree, hf_aprs_weather_idx, tvb, offset, data_len, ENC_ASCII|ENC_NA ); @@ -1090,7 +1090,7 @@ aprs_status( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) { int data_len; - data_len = tvb_length_remaining( tvb, offset ); + data_len = tvb_reported_length_remaining( tvb, offset ); if ( ( data_len > 7 ) && ( tvb_get_guint8( tvb, offset+6 ) == 'z' ) ) { diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c index 445e972ba2..fd0d2dc09a 100644 --- a/epan/dissectors/packet-ar_drone.c +++ b/epan/dissectors/packet-ar_drone.c @@ -122,7 +122,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data char *command; guint32 dword; - if (tvb_length(tvb) < 4) + if (tvb_captured_length(tvb) < 4) return 0; /* Make sure the packet we're dissecting is a ar_drone packet diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index f382528a92..92491b4428 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.c @@ -111,7 +111,7 @@ is_armagetronad_packet(tvbuff_t * tvb) gint offset = 0; /* For each message in the frame */ - while (tvb_length_remaining(tvb, offset) > 2) { + while (tvb_captured_length_remaining(tvb, offset) > 2) { gint data_len = tvb_get_ntohs(tvb, offset + 4) * 2; #if 0 @@ -134,7 +134,7 @@ is_armagetronad_packet(tvbuff_t * tvb) } /* The packed should end with a 2 bytes ID */ - return tvb_length_remaining(tvb, offset) == 2; + return tvb_captured_length_remaining(tvb, offset) == 2; } static void @@ -246,7 +246,7 @@ dissect_armagetronad(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, voi armagetronad_tree = proto_item_add_subtree(ti, ett_armagetronad); /* For each message in the frame */ - while (tvb_length_remaining(tvb, offset) > 2) + while (tvb_reported_length_remaining(tvb, offset) > 2) offset += add_message(tvb, offset, armagetronad_tree, info); /* After the messages, comes the SenderID */ diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c index 0ab722a1d7..2893cc1f0a 100644 --- a/epan/dissectors/packet-asap.c +++ b/epan/dissectors/packet-asap.c @@ -170,7 +170,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree) code = tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET); length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); - padding_length = tvb_length(cause_tvb) - length; + padding_length = tvb_reported_length(cause_tvb) - length; cause_tree = proto_tree_add_subtree(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, -1, ett_asap_cause, &cause_item, val_to_str_const(code, cause_code_values, "Unknown error cause")); @@ -469,7 +469,7 @@ dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tr proto_tree_add_item(parameter_tree, hf_policy_distance, parameter_tvb, POLICY_WRANDDPF_DISTANCE_OFFSET, POLICY_WRANDDPF_DISTANCE_LENGTH, ENC_BIG_ENDIAN); break; default: - length = tvb_length(parameter_tvb) - POLICY_VALUE_OFFSET; + length = tvb_reported_length(parameter_tvb) - POLICY_VALUE_OFFSET; if (length > 0) { proto_tree_add_item(parameter_tree, hf_policy_value, parameter_tvb, POLICY_VALUE_OFFSET, length, ENC_NA); } @@ -645,7 +645,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree) /* extract tag and length from the parameter */ type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - padding_length = tvb_length(parameter_tvb) - length; + padding_length = tvb_reported_length(parameter_tvb) - length; /* create proto_tree stuff */ parameter_tree = proto_tree_add_subtree(asap_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, -1, @@ -720,7 +720,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree) tvbuff_t *parameter_tvb; offset = 0; - while((remaining_length = tvb_length_remaining(parameters_tvb, offset)) > 0) { + while((remaining_length = tvb_reported_length_remaining(parameters_tvb, offset)) > 0) { length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); total_length = ADD_PADDING(length); if (remaining_length >= length) diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 536605c39d..3b8484a4a6 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -4212,7 +4212,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_reported_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"); @@ -4289,7 +4289,7 @@ dissect_r3_upstreammfgfield_checkpointlog (tvbuff_t *tvb, guint32 start_offset, DISSECTOR_ASSERT(start_offset == 0); - len = tvb_length_remaining (tvb, 1); + len = tvb_reported_length_remaining (tvb, 1); proto_tree_add_item (tree, hf_r3_checkpointlog_entryptr, tvb, 0, 1, ENC_LITTLE_ENDIAN); cpl_tree = proto_tree_add_subtree(tree, tvb, 1, -1, ett_r3checkpointlog, NULL, "Checkpoint Log"); @@ -4538,7 +4538,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_reported_length_remaining (tvb, 0)); tfg_tree = proto_tree_add_subtree_format(tree, tvb, 0, -1, ett_r3taskflags, NULL, "Task Flags (%u tasks)", len / 5); @@ -4566,7 +4566,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_reported_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); @@ -4592,7 +4592,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_reported_length_remaining (tvb, 0); for (i = 0; i < len; i += 3) { @@ -4721,7 +4721,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_reported_length_remaining (tvb, 0)); items = 0; i = 0; @@ -4766,7 +4766,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_reported_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"); } @@ -4882,7 +4882,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_reported_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"); @@ -4942,7 +4942,7 @@ dissect_r3_upstreammfgfield_mortisestatelog (tvbuff_t *tvb, guint32 start_offset DISSECTOR_ASSERT(start_offset == 0); - len = tvb_length_remaining (tvb, 3); + len = tvb_reported_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); @@ -6218,7 +6218,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_reported_length_remaining (tvb, start_offset); i = 0; while (i<len && (step=tvb_get_guint8(tvb, start_offset + i))>0) @@ -6325,7 +6325,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_reported_length_remaining (tvb, start_offset); for (i = 0; i < len; i += 3) { @@ -6710,7 +6710,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_reported_length(tvb); } static guint @@ -6723,7 +6723,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_reported_length(tvb); } /* |