Set the parameter item for called party number, calling party number,
and redirecting number to include the number. Clean up white space. svn path=/trunk/; revision=11813
This commit is contained in:
parent
8bf8cd97ce
commit
c8834f9a7c
1 changed files with 20 additions and 25 deletions
|
@ -1529,19 +1529,17 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree *
|
|||
}
|
||||
called_number[i++] = '\0';
|
||||
proto_item_set_text(address_digits_item, "Called Party Number: %s", called_number);
|
||||
if ( number_plan == 1 ) {
|
||||
e164_info.e164_number_type = CALLED_PARTY_NUMBER;
|
||||
e164_info.nature_of_address = indicators1 & 0x7f;
|
||||
e164_info.E164_number_str = called_number;
|
||||
e164_info.E164_number_length = i - 1;
|
||||
dissect_e164_number(parameter_tvb, address_digits_tree, 2,
|
||||
(offset - 2), e164_info);
|
||||
proto_tree_add_string_hidden(address_digits_tree, hf_isup_called, parameter_tvb,
|
||||
proto_item_set_text(parameter_item, "Called Party Number: %s", called_number);
|
||||
if ( number_plan == 1 ) {
|
||||
e164_info.e164_number_type = CALLED_PARTY_NUMBER;
|
||||
e164_info.nature_of_address = indicators1 & 0x7f;
|
||||
e164_info.E164_number_str = called_number;
|
||||
e164_info.E164_number_length = i - 1;
|
||||
dissect_e164_number(parameter_tvb, address_digits_tree, 2, (offset - 2), e164_info);
|
||||
proto_tree_add_string_hidden(address_digits_tree, hf_isup_called, parameter_tvb,
|
||||
offset - length, length, called_number);
|
||||
|
||||
}else{
|
||||
|
||||
proto_tree_add_string(address_digits_tree, hf_isup_called, parameter_tvb,
|
||||
} else {
|
||||
proto_tree_add_string(address_digits_tree, hf_isup_called, parameter_tvb,
|
||||
offset - length, length, called_number);
|
||||
}
|
||||
}
|
||||
|
@ -2938,23 +2936,20 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree
|
|||
calling_number[i++] = '\0';
|
||||
|
||||
proto_item_set_text(address_digits_item, "Calling Party Number: %s", calling_number);
|
||||
proto_item_set_text(parameter_item, "Calling Party Number: %s", calling_number);
|
||||
if ( number_plan == 1 ) {
|
||||
e164_info.e164_number_type = CALLING_PARTY_NUMBER;
|
||||
e164_info.nature_of_address = indicators1 & 0x7f;
|
||||
e164_info.E164_number_str = calling_number;
|
||||
e164_info.E164_number_length = i - 1;
|
||||
dissect_e164_number(parameter_tvb, address_digits_tree, 2,
|
||||
(offset - 2), e164_info);
|
||||
proto_tree_add_string_hidden(address_digits_tree, hf_isup_calling, parameter_tvb,
|
||||
e164_info.e164_number_type = CALLING_PARTY_NUMBER;
|
||||
e164_info.nature_of_address = indicators1 & 0x7f;
|
||||
e164_info.E164_number_str = calling_number;
|
||||
e164_info.E164_number_length = i - 1;
|
||||
dissect_e164_number(parameter_tvb, address_digits_tree, 2, (offset - 2), e164_info);
|
||||
proto_tree_add_string_hidden(address_digits_tree, hf_isup_calling, parameter_tvb,
|
||||
offset - length, length, calling_number);
|
||||
}
|
||||
else{
|
||||
|
||||
proto_tree_add_string(address_digits_tree, hf_isup_calling, parameter_tvb,
|
||||
} else {
|
||||
proto_tree_add_string(address_digits_tree, hf_isup_calling, parameter_tvb,
|
||||
offset - length, length, calling_number);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
/* ------------------------------------------------------------------
|
||||
Dissector Parameter Original called number
|
||||
|
@ -3056,7 +3051,7 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *p
|
|||
|
||||
proto_item_set_text(address_digits_item, "Redirecting Number: %s", calling_number);
|
||||
proto_tree_add_string(address_digits_tree, hf_isup_redirecting, parameter_tvb, offset - length, length, calling_number);
|
||||
|
||||
proto_item_set_text(parameter_item, "Redirecting Number: %s", calling_number);
|
||||
}
|
||||
/* ------------------------------------------------------------------
|
||||
Dissector Parameter Redirection number
|
||||
|
|
Loading…
Reference in a new issue