aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isup.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-isup.c')
-rw-r--r--epan/dissectors/packet-isup.c176
1 files changed, 88 insertions, 88 deletions
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 957b0355a0..a12b1cb06d 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -3378,7 +3378,7 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree *
}
offset += 1;
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid */
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid */
proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
called_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
@@ -3444,7 +3444,7 @@ dissect_isup_subsequent_number_parameter(tvbuff_t *parameter_tvb, proto_tree *pa
offset += 1;
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
/* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -4849,7 +4849,7 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa
sdp_length = (length_indicator) - 3;
- if (sdp_length > tvb_length_remaining(parameter_tvb, offset)) {
+ if (sdp_length > tvb_reported_length_remaining(parameter_tvb, offset)) {
/* If this is a segmented message we may not have all the data */
next_tvb = tvb_new_subset_remaining(parameter_tvb, offset);
} else {
@@ -5093,7 +5093,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf
pinfo,
(apm_Segmentation_local_ref & 0x7f), /* ID for fragments belonging together */
NULL,
- tvb_length_remaining(parameter_tvb, offset), /* fragment length - to the end */
+ tvb_reported_length_remaining(parameter_tvb, offset), /* fragment length - to the end */
more_frag); /* More fragments? */
if ((si_and_apm_seg_ind & 0x3f) !=0 && (si_and_apm_seg_ind &0x40) !=0) {
@@ -5200,7 +5200,7 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree
proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2);
offset = 2;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
if (length == 0) {
proto_tree_add_string_format_value(parameter_tree, hf_isup_calling, parameter_tvb, offset, 0, "", "(empty)");
proto_item_set_text(parameter_item, "Calling Number: (empty)");
@@ -5226,10 +5226,10 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
/* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5279,7 +5279,7 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_in
proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
offset = 2;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
if (length == 0) {
expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
@@ -5291,7 +5291,7 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_in
offset, -1, ett_isup_address_digits, &address_digits_item,
"Original Called Number");
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -5307,10 +5307,10 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_in
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
/* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5347,7 +5347,7 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
offset = 2;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
if (length == 0) {
proto_tree_add_string_format_value(parameter_tree, hf_isup_redirecting, parameter_tvb, offset, 0, "", "(empty)");
@@ -5359,7 +5359,7 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
offset, -1, ett_isup_address_digits, &address_digits_item,
"Redirecting Number");
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -5375,10 +5375,10 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
/* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5419,7 +5419,7 @@ dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
offset, -1, ett_isup_address_digits, &address_digits_item,
"Redirection Number");
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
proto_tree_add_uint(address_digits_tree, hf_isup_called_party_odd_address_signal_digit,
@@ -5435,10 +5435,10 @@ dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
/* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5483,7 +5483,7 @@ dissect_isup_connection_request_parameter(tvbuff_t *parameter_tvb, proto_tree *p
void
dissect_isup_redirection_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
- if (tvb_length(parameter_tvb) == 2) {
+ if (tvb_reported_length(parameter_tvb) == 2) {
guint16 indicators;
indicators = tvb_get_ntohs(parameter_tvb, 0);
proto_tree_add_uint(parameter_tree, hf_isup_redirecting_ind, parameter_tvb, 0, REDIRECTION_INFO_LENGTH, indicators);
@@ -5527,7 +5527,7 @@ dissect_isup_closed_user_group_interlock_code_parameter(tvbuff_t *parameter_tvb,
*/
static void
dissect_isup_user_service_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_user_service_information, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "User service information, (%u byte%s length)",
length , plurality(length, "", "s"));
@@ -5572,7 +5572,7 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2);
offset = 2;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
if (length == 0)
return; /* empty connected number */
address_digits_tree = proto_tree_add_subtree(parameter_tree, parameter_tvb,
@@ -5594,10 +5594,10 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
/* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -5636,7 +5636,7 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, proto_
offset, -1, ett_isup_address_digits, &address_digits_item,
"Network identification");
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -5652,10 +5652,10 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, proto_
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
+ if (((indicators & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
network_id[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
@@ -5903,7 +5903,7 @@ dissect_isup_access_delivery_information_parameter(tvbuff_t *parameter_tvb, prot
*/
static void
dissect_isup_network_specific_facility_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_network_specific_facility, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "Network specific facility (%u byte%s length)", length , plurality(length, "", "s"));
}
@@ -5912,7 +5912,7 @@ dissect_isup_network_specific_facility_parameter(tvbuff_t *parameter_tvb, proto_
*/
static void
dissect_isup_user_service_information_prime_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_user_service_information_prime, parameter_tvb, 0, length, ENC_NA);
dissect_q931_bearer_capability_ie(parameter_tvb,
0, length,
@@ -5938,7 +5938,7 @@ dissect_isup_propagation_delay_counter_parameter(tvbuff_t *parameter_tvb, proto_
*/
static void
dissect_isup_remote_operations_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_remote_operations, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "Remote operations (%u byte%s length)", length , plurality(length, "", "s"));
}
@@ -5950,7 +5950,7 @@ dissect_isup_service_activation_parameter(tvbuff_t *parameter_tvb, proto_tree *p
{
guint i;
guint8 feature_code;
- guint length = tvb_length(parameter_tvb);
+ guint length = tvb_reported_length(parameter_tvb);
for (i=0; i<length; i++) {
feature_code = tvb_get_guint8(parameter_tvb, i);
@@ -5964,7 +5964,7 @@ dissect_isup_service_activation_parameter(tvbuff_t *parameter_tvb, proto_tree *p
static void
dissect_isup_user_teleservice_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
- guint length = tvb_length(parameter_tvb);
+ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_user_teleservice_information, parameter_tvb, 0, length, ENC_NA);
dissect_q931_high_layer_compat_ie(parameter_tvb, 0, length, parameter_tree);
@@ -6065,7 +6065,7 @@ static const true_false_string isup_pass_on_not_possible_indicator_value = {
static void
dissect_isup_message_compatibility_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
- guint length = tvb_length(parameter_tvb);
+ guint length = tvb_reported_length(parameter_tvb);
gint offset = 0;
static const int * params[] = {
@@ -6121,7 +6121,7 @@ static const value_string ISUP_Broadband_narrowband_interworking_indicator_vals[
static void
dissect_isup_parameter_compatibility_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
- guint length = tvb_length(parameter_tvb);
+ guint length = tvb_reported_length(parameter_tvb);
guint len = length;
guint8 upgraded_parameter, upgraded_parameter_no;
guint8 offset;
@@ -6326,7 +6326,7 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para
* (network provided).
* BUG 938 - Just check if there is someting more to dissect.
*/
- if (tvb_length_remaining(parameter_tvb, offset) < 3) {
+ if (tvb_reported_length_remaining(parameter_tvb, offset) < 3) {
proto_item_set_text(parameter_item, "Location number: address not available");
return;
}
@@ -6337,7 +6337,7 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para
offset, -1, ett_isup_address_digits, &address_digits_item,
"Location number");
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -6353,10 +6353,10 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
/* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -6453,7 +6453,7 @@ dissect_isup_call_transfer_number_parameter(tvbuff_t *parameter_tvb, proto_tree
offset, -1, ett_isup_address_digits, &address_digits_item,
"Call transfer number");
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -6469,10 +6469,10 @@ dissect_isup_call_transfer_number_parameter(tvbuff_t *parameter_tvb, proto_tree
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset - 1, 1, address_digit_pair);
calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
if (i > MAXDIGITS)
@@ -6508,7 +6508,7 @@ dissect_isup_ccss_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree,
*/
static void
dissect_isup_forward_gvns_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_forward_gvns, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "Forward GVNS (%u Byte%s)", length , plurality(length, "", "s"));
}
@@ -6531,7 +6531,7 @@ static const value_string isup_jpn_redirect_capabilit_vals[] = {
static void
dissect_isup_redirect_capability_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item, guint8 itu_isup_variant)
{
- guint length = tvb_length(parameter_tvb);
+ guint length = tvb_reported_length(parameter_tvb);
switch (itu_isup_variant) {
case ISUP_JAPAN_VARIANT:
@@ -6578,7 +6578,7 @@ dissect_isup_network_management_controls_parameter(tvbuff_t *parameter_tvb, prot
*/
static void
dissect_isup_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_correlation_id, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "Correlation ID, see Q.1281 (%u Byte%s)", length , plurality(length, "", "s"));
}
@@ -6587,7 +6587,7 @@ dissect_isup_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_tree *param
*/
static void
dissect_isup_scf_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_scf_id, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "SCF ID, see Q.1281 (%u Byte%s)", length , plurality(length, "", "s"));
}
@@ -6630,7 +6630,7 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
offset, -1, ett_isup_address_digits, &address_digits_item,
"Called IN Number");
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -6646,10 +6646,10 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit, parameter_tvb, offset - 1, 1, address_digit_pair);
calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
if (i > MAXDIGITS)
@@ -6678,7 +6678,7 @@ dissect_isup_call_offering_treatment_indicators_parameter(tvbuff_t *parameter_tv
*/
static void
dissect_isup_charged_party_identification_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_charged_party_identification, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "Charged party identification (%u Byte%s)", length , plurality(length, "", "s"));
}
@@ -6712,7 +6712,7 @@ dissect_isup_conference_treatment_indicators_parameter(tvbuff_t *parameter_tvb,
*/
static void
dissect_isup_display_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_display_information, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "Display information (%u Byte%s)",
length , plurality(length, "", "s"));
@@ -6747,7 +6747,7 @@ dissect_isup_uid_capability_indicators_parameter(tvbuff_t *parameter_tvb, proto_
static void
dissect_isup_redirect_counter_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item, guint8 itu_isup_variant)
{
- guint length = tvb_length(parameter_tvb);
+ guint length = tvb_reported_length(parameter_tvb);
switch (itu_isup_variant) {
case ISUP_JAPAN_VARIANT:
@@ -6786,7 +6786,7 @@ dissect_isup_collect_call_request_parameter(tvbuff_t *parameter_tvb, proto_tree
static void
dissect_isup_calling_geodetic_location_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
- guint length = tvb_length(parameter_tvb);
+ guint length = tvb_reported_length(parameter_tvb);
guint8 oct, lpri;
oct = tvb_get_guint8(parameter_tvb, 0);
@@ -6848,7 +6848,7 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinf
proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator_enhanced, parameter_tvb, 2, 1, indicators2);
offset = 3;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
if (length == 0) {
expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
proto_item_set_text(parameter_item, "Generic Number: (empty)");
@@ -6873,10 +6873,10 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinf
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) {
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) {
/* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
@@ -6936,7 +6936,7 @@ dissect_isup_jurisdiction_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
offset += 1;
}
- if (tvb_length(parameter_tvb) > 0) {
+ if (tvb_reported_length(parameter_tvb) > 0) {
proto_tree_add_uint(address_digits_tree, hf_isup_called_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
called_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
@@ -6960,7 +6960,7 @@ dissect_isup_generic_name_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
gen_name = (char *)wmem_alloc(wmem_packet_scope(), MAXGNAME + 1);
gen_name[0] = '\0';
- gen_name_length = tvb_length(parameter_tvb) - 1;
+ gen_name_length = tvb_reported_length(parameter_tvb) - 1;
indicator = tvb_get_guint8(parameter_tvb, 0);
proto_tree_add_uint(parameter_tree, hf_isup_generic_name_presentation, parameter_tvb, 1, 1, indicator);
proto_tree_add_boolean(parameter_tree, hf_isup_generic_name_availability, parameter_tvb, 1, 1, indicator);
@@ -6977,7 +6977,7 @@ dissect_isup_generic_name_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
*/
static void
dissect_isup_generic_digits_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_tree_add_item(parameter_tree, hf_isup_generic_digits, parameter_tvb, 0, length, ENC_NA);
proto_item_set_text(parameter_item, "Generic digits (%u Byte%s)", length , plurality(length, "", "s"));
}
@@ -7008,7 +7008,7 @@ dissect_isup_charge_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
offset, -1, ett_isup_address_digits, &address_digits_item,
"Charge Number");
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
address_digit_pair = tvb_get_guint8(parameter_tvb, offset);
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit,
@@ -7024,10 +7024,10 @@ dissect_isup_charge_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
THROW(ReportedBoundsError);
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
- if (((indicators1 & 0x80) == 0) && (tvb_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
+ if (((indicators1 & 0x80) == 0) && (tvb_reported_length(parameter_tvb) > 0)) { /* Even Indicator set -> last even digit is valid & has be displayed */
proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_even_address_signal_digit,
parameter_tvb, offset - 1, 1, address_digit_pair);
calling_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
@@ -7043,7 +7043,7 @@ dissect_isup_charge_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
/* ------------------------------------------------------------------ */
static void
dissect_isup_unknown_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_item)
-{ guint length = tvb_length(parameter_tvb);
+{ guint length = tvb_reported_length(parameter_tvb);
proto_item_set_text(parameter_item, "Parameter Type unknown/reserved (%u Byte%s)", length , plurality(length, "", "s"));
}
/* ------------------------------------------------------------------ */
@@ -7064,7 +7064,7 @@ dissect_japan_isup_called_dir_num(tvbuff_t *parameter_tvb, packet_info *pinfo, p
int offset = 0;
int parameter_length;
- parameter_length = tvb_length_remaining(parameter_tvb, offset);
+ parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
proto_tree_add_item(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_isup_called_party_nature_of_address_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -7231,7 +7231,7 @@ dissect_japan_isup_redirect_fwd_inf(tvbuff_t *parameter_tvb, packet_info *pinfo,
guint8 tag, tag_len, ext_ind;
int parameter_length;
- parameter_length = tvb_length_remaining(parameter_tvb, offset);
+ parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
while (offset < parameter_length) {
/* Information Type Tag */
@@ -7294,7 +7294,7 @@ dissect_japan_isup_redirect_backw_inf(tvbuff_t *parameter_tvb, packet_info *pinf
guint8 tag, tag_len, ext_ind;
int parameter_length;
- parameter_length = tvb_length_remaining(parameter_tvb, offset);
+ parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
while (offset < parameter_length) {
/* Information Type Tag */
@@ -7489,7 +7489,7 @@ dissect_japan_isup_additonal_user_cat(tvbuff_t *parameter_tvb, packet_info *pinf
guint8 type;
int parameter_length;
- parameter_length = tvb_length_remaining(parameter_tvb, offset);
+ parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
while (offset < parameter_length) {
/* Type of Additional User/Service Information */
@@ -7555,7 +7555,7 @@ dissect_japan_isup_contractor_number(tvbuff_t *parameter_tvb, proto_tree *parame
int parameter_length;
const char *digit_str;
- parameter_length = tvb_length_remaining(parameter_tvb, offset);
+ parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
proto_tree_add_item(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_isup_called_party_nature_of_address_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -7629,7 +7629,7 @@ dissect_japan_isup_carrier_information(tvbuff_t *parameter_tvb, packet_info *pin
proto_tree_add_uint(parameter_tree, hf_isup_carrier_info_iec, parameter_tvb, 0, 1, octet);
- length = tvb_length_remaining(parameter_tvb, 2);
+ length = tvb_reported_length_remaining(parameter_tvb, 2);
if (length == 0) {
expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
proto_item_set_text(parameter_item, "Carrier Information (empty)");
@@ -7804,7 +7804,7 @@ dissect_japan_isup_carrier_information(tvbuff_t *parameter_tvb, packet_info *pin
}
offset += 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
}
/* Write to top of tree */
@@ -7829,7 +7829,7 @@ dissect_japan_isup_charge_inf_delay(tvbuff_t *parameter_tvb, proto_tree *paramet
int offset = 0;
int parameter_length;
- parameter_length = tvb_length_remaining(parameter_tvb, offset);
+ parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
while (offset < parameter_length) {
proto_tree_add_item(parameter_tree, hf_japan_isup_charge_delay_type, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -7915,7 +7915,7 @@ dissect_japan_isup_charge_area_info(tvbuff_t *parameter_tvb, proto_tree *paramet
proto_tree_add_uint(parameter_tree, hf_japan_isup_charge_area_nat_of_info_value, parameter_tvb, 0, 1, octet);
offset = 1;
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
/*Only CA code digits.*/
if (nat_of_info_indic == CHARGE_AREA_NAT_INFO_CA) {
@@ -7959,7 +7959,7 @@ dissect_japan_isup_charge_area_info(tvbuff_t *parameter_tvb, proto_tree *paramet
octet++;
/* Now loop through MA/CA digits.*/
- length = tvb_length_remaining(parameter_tvb, offset);
+ length = tvb_reported_length_remaining(parameter_tvb, offset);
while (length > 0) {
octet = tvb_get_guint8(parameter_tvb, offset);
@@ -8103,7 +8103,7 @@ dissect_japan_chg_inf_type_crt(tvbuff_t *parameter_tvb, proto_tree *parameter_tr
guint8 len;
int parameter_length;
- parameter_length = tvb_length_remaining(parameter_tvb, offset);
+ parameter_length = tvb_reported_length_remaining(parameter_tvb, offset);
/* Unit per Time Period (UTP) */
@@ -8218,7 +8218,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *
/* Dissect all optional parameters while end of message isn't reached */
parameter_type = 0xFF; /* Start-initializiation since parameter_type is used for while-condition */
- while ((tvb_length_remaining(optional_parameters_tvb, offset) >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) {
+ while ((tvb_reported_length_remaining(optional_parameters_tvb, offset) >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) {
parameter_type = tvb_get_guint8(optional_parameters_tvb, offset);
if (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS) {
@@ -8256,7 +8256,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *
if (octet == 0)
continue;
- actual_length = tvb_length_remaining(optional_parameters_tvb, offset);
+ actual_length = tvb_reported_length_remaining(optional_parameters_tvb, offset);
if (actual_length > 0) {
parameter_tvb = tvb_new_subset(optional_parameters_tvb, offset, MIN(parameter_length, actual_length), parameter_length);
switch (parameter_type) {
@@ -8589,7 +8589,7 @@ dissect_ansi_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_i
/* Dissect all optional parameters while end of message isn't reached */
parameter_type = 0xFF; /* Start-initializiation since parameter_type is used for while-condition */
- while ((tvb_length_remaining(optional_parameters_tvb, offset) >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) {
+ while ((tvb_reported_length_remaining(optional_parameters_tvb, offset) >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) {
parameter_type = tvb_get_guint8(optional_parameters_tvb, offset);
if (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS) {
@@ -8611,7 +8611,7 @@ dissect_ansi_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_i
if (octet == 0)
continue;
- actual_length = tvb_length_remaining(optional_parameters_tvb, offset);
+ actual_length = tvb_reported_length_remaining(optional_parameters_tvb, offset);
if (actual_length > 0) {
parameter_tvb = tvb_new_subset(optional_parameters_tvb, offset, MIN(parameter_length, actual_length), parameter_length);
switch (parameter_type) {
@@ -10047,7 +10047,7 @@ dissect_ansi_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree
break;
case MESSAGE_TYPE_CHARGE_INFO:
/* do nothing since format is a national matter */
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
break;
@@ -10093,7 +10093,7 @@ dissect_ansi_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree
break;
case MESSAGE_TYPE_SUBSEQUENT_DIR_NUM:
/* do nothing since format is a national matter */
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
break;
@@ -10111,7 +10111,7 @@ dissect_ansi_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree
/* no dissector necessary since no mandatory parameters included */
break;
default:
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
@@ -10350,7 +10350,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
break;
case MESSAGE_TYPE_CHARGE_INFO:
/* do nothing since format is a national matter */
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0) {
switch (itu_isup_variant) {
case ISUP_RUSSIAN_VARIANT:
@@ -10404,7 +10404,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
break;
case MESSAGE_TYPE_SUBSEQUENT_DIR_NUM:
/* do nothing since format is a national matter */
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
break;
@@ -10412,7 +10412,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
/* Handle national extensions here */
switch (itu_isup_variant) {
case ISUP_ITU_STANDARD_VARIANT:
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
@@ -10426,7 +10426,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
opt_part_possible = TRUE;
break;
default:
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
@@ -10444,7 +10444,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
/* No parameters */
break;
default:
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
@@ -10460,7 +10460,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
opt_part_possible = TRUE;
break;
default:
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
@@ -10475,7 +10475,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
opt_part_possible = TRUE;
break;
default:
- bufferlength = tvb_length_remaining(message_tvb, offset);
+ bufferlength = tvb_reported_length_remaining(message_tvb, offset);
if (bufferlength != 0)
expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
@@ -10711,7 +10711,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
message_tvb = tvb_new_subset_remaining(tvb, 0);
dissect_ansi_isup_message(message_tvb, pinfo, isup_tree, ISUP_ITU_STANDARD_VARIANT, 0);
- return tvb_length(tvb);
+ return tvb_reported_length(tvb);
} else if (strstr(content_type_parameter_str, "spirou")) {
isup_standard = ITU_STANDARD;
itu_isup_variant = ISUP_FRENCH_VARIANT;
@@ -10773,7 +10773,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
message_tvb = tvb_new_subset_remaining(tvb, 0);
dissect_isup_message(message_tvb, pinfo, isup_tree, itu_isup_variant, 0);
- return tvb_length(tvb);
+ return tvb_reported_length(tvb);
}
/* ---------------------------------------------------- stats tree
*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 07:53:38 +0000