#include "config.h"
#include <epan/packet.h>
+#include <epan/expert.h>
#include <epan/exceptions.h>
#include <epan/stats_tree.h>
#include <epan/asn1.h>
"no additional information will be sent"
};
-static const true_false_string isup_connected_line_identity_request_ind_value = {
- /* according 3.38/Q.763 */
- "requested",
- "not requested"
-};
-
static const value_string isup_redirecting_ind_value[] = {
/* according 3.45/Q.763 */
{ 0, "no redirection (national use)"},
/* Initialize the protocol and registered fields */
static int proto_isup = -1;
static int proto_bicc = -1;
-static module_t *isup_module;
static gboolean isup_show_cic_in_info = TRUE;
static int hf_isup_message_type = -1;
static int hf_isup_parameter_type = -1;
+static int hf_isup_mand_parameter_type = -1;
+static int hf_isup_opt_parameter_type = -1;
static int hf_isup_parameter_length = -1;
static int hf_isup_mandatory_variable_parameter_pointer = -1;
static int hf_isup_pointer_to_start_of_optional_part = -1;
static int hf_length_indicator = -1;
static int hf_afi = -1;
static int hf_bicc_nsap_dsp = -1;
+static int hf_bicc_nsap_dsp_length = -1;
static int hf_bat_ase_identifier = -1;
static int hf_Action_Indicator = -1;
static int hf_isup_charging_info_maca_odd_digits = -1;
static int hf_isup_charging_info_maca_even_digits = -1;
+/* Generated from convert_proto_tree_add_text.pl */
+static int hf_isup_protocol_class = -1;
+static int hf_isup_geo_loc_shape_description = -1;
+static int hf_isup_geo_loc_shape = -1;
+static int hf_isup_ccss_call_indicator = -1;
+static int hf_isup_charged_party_identification = -1;
+static int hf_isup_forward_gvns = -1;
+static int hf_isup_idi = -1;
+static int hf_isup_precedence_level = -1;
+static int hf_isup_configuration_data = -1;
+static int hf_isup_redirect_capability = -1;
+static int hf_isup_credit = -1;
+static int hf_isup_idp = -1;
+static int hf_isup_apm_seg_indicator = -1;
+static int hf_isup_user_service_information = -1;
+static int hf_isup_tunnelled_protocol_data = -1;
+static int hf_isup_mlpp_service_domain = -1;
+static int hf_isup_uid_capability_indicators = -1;
+static int hf_isup_call_identity = -1;
+static int hf_isup_scf_id = -1;
+static int hf_isup_call_diversion_information = -1;
+static int hf_isup_display_information = -1;
+static int hf_isup_call_history_info = -1;
+static int hf_isup_remote_operations = -1;
+static int hf_isup_user_to_user_info = -1;
+static int hf_isup_address_digits = -1;
+static int hf_isup_network_id = -1;
+static int hf_isup_uid_action_indicators = -1;
+static int hf_isup_dsp = -1;
+static int hf_isup_instruction_indicators = -1;
+static int hf_isup_circuit_assignment_map = -1;
+static int hf_isup_collect_call_request_indicator = -1;
+static int hf_isup_hop_counter = -1;
+static int hf_isup_user_service_information_prime = -1;
+static int hf_isup_message_compatibility_information = -1;
+static int hf_isup_app_transport_param_field8 = -1;
+static int hf_isup_app_transport_param_field16 = -1;
+static int hf_isup_binary_code = -1;
+static int hf_isup_local_reference = -1;
+static int hf_isup_cause_indicators = -1;
+static int hf_isup_backward_gvns = -1;
+static int hf_isup_presentation_indicator = -1;
+static int hf_isup_mcid_request_indicators = -1;
+static int hf_isup_origination_isc_point_code = -1;
+static int hf_isup_upgraded_parameter = -1;
+static int hf_isup_generic_digits = -1;
+static int hf_isup_diagnostic = -1;
+static int hf_isup_network_specific_facility = -1;
+static int hf_isup_app_transport_instruction_indicator = -1;
+static int hf_isup_look_forward_busy = -1;
+static int hf_isup_redirect_counter = -1;
+static int hf_isup_correlation_id = -1;
+static int hf_isup_network_identity = -1;
+static int hf_isup_user_teleservice_information = -1;
+static int hf_isup_mcid_response_indicators = -1;
+static int hf_isup_apm_user_info_field = -1;
+static int hf_isup_feature_code = -1;
+static int hf_isup_number_qualifier_indicator = -1;
+static int hf_isup_echo_control_information = -1;
+static int hf_isup_network_id_length_indicator = -1;
+static int hf_isup_unknown_organisation_identifier = -1;
+static int hf_isup_originating_line_info = -1;
+static int hf_isup_loop_prevention_indicator_type = -1;
+static int hf_isup_signalling_point_code = -1;
+static int hf_isup_call_transfer_identity = -1;
+static int hf_isup_access_transport_parameter_field = -1;
+static int hf_isup_propagation_delay_counter = -1;
+static int hf_isup_number_different_meaning = -1;
+
/* Initialize the subtree pointers */
static gint ett_isup = -1;
static gint ett_isup_parameter = -1;
static gint ett_isup_apm_msg_fragment = -1;
static gint ett_isup_apm_msg_fragments = -1;
static gint ett_isup_range = -1;
+static gint ett_app_transport_fields = -1;
+static gint ett_app_transport = -1;
+static gint ett_apm_seg_indicator = -1;
+static gint ett_echo_control_information = -1;
+static gint ett_instruction_indicators = -1;
+static gint ett_message_compatibility_information = -1;
+
+static expert_field ei_isup_format_national_matter = EI_INIT;
+static expert_field ei_isup_message_type_unknown = EI_INIT;
+static expert_field ei_isup_not_dissected_yet = EI_INIT;
+static expert_field ei_isup_message_type_no_optional_parameters = EI_INIT;
+static expert_field ei_isup_status_subfield_not_present = EI_INIT;
+static expert_field ei_isup_empty_number = EI_INIT;
static dissector_handle_t bicc_handle;
offset = 2;
if (tvb_reported_length_remaining(parameter_tvb, offset) == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 0, "Called Number (empty)");
+ proto_tree_add_string_format_value(parameter_tree, hf_isup_called, parameter_tvb, offset, 0, "", "(empty)");
proto_item_set_text(parameter_item, "Called Number: (empty)");
return;
}
void
dissect_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{ guint length = tvb_reported_length(parameter_tvb);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, -1, "Cause indicators (-> Q.850)");
+ proto_tree_add_item(parameter_tree, hf_isup_cause_indicators, parameter_tvb, 0, -1, ENC_NA);
dissect_q931_cause_ie(parameter_tvb, 0, length,
parameter_tree,
hf_isup_cause_indicator, &tap_cause_value, isup_parameter_type_value);
if (length == 0) {
return;
}
- proto_tree_add_text(parameter_tree, parameter_tvb, offset,
- length, "Diagnostic: %s",
- tvb_bytes_to_ep_str(parameter_tvb, offset, length));
+ proto_tree_add_item(parameter_tree, hf_isup_diagnostic, parameter_tvb, offset, length, ENC_NA);
return;
case 2:
/*ANSI*/
if (length == 0) {
return;
}
- proto_tree_add_text(parameter_tree, parameter_tvb, offset,
- length, "Diagnostic: %s",
- tvb_bytes_to_ep_str(parameter_tvb, offset, length));
+ proto_tree_add_item(parameter_tree, hf_isup_diagnostic, parameter_tvb, offset, length, ENC_NA);
return;
default:
proto_tree_add_item(parameter_tree, hf_ansi_isup_coding_standard, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
Dissector Parameter Range and Status Indicators
*/
static void
-dissect_isup_range_and_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_range_and_status_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
proto_tree *range_tree;
int offset = 0;
decode_bits_in_field(8-range, range, tvb_get_guint8(parameter_tvb, offset)));
}
} else {
- proto_tree_add_text(parameter_tree, parameter_tvb , 0, 0, "Status subfield is not present with this message type");
+ expert_add_info(pinfo, parameter_item, &ei_isup_status_subfield_not_present);
}
proto_item_set_text(parameter_item, "Range (%u) and status", range);
static void
dissect_isup_user_to_user_information_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{ guint length = tvb_reported_length(parameter_tvb);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, -1,
- "User-to-user info (-> Q.931)");
+ proto_tree_add_item(parameter_tree, hf_isup_user_to_user_info, parameter_tvb, 0, -1, ENC_NA);
dissect_q931_user_user_ie(parameter_tvb, pinfo, 0, length,
parameter_tree);
proto_item_set_text(parameter_item, "User-to-user information,(%u byte%s length)",
call_id = tvb_get_ntoh24(parameter_tvb, 0);
spc = tvb_get_letohs(parameter_tvb, CALL_ID_LENGTH) & 0x3FFF; /*since 1st 2 bits spare */
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, CALL_ID_LENGTH, "Call identity: %u", call_id);
- proto_tree_add_text(parameter_tree, parameter_tvb, CALL_ID_LENGTH, SPC_LENGTH, "Signalling Point Code: %u", spc);
+ proto_tree_add_item(parameter_tree, hf_isup_call_identity, parameter_tvb, 0, CALL_ID_LENGTH, ENC_BIG_ENDIAN);
+ proto_tree_add_item(parameter_tree, hf_isup_signalling_point_code, parameter_tvb, CALL_ID_LENGTH, SPC_LENGTH, ENC_BIG_ENDIAN);
proto_item_set_text(parameter_item, "Call Reference: Call ID = %u, SPC = %u", call_id, spc);
}
proto_item *parameter_item, packet_info *pinfo)
{ guint length = tvb_reported_length(parameter_tvb);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, -1,
- "Access transport parameter field (-> Q.931)");
+ proto_tree_add_item(parameter_tree, hf_isup_access_transport_parameter_field, parameter_tvb, 0, -1, ENC_NA);
if (q931_ie_handle)
call_dissector(q931_ie_handle, parameter_tvb, pinfo, parameter_tree);
dissect_nsap(tvbuff_t *parameter_tvb, gint offset, gint len, proto_tree *parameter_tree)
{
guint8 afi;
- guint8 length = 0;
- guint icp, cc_offset;
+ guint icp;
afi = tvb_get_guint8(parameter_tvb, offset);
switch (afi) {
case 0x35: /* IANA ICP Binary fortmat*/
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 3,
- "IDP = %s", tvb_bytes_to_ep_str(parameter_tvb, offset, 3));
+ proto_tree_add_item(parameter_tree, hf_isup_idp, parameter_tvb, offset, 3, ENC_NA);
proto_tree_add_uint(parameter_tree, hf_afi, parameter_tvb, offset, 1, afi);
offset = offset + 1;
icp = tvb_get_ntohs(parameter_tvb, offset);
proto_tree_add_uint(parameter_tree, hf_iana_icp, parameter_tvb, offset, 1, icp);
if (icp == 0) { /* IPv6 addr */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset + 2 , 17,
- "DSP = %s", tvb_bytes_to_ep_str(parameter_tvb, offset + 2, 17));
+ proto_tree_add_item(parameter_tree, hf_isup_dsp, parameter_tvb, offset + 2, 17, ENC_NA);
proto_tree_add_item(parameter_tree, hf_nsap_ipv6_addr, parameter_tvb, offset + 2,
16, ENC_NA);
}
else { /* IPv4 addr */
/* XXX - this is really only for ICP 1 */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset + 2, 17,
- "DSP = %s", tvb_bytes_to_ep_str(parameter_tvb, offset + 2, 17));
+ proto_tree_add_item(parameter_tree, hf_isup_dsp, parameter_tvb, offset + 2, 17, ENC_NA);
proto_tree_add_item(parameter_tree, hf_nsap_ipv4_addr, parameter_tvb, offset + 2, 4, ENC_BIG_ENDIAN);
}
break;
case 0x45: /* E.164 ATM format */
case 0xC3: /* E.164 ATM group format */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 9,
- "IDP = %s", tvb_bytes_to_ep_str(parameter_tvb, offset, 9));
+ proto_tree_add_item(parameter_tree, hf_isup_idp, parameter_tvb, offset, 9, ENC_NA);
proto_tree_add_uint(parameter_tree, hf_afi, parameter_tvb, offset, 1, afi);
- proto_tree_add_text(parameter_tree, parameter_tvb, offset + 1, 8,
- "IDI = %s", tvb_bytes_to_ep_str(parameter_tvb, offset + 1, 8));
+ proto_tree_add_item(parameter_tree, hf_isup_idi, parameter_tvb, offset + 1, 8, ENC_NA);
offset = offset +1;
/* Dissect country code */
- cc_offset = offset;
dissect_e164_cc(parameter_tvb, parameter_tree, 3, E164_ENC_BCD);
- proto_tree_add_text(parameter_tree, parameter_tvb, cc_offset, length, "DSP length %u(len %u -9)", (len-9), len);
+ proto_tree_add_uint_format_value(parameter_tree, hf_bicc_nsap_dsp_length, parameter_tvb, offset, 0,
+ (len-9), "%u (len %u -9)", (len-9), len);
proto_tree_add_item(parameter_tree, hf_bicc_nsap_dsp, parameter_tvb, offset + 8, (len - 9), ENC_NA);
/* four bit config data, TODO decode config */
if (len > 2) {
tempdata = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(tree, tvb, offset, 1, "Configuration data : 0x%x", tempdata);
+ proto_tree_add_item(tree, hf_isup_configuration_data, tvb, offset, 1, ENC_NA);
offset = offset + 1;
}
break;
/* three bit config data, TODO decode config */
if (len > 2) {
tempdata = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(tree, tvb, offset, 1 , "Configuration data : 0x%x", tempdata);
+ proto_tree_add_item(tree, hf_isup_configuration_data, tvb, offset, 1, ENC_NA);
offset = offset + 1;
}
break;
default:
offset = offset + 1;
tempdata = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(tree, tvb, offset, len ,
- "Unknown organisation Identifier (Non ITU-T/ETSI codec) %u", tempdata);
+ proto_tree_add_item(tree, hf_isup_unknown_organisation_identifier, tvb, offset, len, ENC_NA);
offset = offset + len - 1;
break;
}
bat_ase_tree = proto_tree_add_subtree(parameter_tree, parameter_tvb, offset, -1, ett_bat_ase, NULL,
"Bearer Association Transport (BAT) Application Service Element (ASE) Encapsulated Application Information:");
- proto_tree_add_text(bat_ase_tree, parameter_tvb, offset, -1,
- "BAT ASE Encapsulated Application Information, (%u byte%s length)", length, plurality(length, "", "s"));
+ proto_tree_add_text(bat_ase_tree, parameter_tvb, offset, -1, "BAT ASE Encapsulated Application Information, (%u byte%s length)", length, plurality(length, "", "s"));
while (tvb_reported_length_remaining(parameter_tvb, offset) > 0) {
element_no = element_no + 1;
identifier = tvb_get_guint8(parameter_tvb, offset);
/* IPBCP (text encoded) */
call_dissector(sdp_handle, next_tvb, pinfo, bat_ase_element_tree);
} else {
- proto_tree_add_text(bat_ase_element_tree, next_tvb, 0, -1, "Tunnelled Protocol Data");
+ proto_tree_add_item(bat_ase_element_tree, hf_isup_tunnelled_protocol_data, next_tvb, 0, -1, ENC_NA);
}
offset = offset + sdp_length;
break;
break;
case BEARER_CONTROL_UNIT_IDENTIFIER :
tempdata = tvb_get_guint8(parameter_tvb, offset);
- proto_tree_add_text(bat_ase_element_tree, parameter_tvb, offset, 1, "Network ID Length indicator = %u", tempdata);
+ proto_tree_add_item(bat_ase_element_tree, hf_isup_network_id_length_indicator, parameter_tvb, offset, 1, ENC_NA);
offset = offset + 1;
if (tempdata > 0) {
each call.
*/
- proto_tree_add_text(bat_ase_element_tree, parameter_tvb, offset, tempdata , "Network ID: %s",
- tvb_bytes_to_ep_str(parameter_tvb, offset, tempdata));
- offset = offset + tempdata;
+ proto_tree_add_item(bat_ase_element_tree, hf_isup_network_id, parameter_tvb, offset, tempdata, ENC_NA);
+ offset += tempdata;
} /* end if */
Local_BCU_ID = tvb_get_letohl(parameter_tvb, offset);
proto_tree_add_uint_format_value(bat_ase_element_tree, hf_Local_BCU_ID , parameter_tvb, offset, 4,
Local_BCU_ID , "0x%08x", Local_BCU_ID);
- offset = offset + 4;
+ offset += 4;
break;
case SIGNAL :
/* As type is Constructor new elements follow, return to main loop */
offset = offset + content_len;
break;
default :
- proto_tree_add_text(bat_ase_element_tree, parameter_tvb, offset, content_len ,
- "Default ?, (%u byte%s length)", (content_len), plurality(content_len, "", "s"));
+ proto_tree_add_text(bat_ase_element_tree, parameter_tvb, offset, content_len , "Default ?, (%u byte%s length)", (content_len), plurality(content_len, "", "s"));
offset = offset + content_len;
}
}
tvbuff_t *next_tvb = NULL;
fragment_head *frag_msg = NULL;
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, -1, "Application transport parameter fields:");
+ static const int * apm_flags[] = {
+ &hf_isup_extension_ind,
+ &hf_isup_apm_si_ind,
+ &hf_isup_apm_segmentation_ind,
+ NULL
+ };
+
+ static const int * app_trans_flags[] = {
+ &hf_isup_extension_ind,
+ &hf_isup_app_Send_notification_ind,
+ &hf_isup_app_Release_call_ind,
+ NULL
+ };
+
+ static const int * app_field_flags[] = {
+ &hf_isup_extension_ind,
+ &hf_isup_app_cont_ident,
+ NULL
+ };
+
proto_item_set_text(parameter_item, "Application transport, (%u byte%s length)", length , plurality(length, "", "s"));
aci16 = tvb_get_guint8(parameter_tvb, offset);
if ((aci16 & H_8BIT_MASK) == 0x80) {
/* Octet 1 */
aci16 = aci16 & 0x7f;
- proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_uint(parameter_tree, hf_isup_app_cont_ident , parameter_tvb, offset, 1, aci16);
+ proto_tree_add_bitmask(parameter_tree, parameter_tvb, offset, hf_isup_app_transport_param_field8, ett_app_transport_fields, app_field_flags, ENC_NA);
offset = offset + 1;
}
/* Octet 1a */
else {
+ proto_tree_add_item(parameter_tree, hf_isup_app_transport_param_field16, parameter_tvb, offset, 2, ENC_BIG_ENDIAN);
aci16 = (aci16<<8) | (tvb_get_guint8(parameter_tvb, offset) & 0x7f);
proto_tree_add_uint(parameter_tree, hf_isup_app_cont_ident , parameter_tvb, offset, 2, aci16);
offset = offset + 2;
}
/* Octet 2 */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, -1, "Application transport instruction indicators: ");
- proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(parameter_tree, hf_isup_app_Send_notification_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(parameter_tree, hf_isup_app_Release_call_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(parameter_tree, parameter_tvb, offset, hf_isup_app_transport_instruction_indicator, ett_app_transport, app_trans_flags, ENC_NA);
offset = offset + 1;
/* Octet 3*/
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 1, "APM segmentation indicator:");
si_and_apm_seg_ind = tvb_get_guint8(parameter_tvb, offset);
- proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(parameter_tree, hf_isup_apm_si_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(parameter_tree, hf_isup_apm_segmentation_ind, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(parameter_tree, parameter_tvb, offset, hf_isup_apm_seg_indicator, ett_apm_seg_indicator, apm_flags, ENC_NA);
offset = offset + 1;
/* Octet 3a */
proto_tree_add_item(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
/* Address digits */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, octet - 2, "Address digits");
+ proto_tree_add_item(parameter_tree, hf_isup_address_digits, parameter_tvb, offset, octet - 2, ENC_NA);
offset = offset + octet - 2;
}
/* Octet 5 Destination Address length */
proto_tree_add_item(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
/* Address digits */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, octet - 2, "Address digits");
+ proto_tree_add_item(parameter_tree, hf_isup_address_digits, parameter_tvb, offset, octet - 2, ENC_NA);
offset = offset + octet - 2;
}
}
if (offset == (gint)length) {
/* No data */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 0, "Empty APM-user information field");
+ proto_tree_add_item(parameter_tree, hf_isup_apm_user_info_field, parameter_tvb, offset, 0, ENC_NA);
return;
}
if (new_tvb) { /* take it all */
next_tvb = tvb_new_subset_remaining(parameter_tvb, offset);
}
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, -1,
- "APM-user information field (%u Bytes)", tvb_length_remaining(parameter_tvb, offset));
+ proto_tree_add_item(parameter_tree, hf_isup_apm_user_info_field, parameter_tvb, offset, -1, ENC_NA);
switch (aci16 & 0x7fff) {
case 3:
dissect_bat_ase_Encapsulated_Application_Information(next_tvb, pinfo, parameter_tree, 0);
break;
default:
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, -1, "No further dissection of APM-user information field");
+ expert_add_info_format(pinfo, parameter_tree, &ei_isup_not_dissected_yet, "No further dissection of APM-user information field");
break;
}
}
length = tvb_length_remaining(parameter_tvb, offset);
if (length == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 0, "Calling Number (empty)");
+ 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)");
return;
}
Dissector Parameter Original called number
*/
void
-dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
proto_item *address_digits_item;
proto_tree *address_digits_tree;
length = tvb_length_remaining(parameter_tvb, offset);
if (length == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 0, "Original Called Number (empty)");
+ expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
proto_item_set_text(parameter_item, "Original Called Number: (empty)");
return;
}
length = tvb_length_remaining(parameter_tvb, offset);
if (length == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 0, "Redirecting Number (empty)");
+ proto_tree_add_string_format_value(parameter_tree, hf_isup_redirecting, parameter_tvb, offset, 0, "", "(empty)");
proto_item_set_text(parameter_item, "Redirecting Number: (empty)");
return;
}
guint8 protocol_class, credit, offset = 0;
local_ref = tvb_get_ntoh24(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, LOCAL_REF_LENGTH, "Local Reference: %u", local_ref);
+ proto_tree_add_item(parameter_tree, hf_isup_local_reference, parameter_tvb, offset, LOCAL_REF_LENGTH, ENC_BIG_ENDIAN);
offset = LOCAL_REF_LENGTH;
spc = tvb_get_letohs(parameter_tvb, offset) & 0x3FFF; /*since 1st 2 bits spare */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, SPC_LENGTH, "Signalling Point Code: %u", spc);
+ proto_tree_add_item(parameter_tree, hf_isup_signalling_point_code, parameter_tvb, offset, SPC_LENGTH, ENC_BIG_ENDIAN);
offset += SPC_LENGTH;
protocol_class = tvb_get_guint8(parameter_tvb, offset);
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, PROTOCOL_CLASS_LENGTH, "Protocol Class: %u", protocol_class);
+ proto_tree_add_item(parameter_tree, hf_isup_protocol_class, parameter_tvb, offset, PROTOCOL_CLASS_LENGTH, ENC_BIG_ENDIAN);
offset += PROTOCOL_CLASS_LENGTH;
credit = tvb_get_guint8(parameter_tvb, offset);
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, CREDIT_LENGTH, "Credit: %u", credit);
+ proto_tree_add_item(parameter_tree, hf_isup_credit, parameter_tvb, offset, CREDIT_LENGTH, ENC_BIG_ENDIAN);
proto_item_set_text(parameter_item,
"Connection request: Local Reference = %u, SPC = %u, Protocol Class = %u, Credit = %u",
NI_digits[2] = number_to_char((digit_pair & HGFE_8BIT_MASK) / 0x10);
NI_digits[3] = number_to_char(digit_pair & DCBA_8BIT_MASK);
NI_digits[4] = '\0';
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, 2, "Network Identity: %s", NI_digits);
+ proto_tree_add_string(parameter_tree, hf_isup_network_identity, parameter_tvb, 0, 2, NI_digits);
bin_code = tvb_get_ntohs(parameter_tvb, 2);
- proto_tree_add_text(parameter_tree, parameter_tvb, 2, 2, "Binary Code: 0x%x", bin_code);
+ proto_tree_add_item(parameter_tree, hf_isup_binary_code, parameter_tvb, 2, 2, ENC_BIG_ENDIAN);
proto_item_set_text(parameter_item, "Closed user group interlock code: NI = %s, Binary code = 0x%x", NI_digits, bin_code);
}
/* ------------------------------------------------------------------
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length,
- "User service information (-> Q.931 Bearer_capability)");
+ 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"));
dissect_q931_bearer_capability_ie(parameter_tvb,
guint16 spc;
spc = tvb_get_letohs(parameter_tvb, 0) & 0x3FFF; /*since 1st 2 bits spare */
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, SIGNALLING_POINT_CODE_LENGTH, "Signalling Point Code: %u", spc);
+ proto_tree_add_item(parameter_tree, hf_isup_signalling_point_code, parameter_tvb, 0, SIGNALLING_POINT_CODE_LENGTH, ENC_BIG_ENDIAN);
proto_item_set_text(parameter_item, "Signalling point code: %u", spc);
}
map_type = tvb_get_guint8(parameter_tvb, 0);
proto_tree_add_uint(parameter_tree, hf_isup_map_type, parameter_tvb, 0, 1, map_type);
- proto_tree_add_text(parameter_tree, parameter_tvb, 1, 5,
- "Circuit assignment map (bit position indicates usage of corresponding circuit->3.69/Q.763)");
+ proto_tree_add_item(parameter_tree, hf_isup_circuit_assignment_map, parameter_tvb, 1, 5, ENC_NA);
proto_item_set_text(parameter_item, "Circuit assignment map");
}
/* ------------------------------------------------------------------
guint16 spc;
spc = tvb_get_letohs(parameter_tvb, 0) & 0x3FFF; /*since 1st 2 bits spare */
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, ORIGINAL_ISC_POINT_CODE_LENGTH, "Origination ISC Point Code: %u", spc);
+ proto_tree_add_item(parameter_tree, hf_isup_origination_isc_point_code, parameter_tvb, 0, ORIGINAL_ISC_POINT_CODE_LENGTH, ENC_BIG_ENDIAN);
proto_item_set_text(parameter_item, "Origination ISC point code: %u", spc);
}
guint16 info;
info = tvb_get_ntohs(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, CALL_HISTORY_INFO_LENGTH, "Call history info: propagation delay = %u ms", info);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_call_history_info, parameter_tvb, 0, CALL_HISTORY_INFO_LENGTH, info, "propagation delay = %u ms", info);
proto_item_set_text(parameter_item, "Call history info: propagation delay = %u ms", info);
}
/* ------------------------------------------------------------------
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Network specific facility (refer to 3.36/Q.763 for detailed decoding)");
+ 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"));
}
/* ------------------------------------------------------------------
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length,
- "User service information prime (-> Q.931 Bearer capability information IE)");
+ 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,
parameter_tree);
guint16 info;
info = tvb_get_ntohs(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, PROPAGATION_DELAY_COUNT_LENGTH, "Propagation delay counter = %u ms", info);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_propagation_delay_counter, parameter_tvb, 0, PROPAGATION_DELAY_COUNT_LENGTH, info, "%u ms", info);
proto_item_set_text(parameter_item, "Propagation delay counter = %u ms", info);
}
/* ------------------------------------------------------------------
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Remote operations");
+ 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"));
}
/* ------------------------------------------------------------------
for (i=0; i<length; i++) {
feature_code = tvb_get_guint8(parameter_tvb, i);
- proto_tree_add_text(parameter_tree, parameter_tvb, i, 1, "Feature Code %u: %u", i+1, feature_code);
+ proto_tree_add_uint_format(parameter_tree, hf_isup_feature_code, parameter_tvb, i, 1, feature_code, "Feature Code %u: %u", i+1, feature_code);
}
proto_item_set_text(parameter_item, "Service Activation (%u byte%s length)", length , plurality(length, "", "s"));
}
dissect_isup_user_teleservice_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
guint length = tvb_length(parameter_tvb);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length,
- "User teleservice information (-> Q.931 High Layer Compatibility IE)");
+ 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);
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, CALL_DIV_INFO_LENGTH,
- "Call diversion information: 0x%x (refer to 3.6/Q.763 for detailed decoding)", indicator);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_call_diversion_information, parameter_tvb, 0, CALL_DIV_INFO_LENGTH, indicator,
+ "0x%x (refer to 3.6/Q.763 for detailed decoding)", indicator);
proto_item_set_text(parameter_item, "Call diversion information: 0x%x", indicator);
}
/* ------------------------------------------------------------------
static void
dissect_isup_echo_control_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{ guint8 indicator;
- gint offset = 0;
+ static const int * info[] = {
+ &hf_isup_OECD_inf_ind,
+ &hf_isup_IECD_inf_ind,
+ &hf_isup_OECD_req_ind,
+ &hf_isup_IECD_req_ind,
+ NULL
+ };
indicator = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, ECHO_CONTROL_INFO_LENGTH,
- "Echo control information: 0x%x", indicator);
-
- proto_tree_add_uint(parameter_tree, hf_isup_OECD_inf_ind,
- parameter_tvb, offset, 1, indicator);
-
- proto_tree_add_uint(parameter_tree, hf_isup_IECD_inf_ind,
- parameter_tvb, offset, 1, indicator);
-
- proto_tree_add_uint(parameter_tree, hf_isup_OECD_req_ind,
- parameter_tvb, offset, 1, indicator);
-
- proto_tree_add_uint(parameter_tree, hf_isup_IECD_req_ind,
- parameter_tvb, offset, 1, indicator);
+ proto_tree_add_bitmask(parameter_tree, parameter_tvb, 0, hf_isup_echo_control_information, ett_echo_control_information, info, ENC_NA);
proto_item_set_text(parameter_item, "Echo control information: 0x%x", indicator);
}
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 instruction_indicators;
gint offset = 0;
- instruction_indicators = tvb_get_guint8(parameter_tvb, offset);
-
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length,
- "Message compatibility information");
-
- proto_tree_add_boolean(parameter_tree, hf_isup_transit_at_intermediate_exchange_ind,
- parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_Release_call_ind,
- parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_Send_notification_ind,
- parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_Discard_message_ind_value,
- parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_pass_on_not_possible_indicator2,
- parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_uint(parameter_tree, hf_isup_Broadband_narrowband_interworking_ind2,
- parameter_tvb, offset, 1, instruction_indicators);
+ static const int * params[] = {
+ &hf_isup_transit_at_intermediate_exchange_ind,
+ &hf_isup_Release_call_ind,
+ &hf_isup_Send_notification_ind,
+ &hf_isup_Discard_message_ind_value,
+ &hf_isup_pass_on_not_possible_indicator2,
+ &hf_isup_Broadband_narrowband_interworking_ind2,
+ &hf_isup_extension_ind,
+ NULL
+ };
- proto_tree_add_boolean(parameter_tree, hf_isup_extension_ind ,
- parameter_tvb, offset, 1, instruction_indicators);
+ proto_tree_add_bitmask(parameter_tree, parameter_tvb, offset, hf_isup_message_compatibility_information, ett_message_compatibility_information, params, ENC_NA);
proto_item_set_text(parameter_item, "Message compatibility information (%u byte%s length)",
length , plurality(length, "", "s"));
guint8 offset;
guint8 instruction_indicators;
+ static const int * indicator_flags[] = {
+ &hf_isup_transit_at_intermediate_exchange_ind,
+ &hf_isup_Release_call_ind,
+ &hf_isup_Send_notification_ind,
+ &hf_isup_Discard_message_ind_value,
+ &hf_isup_Discard_parameter_ind,
+ &hf_isup_Pass_on_not_possible_indicator,
+ &hf_isup_extension_ind,
+ NULL
+ };
+
offset = 0;
upgraded_parameter_no = 0;
upgraded_parameter_no = upgraded_parameter_no + 1;
upgraded_parameter = tvb_get_guint8(parameter_tvb, offset);
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 1,
+ proto_tree_add_uint_format(parameter_tree, hf_isup_upgraded_parameter, parameter_tvb, offset, 1, upgraded_parameter,
"Upgraded parameter no: %u = %s", upgraded_parameter_no,
val_to_str_ext(upgraded_parameter, &isup_parameter_type_value_ext, "unknown (%u)"));
offset += 1;
len -= 1;
instruction_indicators = tvb_get_guint8(parameter_tvb, offset);
-
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 1,
- "Instruction indicators: 0x%x ",
- instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_transit_at_intermediate_exchange_ind,
- parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_Release_call_ind, parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_Send_notification_ind, parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_Discard_message_ind_value, parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_Discard_parameter_ind, parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_uint(parameter_tree, hf_isup_Pass_on_not_possible_indicator, parameter_tvb, offset, 1, instruction_indicators);
-
- proto_tree_add_boolean(parameter_tree, hf_isup_extension_ind , parameter_tvb, offset, 1, instruction_indicators);
+ proto_tree_add_bitmask(parameter_tree, parameter_tvb, offset, hf_isup_instruction_indicators, ett_instruction_indicators, indicator_flags, ENC_NA);
offset += 1;
len -= 1;
/* ------------------------------------------------------------------
Dissector Parameter MLPP precedence
*/
+static const value_string isup_mlpp_precedence_look_forward_busy_vals[] = {
+ { 0x00 , "Allowed" },
+ { 0x01 , "Not Allowed" },
+ { 0x02 , "Path reserved" },
+ { 0x03 , "Spare" },
+ { 0 , NULL },
+};
+
+static const value_string isup_mlpp_precedence_level_vals[] = {
+ { 0x00 , "Flash Override" },
+ { 0x01 , "Flash" },
+ { 0x02 , "Immediate" },
+ { 0x03 , "Priority" },
+ { 0x04 , "Routine" },
+ { 0x05 , "Spare" },
+ { 0x06 , "Spare" },
+ { 0x07 , "Spare" },
+ { 0x08 , "Spare" },
+ { 0x09 , "Spare" },
+ { 0x0A , "Spare" },
+ { 0x0B , "Spare" },
+ { 0x0C , "Spare" },
+ { 0x0D , "Spare" },
+ { 0x0E , "Spare" },
+ { 0x0F , "Spare" },
+ { 0 , NULL },
+};
+
static void
dissect_isup_mlpp_precedence_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
char NI_digits[5] = "";
const char *temp_text = "";
- guint8 indicators, digit_pair;
+ guint8 digit_pair;
guint32 bin_code;
- indicators = tvb_get_guint8(parameter_tvb, 0);
- switch ((indicators & 0x60) >> 5) {
- case 0x0:
- temp_text = "Allowed";
- break;
- case 0x1:
- temp_text = "Not Allowed";
- break;
- case 0x2:
- temp_text = "Path reserved";
- break;
- case 0x3:
- temp_text = "Spare";
- break;
- }
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, 1, "Look forward busy: %s", temp_text);
- switch (indicators & 0xf) {
- case 0x0:
- temp_text = "Flash Override";
- break;
- case 0x1:
- temp_text = "Flash";
- break;
- case 0x2:
- temp_text = "Immediate";
- break;
- case 0x3:
- temp_text = "Priority";
- break;
- case 0x4:
- temp_text = "Routine";
- break;
- default:
- temp_text = "Spare";
- break;
- }
+ proto_tree_add_item(parameter_tree, hf_isup_look_forward_busy, parameter_tvb, 0, 1, ENC_NA);
+ proto_tree_add_item(parameter_tree, hf_isup_precedence_level, parameter_tvb, 0, 1, ENC_NA);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, 1, "Precedence Level: %s", temp_text);
digit_pair = tvb_get_guint8(parameter_tvb, 1);
NI_digits[0] = number_to_char((digit_pair & HGFE_8BIT_MASK) / 0x10);
NI_digits[1] = number_to_char(digit_pair & DCBA_8BIT_MASK);
NI_digits[2] = number_to_char((digit_pair & HGFE_8BIT_MASK) / 0x10);
NI_digits[3] = number_to_char(digit_pair & DCBA_8BIT_MASK);
NI_digits[4] = '\0';
- proto_tree_add_text(parameter_tree, parameter_tvb, 1, 2, "Network Identity: %s", NI_digits);
+ proto_tree_add_string(parameter_tree, hf_isup_network_identity, parameter_tvb, 1, 2, NI_digits);
bin_code = tvb_get_ntoh24(parameter_tvb, 3);
- proto_tree_add_text(parameter_tree, parameter_tvb, 3, 3, "MLPP service domain: 0x%x", bin_code);
+ proto_tree_add_item(parameter_tree, hf_isup_mlpp_service_domain, parameter_tvb, 3, 3, ENC_BIG_ENDIAN);
proto_item_set_text(parameter_item,
"MLPP precedence: Prec = %s, NI = %s, MLPP service domain = 0x%x", temp_text, NI_digits, bin_code);
}
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, MCID_REQUEST_IND_LENGTH,
- "MCID request indicators: 0x%x (MCID requested by Bit1=1, Holding requested by Bit2=1 see 3.31/Q.763)", indicator);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_mcid_request_indicators, parameter_tvb, 0, MCID_REQUEST_IND_LENGTH, indicator, "0x%x (MCID requested by Bit1=1, Holding requested by Bit2=1 see 3.31/Q.763)", indicator);
proto_item_set_text(parameter_item, "MCID request indicators: 0x%x", indicator);
}
/* ------------------------------------------------------------------
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, MCID_RESPONSE_IND_LENGTH,
- "MCID response indicators: 0x%x (MCID included if Bit1=1, Holding provided if Bit2=1 see 3.32/Q.763)", indicator);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_mcid_response_indicators, parameter_tvb, 0, MCID_RESPONSE_IND_LENGTH, indicator, "0x%x (MCID included if Bit1=1, Holding provided if Bit2=1 see 3.32/Q.763)", indicator);
proto_item_set_text(parameter_item, "MCID response indicators: 0x%x", indicator);
}
/* ------------------------------------------------------------------
{ guint8 counter;
counter = tvb_get_guint8(parameter_tvb, 0) & EDCBA_8BIT_MASK; /* since bits H,G and F are spare */
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, HOP_COUNTER_LENGTH, "Hop counter: %u", counter);
+ proto_tree_add_item(parameter_tree, hf_isup_hop_counter, parameter_tvb, 0, HOP_COUNTER_LENGTH, ENC_NA);
proto_item_set_text(parameter_item, "Hop counter: %u", counter);
}
/* ------------------------------------------------------------------
{ guint8 info;
info = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, ORIG_LINE_INFO_LENGTH, "Originating line info: %u", info);
+ proto_tree_add_item(parameter_tree, hf_isup_originating_line_info, parameter_tvb, 0, ORIG_LINE_INFO_LENGTH, ENC_NA);
proto_item_set_text(parameter_item, "Originating line info: %u (ANI II if < 51, reserved otherwise)", info);
}
/* ------------------------------------------------------------------
proto_tree_add_boolean(parameter_tree, hf_isup_inn_indicator, parameter_tvb, 1, 1, indicators2);
proto_tree_add_uint(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, 1, 1, indicators2);
if ((indicators2 & GFE_8BIT_MASK) == 0x50)
- proto_tree_add_text(parameter_tree, parameter_tvb, 1, 1,
- "Different meaning for Location Number: Numbering plan indicator = private numbering plan");
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_number_different_meaning, parameter_tvb, 1, 1, indicators2 & GFE_8BIT_MASK,
+ "Numbering plan indicator = private numbering plan");
proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2);
* BUG 938 - Just check if there is someting more to dissect.
*/
if (tvb_length_remaining(parameter_tvb, offset) < 3) {
- proto_tree_add_text(parameter_tree, parameter_tvb, 1, -1, "Location number: address not available");
proto_item_set_text(parameter_item, "Location number: address not available");
return;
}
/* ------------------------------------------------------------------
Dissector Parameter Redirection number restiriction
*/
+static const value_string isup_redirection_presentation_indicator_vals[] = {
+ { 0x00 , "Presentation allowed" },
+ { 0x01 , "Presentation restricted" },
+ { 0x02 , "Spare" },
+ { 0x03 , "Spare" },
+ { 0 , NULL },
+};
+
static void
dissect_isup_redirection_number_restriction_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
- switch (indicator & BA_8BIT_MASK) {
- case 0:
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, REDIRECTION_NUMBER_RESTRICTION_LENGTH,
- "Presentation indicator: Presentation allowed");
- break;
- case 1:
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, REDIRECTION_NUMBER_RESTRICTION_LENGTH,
- "Presentation indicator: Presentation restricted");
- break;
- default:
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, REDIRECTION_NUMBER_RESTRICTION_LENGTH,
- "Presentation indicator: spare");
- break;
- }
+ proto_tree_add_item(parameter_tree, hf_isup_presentation_indicator, parameter_tvb, 0, REDIRECTION_NUMBER_RESTRICTION_LENGTH, ENC_NA);
proto_item_set_text(parameter_item, "Redirection number restriction: 0x%x ", indicator);
}
/* ------------------------------------------------------------------
{ guint8 id;
id = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, CALL_TRANSFER_REF_LENGTH, "Call transfer identity: %u", id);
+ proto_tree_add_item(parameter_tree, hf_isup_call_transfer_identity, parameter_tvb, 0, CALL_TRANSFER_REF_LENGTH, ENC_NA);
proto_item_set_text(parameter_item, "Call transfer reference: %u", id);
}
/* ------------------------------------------------------------------
Dissector Parameter Loop prevention
*/
+static const true_false_string tfs_response_request = { "Response", "Request"};
+
static void
dissect_isup_loop_prevention_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
+ proto_tree_add_item(parameter_tree, hf_isup_loop_prevention_indicator_type, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, ENC_NA);
if ((indicator & A_8BIT_MASK) == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, "Type: Request");
proto_item_set_text(parameter_item, "Loop prevention indicators: Request (%u)", indicator);
}
else {
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, "Type: Response");
proto_tree_add_uint(parameter_tree, hf_isup_loop_prevention_response_ind,
parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, indicator);
proto_item_set_text(parameter_item, "Loop prevention indicators: Response (%u)", indicator);
indicators2 = tvb_get_guint8(parameter_tvb, 1);
proto_tree_add_uint(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, 1, 1, indicators2);
if ((indicators2 & GFE_8BIT_MASK) == 0x50)
- proto_tree_add_text(parameter_tree, parameter_tvb, 1, 1,
- "Different meaning for Call Transfer Number: Numbering plan indicator = private numbering plan");
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_number_different_meaning, parameter_tvb, 1, 1, indicators2 & GFE_8BIT_MASK,
+ "Numbering plan indicator = private numbering plan");
proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2);
proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator_enhanced, parameter_tvb, 1, 1, indicators2);
offset = 2;
/* ------------------------------------------------------------------
Dissector Parameter CCSS
*/
+static const true_false_string tfs_ccss_call_no_indication = { "CCSS call", "no indication"};
+
static void
dissect_isup_ccss_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
+ proto_tree_add_item(parameter_tree, hf_isup_ccss_call_indicator, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, ENC_NA);
if ((indicator & A_8BIT_MASK) == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, "CCSS call indicator: no indication");
proto_item_set_text(parameter_item, "CCSS call indicator: no indication (%u)", indicator);
}
else {
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, LOOP_PREVENTION_IND_LENGTH, "CCSS call indicator: CCSS call");
proto_item_set_text(parameter_item, "CCSS call indicator: CCSS call (%u)", indicator);
}
}
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Forward GVNS (refer to 3.66/Q.763 for detailed decoding)");
+ 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"));
}
/* ------------------------------------------------------------------
proto_tree_add_item(parameter_tree, hf_japan_isup_redirect_capability, parameter_tvb, 0, 1, ENC_BIG_ENDIAN);
break;
default:
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Redirect capability (format is a national matter)");
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_redirect_capability, parameter_tvb, 0, length, itu_isup_variant, "(format is a national matter)");
break;
}
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, BACKWARD_GVNS_LENGTH,
- "Backward GVNS: 0x%x (refer to 3.62/Q.763 for detailed decoding)", indicator);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_backward_gvns, parameter_tvb, 0, BACKWARD_GVNS_LENGTH, indicator,
+ "0x%x (refer to 3.62/Q.763 for detailed decoding)", indicator);
proto_item_set_text(parameter_item, "Backward GVNS: 0x%x", indicator);
}
/* ------------------------------------------------------------------
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Correlation ID (-> Q.1281)");
+ 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"));
}
/* ------------------------------------------------------------------
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "SCF ID (-> Q.1281)");
+ 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"));
}
/* ------------------------------------------------------------------
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length,
- "Charged party identification (format is national network specific)");
+ 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"));
}
/* ------------------------------------------------------------------
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length,
- "Display information (-> Q.931)");
+ 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"));
}
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, UID_ACTION_IND_LENGTH,
- "UID action indicators: 0x%x (refer to 3.78/Q.763 for detailed decoding)", indicator);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_uid_action_indicators, parameter_tvb, 0, UID_ACTION_IND_LENGTH, indicator,
+ "0x%x (refer to 3.78/Q.763 for detailed decoding)", indicator);
proto_item_set_text(parameter_item, "UID action indicators: 0x%x", indicator);
}
/* ------------------------------------------------------------------
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, UID_CAPABILITY_IND_LENGTH,
- "UID capability indicators: 0x%x (refer to 3.79/Q.763 for detailed decoding)", indicator);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_uid_capability_indicators, parameter_tvb, 0, UID_CAPABILITY_IND_LENGTH,
+ indicator, "0x%x (refer to 3.79/Q.763 for detailed decoding)", indicator);
proto_item_set_text(parameter_item, "UID capability indicators: 0x%x", indicator);
}
/* ------------------------------------------------------------------
proto_tree_add_item(parameter_tree, hf_japan_isup_redirect_counter, parameter_tvb, 0, 1, ENC_BIG_ENDIAN);
break;
default:
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Redirect counter (format is a national matter)");
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_redirect_counter, parameter_tvb, 0, length, itu_isup_variant, "(format is a national matter)");
break;
}
/* ------------------------------------------------------------------
Dissector Parameter Collect call request
*/
+static const true_false_string tfs_collect_call_req_no_indication = { "collect call requested", "no indication"};
+
static void
dissect_isup_collect_call_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
+ proto_tree_add_item(parameter_tree, hf_isup_collect_call_request_indicator, parameter_tvb, 0, COLLECT_CALL_REQUEST_LENGTH, ENC_NA);
if ((indicator & A_8BIT_MASK) == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, COLLECT_CALL_REQUEST_LENGTH, "Collect call request indicator: no indication");
proto_item_set_text(parameter_item, "Collect call request: no indication (0x%x)", indicator);
}
else {
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, COLLECT_CALL_REQUEST_LENGTH, "Collect call request indicator: collect call requested");
proto_item_set_text(parameter_item, "Collect call request: collect call requested (0x%x)", indicator);
}
}
Dissector Parameter Calling geodetic location
*/
static void
-dissect_isup_calling_geodetic_location_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+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);
guint8 oct, lpri;
oct = tvb_get_guint8(parameter_tvb, 1);
proto_tree_add_boolean(parameter_tree, hf_isup_extension_ind, parameter_tvb, 1, 1, oct);
- proto_tree_add_text(parameter_tree, parameter_tvb, 1, 1,
- "Calling geodetic location type of shape: %s (%u)",
- val_to_str_const(oct & GFEDCBA_8BIT_MASK, isup_location_type_of_shape_value, "spare/reserved"), oct);
+ proto_tree_add_item(parameter_tree, hf_isup_geo_loc_shape, parameter_tvb, 1, 1, ENC_NA);
if (length > 2)
{
if (lpri < 0x2)
{
- proto_tree_add_text(parameter_tree, parameter_tvb, 2, length - 2,
- "Shape description");
+ proto_tree_add_item(parameter_tree, hf_isup_geo_loc_shape_description, parameter_tvb, 2, length - 2, ENC_NA);
}
else
{
/* not supposed to have any data if 'lpri' was 'location not available' */
- proto_tree_add_text(parameter_tree, parameter_tvb, 2, length - 2,
- "Unknown (?), should not have data if LPRI is 'location not available'");
+ proto_tree_add_expert_format(parameter_tree, pinfo, &ei_isup_not_dissected_yet, parameter_tvb, 2, length - 2,
+ "Unknown (?), should not have data if LPRI is 'location not available'");
}
}
Dissector Parameter Generic number
*/
void
-dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
proto_item *address_digits_item;
proto_tree *address_digits_tree;
char calling_number[MAXDIGITS + 1] = "";
nr_qualifier_ind = tvb_get_guint8(parameter_tvb, 0);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, 1,
- "Number qualifier indicator: 0x%x (refer to 3.26/Q.763 for detailed decoding)", nr_qualifier_ind);
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_number_qualifier_indicator, parameter_tvb, 0, 1, nr_qualifier_ind,
+ "0x%x (refer to 3.26/Q.763 for detailed decoding)", nr_qualifier_ind);
indicators1 = tvb_get_guint8(parameter_tvb, 1);
proto_tree_add_boolean(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, 1, 1, indicators1);
proto_tree_add_uint(parameter_tree, hf_isup_calling_party_nature_of_address_indicator, parameter_tvb, 0, 1, indicators1);
proto_tree_add_boolean(parameter_tree, hf_isup_ni_indicator, parameter_tvb, 2, 1, indicators2);
proto_tree_add_uint(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, 2, 1, indicators2);
if ((indicators2 & GFE_8BIT_MASK) == 0x50)
- proto_tree_add_text(parameter_tree, parameter_tvb, 2, 1,
- "Different meaning for Generic Number: Numbering plan indicator = private numbering plan");
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_number_different_meaning, parameter_tvb, 2, 1, indicators2 & GFE_8BIT_MASK,
+ "Numbering plan indicator = private numbering plan");
proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 2, 1, indicators2);
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);
if (length == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 0, "Generic Number (empty)");
+ expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
proto_item_set_text(parameter_item, "Generic Number: (empty)");
return;
}
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);
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, length, "Generic digits (refer to 3.24/Q.673 for detailed decoding)");
+ 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"));
}
Filler (if necessary) nth address signal 15
*/
static void
-dissect_japan_isup_called_dir_num(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_japan_isup_called_dir_num(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
int offset = 0;
int parameter_length;
proto_tree_add_item(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, parameter_length-offset, "Number not dissected yet");
+ proto_tree_add_expert_format(parameter_tree, pinfo, &ei_isup_not_dissected_yet, parameter_tvb, offset, parameter_length-offset, "Number not dissected yet");
proto_item_set_text(parameter_item, "Called Directory Number");
static void
-dissect_japan_isup_redirect_fwd_inf(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_japan_isup_redirect_fwd_inf(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
int offset = 0;
guint8 tag, tag_len, ext_ind;
break;
default:
/* Information Type Value */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, tag_len, "Unknown(not dissected) tag");
+ proto_tree_add_expert_format(parameter_tree, pinfo, &ei_isup_not_dissected_yet, parameter_tvb, offset, tag_len, "Unknown(not dissected) tag");
offset = offset + tag_len;
break;
}
};
static void
-dissect_japan_isup_redirect_backw_inf(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_japan_isup_redirect_backw_inf(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
int offset = 0;
guint8 tag, tag_len, ext_ind;
break;
default:
/* Information Type Value */
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, tag_len, "Unknown(not dissected) tag");
+ proto_tree_add_expert_format(parameter_tree, pinfo, &ei_isup_not_dissected_yet, parameter_tvb, offset, tag_len, "Unknown(not dissected) tag");
offset = offset + tag_len;
break;
}
void
-dissect_japan_isup_additonal_user_cat(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_japan_isup_additonal_user_cat(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
int offset = 0;
guint8 type;
proto_tree_add_item(parameter_tree, hf_japan_isup_type_3_add_mobile_serv_inf, parameter_tvb, offset, 1, ENC_BIG_ENDIAN);
break;
default:
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 1, "Unknown(not dissected) Additional User/Service Information");
+ proto_tree_add_expert_format(parameter_tree, pinfo, &ei_isup_not_dissected_yet, parameter_tvb, offset, 1,
+ "Unknown(not dissected) Additional User/Service Information");
break;
}
offset += 1;
. .
*/
static void
-dissect_japan_isup_carrier_information(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_japan_isup_carrier_information(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item)
{
proto_item *catagory_of_carrier;
proto_tree *carrier_info_tree;
length = tvb_length_remaining(parameter_tvb, 2);
if (length == 0) {
- proto_tree_add_text(parameter_tree, parameter_tvb, offset, 0, "Carrier Information (empty)");
+ expert_add_info(pinfo, parameter_item, &ei_isup_empty_number);
proto_item_set_text(parameter_item, "Carrier Information (empty)");
return;
}
static void
-dissect_japan_chg_inf_param(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item, guint16 chg_inf_type)
+dissect_japan_chg_inf_param(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item, guint16 chg_inf_type)
{
switch (chg_inf_type) {
dissect_japan_chg_inf_type_crt(parameter_tvb, parameter_tree, parameter_item);
break;
default:
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, -1, "Charge information data, not dissected yet");
+ proto_tree_add_expert_format(parameter_tree, pinfo, &ei_isup_not_dissected_yet, parameter_tvb, 0, -1, "Charge information data, not dissected yet");
break;
}
case ISUP_JAPAN_VARIANT:
/* Fall trough */
case ISUP_JAPAN_TTC_VARIANT:
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH,
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_opt_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH,
parameter_type,
- "Optional Parameter: %u (%s)",
+ "%u (%s)",
parameter_type,
val_to_str_ext_const(parameter_type, &japan_isup_parameter_type_value_ext, "unknown"));
break;
default:
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH,
- parameter_type,
- "Optional Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_opt_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH, parameter_type);
break;
}
dissect_isup_circuit_group_supervision_message_type_parameter(parameter_tvb, parameter_tree, parameter_item);
break;
case PARAM_TYPE_RANGE_AND_STATUS:
- dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_range_and_status_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case PARAM_TYPE_FACILITY_IND:
dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item);
dissect_isup_automatic_congestion_level_parameter(parameter_tvb, parameter_tree, parameter_item);
break;
case PARAM_TYPE_ORIG_CALLED_NR:
- dissect_isup_original_called_number_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_original_called_number_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case PARAM_TYPE_OPT_BACKW_CALL_IND:
dissect_isup_optional_backward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
dissect_isup_collect_call_request_parameter(parameter_tvb, parameter_tree, parameter_item);
break;
case PARAM_TYPE_GENERIC_NR:
- dissect_isup_generic_number_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_generic_number_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case PARAM_TYPE_GENERIC_DIGITS:
dissect_isup_generic_digits_parameter(parameter_tvb, parameter_tree, parameter_item);
case ISUP_JAPAN_TTC_VARIANT:
switch (parameter_type) {
case JAPAN_ISUP_PARAM_CALLED_DIRECTORY_NUMBER:
- dissect_japan_isup_called_dir_num(parameter_tvb, parameter_tree, parameter_item);
+ dissect_japan_isup_called_dir_num(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case JAPAN_ISUP_PARAM_REDIRECT_FORWARD_INF: /* 0x8B */
- dissect_japan_isup_redirect_fwd_inf(parameter_tvb, parameter_tree, parameter_item);
+ dissect_japan_isup_redirect_fwd_inf(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case JAPAN_ISUP_PARAM_REDIRECT_BACKWARD_INF: /* 0x8C */
- dissect_japan_isup_redirect_backw_inf(parameter_tvb, parameter_tree, parameter_item);
+ dissect_japan_isup_redirect_backw_inf(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case JAPAN_ISUP_PARAM_EMERGENCY_CALL_INF_IND: /* EC */
dissect_japan_isup_emergency_call_inf_ind(parameter_tvb, parameter_tree, parameter_item);
dissect_japan_isup_network_poi_cad(parameter_tvb, parameter_tree, parameter_item);
break;
case JAPAN_ISUP_PARAM_TYPE_CARRIER_INFO: /* 241 F1 */
- dissect_japan_isup_carrier_information(parameter_tvb, parameter_tree, parameter_item);
+ dissect_japan_isup_carrier_information(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case JAPAN_ISUP_PARAM_CHARGE_INF_DELAY: /* 242 F2 */
dissect_japan_isup_charge_inf_delay(parameter_tvb, parameter_tree, parameter_item);
break;
case JAPAN_ISUP_PARAM_TYPE_ADDITONAL_USER_CAT: /* F3 */
- dissect_japan_isup_additonal_user_cat(parameter_tvb, parameter_tree, parameter_item);
+ dissect_japan_isup_additonal_user_cat(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case JAPAN_ISUP_PARAM_REASON_FOR_CLIP_FAIL: /* F5 */
dissect_japan_isup_reason_for_clip_fail(parameter_tvb, parameter_tree, parameter_item);
chg_inf_type = dissect_japan_chg_inf_type(parameter_tvb, parameter_tree, parameter_item);
break;
case JAPAN_ISUP_PARAM_TYPE_CHARGE_INF:
- dissect_japan_chg_inf_param(parameter_tvb, parameter_tree, parameter_item, chg_inf_type);
+ dissect_japan_chg_inf_param(parameter_tvb, pinfo, parameter_tree, parameter_item, chg_inf_type);
break;
case JAPAN_ISUP_PARAM_TYPE_CHARGE_AREA_INFO:
dissect_japan_isup_charge_area_info(parameter_tvb, parameter_tree, parameter_item);
offset, parameter_length + PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item, "Parameter: type %u",
parameter_type);
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, optional_parameters_tvb, offset,
- PARAMETER_TYPE_LENGTH, parameter_type,
- "Optional Parameter: %u (%s)", parameter_type,
- val_to_str_ext_const(parameter_type, &ansi_isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_opt_parameter_type, optional_parameters_tvb, offset,
+ PARAMETER_TYPE_LENGTH, parameter_type);
offset += PARAMETER_TYPE_LENGTH;
octet = tvb_get_guint8(optional_parameters_tvb, offset);
dissect_isup_circuit_group_supervision_message_type_parameter(parameter_tvb, parameter_tree, parameter_item);
break;
case PARAM_TYPE_RANGE_AND_STATUS:
- dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_range_and_status_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case PARAM_TYPE_FACILITY_IND:
dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item);
dissect_isup_automatic_congestion_level_parameter(parameter_tvb, parameter_tree, parameter_item);
break;
case PARAM_TYPE_ORIG_CALLED_NR:
- dissect_isup_original_called_number_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_original_called_number_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case PARAM_TYPE_OPT_BACKW_CALL_IND:
dissect_isup_optional_backward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
dissect_isup_collect_call_request_parameter(parameter_tvb, parameter_tree, parameter_item);
break;
case PARAM_TYPE_CALLING_GEODETIC_LOCATION:
- dissect_isup_calling_geodetic_location_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_calling_geodetic_location_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case PARAM_TYPE_GENERIC_NR:
- dissect_isup_generic_number_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_generic_number_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break;
case PARAM_TYPE_JURISDICTION:
dissect_isup_jurisdiction_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset, CVR_RESP_IND_LENGTH,
ett_isup_parameter, ¶meter_item, "CVR Response Indicator");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type,
+ "%u (%s)",
parameter_type,
val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "CVR Response Indicator"));
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
CG_CHAR_IND_LENGTH, ett_isup_parameter, ¶meter_item,
"Circuit Group Characteristics Indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type,
+ "%u (%s)",
parameter_type,
val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "Circuit Group Characters"));
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
NATURE_OF_CONNECTION_IND_LENGTH, ett_isup_parameter, ¶meter_item,
"Nature of Connection Indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(NATURE_OF_CONNECTION_IND_LENGTH, actual_length), NATURE_OF_CONNECTION_IND_LENGTH);
dissect_isup_nature_of_connection_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
NATURE_OF_CONNECTION_IND_LENGTH, ett_isup_parameter, ¶meter_item,
"Nature of Connection Indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(NATURE_OF_CONNECTION_IND_LENGTH, actual_length), NATURE_OF_CONNECTION_IND_LENGTH);
dissect_isup_nature_of_connection_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
FORWARD_CALL_IND_LENGTH, ett_isup_parameter, ¶meter_item,
"Forward Call Indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FORWARD_CALL_IND_LENGTH, actual_length), FORWARD_CALL_IND_LENGTH);
dissect_isup_forward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
CALLING_PRTYS_CATEGORY_LENGTH,
ett_isup_parameter, ¶meter_item,
"Calling Party's category");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CALLING_PRTYS_CATEGORY_LENGTH, actual_length), CALLING_PRTYS_CATEGORY_LENGTH);
dissect_isup_calling_partys_category_parameter(parameter_tvb, parameter_tree, parameter_item, itu_isup_variant);
TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH,
ett_isup_parameter, ¶meter_item,
"Transmission medium requirement");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb,
offset,
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"User Service Information");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Called Party Number");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Subsequent Number");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
INFO_REQUEST_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Information request indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(INFO_REQUEST_IND_LENGTH, actual_length), INFO_REQUEST_IND_LENGTH);
dissect_isup_information_request_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
INFO_IND_LENGTH, ett_isup_parameter, ¶meter_item,
"Information indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(INFO_IND_LENGTH, actual_length), INFO_IND_LENGTH);
dissect_isup_information_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
CONTINUITY_IND_LENGTH, ett_isup_parameter, ¶meter_item,
"Continuity indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CONTINUITY_IND_LENGTH, actual_length), CONTINUITY_IND_LENGTH);
dissect_isup_continuity_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
BACKWARD_CALL_IND_LENGTH, ett_isup_parameter, ¶meter_item,
"Backward Call Indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(BACKWARD_CALL_IND_LENGTH, actual_length), BACKWARD_CALL_IND_LENGTH);
dissect_isup_backward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
BACKWARD_CALL_IND_LENGTH, ett_isup_parameter, ¶meter_item,
"Backward Call Indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(BACKWARD_CALL_IND_LENGTH, actual_length), BACKWARD_CALL_IND_LENGTH);
dissect_isup_backward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Cause indicators");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
SUSPEND_RESUME_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Suspend/Resume indicator");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(SUSPEND_RESUME_IND_LENGTH, actual_length), SUSPEND_RESUME_IND_LENGTH);
dissect_isup_suspend_resume_indicators_parameter(parameter_tvb, parameter_tree, parameter_item);
Dissector Message Type Circuit group reset/query message
*/
static gint
-dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
+dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup_tree)
{ proto_item *parameter_item;
proto_tree *parameter_tree;
tvbuff_t *parameter_tvb;
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Range and status");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH,
MIN(parameter_length, actual_length),
parameter_length);
- dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_range_and_status_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
return offset;
Dissector Message Type Circuit group blocking/blocking ack/unblocking/unblocking ack messages
*/
static gint
-dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree *isup_tree)
+dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup_tree)
{ proto_item *parameter_item;
proto_tree *parameter_tree;
tvbuff_t *parameter_tvb;
CIRC_GRP_SV_MSG_TYPE_LENGTH,
ett_isup_parameter, ¶meter_item,
"Circuit group supervision message type");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CIRC_GRP_SV_MSG_TYPE_LENGTH, actual_length), CIRC_GRP_SV_MSG_TYPE_LENGTH);
dissect_isup_circuit_group_supervision_message_type_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Range and status");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH,
MIN(parameter_length, actual_length),
parameter_length);
- dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_range_and_status_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
return offset;
FACILITY_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Facility indicator");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FACILITY_IND_LENGTH, actual_length), FACILITY_IND_LENGTH);
dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item);
FACILITY_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Facility indicator");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FACILITY_IND_LENGTH, actual_length), FACILITY_IND_LENGTH);
dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item);
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Cause indicators, see Q.850");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb,
offset, PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
Dissector Message Type Circuit group reset acknowledgement message
*/
static gint
-dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
+dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup_tree)
{ proto_item *parameter_item;
proto_tree *parameter_tree;
tvbuff_t *parameter_tvb;
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Range and status");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH,
MIN(parameter_length, actual_length),
parameter_length);
- dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_range_and_status_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
return offset;
Dissector Message Type Circuit group query response message
*/
static gint
-dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_tree *isup_tree)
+dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup_tree)
{ proto_item *parameter_item;
proto_tree *parameter_tree;
tvbuff_t *parameter_tvb;
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Range and status");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH,
MIN(parameter_length, actual_length),
parameter_length);
- dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_range_and_status_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
/* Do stuff for 2. mandatory variable parameter Circuit state indicator*/
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Circuit state indicator (national use)");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset,
EVENT_INFO_LENGTH, ett_isup_parameter, ¶meter_item,
"Event information");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(EVENT_INFO_LENGTH, actual_length), EVENT_INFO_LENGTH);
dissect_isup_event_information_parameter(parameter_tvb, parameter_tree, parameter_item);
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"User-to-user information, see Q.931");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer,
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Cause indicators, see Q.850");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
- parameter_type,
- val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown"));
+ proto_tree_add_uint(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type);
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
PARAMETER_POINTER_LENGTH, parameter_pointer);
proto_tree_add_uint(parameter_tree, hf_isup_parameter_length,
}
static int
-dissect_japan_chg_inf(tvbuff_t *message_tvb, proto_tree *isup_tree)
+dissect_japan_chg_inf(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup_tree)
{
proto_item *parameter_item;
proto_tree *parameter_tree;
parameter_type = JAPAN_ISUP_PARAM_TYPE_CHARGE_INF_TYPE;
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset, 1,
ett_isup_parameter, ¶meter_item, "Charge information type");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type,
+ "%u (%s)",
parameter_type,
val_to_str_ext_const(parameter_type, &japan_isup_parameter_type_value_ext, "unknown"));
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_length + PARAMETER_LENGTH_IND_LENGTH,
ett_isup_parameter, ¶meter_item,
"Charge information");
- proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type,
- "Mandatory Parameter: %u (%s)",
+ proto_tree_add_uint_format_value(parameter_tree, hf_isup_mand_parameter_type, message_tvb, 0, 0, parameter_type,
+ "%u (%s)",
parameter_type,
val_to_str_ext_const(parameter_type, &japan_isup_parameter_type_value_ext, "unknown"));
proto_tree_add_uint(parameter_tree, hf_isup_mandatory_variable_parameter_pointer, message_tvb, offset,
dissect_japan_chg_inf_type_crt(parameter_tvb, parameter_tree, parameter_item);
break;
default:
- proto_tree_add_text(parameter_tree, parameter_tvb, 0, -1, "Charge information data, not dissected yet");
+ proto_tree_add_expert_format(parameter_tree, pinfo, &ei_isup_not_dissected_yet, parameter_tvb, 0, -1, "Charge information data, not dissected yet");
break;
}
tvbuff_t *parameter_tvb;
tvbuff_t *optional_parameter_tvb;
proto_tree *pass_along_tree;
+ proto_item *type_item;
gint offset, bufferlength;
guint8 message_type, opt_parameter_pointer;
gint opt_part_possible = FALSE; /* default setting - for message types allowing optional
/* Extract message type field */
message_type = tvb_get_guint8(message_tvb, 0);
- proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type, "Message type: %s (%u)",
+ type_item = proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type, "Message type: %s (%u)",
val_to_str_ext_const(message_type, &ansi_isup_message_type_value_ext, "reserved"), message_type);
offset += MESSAGE_TYPE_LENGTH;
/* no dissector necessary since no mandatory parameters included */
break;
case MESSAGE_TYPE_CIRC_GRP_RST:
- offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_BLCK:
- offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_UNBL:
- offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_BL_ACK:
- offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_UNBL_ACK:
- offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_FACILITY_REQ:
offset += dissect_isup_facility_request_accepted_message(parameter_tvb, isup_tree);
break;
}
case MESSAGE_TYPE_CIRC_GRP_RST_ACK:
- offset += dissect_isup_circuit_group_reset_acknowledgement_message(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_reset_acknowledgement_message(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_QRY:
- offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_QRY_RSP:
- offset += dissect_isup_circuit_group_query_response_message(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_query_response_message(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CALL_PROGRSS:
offset += dissect_isup_call_progress_message(parameter_tvb, isup_tree);
/* do nothing since format is a national matter */
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter");
+ proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
break;
case MESSAGE_TYPE_NETW_RESRC_MGMT:
/* no dissector necessary since no mandatory parameters included */
/* do nothing since format is a national matter */
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter");
+ proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
break;
case ANSI_ISUP_MESSAGE_TYPE_CIRCUIT_RES_ACK:
/* no dissector necessary since no mandatory parameters included */
default:
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength,
- "Unknown Message type (possibly reserved/used in former ISUP version)");
+ expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
}
"No optional parameter present (Pointer: %u)", opt_parameter_pointer);
}
else if (message_type != MESSAGE_TYPE_CHARGE_INFO)
- proto_tree_add_text(isup_tree, message_tvb, 0, 0, "No optional parameters are possible with this message type");
+ expert_add_info(pinfo, type_item, &ei_isup_message_type_no_optional_parameters);
/* if there are calling/called number, we'll get them for the tap */
tap_rec->calling_number = tap_calling_number ? tap_calling_number : wmem_strdup(wmem_packet_scope(), "");
tvbuff_t *parameter_tvb;
tvbuff_t *optional_parameter_tvb;
proto_tree *pass_along_tree;
+ proto_item *type_item = NULL;
gint offset, bufferlength;
guint8 message_type, opt_parameter_pointer;
gint opt_part_possible = FALSE; /* default setting - for message types allowing optional
switch (itu_isup_variant) {
case ISUP_ITU_STANDARD_VARIANT:
- proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
- "Message type: %s (%u)",
+ type_item = proto_tree_add_uint_format_value(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
+ "%s (%u)",
val_to_str_ext_const(message_type, &isup_message_type_value_ext, "reserved"),
message_type);
break;
case ISUP_FRENCH_VARIANT:
- proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
- "Message type: %s (%u)",
+ type_item = proto_tree_add_uint_format_value(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
+ "%s (%u)",
val_to_str_ext_const(message_type, &french_isup_message_type_value_ext, "reserved"),
message_type);
break;
case ISUP_ISRAELI_VARIANT:
- proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
- "Message type: %s (%u)",
+ type_item = proto_tree_add_uint_format_value(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
+ "%s (%u)",
val_to_str_ext_const(message_type, &israeli_isup_message_type_value_ext, "reserved"),
message_type);
break;
case ISUP_RUSSIAN_VARIANT:
- proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
- "Message type: %s (%u)",
+ type_item = proto_tree_add_uint_format_value(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
+ "%s (%u)",
val_to_str_ext_const(message_type, &russian_isup_message_type_value_ext, "reserved"),
message_type);
break;
case ISUP_JAPAN_VARIANT:
/* Fall trough */
case ISUP_JAPAN_TTC_VARIANT:
- proto_tree_add_uint_format(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
- "Message type: %s (%u)",
+ type_item = proto_tree_add_uint_format_value(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
+ "%s (%u)",
val_to_str_ext_const(message_type, &japan_isup_message_type_value_ext, "reserved"),
message_type);
break;
/* no dissector necessary since no mandatory parameters included */
break;
case MESSAGE_TYPE_CIRC_GRP_RST:
- offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_BLCK:
- offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_UNBL:
- offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_BL_ACK:
- offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_UNBL_ACK:
- offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_blocking_messages(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_FACILITY_REQ:
offset += dissect_isup_facility_request_accepted_message(parameter_tvb, isup_tree);
break;
}
case MESSAGE_TYPE_CIRC_GRP_RST_ACK:
- offset += dissect_isup_circuit_group_reset_acknowledgement_message(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_reset_acknowledgement_message(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_QRY:
- offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_reset_query_message(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CIRC_GRP_QRY_RSP:
- offset += dissect_isup_circuit_group_query_response_message(parameter_tvb, isup_tree);
+ offset += dissect_isup_circuit_group_query_response_message(parameter_tvb, pinfo, isup_tree);
break;
case MESSAGE_TYPE_CALL_PROGRSS:
offset += dissect_isup_call_progress_message(parameter_tvb, isup_tree);
if (bufferlength != 0) {
switch (itu_isup_variant) {
case ISUP_RUSSIAN_VARIANT:
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter");
+ proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
break;
default:
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter");
+ proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
break;
}
}
/* do nothing since format is a national matter */
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength, "Format is a national matter");
+ proto_tree_add_expert(isup_tree, pinfo, &ei_isup_format_national_matter, parameter_tvb, 0, bufferlength);
break;
default:
/* Handle national extensions here */
case ISUP_ITU_STANDARD_VARIANT:
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength,
- "Unknown Message type (possibly reserved/used in former ISUP version)");
+ expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
case ISUP_FRENCH_VARIANT:
switch (message_type) {
default:
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength,
- "Unknown Message type (possibly reserved/used in former ISUP version)");
+ expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
}
break;
default:
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength,
- "Unknown Message type (possibly reserved/used in former ISUP version)");
+ expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
}
break;
default:
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength,
- "Unknown Message type (possibly reserved/used in former ISUP version)");
+ expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
}
break;
case ISUP_JAPAN_TTC_VARIANT:
switch (message_type) {
case MESSAGE_TYPE_JAPAN_CHARG_INF:
- offset += dissect_japan_chg_inf(parameter_tvb, isup_tree);
+ offset += dissect_japan_chg_inf(parameter_tvb, pinfo, isup_tree);
opt_part_possible = TRUE;
break;
default:
bufferlength = tvb_length_remaining(message_tvb, offset);
if (bufferlength != 0)
- proto_tree_add_text(isup_tree, parameter_tvb, 0, bufferlength,
- "Unknown Message type (possibly reserved/used in former ISUP version)");
+ expert_add_info(pinfo, type_item, &ei_isup_message_type_unknown);
break;
}
break;
"No optional parameter present (Pointer: %u)", opt_parameter_pointer);
}
else if (message_type != MESSAGE_TYPE_CHARGE_INFO)
- proto_tree_add_text(isup_tree, message_tvb, 0, 0, "No optional parameters are possible with this message type");
+ expert_add_info(pinfo, type_item, &ei_isup_message_type_no_optional_parameters);
/* if there are calling/called number, we'll get them for the tap */
tap_rec->calling_number = tap_calling_number ? tap_calling_number : wmem_strdup(wmem_packet_scope(), "");
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
+ { &hf_isup_mand_parameter_type,
+ { "Mandatory Parameter", "isup.parameter_type",
+ FT_UINT8, BASE_DEC|BASE_EXT_STRING, &isup_parameter_type_value_ext, 0x0,
+ NULL, HFILL }},
+
+ { &hf_isup_opt_parameter_type,
+ { "Optional Parameter", "isup.parameter_type",
+ FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ansi_isup_parameter_type_value_ext, 0x0,
+ NULL, HFILL }},
+
{ &hf_isup_parameter_length,
{ "Parameter Length", "isup.parameter_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
FT_UINT8, BASE_DEC, VALS(isup_address_presentation_restricted_ind_value), ISUP_ADDRESS_PRESENTATION_RESTR_IND_MASK,
NULL, HFILL }},
+ { &hf_isup_number_different_meaning,
+ { "Different meaning for number", "isup.number_different_meaning",
+ FT_UINT8, BASE_HEX, NULL, 0,
+ NULL, HFILL }},
+
{ &hf_isup_screening_indicator,
{ "Screening indicator", "isup.screening_indicator",
FT_UINT8, BASE_DEC, VALS(isup_screening_ind_value), ISUP_SCREENING_IND_MASK,
{ &hf_isup_connected_line_identity_request_ind,
{ "Connected line identity request indicator", "isup.connected_line_identity_request_ind",
- FT_BOOLEAN, 8, TFS(&isup_connected_line_identity_request_ind_value), H_8BIT_MASK,
+ FT_BOOLEAN, 8, TFS(&tfs_requested_not_requested), H_8BIT_MASK,
NULL, HFILL }},
{ &hf_isup_redirecting_ind,
{ "X.213 Address Format Information (DSP)", "x213.dsp",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
+
+ { &hf_bicc_nsap_dsp_length,
+ { "DSP Length", "x213.dsp_length",
+ FT_UINT32, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
+
{ &hf_characteristics,
{ "Backbone network connection characteristics", "bat_ase.char",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &bearer_network_connection_characteristics_vals_ext, 0x0,
{ "Tariff rate presentation", "isup.japan.tariff_rate_pres",
FT_UINT8, BASE_DEC, VALS(japan_isup_tariff_rate_pres_values), 0x7f,
NULL, HFILL }},
+
+ /* Generated from convert_proto_tree_add_text.pl */
+ { &hf_isup_cause_indicators, { "Cause indicators (-> Q.850)", "isup.cause_indicators", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_diagnostic, { "Diagnostic", "isup.diagnostic", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_user_to_user_info, { "User-to-user info (-> Q.931)", "isup.user_to_user_info", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_call_identity, { "Call identity", "isup.call_identity", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_signalling_point_code, { "Signalling Point Code", "isup.signalling_point_code", FT_UINT16, BASE_DEC, NULL, 0x3FFF, NULL, HFILL }},
+ { &hf_isup_access_transport_parameter_field, { "Access transport parameter field (-> Q.931)", "isup.access_transport_parameter_field", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_idp, { "IDP", "isup.idp", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_dsp, { "DSP", "isup.dsp", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_idi, { "IDI", "isup.idi", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_configuration_data, { "Configuration data", "isup.configuration_data", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_unknown_organisation_identifier, { "Unknown organisation Identifier (Non ITU-T/ETSI codec)", "isup.unknown_organisation_identifier", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_tunnelled_protocol_data, { "Tunnelled Protocol Data", "isup.tunnelled_protocol_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_network_id_length_indicator, { "Network ID Length indicator", "isup.network_id_length_indicator", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_network_id, { "Network ID", "isup.network_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_app_transport_param_field8, { "Application transport parameter fields", "isup.app_transport_param_field", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_app_transport_param_field16, { "Application transport parameter fields", "isup.app_transport_param_field", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_app_transport_instruction_indicator, { "Application transport instruction indicators", "isup.app_transport_instruction_indicator", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_apm_seg_indicator, { "APM segmentation indicator", "isup.apm_seg_indicator", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_address_digits, { "Address digits", "isup.address_digits", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_apm_user_info_field, { "APM-user information field", "isup.apm_user_info_field", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_local_reference, { "Local Reference", "isup.local_reference", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_protocol_class, { "Protocol Class", "isup.protocol_class", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_credit, { "Credit", "isup.credit", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_network_identity, { "Network Identity", "isup.network_identity", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_binary_code, { "Binary Code", "isup.binary_code", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_user_service_information, { "User service information (-> Q.931 Bearer_capability)", "isup.user_service_information", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_circuit_assignment_map, { "Circuit assignment map (bit position indicates usage of corresponding circuit->3.69/Q.763)", "isup.circuit_assignment_map", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_origination_isc_point_code, { "Origination ISC Point Code", "isup.origination_isc_point_code", FT_UINT16, BASE_DEC, NULL, 0x3FFF, NULL, HFILL }},
+ { &hf_isup_call_history_info, { "Call history info", "isup.call_history_info", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_network_specific_facility, { "Network specific facility (refer to 3.36/Q.763 for detailed decoding)", "isup.network_specific_facility", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_user_service_information_prime, { "User service information prime (-> Q.931 Bearer capability information IE)", "isup.user_service_information_prime", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_propagation_delay_counter, { "Propagation delay counter", "isup.propagation_delay_counter", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_remote_operations, { "Remote operations", "isup.remote_operations", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_feature_code, { "Feature Code", "isup.feature_code", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_user_teleservice_information, { "User teleservice information (-> Q.931 High Layer Compatibility IE)", "isup.user_teleservice_information", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_call_diversion_information, { "Call diversion information", "isup.call_diversion_information", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_echo_control_information, { "Echo control information", "isup.echo_control_information", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_message_compatibility_information, { "Message compatibility information", "isup.message_compatibility_information", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_upgraded_parameter, { "Upgraded parameter", "isup.upgraded_parameter", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &isup_parameter_type_value_ext, 0x0, NULL, HFILL }},
+ { &hf_isup_instruction_indicators, { "Instruction indicators", "isup.instruction_indicators", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_look_forward_busy, { "Look forward busy", "isup.look_forward_busy", FT_UINT8, BASE_DEC, VALS(isup_mlpp_precedence_look_forward_busy_vals), 0x60, NULL, HFILL }},
+ { &hf_isup_precedence_level, { "Precedence Level", "isup.precedence_level", FT_UINT8, BASE_DEC, VALS(isup_mlpp_precedence_level_vals), 0x0F, NULL, HFILL }},
+ { &hf_isup_mlpp_service_domain, { "MLPP service domain", "isup.mlpp_service_domain", FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_mcid_request_indicators, { "MCID request indicators", "isup.mcid_request_indicators", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_mcid_response_indicators, { "MCID response indicators", "isup.mcid_response_indicators", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_hop_counter, { "Hop counter", "isup.hop_counter", FT_UINT8, BASE_DEC, NULL, EDCBA_8BIT_MASK, NULL, HFILL }},
+ { &hf_isup_originating_line_info, { "Originating line info", "isup.originating_line_info", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_presentation_indicator, { "Presentation indicator", "isup.presentation_indicator", FT_UINT8, BASE_DEC, VALS(isup_redirection_presentation_indicator_vals), BA_8BIT_MASK, NULL, HFILL }},
+ { &hf_isup_call_transfer_identity, { "Call transfer identity", "isup.call_transfer_identity", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_loop_prevention_indicator_type, { "Type", "isup.loop_prevention_indicator_type", FT_BOOLEAN, 8, TFS(&tfs_response_request), A_8BIT_MASK, NULL, HFILL }},
+ { &hf_isup_ccss_call_indicator, { "CCSS call indicator", "isup.ccss_call_indicator", FT_BOOLEAN, 8, TFS(&tfs_ccss_call_no_indication), A_8BIT_MASK, NULL, HFILL }},
+ { &hf_isup_forward_gvns, { "Forward GVNS (refer to 3.66/Q.763 for detailed decoding)", "isup.forward_gvns", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_redirect_capability, { "Redirect capability", "isup.redirect_capability", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_backward_gvns, { "Backward GVNS", "isup.backward_gvns", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_correlation_id, { "Correlation ID (-> Q.1281)", "isup.correlation_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_scf_id, { "SCF ID (-> Q.1281)", "isup.scf_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_charged_party_identification, { "Charged party identification (format is national network specific)", "isup.charged_party_identification", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_display_information, { "Display information (-> Q.931)", "isup.display_information", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_uid_action_indicators, { "UID action indicators", "isup.uid_action_indicators", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_uid_capability_indicators, { "UID capability indicators", "isup.uid_capability_indicators", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_redirect_counter, { "Redirect counter", "isup.redirect_counter", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_collect_call_request_indicator, { "Collect call request indicator", "isup.collect_call_request_indicator", FT_BOOLEAN, 8, TFS(&tfs_collect_call_req_no_indication), A_8BIT_MASK, NULL, HFILL }},
+ { &hf_isup_geo_loc_shape, { "Calling geodetic location type of shape", "isup.geo_loc_shape", FT_UINT8, BASE_DEC, VALS(isup_location_type_of_shape_value), GFEDCBA_8BIT_MASK, NULL, HFILL }},
+ { &hf_isup_geo_loc_shape_description, { "Shape description", "isup.shape_description", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_number_qualifier_indicator, { "Number qualifier indicator", "isup.number_qualifier_indicator", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { &hf_isup_generic_digits, { "Generic digits (refer to 3.24/Q.673 for detailed decoding)", "isup.generic_digits", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
};
/* Setup protocol subtree array */
&ett_isup_apm_msg_fragment,
&ett_isup_apm_msg_fragments,
&ett_isup_range,
+ &ett_app_transport_fields,
+ &ett_app_transport,
+ &ett_apm_seg_indicator,
+ &ett_echo_control_information,
+ &ett_instruction_indicators,
+ &ett_message_compatibility_information,
+ };
+
+ static ei_register_info ei[] = {
+ { &ei_isup_format_national_matter, { "isup.format_national_matter", PI_PROTOCOL, PI_NOTE, "Format is a national matter", EXPFILL }},
+ { &ei_isup_message_type_unknown, { "isup.message_type.unknown", PI_PROTOCOL, PI_WARN, "Unknown Message type (possibly reserved/used in former ISUP version)", EXPFILL }},
+ { &ei_isup_not_dissected_yet, { "isup.not_dissected_yet", PI_UNDECODED, PI_WARN, "Not dissected yet", EXPFILL }},
+ { &ei_isup_status_subfield_not_present, { "isup.status_subfield_not_present", PI_PROTOCOL, PI_NOTE, "Status subfield is not present with this message type", EXPFILL }},
+ { &ei_isup_message_type_no_optional_parameters, { "isup.message_type.no_optional_parameters", PI_PROTOCOL, PI_WARN, "No optional parameters are possible with this message type", EXPFILL }},
+ { &ei_isup_empty_number, { "isup.empty_number", PI_PROTOCOL, PI_NOTE, "(empty) number", EXPFILL }},
};
static const enum_val_t isup_variants[] = {
{NULL, NULL, -1}
};
+ module_t *isup_module;
+ expert_module_t* expert_isup;
+
/* Register the protocol name and description */
proto_isup = proto_register_protocol("ISDN User Part",
"ISUP", "isup");
/* Required function calls to register the header fields and subtrees used */
proto_register_field_array(proto_isup, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+ expert_isup = expert_register_protocol(proto_isup);
+ expert_register_field_array(expert_isup, ei, array_length(ei));
isup_tap = register_tap("isup");
static gint *ett[] = {
&ett_bicc
};
+
proto_bicc = proto_register_protocol("Bearer Independent Call Control",
"BICC", "bicc");
git.samba.org / metze / wireshark / wip.git / commitdiff