diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2003-01-22 09:07:26 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2003-01-22 09:07:26 +0000 |
| commit | e66a16258f998c6ce9f5f07f53e3290f60220860 (patch) | |
| tree | 095822e517f5c084384c3232e1af61acebc55294 | |
| parent | 45e0f7c4702c402b642179af035d5c3021c2f990 (diff) | |
| download | wireshark-e66a16258f998c6ce9f5f07f53e3290f60220860.tar.gz wireshark-e66a16258f998c6ce9f5f07f53e3290f60220860.tar.bz2 wireshark-e66a16258f998c6ce9f5f07f53e3290f60220860.zip | |
Added support for version 05 of the (expired) ID describing M3UA.
Updated to support RFC 3332.
Better handling of padding.
svn path=/trunk/; revision=6976
| -rw-r--r-- | packet-m3ua.c | 1957 |
1 files changed, 908 insertions, 1049 deletions
diff --git a/packet-m3ua.c b/packet-m3ua.c index 4c6bd2bdc6..51921624ea 100644 --- a/packet-m3ua.c +++ b/packet-m3ua.c @@ -1,15 +1,13 @@ /* packet-m3ua.c * Routines for MTP3 User Adaptation Layer dissection * It is hopefully (needs testing) compilant to - * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-06.txt - * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-12.txt - * To do: - clean up the code - * - provide better handling of length parameters - * - provide good information in summary window + * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-05.txt (expired) + * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-06.txt (expired) + * http://www.ietf.org/rfc/rfc3332.txt * - * Copyright 2000, 2001, 2002, Michael Tuexen <Michael.Tuexen [AT] siemens.com> + * Copyright 2000, 2001, 2002, 2003 Michael Tuexen <Michael.Tuexen [AT] siemens.com> * - * $Id: packet-m3ua.c,v 1.23 2003/01/14 23:53:32 guy Exp $ + * $Id: packet-m3ua.c,v 1.24 2003/01/22 09:07:26 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -48,6 +46,8 @@ #include "sctpppids.h" #define SCTP_PORT_M3UA 2905 +#define NETWORK_BYTE_ORDER FALSE +#define ADD_PADDING(x) ((((x) + 3) >> 2) << 2) #define VERSION_LENGTH 1 #define RESERVED_LENGTH 1 @@ -72,120 +72,9 @@ #define PARAMETER_VALUE_OFFSET (PARAMETER_LENGTH_OFFSET + PARAMETER_LENGTH_LENGTH) #define PARAMETER_HEADER_OFFSET PARAMETER_TAG_OFFSET -#define V6_NETWORK_APPEARANCE_PARAMETER_TAG 1 -#define V6_PROTOCOL_DATA_1_PARAMETER_TAG 2 -#define V6_PROTOCOL_DATA_2_PARAMETER_TAG 3 -#define V6_INFO_PARAMETER_TAG 4 -#define V6_AFFECTED_DESTINATIONS_PARAMETER_TAG 5 -#define V6_ROUTING_CONTEXT_PARAMETER_TAG 6 -#define V6_DIAGNOSTIC_INFORMATION_PARAMETER_TAG 7 -#define V6_HEARTBEAT_DATA_PARAMETER_TAG 8 -#define V6_USER_CAUSE_PARAMETER_TAG 9 -#define V6_REASON_PARAMETER_TAG 10 -#define V6_TRAFFIC_MODE_TYPE_PARAMETER_TAG 11 -#define V6_ERROR_CODE_PARAMETER_TAG 12 -#define V6_STATUS_PARAMETER_TAG 13 -#define V6_CONGESTION_INDICATION_PARAMETER_TAG 14 -#define V6_CONCERNED_DESTINATION_PARAMETER_TAG 15 -#define V6_ROUTING_KEY_PARAMETER_TAG 16 -#define V6_REGISTRATION_RESULT_PARAMETER_TAG 17 -#define V6_DEREGISTRATION_RESULT_PARAMETER_TAG 18 -#define V6_LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG 19 -#define V6_DESTINATION_POINT_CODE_PARAMETER_TAG 20 -#define V6_SERVICE_INDICATORS_PARAMETER_TAG 21 -#define V6_SUBSYSTEM_NUMBERS_PARAMETER_TAG 22 -#define V6_ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG 23 -#define V6_CIRCUIT_RANGE_PARAMETER_TAG 24 -#define V6_REGISTRATION_RESULTS_PARAMETER_TAG 25 -#define V6_DEREGISTRATION_RESULTS_PARAMETER_TAG 26 - -static const value_string m3ua_v6_parameter_tag_values[] = { - { V6_NETWORK_APPEARANCE_PARAMETER_TAG, "Network appearance" }, - { V6_PROTOCOL_DATA_1_PARAMETER_TAG, "Protocol data 1" }, - { V6_PROTOCOL_DATA_2_PARAMETER_TAG, "Protocol data 2" }, - { V6_INFO_PARAMETER_TAG, "Info" }, - { V6_AFFECTED_DESTINATIONS_PARAMETER_TAG, "Affected destinations" }, - { V6_ROUTING_CONTEXT_PARAMETER_TAG, "Routing context" }, - { V6_DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" }, - { V6_HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" }, - { V6_USER_CAUSE_PARAMETER_TAG, "User / Cause" }, - { V6_REASON_PARAMETER_TAG, "Reason" }, - { V6_TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" }, - { V6_ERROR_CODE_PARAMETER_TAG, "Error code" }, - { V6_STATUS_PARAMETER_TAG, "Status" }, - { V6_CONGESTION_INDICATION_PARAMETER_TAG, "Congestion indication" }, - { V6_CONCERNED_DESTINATION_PARAMETER_TAG, "Concerned destination" }, - { V6_ROUTING_KEY_PARAMETER_TAG, "Routing Key" }, - { V6_REGISTRATION_RESULT_PARAMETER_TAG, "Registration result" }, - { V6_DEREGISTRATION_RESULT_PARAMETER_TAG, "De-registration result" }, - { V6_LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG, "Local routing key identifier" }, - { V6_DESTINATION_POINT_CODE_PARAMETER_TAG, "Destination point code" }, - { V6_SERVICE_INDICATORS_PARAMETER_TAG, "Service indicators" }, - { V6_SUBSYSTEM_NUMBERS_PARAMETER_TAG, "Subsystem numbers" }, - { V6_ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG, "Originating point code list" }, - { V6_CIRCUIT_RANGE_PARAMETER_TAG, "Circuit range" }, - { V6_REGISTRATION_RESULTS_PARAMETER_TAG, "Registration results" }, - { V6_DEREGISTRATION_RESULTS_PARAMETER_TAG, "De-registration results" }, - { 0, NULL } }; - -#define V12_INFO_STRING_PARAMETER_TAG 0x0004 -#define V12_ROUTING_CONTEXT_PARAMETER_TAG 0x0006 -#define V12_DIAGNOSTIC_INFORMATION_PARAMETER_TAG 0x0007 -#define V12_HEARTBEAT_DATA_PARAMETER_TAG 0x0009 -#define V12_TRAFFIC_MODE_TYPE_PARAMETER_TAG 0x000b -#define V12_ERROR_CODE_PARAMETER_TAG 0x000c -#define V12_STATUS_PARAMETER_TAG 0x000d -#define V12_ASP_IDENTIFIER_PARAMETER_TAG 0x0011 -#define V12_AFFECTED_POINT_CODE_PARAMETER_TAG 0x0012 -#define V12_CORRELATION_IDENTIFIER_PARAMETER_TAG 0x0013 - -#define V12_NETWORK_APPEARANCE_PARAMETER_TAG 0x0200 -#define V12_USER_CAUSE_PARAMETER_TAG 0x0204 -#define V12_CONGESTION_INDICATIONS_PARAMETER_TAG 0x0205 -#define V12_CONCERNED_DESTINATION_PARAMETER_TAG 0x0206 -#define V12_ROUTING_KEY_PARAMETER_TAG 0x0207 -#define V12_REGISTRATION_RESULT_PARAMETER_TAG 0x0208 -#define V12_DEREGISTRATION_RESULT_PARAMETER_TAG 0x0209 -#define V12_LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG 0x020a -#define V12_DESTINATION_POINT_CODE_PARAMETER_TAG 0x020b -#define V12_SERVICE_INDICATORS_PARAMETER_TAG 0x020c -#define V12_ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG 0x020e -#define V12_CIRCUIT_RANGE_PARAMETER_TAG 0x020f -#define V12_PROTOCOL_DATA_PARAMETER_TAG 0x0210 -#define V12_REGISTRATION_STATUS_PARAMETER_TAG 0x0212 -#define V12_DEREGISTRATION_STATUS_PARAMETER_TAG 0x0213 - -static const value_string m3ua_v12_parameter_tag_values[] = { - { V12_INFO_STRING_PARAMETER_TAG, "Info string" } , - { V12_ROUTING_CONTEXT_PARAMETER_TAG, "Routing context" } , - { V12_DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic Information" } , - { V12_HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" } , - { V12_TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" } , - { V12_ERROR_CODE_PARAMETER_TAG, "Error code" } , - { V12_STATUS_PARAMETER_TAG, "Status" } , - { V12_ASP_IDENTIFIER_PARAMETER_TAG, "ASP identifier" } , - { V12_AFFECTED_POINT_CODE_PARAMETER_TAG, "Affected point code" } , - { V12_CORRELATION_IDENTIFIER_PARAMETER_TAG, "Correlation identifier" } , - { V12_NETWORK_APPEARANCE_PARAMETER_TAG, "Network appearance" } , - { V12_USER_CAUSE_PARAMETER_TAG, "User / cause" } , - { V12_CONGESTION_INDICATIONS_PARAMETER_TAG, "Congestion indications" } , - { V12_CONCERNED_DESTINATION_PARAMETER_TAG, "Concerned destination" } , - { V12_ROUTING_KEY_PARAMETER_TAG, "Routing key" } , - { V12_REGISTRATION_RESULT_PARAMETER_TAG, "Registration result" } , - { V12_DEREGISTRATION_RESULT_PARAMETER_TAG, "Deregistration result" } , - { V12_LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG, "Local routing key identifier" } , - { V12_DESTINATION_POINT_CODE_PARAMETER_TAG, "Destination point code" } , - { V12_SERVICE_INDICATORS_PARAMETER_TAG, "Service indicators" } , - { V12_ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG, "Originating point code list" } , - { V12_CIRCUIT_RANGE_PARAMETER_TAG, "Circuit range" } , - { V12_PROTOCOL_DATA_PARAMETER_TAG, "Protocol data" } , - { V12_REGISTRATION_STATUS_PARAMETER_TAG, "Registration status" } , - { V12_DEREGISTRATION_STATUS_PARAMETER_TAG, "Deregistration status" } , - { 0, NULL } }; - #define PROTOCOL_VERSION_RELEASE_1 1 -static const value_string m3ua_protocol_version_values[] = { +static const value_string protocol_version_values[] = { { PROTOCOL_VERSION_RELEASE_1, "Release 1" }, { 0, NULL } }; @@ -196,7 +85,7 @@ static const value_string m3ua_protocol_version_values[] = { #define MESSAGE_CLASS_ASPTM_MESSAGE 4 #define MESSAGE_CLASS_RKM_MESSAGE 9 -static const value_string m3ua_message_class_values[] = { +static const value_string message_class_values[] = { { MESSAGE_CLASS_MGMT_MESSAGE, "Management messages" }, { MESSAGE_CLASS_TFER_MESSAGE, "Transfer messages" }, { MESSAGE_CLASS_SSNM_MESSAGE, "SS7 signalling network management messages" }, @@ -205,6 +94,14 @@ static const value_string m3ua_message_class_values[] = { { MESSAGE_CLASS_RKM_MESSAGE, "Routing key management messages" }, { 0, NULL } }; +static const value_string v5_message_class_values[] = { + { MESSAGE_CLASS_MGMT_MESSAGE, "Management messages" }, + { MESSAGE_CLASS_TFER_MESSAGE, "Transfer messages" }, + { MESSAGE_CLASS_SSNM_MESSAGE, "SS7 signalling network management messages" }, + { MESSAGE_CLASS_ASPSM_MESSAGE, "ASP state maintenance messages" }, + { MESSAGE_CLASS_ASPTM_MESSAGE, "ASP traffic maintenance messages" }, + { 0, NULL } }; + #define MESSAGE_TYPE_ERR 0 #define MESSAGE_TYPE_NTFY 1 @@ -234,8 +131,7 @@ static const value_string m3ua_message_class_values[] = { #define MESSAGE_TYPE_DEREG_REQ 3 #define MESSAGE_TYPE_DEREG_RSP 4 - -static const value_string m3ua_message_class_type_values[] = { +static const value_string v5_message_class_type_values[] = { { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_ERR, "Error (ERR)" }, { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_NTFY, "Notify (NTFY)" }, { MESSAGE_CLASS_TFER_MESSAGE * 256 + MESSAGE_TYPE_DATA, "Payload data (DATA)" }, @@ -244,7 +140,6 @@ static const value_string m3ua_message_class_type_values[] = { { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DAUD, "Destination state audit (DAUD)" }, { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_SCON, "SS7 Network congestion state (SCON)" }, { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DUPU, "Destination userpart unavailable (DUPU)" }, - { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DRST, "Destination Restricted (DRST)" }, { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_UP, "ASP up (UP)" }, { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_DOWN, "ASP down (DOWN)" }, { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_BEAT, "Heartbeat (BEAT)" }, @@ -255,13 +150,35 @@ static const value_string m3ua_message_class_type_values[] = { { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_INACTIVE , "ASP inactive (INACTIVE)" }, { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_ACTIVE_ACK , "ASP active ack (ACTIVE ACK)" }, { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_INACTIVE_ACK , "ASP inactive ack (INACTIVE ACK)" }, + { 0, NULL } }; + +static const value_string message_class_type_values[] = { + { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_ERR, "Error (ERR)" }, + { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_NTFY, "Notify (NTFY)" }, + { MESSAGE_CLASS_TFER_MESSAGE * 256 + MESSAGE_TYPE_DATA, "Payload data (DATA)" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DUNA, "Destination unavailable (DUNA)" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DAVA, "Destination available (DAVA)" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DAUD, "Destination state audit (DAUD)" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_SCON, "SS7 Network congestion state (SCON)" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DUPU, "Destination userpart unavailable (DUPU)" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DRST, "Destination Restricted (DRST)" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_UP, "ASP up (ASPUP)" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_DOWN, "ASP down (ASPDN)" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_BEAT, "Heartbeat (BEAT)" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_UP_ACK, "ASP up ack (ASPUP_ACK)" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_DOWN_ACK, "ASP down ack (ASPDN_ACK)" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_BEAT_ACK, "Heartbeat ack (BEAT_ACK)" }, + { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_ACTIVE , "ASP active (ASPAC)" }, + { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_INACTIVE , "ASP inactive (ASPIA)" }, + { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_ACTIVE_ACK , "ASP active ack (ASPAC_ACK)" }, + { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_INACTIVE_ACK , "ASP inactive ack (ASPIA_ACK)" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_REQ , "Registration request (REG_REQ)" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_RSP , "Registration response (REG_RSP)" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_DEREG_REQ , "Deregistration request (DEREG_REQ)" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_DEREG_RSP , "Deregistration response (DEREG_RSP)" }, { 0, NULL } }; -static const value_string m3ua_message_class_type_acro_values[] = { +static const value_string v5_message_class_type_acro_values[] = { { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_ERR, "ERR" }, { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_NTFY, "NTFY" }, { MESSAGE_CLASS_TFER_MESSAGE * 256 + MESSAGE_TYPE_DATA, "DATA" }, @@ -270,7 +187,6 @@ static const value_string m3ua_message_class_type_acro_values[] = { { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DAUD, "DAUD" }, { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_SCON, "SCON" }, { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DUPU, "DUPU" }, - { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DRST, "DRST" }, { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_UP, "ASP_UP" }, { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_DOWN, "ASP_DOWN" }, { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_BEAT, "BEAT" }, @@ -281,6 +197,28 @@ static const value_string m3ua_message_class_type_acro_values[] = { { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_INACTIVE , "ASP_INACTIVE" }, { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_ACTIVE_ACK , "ASP_ACTIVE_ACK" }, { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_INACTIVE_ACK , "ASP_INACTIVE_ACK" }, + { 0, NULL } }; + +static const value_string message_class_type_acro_values[] = { + { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_ERR, "ERR" }, + { MESSAGE_CLASS_MGMT_MESSAGE * 256 + MESSAGE_TYPE_NTFY, "NTFY" }, + { MESSAGE_CLASS_TFER_MESSAGE * 256 + MESSAGE_TYPE_DATA, "DATA" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DUNA, "DUNA" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DAVA, "DAVA" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DAUD, "DAUD" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_SCON, "SCON" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DUPU, "DUPU" }, + { MESSAGE_CLASS_SSNM_MESSAGE * 256 + MESSAGE_TYPE_DRST, "DRST" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_UP, "ASPUP" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_DOWN, "ASPDN" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_BEAT, "BEAT" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_UP_ACK, "ASPUP_ACK" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_DOWN_ACK, "ASPDN_ACK" }, + { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_BEAT_ACK, "BEAT_ACK" }, + { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_ACTIVE , "ASPAC" }, + { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_INACTIVE , "ASPIA" }, + { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_ACTIVE_ACK , "ASPAC_ACK" }, + { MESSAGE_CLASS_ASPTM_MESSAGE * 256 + MESSAGE_TYPE_INACTIVE_ACK , "ASPIA_ACK" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_REQ , "REG_REQ" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_REG_RSP , "REG_RSP" }, { MESSAGE_CLASS_RKM_MESSAGE * 256 + MESSAGE_TYPE_DEREG_REQ , "DEREG_REQ" }, @@ -294,343 +232,434 @@ static const value_string m3ua_message_class_type_acro_values[] = { #define PROTOCOL_DATA_OFFSET PARAMETER_VALUE_OFFSET -#define UNSPECIFIED_REASON 0 -#define USER_UNAVAILABLE_REASON 1 -#define MANAGEMENT_BLOCKING_REASON 2 - -static const value_string m3ua_reason_values[] = { - { UNSPECIFIED_REASON, "Unspecified" }, - { USER_UNAVAILABLE_REASON, "User unavailable" }, - { MANAGEMENT_BLOCKING_REASON, "Management blocking" }, - {0, NULL } }; - -#define REASON_LENGTH 4 -#define REASON_OFFSET PARAMETER_VALUE_OFFSET #define TRAFFIC_MODE_TYPE_LENGTH 4 #define TRAFFIC_MODE_TYPE_OFFSET PARAMETER_VALUE_OFFSET /* Initialize the protocol and registered fields */ static int proto_m3ua = -1; -static int hf_m3ua_version = -1; -static int hf_m3ua_reserved = -1; -static int hf_m3ua_message_class = -1; -static int hf_m3ua_message_type = -1; -static int hf_m3ua_message_length = -1; -static int hf_m3ua_parameter_tag = -1; -static int hf_m3ua_parameter_length = -1; -static int hf_m3ua_parameter_value = -1; -static int hf_m3ua_parameter_padding = -1; -static int hf_m3ua_network_appearance = -1; -static int hf_m3ua_info_string = -1; -static int hf_m3ua_routing_context = -1; -static int hf_m3ua_diagnostic_information = -1; -static int hf_m3ua_heartbeat_data = -1; -static int hf_m3ua_error_code = -1; -static int hf_m3ua_status_type = -1; -static int hf_m3ua_status_info = -1; -static int hf_m3ua_asp_identifier = -1; -static int hf_m3ua_affected_point_code_mask = -1; -static int hf_m3ua_affected_point_code_pc = -1; -static int hf_m3ua_unavailability_cause = -1; -static int hf_m3ua_user_identity = -1; -static int hf_m3ua_reason = -1; -static int hf_m3ua_traffic_mode_type = -1; -static int hf_m3ua_congestion_reserved = -1; -static int hf_m3ua_congestion_level = -1; -static int hf_m3ua_concerned_dest_reserved = -1; -static int hf_m3ua_concerned_dest_pc = -1; -static int hf_m3ua_local_rk_identifier = -1; -static int hf_m3ua_dpc_mask = -1; -static int hf_m3ua_dpc_pc = -1; -static int hf_m3ua_si = -1; -static int hf_m3ua_ssn = -1; -static int hf_m3ua_opc_list_mask = -1; -static int hf_m3ua_opc_list_pc = -1; -static int hf_m3ua_cic_range_mask = -1; -static int hf_m3ua_cic_range_pc = -1; -static int hf_m3ua_cic_range_upper = -1; -static int hf_m3ua_cic_range_lower = -1; -static int hf_m3ua_protocol_data_opc = -1; -static int hf_m3ua_protocol_data_dpc = -1; -static int hf_m3ua_protocol_data_si = -1; -static int hf_m3ua_protocol_data_ni = -1; -static int hf_m3ua_protocol_data_mp = -1; -static int hf_m3ua_protocol_data_sls = -1; -static int hf_m3ua_correlation_identifier = -1; -static int hf_m3ua_registration_status = -1; -static int hf_m3ua_deregistration_status = -1; -static int hf_m3ua_registration_result_identifier = -1; -static int hf_m3ua_registration_result_status = -1; -static int hf_m3ua_registration_result_context = -1; -static int hf_m3ua_deregistration_result_status = -1; -static int hf_m3ua_deregistration_result_context = -1; -static int hf_m3ua_li = -1; +static int hf_version = -1; +static int hf_reserved = -1; +static int hf_message_class = -1; +static int hf_v5_message_class = -1; +static int hf_message_type = -1; +static int hf_message_length = -1; +static int hf_v5_parameter_tag = -1; +static int hf_v6_parameter_tag = -1; +static int hf_parameter_tag = -1; +static int hf_parameter_length = -1; +static int hf_parameter_value = -1; +static int hf_parameter_padding = -1; +static int hf_parameter_trailer = -1; +static int hf_network_appearance = -1; +static int hf_info_string = -1; +static int hf_routing_context = -1; +static int hf_diagnostic_information = -1; +static int hf_heartbeat_data = -1; +static int hf_v5_error_code = -1; +static int hf_v6_error_code = -1; +static int hf_error_code = -1; +static int hf_status_type = -1; +static int hf_status_info = -1; +static int hf_asp_identifier = -1; +static int hf_affected_point_code_mask = -1; +static int hf_affected_point_code_pc = -1; +static int hf_cause = -1; +static int hf_user = -1; +static int hf_reason = -1; +static int hf_v5_traffic_mode_type = -1; +static int hf_v6_traffic_mode_type = -1; +static int hf_traffic_mode_type = -1; +static int hf_congestion_reserved = -1; +static int hf_congestion_level = -1; +static int hf_concerned_dest_reserved = -1; +static int hf_concerned_dest_pc = -1; +static int hf_local_rk_identifier = -1; +static int hf_dpc_mask = -1; +static int hf_dpc_pc = -1; +static int hf_si = -1; +static int hf_ssn = -1; +static int hf_opc_list_mask = -1; +static int hf_opc_list_pc = -1; +static int hf_cic_range_mask = -1; +static int hf_cic_range_pc = -1; +static int hf_cic_range_upper = -1; +static int hf_cic_range_lower = -1; +static int hf_protocol_data_opc = -1; +static int hf_protocol_data_dpc = -1; +static int hf_protocol_data_si = -1; +static int hf_protocol_data_ni = -1; +static int hf_protocol_data_mp = -1; +static int hf_protocol_data_sls = -1; +static int hf_correlation_identifier = -1; +static int hf_registration_status = -1; +static int hf_deregistration_status = -1; +static int hf_registration_result_identifier = -1; +static int hf_registration_result_status = -1; +static int hf_registration_result_context = -1; +static int hf_v6_deregistration_result_status = -1; +static int hf_v6_deregistration_result_context = -1; +static int hf_li = -1; /* Initialize the subtree pointers */ static gint ett_m3ua = -1; -static gint ett_m3ua_parameter = -1; +static gint ett_parameter = -1; static module_t *m3ua_module; static dissector_handle_t mtp3_handle, data_handle; -static dissector_table_t m3ua_si_dissector_table; +static dissector_table_t si_dissector_table; /* stuff for supporting multiple versions */ -#define M3UA_V6 1 -#define M3UA_V12 2 -static gint m3ua_version = M3UA_V12; +typedef enum { + M3UA_V5, + M3UA_V6, + M3UA_RFC +} Version_Type; + +static Version_Type version = M3UA_RFC; static void -dissect_m3ua_parameters(tvbuff_t *, packet_info *, proto_tree *, proto_tree *); +dissect_parameters(tvbuff_t *, packet_info *, proto_tree *, proto_tree *); -static guint -nr_of_padding_bytes (guint length) +static void +dissect_v5_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tree *m3ua_tree) { - guint remainder; + guint8 message_class, message_type; + + /* Extract the common header */ + message_class = tvb_get_guint8(common_header_tvb, MESSAGE_CLASS_OFFSET); + message_type = tvb_get_guint8(common_header_tvb, MESSAGE_TYPE_OFFSET); - remainder = length % 4; + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_class * 256 + message_type, v5_message_class_type_acro_values, "reserved")); + col_append_str(pinfo->cinfo, COL_INFO, " "); + } - if (remainder == 0) - return 0; - else - return 4 - remainder; + if (m3ua_tree) { + /* add the components of the common header to the protocol tree */ + proto_tree_add_item(m3ua_tree, hf_version, common_header_tvb, VERSION_OFFSET, VERSION_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(m3ua_tree, hf_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(m3ua_tree, hf_v5_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_uint_format(m3ua_tree, hf_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, + "Message type: %s (%u)", val_to_str(message_class * 256 + message_type, v5_message_class_type_values, "reserved"), message_type); + proto_tree_add_item(m3ua_tree, hf_message_length, common_header_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, NETWORK_BYTE_ORDER); + } } static void -dissect_m3ua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tree *m3ua_tree) +dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tree *m3ua_tree) { - guint8 version, reserved, message_class, message_type; - guint32 message_length; + guint8 message_class, message_type; /* Extract the common header */ - version = tvb_get_guint8(common_header_tvb, VERSION_OFFSET); - reserved = tvb_get_guint8(common_header_tvb, RESERVED_OFFSET); message_class = tvb_get_guint8(common_header_tvb, MESSAGE_CLASS_OFFSET); message_type = tvb_get_guint8(common_header_tvb, MESSAGE_TYPE_OFFSET); - message_length = tvb_get_ntohl (common_header_tvb, MESSAGE_LENGTH_OFFSET); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_class * 256 + message_type, m3ua_message_class_type_acro_values, "reserved")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_class * 256 + message_type, message_class_type_acro_values, "reserved")); col_append_str(pinfo->cinfo, COL_INFO, " "); } if (m3ua_tree) { /* add the components of the common header to the protocol tree */ - proto_tree_add_uint(m3ua_tree, hf_m3ua_version, common_header_tvb, VERSION_OFFSET, VERSION_LENGTH, version); - proto_tree_add_uint(m3ua_tree, hf_m3ua_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved); - proto_tree_add_uint(m3ua_tree, hf_m3ua_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, message_class); - proto_tree_add_uint_format(m3ua_tree, hf_m3ua_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, - "Message type: %s (%u)", - val_to_str(message_class * 256 + message_type, m3ua_message_class_type_values, "reserved"), message_type); - proto_tree_add_uint(m3ua_tree, hf_m3ua_message_length, common_header_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, message_length); + proto_tree_add_item(m3ua_tree, hf_version, common_header_tvb, VERSION_OFFSET, VERSION_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(m3ua_tree, hf_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(m3ua_tree, hf_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_uint_format(m3ua_tree, hf_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type, + "Message type: %s (%u)", val_to_str(message_class * 256 + message_type, message_class_type_values, "reserved"), message_type); + proto_tree_add_item(m3ua_tree, hf_message_length, common_header_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, NETWORK_BYTE_ORDER); } } -#define INFO_STRING_OFFSET PARAMETER_VALUE_OFFSET +#define NETWORK_APPEARANCE_LENGTH 4 +#define NETWORK_APPEARANCE_OFFSET PARAMETER_VALUE_OFFSET + +static void +dissect_network_appearance_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + proto_tree_add_item(parameter_tree, hf_network_appearance, parameter_tvb, NETWORK_APPEARANCE_OFFSET, NETWORK_APPEARANCE_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%u)", tvb_get_ntohl(parameter_tvb, NETWORK_APPEARANCE_OFFSET)); +} static void -dissect_m3ua_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_v5_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_item *parameter_item) { - guint16 length, info_string_length; - const char *info_string; + guint16 length, protocol_data_length; + tvbuff_t *payload_tvb; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); + protocol_data_length = length - PARAMETER_HEADER_LENGTH; + payload_tvb = tvb_new_subset(parameter_tvb, PROTOCOL_DATA_OFFSET, protocol_data_length, protocol_data_length); + proto_item_append_text(parameter_item, " (SS7 message of %u byte%s)", protocol_data_length, plurality(protocol_data_length, "", "s")); + proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH); + call_dissector(mtp3_handle, payload_tvb, pinfo, tree); +} + +#define INFO_STRING_OFFSET PARAMETER_VALUE_OFFSET + +static void +dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + guint16 info_string_length; + + info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; + proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%.*s)", info_string_length, + (const char *)tvb_get_ptr(parameter_tvb, INFO_STRING_OFFSET, info_string_length)); +} + +#define AFFECTED_MASK_LENGTH 1 +#define AFFECTED_DPC_LENGTH 3 +#define AFFECTED_DESTINATION_LENGTH (AFFECTED_MASK_LENGTH + AFFECTED_DPC_LENGTH) - info_string_length = length - PARAMETER_HEADER_LENGTH; - info_string = (const char *)tvb_get_ptr(parameter_tvb, INFO_STRING_OFFSET, info_string_length); - proto_tree_add_string(parameter_tree, hf_m3ua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, info_string); - proto_item_set_text(parameter_item, "Info String (%.*s)", info_string_length, info_string); +#define AFFECTED_MASK_OFFSET 0 +#define AFFECTED_DPC_OFFSET 1 + +static void +dissect_affected_destinations_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + guint16 number_of_destinations, destination_number; + gint destination_offset; + + number_of_destinations = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) >> 2; + destination_offset = PARAMETER_VALUE_OFFSET; + for(destination_number=1; destination_number <= number_of_destinations; destination_number++) { + proto_tree_add_item(parameter_tree, hf_affected_point_code_mask, parameter_tvb, destination_offset + AFFECTED_MASK_OFFSET, AFFECTED_MASK_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_affected_point_code_pc, parameter_tvb, destination_offset + AFFECTED_DPC_OFFSET, AFFECTED_DPC_LENGTH, NETWORK_BYTE_ORDER); + destination_offset += AFFECTED_DESTINATION_LENGTH; + } + proto_item_append_text(parameter_item, " (%u destination%s)", number_of_destinations, plurality(number_of_destinations, "", "s")); } #define ROUTING_CONTEXT_LENGTH 4 static void -dissect_m3ua_routing_context_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_routing_context_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint16 length, number_of_contexts, context_number; - guint32 context; + guint16 number_of_contexts, context_number, parameter_length; gint context_offset; - length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - number_of_contexts = (length - PARAMETER_HEADER_LENGTH) / 4; + parameter_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); + number_of_contexts = (parameter_length - PARAMETER_HEADER_LENGTH) >> 4; context_offset = PARAMETER_VALUE_OFFSET; for(context_number=1; context_number <= number_of_contexts; context_number++) { - context = tvb_get_ntohl(parameter_tvb, context_offset); - proto_tree_add_uint(parameter_tree, hf_m3ua_routing_context, parameter_tvb, context_offset, ROUTING_CONTEXT_LENGTH, context); + proto_tree_add_item(parameter_tree, hf_routing_context, parameter_tvb, context_offset, ROUTING_CONTEXT_LENGTH, NETWORK_BYTE_ORDER); context_offset += ROUTING_CONTEXT_LENGTH; - } - proto_item_set_text(parameter_item, "Routing context parameter (%u context%s)", number_of_contexts, plurality(number_of_contexts, "", "s")); + }; + proto_item_append_text(parameter_item, " (%u context%s)", number_of_contexts, plurality(number_of_contexts, "", "s")); } +#define DIAGNOSTIC_INFO_OFFSET PARAMETER_VALUE_OFFSET + static void -dissect_m3ua_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint16 length, diagnostic_info_length; - - length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - diagnostic_info_length = length - PARAMETER_HEADER_LENGTH; - - proto_tree_add_bytes(parameter_tree, hf_m3ua_diagnostic_information, parameter_tvb, PARAMETER_VALUE_OFFSET, diagnostic_info_length, - tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, diagnostic_info_length)); + guint16 diag_info_length; - proto_item_set_text(parameter_item, "Diagnostic information (%u byte%s)", diagnostic_info_length, plurality(diagnostic_info_length, "", "s")); + diag_info_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; + proto_tree_add_item(parameter_tree, hf_diagnostic_information, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diag_info_length, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%u byte%s)", diag_info_length, plurality(diag_info_length, "", "s")); } +#define HEARTBEAT_DATA_OFFSET PARAMETER_VALUE_OFFSET + static void -dissect_m3ua_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint16 length, heartbeat_data_length; + guint16 heartbeat_data_length; - length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); + heartbeat_data_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; + proto_tree_add_item(parameter_tree, hf_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%u byte%s)", heartbeat_data_length, plurality(heartbeat_data_length, "", "s")); +} + +#define UNKNOWN_UNAVAIL_CAUSE 0 +#define UNEQUIPPED_REMOTE_USER_UNAVAIL_CAUSE 1 +#define INACCESSABLE_REMOTE_USER_UNAVAIL_CAUSE 2 + +static const value_string unavailability_cause_values[] = { + { UNKNOWN_UNAVAIL_CAUSE, "Unknown" }, + { UNEQUIPPED_REMOTE_USER_UNAVAIL_CAUSE, "Unequipped remote user" }, + { INACCESSABLE_REMOTE_USER_UNAVAIL_CAUSE, "Inaccessable remote user" }, + {0, NULL } }; + +#define RESERVED_0_USER_ID 0 +#define RESERVED_1_USER_ID 1 +#define RESERVED_2_USER_ID 2 +#define SCCP_USER_ID 3 +#define TUP_USER_ID 4 +#define ISUP_USER_ID 5 +#define RESERVED_6_USER_ID 6 +#define RESERVED_7_USER_ID 7 +#define RESERVED_8_USER_ID 8 +#define BROADBAND_ISUP_USER_ID 9 +#define SATELLITE_ISUP_USER_ID 10 + +static const value_string user_identity_values[] = { + { RESERVED_0_USER_ID, "Reserved" }, + { RESERVED_1_USER_ID, "Reserved" }, + { RESERVED_2_USER_ID, "Reserved" }, + { SCCP_USER_ID, "SCCP" }, + { TUP_USER_ID, "TUP" }, + { ISUP_USER_ID, "ISUP" }, + { RESERVED_6_USER_ID, "Reserved" }, + { RESERVED_7_USER_ID, "Reserved" }, + { RESERVED_8_USER_ID, "Reserved" }, + { BROADBAND_ISUP_USER_ID, "Broadband ISUP" }, + { SATELLITE_ISUP_USER_ID, "Satellite ISUP" }, + {0, NULL } }; - heartbeat_data_length = length - PARAMETER_HEADER_LENGTH; +#define CAUSE_LENGTH 2 +#define USER_LENGTH 2 - proto_tree_add_bytes(parameter_tree, hf_m3ua_heartbeat_data, parameter_tvb, PARAMETER_VALUE_OFFSET, heartbeat_data_length, - tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, heartbeat_data_length)); +#define CAUSE_OFFSET PARAMETER_VALUE_OFFSET +#define USER_OFFSET (CAUSE_OFFSET + CAUSE_LENGTH) - proto_item_set_text(parameter_item, "Heartbeat data (%u byte%s)", heartbeat_data_length, plurality(heartbeat_data_length, "", "s")); +static void +dissect_user_cause_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + proto_tree_add_item(parameter_tree, hf_cause, parameter_tvb, CAUSE_OFFSET, CAUSE_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_user, parameter_tvb, USER_OFFSET, USER_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s: %s)", + val_to_str(tvb_get_ntohs(parameter_tvb, USER_OFFSET), user_identity_values, "Unknown user"), + val_to_str(tvb_get_ntohs(parameter_tvb, CAUSE_OFFSET), unavailability_cause_values, "unknown cause")); } -#define OVER_RIDE_TYPE 1 -#define LOAD_SHARE_TYPE 2 -#define OVER_RIDE_STANDBY_TYPE 3 -#define LOAD_SHARE_STANDBY_TYPE 4 +#define UNSPECIFIED_REASON 0 +#define USER_UNAVAILABLE_REASON 1 +#define MANAGEMENT_BLOCKING_REASON 2 -static const value_string m3ua_v6_traffic_mode_type_values[] = { - { OVER_RIDE_TYPE , "Over-ride" }, - { LOAD_SHARE_TYPE, "Load-share" }, - { OVER_RIDE_STANDBY_TYPE, "Over-ride (standby)" }, - { LOAD_SHARE_STANDBY_TYPE, "Load-share (standby)" }, +static const value_string reason_values[] = { + { UNSPECIFIED_REASON, "Unspecified" }, + { USER_UNAVAILABLE_REASON, "User unavailable" }, + { MANAGEMENT_BLOCKING_REASON, "Management blocking" }, {0, NULL } }; +#define REASON_LENGTH 4 +#define REASON_OFFSET PARAMETER_VALUE_OFFSET + static void -dissect_m3ua_v6_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_reason_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 traffic_mode_type; + proto_tree_add_item(parameter_tree, hf_reason, parameter_tvb, REASON_OFFSET, REASON_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, REASON_OFFSET), reason_values, "unknown")); +} - traffic_mode_type = tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET); +static const value_string v5_traffic_mode_type_values[] = { + { 1, "Over-ride" }, + { 2, "Load-share" }, + { 3, "Over-ride (standby)" }, + { 4, "Load-share (standby)" }, + { 0, NULL } }; - proto_tree_add_uint_format(parameter_tree, hf_m3ua_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, traffic_mode_type, - "Traffic mode type: %u (%s)", traffic_mode_type, val_to_str(traffic_mode_type, m3ua_v6_traffic_mode_type_values, "unknown")); - proto_item_set_text(parameter_item, "Traffic mode type parameter (%s)", val_to_str(traffic_mode_type, m3ua_v6_traffic_mode_type_values, "unknown")); +static void +dissect_v5_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + proto_tree_add_item(parameter_tree, hf_v5_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET), v5_traffic_mode_type_values, "unknown")); } -#define BROADCAST_TYPE 3 - -static const value_string m3ua_v12_traffic_mode_type_values[] = { - { OVER_RIDE_TYPE , "Over-ride" }, - { LOAD_SHARE_TYPE, "Load-share" }, - { BROADCAST_TYPE, "Broadcast" }, - {0, NULL } }; +static const value_string v6_traffic_mode_type_values[] = { + { 1, "Over-ride" }, + { 2, "Load-share" }, + { 3, "Over-ride (standby)" }, + { 4, "Load-share (standby)" }, + { 0, NULL } }; static void -dissect_m3ua_v12_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_v6_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 traffic_mode_type; + proto_tree_add_item(parameter_tree, hf_v6_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET), v6_traffic_mode_type_values, "unknown")); +} - traffic_mode_type = tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET); +static const value_string traffic_mode_type_values[] = { + { 1, "Over-ride" }, + { 2, "Load-share" }, + { 3, "Broadcast" }, + { 0, NULL } }; - proto_tree_add_uint_format(parameter_tree, hf_m3ua_traffic_mode_type, - parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, - traffic_mode_type, "Traffic mode type: %u (%s)", - traffic_mode_type, val_to_str(traffic_mode_type, m3ua_v12_traffic_mode_type_values, "unknown")); - proto_item_set_text(parameter_item, "Traffic mode type parameter (%s)", val_to_str(traffic_mode_type, m3ua_v12_traffic_mode_type_values, "unknown")); +static void +dissect_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + proto_tree_add_item(parameter_tree, hf_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET), traffic_mode_type_values, "unknown")); } -#define V6_INVALID_VERSION_ERROR_CODE 1 -#define V6_INVALID_NETWORK_APPEARANCE_ERROR_CODE 2 -#define V6_UNSUPPORTED_MESSAGE_CLASS_ERROR_CODE 3 -#define V6_UNSUPPORTED_MESSAGE_TYPE_ERROR_CODE 4 -#define V6_INVALID_TRAFFIC_HANDLING_MODE_ERROR_CODE 5 -#define V6_UNEXPECTED_MESSAGE_ERROR_CODE 6 -#define V6_PROTOCOL_ERROR_ERROR_CODE 7 -#define V6_INVALID_ROUTING_CONTEXT_ERROR_CODE 8 -#define V6_INVALID_STREAM_IDENTIFIER_ERROR_CODE 9 -#define V6_INVALID_PARAMETER_VALUE_ERROR_CODE 10 - -static const value_string m3ua_v6_error_code_values[] = { - { V6_INVALID_VERSION_ERROR_CODE, "Invalid version" }, - { V6_INVALID_NETWORK_APPEARANCE_ERROR_CODE, "Invalid network appearance" }, - { V6_UNSUPPORTED_MESSAGE_CLASS_ERROR_CODE, "Unsupported message class" }, - { V6_UNSUPPORTED_MESSAGE_TYPE_ERROR_CODE, "Unsupported message type" }, - { V6_INVALID_TRAFFIC_HANDLING_MODE_ERROR_CODE, "Invalid traffic handling mode" }, - { V6_UNEXPECTED_MESSAGE_ERROR_CODE, "Unexpected message" }, - { V6_PROTOCOL_ERROR_ERROR_CODE, "Protocol error" }, - { V6_INVALID_ROUTING_CONTEXT_ERROR_CODE, "Invalid routing context" }, - { V6_INVALID_STREAM_IDENTIFIER_ERROR_CODE, "Invalid stream identifier" }, - { V6_INVALID_PARAMETER_VALUE_ERROR_CODE, "Invalid parameter value" }, - { 0, NULL } }; - #define ERROR_CODE_LENGTH 4 #define ERROR_CODE_OFFSET PARAMETER_VALUE_OFFSET +static const value_string v5_error_code_values[] = { + { 1, "Invalid version" }, + { 2, "Invalid network appearance" }, + { 3, "Unsupported message class" }, + { 4, "Unsupported message type" }, + { 5, "Invalid traffic handling mode" }, + { 6, "Unexpected message" }, + { 7, "Protocol error" }, + { 8, "Invalid routing context" }, + { 0, NULL } }; + static void -dissect_m3ua_v6_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_v5_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 error_code; - - error_code = tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET); - proto_tree_add_uint_format(parameter_tree, hf_m3ua_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, error_code, - "Error code: %u (%s)", error_code, val_to_str(error_code, m3ua_v6_error_code_values, "unknown")); - proto_item_set_text(parameter_item, "Error code parameter (%s)", val_to_str(error_code, m3ua_v6_error_code_values, "unknown")); + proto_tree_add_item(parameter_tree, hf_v5_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET), v5_error_code_values, "unknown")); } +static const value_string v6_error_code_values[] = { + { 1, "Invalid version" }, + { 2, "Invalid network appearance" }, + { 3, "Unsupported message class" }, + { 4, "Unsupported message type" }, + { 5, "Invalid traffic handling mode" }, + { 6, "Unexpected message" }, + { 7, "Protocol error" }, + { 8, "Invalid routing context" }, + { 9, "Invalid stream identifier" }, + { 10, "Invalid parameter value" }, + { 0, NULL } }; -#define V12_INVALID_VERSION_ERROR_CODE 0x01 -#define V12_UNSUPPORTED_MESSAGE_CLASS_ERROR_CODE 0x03 -#define V12_UNSUPPORTED_MESSAGE_TYPE_ERROR_CODE 0x04 -#define V12_UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR_CODE 0x05 -#define V12_UNEXPECTED_MESSAGE_ERROR_CODE 0x06 -#define V12_PROTOCOL_ERROR_ERROR_CODE 0x07 -#define V12_INVALID_STREAM_IDENTIFIER_ERROR_CODE 0x09 -#define V12_REFUSED_ERROR_CODE 0x0d -#define V12_ASP_IDENTIFIER_REQUIRED_ERROR_CODE 0x0e -#define V12_INVALID_ASP_IDENTIFIER_ERROR_CODE 0x0f -#define V12_INVALID_PARAMETER_VALUE_ERROR_CODE 0x11 -#define V12_PARAMETER_FIELD_ERROR_CODE 0x12 -#define V12_UNEXPECTED_PARAMETER_ERROR_CODE 0x13 -#define V12_DESTINATION_STATUS_UNKNOWN_ERROR_CODE 0x14 -#define V12_INVALID_NETWORK_APPEARANCE_ERROR_CODE 0x15 -#define V12_MISSING_PARAMETER_ERROR_CODE 0x16 -#define V12_INVALID_ROUTING_CONTEXT_ERROR_CODE 0x19 -#define V12_NO_CONFIGURED_AS_FOR_ASP_ERROR_CODE 0x1a - -static const value_string m3ua_v12_error_code_values[] = { - { V12_INVALID_VERSION_ERROR_CODE, "Invalid version" }, - { V12_UNSUPPORTED_MESSAGE_CLASS_ERROR_CODE, "Unsupported message class" }, - { V12_UNSUPPORTED_MESSAGE_TYPE_ERROR_CODE, "Unsupported message type" }, - { V12_UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR_CODE, "Unsupported traffic handling mode" }, - { V12_UNEXPECTED_MESSAGE_ERROR_CODE, "Unexpected message" }, - { V12_PROTOCOL_ERROR_ERROR_CODE, "Protocol error" }, - { V12_INVALID_STREAM_IDENTIFIER_ERROR_CODE, "Invalid stream identifier" }, - { V12_REFUSED_ERROR_CODE, "Refused - management blocking" }, - { V12_ASP_IDENTIFIER_REQUIRED_ERROR_CODE, "ASP identifier required" }, - { V12_INVALID_ASP_IDENTIFIER_ERROR_CODE, "Invalid ASP identifier" }, - { V12_INVALID_PARAMETER_VALUE_ERROR_CODE, "Invalid parameter value" }, - { V12_PARAMETER_FIELD_ERROR_CODE, "Parameter field error" }, - { V12_UNEXPECTED_PARAMETER_ERROR_CODE, "Unexpected parameter" }, - { V12_DESTINATION_STATUS_UNKNOWN_ERROR_CODE, "Destination status unknown" }, - { V12_INVALID_NETWORK_APPEARANCE_ERROR_CODE, "Invalid network appearance" }, - { V12_MISSING_PARAMETER_ERROR_CODE, "Missing parameter" }, - { V12_INVALID_ROUTING_CONTEXT_ERROR_CODE, "Invalid routing context" }, - { V12_NO_CONFIGURED_AS_FOR_ASP_ERROR_CODE, "No configured AS for ASP" }, - { 0, NULL } }; static void -dissect_m3ua_v12_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_v6_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 error_code; + proto_tree_add_item(parameter_tree, hf_v6_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET), v6_error_code_values, "unknown")); +} + +static const value_string error_code_values[] = { + { 0x01, "Invalid version" }, + { 0x03, "Unsupported message class" }, + { 0x04, "Unsupported message type" }, + { 0x05, "Unsupported traffic handling mode" }, + { 0x06, "Unexpected message" }, + { 0x07, "Protocol error" }, + { 0x09, "Invalid stream identifier" }, + { 0x0d, "Refused - management blocking" }, + { 0x0e, "ASP identifier required" }, + { 0x0f, "Invalid ASP identifier" }, + { 0x11, "Invalid parameter value" }, + { 0x12, "Parameter field error" }, + { 0x13, "Unexpected parameter" }, + { 0x14, "Destination status unknown" }, + { 0x15, "Invalid network appearance" }, + { 0x16, "Missing parameter" }, + { 0x19, "Invalid routing context" }, + { 0x1a, "No configured AS for ASP" }, + { 0, NULL } }; - error_code = tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET); - proto_tree_add_uint_format(parameter_tree, hf_m3ua_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, error_code, - "Error code: %u (%s)",error_code, val_to_str(error_code, m3ua_v12_error_code_values, "unknown")); - proto_item_set_text(parameter_item, "Error code parameter (%s)", val_to_str(error_code, m3ua_v12_error_code_values, "unknown")); +static void +dissect_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + proto_tree_add_item(parameter_tree, hf_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET), error_code_values, "unknown")); } #define AS_STATE_CHANGE_TYPE 1 #define OTHER_TYPE 2 -static const value_string m3ua_status_type_values[] = { +static const value_string status_type_values[] = { { AS_STATE_CHANGE_TYPE, "Application server state change" }, { OTHER_TYPE, "Other" }, { 0, NULL } }; @@ -644,16 +673,16 @@ static const value_string m3ua_status_type_values[] = { #define ALTERNATE_ASP_ACTIVE_INFO 2 #define ASP_FAILURE_INFO 3 -static const value_string m3ua_status_type_info_values[] = { +static const value_string v56_status_type_info_values[] = { { AS_STATE_CHANGE_TYPE * 256 * 256 + RESERVED_INFO, "Reserved" }, { AS_STATE_CHANGE_TYPE * 256 * 256 + AS_INACTIVE_INFO, "Application server inactive" }, { AS_STATE_CHANGE_TYPE * 256 * 256 + AS_ACTIVE_INFO, "Application server active" }, { AS_STATE_CHANGE_TYPE * 256 * 256 + AS_PENDING_INFO, "Application server pending" }, { OTHER_TYPE * 256 * 256 + INSUFFICIENT_ASP_RES_INFO, "Insufficient ASP resources active in AS" }, { OTHER_TYPE * 256 * 256 + ALTERNATE_ASP_ACTIVE_INFO, "Alternate ASP active" }, - { OTHER_TYPE * 256 * 256 + ASP_FAILURE_INFO, "ASP Failure" }, {0, NULL } }; + #define STATUS_TYPE_LENGTH 2 #define STATUS_INFO_LENGTH 2 @@ -661,136 +690,78 @@ static const value_string m3ua_status_type_info_values[] = { #define STATUS_INFO_OFFSET (STATUS_TYPE_OFFSET + STATUS_TYPE_LENGTH) static void -dissect_m3ua_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_v56_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 status_type, status_info; status_type = tvb_get_ntohs(parameter_tvb, STATUS_TYPE_OFFSET); status_info = tvb_get_ntohs(parameter_tvb, STATUS_INFO_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_status_type, parameter_tvb, STATUS_TYPE_OFFSET, STATUS_TYPE_LENGTH, status_type); - proto_tree_add_uint_format(parameter_tree, hf_m3ua_status_info, parameter_tvb, STATUS_INFO_OFFSET, STATUS_INFO_LENGTH, status_info, - "Status info: %s (%u)", val_to_str(status_type * 256 * 256 + status_info, m3ua_status_type_info_values, "unknown"), status_info); + proto_tree_add_item(parameter_tree, hf_status_type, parameter_tvb, STATUS_TYPE_OFFSET, STATUS_TYPE_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_uint_format(parameter_tree, hf_status_info, parameter_tvb, STATUS_INFO_OFFSET, STATUS_INFO_LENGTH, status_info, + "Status info: %s (%u)", val_to_str(status_type * 256 * 256 + status_info, v56_status_type_info_values, "unknown"), status_info); - proto_item_set_text(parameter_item, - "Status type / ID (%s)", val_to_str(status_type * 256 * 256 + status_info, m3ua_status_type_info_values, "unknown status information")); + proto_item_append_text(parameter_item, " (%s)", val_to_str(status_type * 256 * 256 + status_info, v56_status_type_info_values, "unknown status information")); } -#define ASP_IDENTIFIER_OFFSET PARAMETER_VALUE_OFFSET -#define ASP_IDENTIFIER_LENGTH 4 +static const value_string status_type_info_values[] = { + { AS_STATE_CHANGE_TYPE * 256 * 256 + RESERVED_INFO, "Reserved" }, + { AS_STATE_CHANGE_TYPE * 256 * 256 + AS_INACTIVE_INFO, "Application server inactive" }, + { AS_STATE_CHANGE_TYPE * 256 * 256 + AS_ACTIVE_INFO, "Application server active" }, + { AS_STATE_CHANGE_TYPE * 256 * 256 + AS_PENDING_INFO, "Application server pending" }, + { OTHER_TYPE * 256 * 256 + INSUFFICIENT_ASP_RES_INFO, "Insufficient ASP resources active in AS" }, + { OTHER_TYPE * 256 * 256 + ALTERNATE_ASP_ACTIVE_INFO, "Alternate ASP active" }, + { OTHER_TYPE * 256 * 256 + ASP_FAILURE_INFO, "ASP Failure" }, + {0, NULL } }; static void -dissect_m3ua_asp_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 identifier; - - identifier = tvb_get_ntohl(parameter_tvb, ASP_IDENTIFIER_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_asp_identifier, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, identifier); - proto_item_set_text(parameter_item, "ASP identifier (%u)", identifier); -} + guint16 status_type, status_info; -#define AFFECTED_MASK_LENGTH 1 -#define AFFECTED_PC_LENGTH 3 -#define AFFECTED_POINT_CODE_LENGTH (AFFECTED_MASK_LENGTH + AFFECTED_PC_LENGTH) + status_type = tvb_get_ntohs(parameter_tvb, STATUS_TYPE_OFFSET); + status_info = tvb_get_ntohs(parameter_tvb, STATUS_INFO_OFFSET); -#define AFFECTED_MASK_OFFSET 0 -#define AFFECTED_PC_OFFSET (AFFECTED_MASK_OFFSET + AFFECTED_MASK_LENGTH) + proto_tree_add_item(parameter_tree, hf_status_type, parameter_tvb, STATUS_TYPE_OFFSET, STATUS_TYPE_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_uint_format(parameter_tree, hf_status_info, parameter_tvb, STATUS_INFO_OFFSET, STATUS_INFO_LENGTH, status_info, + "Status info: %s (%u)", val_to_str(status_type * 256 * 256 + status_info, status_type_info_values, "unknown"), status_info); -static void -dissect_m3ua_affected_point_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ - guint8 mask; - guint16 length, number_of_point_codes, point_code_number; - guint32 pc; - gint point_code_offset; + proto_item_append_text(parameter_item, " (%s)", val_to_str(status_type * 256 * 256 + status_info, status_type_info_values, "unknown status information")); +} - length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - number_of_point_codes = (length - PARAMETER_HEADER_LENGTH) / AFFECTED_POINT_CODE_LENGTH; +static const value_string congestion_level_values[] = { + { 0, "No congestion or undefined" }, + { 1, "Congestion level 1" }, + { 2, "Congestion level 2" }, + { 3, "Congestion level 3" }, + { 0, NULL } }; - point_code_offset = PARAMETER_VALUE_OFFSET; - for(point_code_number=1; point_code_number <= number_of_point_codes; point_code_number++) { - mask = tvb_get_guint8(parameter_tvb, point_code_offset + AFFECTED_MASK_OFFSET); - pc = tvb_get_ntoh24(parameter_tvb, point_code_offset + AFFECTED_PC_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_affected_point_code_mask, parameter_tvb, point_code_offset + AFFECTED_MASK_OFFSET, AFFECTED_MASK_LENGTH, mask); - proto_tree_add_uint(parameter_tree, hf_m3ua_affected_point_code_pc, parameter_tvb, point_code_offset + AFFECTED_PC_OFFSET, AFFECTED_PC_LENGTH, pc); - point_code_offset += AFFECTED_POINT_CODE_LENGTH; - }; - proto_item_set_text(parameter_item, "Affected point code parameter (%u point code%s)", number_of_point_codes, plurality(number_of_point_codes, "", "s")); - -} +#define CONG_IND_RESERVED_LENGTH 3 +#define CONG_IND_LEVEL_LENGTH 1 -#define NETWORK_APPEARANCE_LENGTH 4 -#define NETWORK_APPEARANCE_OFFSET PARAMETER_VALUE_OFFSET +#define CONG_IND_RESERVED_OFFSET PARAMETER_VALUE_OFFSET +#define CONG_IND_LEVEL_OFFSET (CONG_IND_RESERVED_OFFSET + CONG_IND_RESERVED_LENGTH) static void -dissect_m3ua_network_appearance_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_congestion_indication_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 network_appearance; - - network_appearance = tvb_get_ntohl(parameter_tvb, NETWORK_APPEARANCE_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_network_appearance, parameter_tvb, NETWORK_APPEARANCE_OFFSET, NETWORK_APPEARANCE_LENGTH, network_appearance); - proto_item_set_text(parameter_item, "Network appearance: %u", network_appearance); + proto_tree_add_item(parameter_tree, hf_congestion_reserved, parameter_tvb, CONG_IND_RESERVED_OFFSET, CONG_IND_RESERVED_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_congestion_level, parameter_tvb, CONG_IND_LEVEL_OFFSET, CONG_IND_LEVEL_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_guint8(parameter_tvb, CONG_IND_LEVEL_OFFSET), congestion_level_values, "unknown")); } -#define UNKNOWN_UNAVAIL_CAUSE 0 -#define UNEQUIPPED_REMOTE_USER_UNAVAIL_CAUSE 1 -#define INACCESSABLE_REMOTE_USER_UNAVAIL_CAUSE 2 - -static const value_string m3ua_unavailability_cause_values[] = { - { UNKNOWN_UNAVAIL_CAUSE, "Unknown" }, - { UNEQUIPPED_REMOTE_USER_UNAVAIL_CAUSE, "Unequipped remote user" }, - { INACCESSABLE_REMOTE_USER_UNAVAIL_CAUSE, "Inaccessable remote user" }, - {0, NULL } }; - -#define RESERVED_0_USER_ID 0 -#define RESERVED_1_USER_ID 1 -#define RESERVED_2_USER_ID 2 -#define SCCP_USER_ID 3 -#define TUP_USER_ID 4 -#define ISUP_USER_ID 5 -#define RESERVED_6_USER_ID 6 -#define RESERVED_7_USER_ID 7 -#define RESERVED_8_USER_ID 8 -#define BROADBAND_ISUP_USER_ID 9 -#define SATELLITE_ISUP_USER_ID 10 - -static const value_string m3ua_user_identity_values[] = { - { RESERVED_0_USER_ID, "Reserved" }, - { RESERVED_1_USER_ID, "Reserved" }, - { RESERVED_2_USER_ID, "Reserved" }, - { SCCP_USER_ID, "SCCP" }, - { TUP_USER_ID, "TUP" }, - { ISUP_USER_ID, "ISUP" }, - { RESERVED_6_USER_ID, "Reserved" }, - { RESERVED_7_USER_ID, "Reserved" }, - { RESERVED_8_USER_ID, "Reserved" }, - { BROADBAND_ISUP_USER_ID, "Broadband ISUP" }, - { SATELLITE_ISUP_USER_ID, "Satellite ISUP" }, - {0, NULL } }; - -#define CAUSE_LENGTH 2 -#define USER_LENGTH 2 - -#define CAUSE_OFFSET PARAMETER_VALUE_OFFSET -#define USER_OFFSET (CAUSE_OFFSET + CAUSE_LENGTH) +#define ASP_IDENTIFIER_OFFSET PARAMETER_VALUE_OFFSET +#define ASP_IDENTIFIER_LENGTH 4 static void -dissect_m3ua_user_cause_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_asp_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint16 cause, user; - - cause = tvb_get_ntohs(parameter_tvb, CAUSE_OFFSET); - user = tvb_get_ntohs(parameter_tvb, USER_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_m3ua_unavailability_cause, parameter_tvb, CAUSE_OFFSET, CAUSE_LENGTH, cause); - proto_tree_add_uint(parameter_tree, hf_m3ua_user_identity, parameter_tvb, USER_OFFSET, USER_LENGTH, user); - proto_item_set_text(parameter_item, "User / Cause parameter (%s: %s)", - val_to_str(user, m3ua_user_identity_values, "Unknown user"), - val_to_str(cause, m3ua_unavailability_cause_values, "unknown cause")); + proto_tree_add_item(parameter_tree, hf_asp_identifier, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%u)", tvb_get_ntohl(parameter_tvb, ASP_IDENTIFIER_OFFSET)); } static void -dissect_m3ua_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_item *parameter_item) +dissect_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_item *parameter_item) { guint16 length, protocol_data_length; tvbuff_t *payload_tvb; @@ -798,7 +769,7 @@ dissect_m3ua_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pin length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); protocol_data_length = length - PARAMETER_HEADER_LENGTH; payload_tvb = tvb_new_subset(parameter_tvb, PROTOCOL_DATA_OFFSET, protocol_data_length, protocol_data_length); - proto_item_set_text(parameter_item, "Protocol data (SS7 message of %u byte%s)", protocol_data_length, plurality(protocol_data_length, "", "s")); + proto_item_append_text(parameter_item, " (SS7 message of %u byte%s)", protocol_data_length, plurality(protocol_data_length, "", "s")); proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH); call_dissector(mtp3_handle, payload_tvb, pinfo, tree); @@ -808,7 +779,7 @@ dissect_m3ua_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pin #define LI_OCTETT_OFFSET PARAMETER_VALUE_OFFSET static void -dissect_m3ua_protocol_data_2_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_protocol_data_2_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 li; guint16 length, protocol_data_length; @@ -818,53 +789,13 @@ dissect_m3ua_protocol_data_2_parameter(tvbuff_t *parameter_tvb, packet_info *pin li = tvb_get_guint8(parameter_tvb, LI_OCTETT_OFFSET); protocol_data_length = length - PARAMETER_HEADER_LENGTH - LI_OCTETT_LENGTH; payload_tvb = tvb_new_subset(parameter_tvb, PROTOCOL_DATA_OFFSET + LI_OCTETT_LENGTH, protocol_data_length, protocol_data_length); - proto_tree_add_uint(parameter_tree, hf_m3ua_li, parameter_tvb, LI_OCTETT_OFFSET, LI_OCTETT_LENGTH, li); - proto_item_set_text(parameter_item, "Protocol data (SS7 message of %u byte%s)", protocol_data_length, plurality(protocol_data_length, "", "s")); + proto_tree_add_uint(parameter_tree, hf_li, parameter_tvb, LI_OCTETT_OFFSET, LI_OCTETT_LENGTH, li); + proto_item_append_text(parameter_item, " (SS7 message of %u byte%s)", protocol_data_length, plurality(protocol_data_length, "", "s")); proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH + LI_OCTETT_LENGTH); call_dissector(mtp3_handle, payload_tvb, pinfo, tree); } -static void -dissect_m3ua_reason_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ - guint32 reason; - - reason = tvb_get_ntohl(parameter_tvb, REASON_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_m3ua_reason, parameter_tvb, REASON_OFFSET, REASON_LENGTH, reason); - proto_item_set_text(parameter_item, "Reason parameter (%s)", val_to_str(reason, m3ua_reason_values, "unknown")); -} - -#define NO_CONGESTION_LEVEL 0 -#define CONGESTION_LEVEL_1_LEVEL 1 -#define CONGESTION_LEVEL_2_LEVEL 2 -#define CONGESTION_LEVEL_3_LEVEL 3 - -static const value_string m3ua_congestion_level_values[] = { - { NO_CONGESTION_LEVEL, "No congestion or undefined" }, - { CONGESTION_LEVEL_1_LEVEL, "Congestion level 1" }, - { CONGESTION_LEVEL_2_LEVEL, "Congestion level 2" }, - { CONGESTION_LEVEL_3_LEVEL, "Congestion level 3" }, - {0, NULL } }; - -#define CONG_IND_RESERVED_LENGTH 3 -#define CONG_IND_LEVEL_LENGTH 1 - -#define CONG_IND_RESERVED_OFFSET PARAMETER_VALUE_OFFSET -#define CONG_IND_LEVEL_OFFSET (CONG_IND_RESERVED_OFFSET + CONG_IND_RESERVED_LENGTH) - -static void -dissect_m3ua_congestion_indication_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ - guint8 level; - - level = tvb_get_guint8(parameter_tvb, CONG_IND_LEVEL_OFFSET); - proto_tree_add_bytes(parameter_tree, hf_m3ua_congestion_reserved, parameter_tvb, CONG_IND_RESERVED_OFFSET, CONG_IND_RESERVED_LENGTH, - tvb_get_ptr(parameter_tvb, CONG_IND_RESERVED_OFFSET, CONG_IND_RESERVED_LENGTH)); - proto_tree_add_uint(parameter_tree, hf_m3ua_congestion_level, parameter_tvb, CONG_IND_LEVEL_OFFSET, CONG_IND_LEVEL_LENGTH, level); - proto_item_set_text(parameter_item, "Congestion indication(%s)", val_to_str(level, m3ua_congestion_level_values, "unknown")); -} #define CON_DEST_RESERVED_LENGTH 1 #define CON_DEST_PC_LENGTH 3 @@ -873,20 +804,15 @@ dissect_m3ua_congestion_indication_parameter(tvbuff_t *parameter_tvb, proto_tree #define CON_DEST_PC_OFFSET (CON_DEST_RESERVED_OFFSET + CON_DEST_RESERVED_LENGTH) static void -dissect_m3ua_concerned_destination_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_concerned_destination_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 pc; - - pc = tvb_get_ntoh24(parameter_tvb, CON_DEST_PC_OFFSET); - - proto_tree_add_bytes(parameter_tree, hf_m3ua_concerned_dest_reserved, parameter_tvb, CON_DEST_RESERVED_OFFSET, CON_DEST_RESERVED_LENGTH, - tvb_get_ptr(parameter_tvb, CON_DEST_RESERVED_OFFSET, CON_DEST_RESERVED_LENGTH)); - proto_tree_add_uint(parameter_tree, hf_m3ua_concerned_dest_pc, parameter_tvb, CON_DEST_PC_OFFSET, CON_DEST_PC_LENGTH, pc); - proto_item_set_text(parameter_item, "Concerned destination (%u)", pc); + proto_tree_add_item(parameter_tree, hf_concerned_dest_reserved, parameter_tvb, CON_DEST_RESERVED_OFFSET, CON_DEST_RESERVED_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_concerned_dest_pc, parameter_tvb, CON_DEST_PC_OFFSET, CON_DEST_PC_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%u)", tvb_get_ntoh24(parameter_tvb, CON_DEST_PC_OFFSET)); } static void -dissect_m3ua_routing_key_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_routing_key_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree) { tvbuff_t *parameters_tvb; guint16 length, parameters_length; @@ -894,11 +820,10 @@ dissect_m3ua_routing_key_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); - dissect_m3ua_parameters(parameters_tvb, pinfo, tree, parameter_tree); - proto_item_set_text(parameter_item, "Routing key"); + dissect_parameters(parameters_tvb, pinfo, tree, parameter_tree); } -static const value_string m3ua_registration_result_status_values[] = { +static const value_string registration_result_status_values[] = { { 0, "Successfully Registered" } , { 1, "Error - Unknown" } , { 2, "Error - Invalid DPC" } , @@ -919,22 +844,15 @@ static const value_string m3ua_registration_result_status_values[] = { #define REG_RES_CONTEXT_OFFSET (REG_RES_STATUS_OFFSET + REG_RES_STATUS_LENGTH) static void -dissect_m3ua_v6_registration_result_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_v6_registration_result_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) { - guint32 id, status, context; - - id = tvb_get_ntohl(parameter_tvb, REG_RES_IDENTIFIER_OFFSET); - status = tvb_get_ntohl(parameter_tvb, REG_RES_STATUS_OFFSET); - context = tvb_get_ntohl(parameter_tvb, REG_RES_CONTEXT_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_m3ua_registration_result_identifier, parameter_tvb, REG_RES_IDENTIFIER_OFFSET, REG_RES_IDENTIFIER_LENGTH, id); - proto_tree_add_uint(parameter_tree, hf_m3ua_registration_result_status, parameter_tvb, REG_RES_STATUS_OFFSET, REG_RES_STATUS_LENGTH, status); - proto_tree_add_uint(parameter_tree, hf_m3ua_registration_result_context, parameter_tvb, REG_RES_CONTEXT_OFFSET, REG_RES_CONTEXT_LENGTH, context); - proto_item_set_text(parameter_item, "Registration result"); + proto_tree_add_item(parameter_tree, hf_registration_result_identifier, parameter_tvb, REG_RES_IDENTIFIER_OFFSET, REG_RES_IDENTIFIER_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_registration_result_status, parameter_tvb, REG_RES_STATUS_OFFSET, REG_RES_STATUS_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_registration_result_context, parameter_tvb, REG_RES_CONTEXT_OFFSET, REG_RES_CONTEXT_LENGTH, NETWORK_BYTE_ORDER); } static void -dissect_m3ua_v12_registration_result_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_registration_result_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree) { tvbuff_t *parameters_tvb; guint16 length, parameters_length; @@ -942,17 +860,16 @@ dissect_m3ua_v12_registration_result_parameter(tvbuff_t *parameter_tvb, packet_i length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); - dissect_m3ua_parameters(parameters_tvb, pinfo, tree, parameter_tree); - proto_item_set_text(parameter_item, "Registration result"); + dissect_parameters(parameters_tvb, pinfo, tree, parameter_tree); } -static const value_string m3ua_deregistration_result_status_values[] = { - { 0, "Successfully De-registered" } , - { 1, "Error - Unknown" } , - { 2, "Error - Invalid Routing context" } , - { 3, "Error - Permission Denied" } , - { 4, "Error - Not registered" } , - { 0, NULL } }; +static const value_string v6_deregistration_result_status_values[] = { + { 0, "Successfully De-registered" } , + { 1, "Error - Unknown" } , + { 2, "Error - Invalid Routing context" } , + { 3, "Error - Permission Denied" } , + { 4, "Error - Not registered" } , + { 0, NULL } }; #define DEREG_RES_CONTEXT_LENGTH 4 #define DEREG_RES_STATUS_LENGTH 4 @@ -961,30 +878,22 @@ static const value_string m3ua_deregistration_result_status_values[] = { #define DEREG_RES_STATUS_OFFSET (DEREG_RES_CONTEXT_OFFSET + DEREG_RES_CONTEXT_LENGTH) static void -dissect_m3ua_v6_deregistration_result_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_v6_deregistration_result_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) { - guint32 status, context; - - context = tvb_get_ntohl(parameter_tvb, DEREG_RES_CONTEXT_OFFSET); - status = tvb_get_ntohl(parameter_tvb, DEREG_RES_STATUS_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_m3ua_deregistration_result_context, parameter_tvb, DEREG_RES_CONTEXT_OFFSET, DEREG_RES_CONTEXT_LENGTH, context); - proto_tree_add_uint(parameter_tree, hf_m3ua_deregistration_result_status, parameter_tvb, DEREG_RES_STATUS_OFFSET, DEREG_RES_STATUS_LENGTH, status); - proto_item_set_text(parameter_item, "De-registration result"); - + proto_tree_add_item(parameter_tree, hf_v6_deregistration_result_context, parameter_tvb, DEREG_RES_CONTEXT_OFFSET, DEREG_RES_CONTEXT_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_v6_deregistration_result_status, parameter_tvb, DEREG_RES_STATUS_OFFSET, DEREG_RES_STATUS_LENGTH, NETWORK_BYTE_ORDER); } static void -dissect_m3ua_v12_deregistration_result_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_deregistration_result_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree) { tvbuff_t *parameters_tvb; guint16 length, parameters_length; - length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; - parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); - dissect_m3ua_parameters(parameters_tvb, pinfo, tree, parameter_tree); - proto_item_set_text(parameter_item, "Deregistration result"); + parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); + dissect_parameters(parameters_tvb, pinfo, tree, parameter_tree); } @@ -992,13 +901,13 @@ dissect_m3ua_v12_deregistration_result_parameter(tvbuff_t *parameter_tvb, packet #define LOCAL_RK_IDENTIFIER_LENGTH 4 static void -dissect_m3ua_local_routing_key_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_local_routing_key_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint32 id; id = tvb_get_ntohl(parameter_tvb, LOCAL_RK_IDENTIFIER_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_local_rk_identifier, parameter_tvb, LOCAL_RK_IDENTIFIER_OFFSET, LOCAL_RK_IDENTIFIER_LENGTH, id); - proto_item_set_text(parameter_item, "Local routing key identifier (%u)", id); + proto_tree_add_item(parameter_tree, hf_local_rk_identifier, parameter_tvb, LOCAL_RK_IDENTIFIER_OFFSET, LOCAL_RK_IDENTIFIER_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%u)", tvb_get_ntohl(parameter_tvb, LOCAL_RK_IDENTIFIER_OFFSET)); } #define DPC_MASK_LENGTH 1 @@ -1008,25 +917,18 @@ dissect_m3ua_local_routing_key_identifier_parameter(tvbuff_t *parameter_tvb, pro #define DPC_PC_OFFSET (DPC_MASK_OFFSET + DPC_MASK_LENGTH) static void -dissect_m3ua_destination_point_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_destination_point_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 pc; - guint8 mask; - - mask = tvb_get_guint8(parameter_tvb, DPC_MASK_OFFSET); - pc = tvb_get_ntoh24(parameter_tvb, DPC_PC_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_m3ua_dpc_mask, parameter_tvb, DPC_MASK_OFFSET, DPC_MASK_LENGTH, mask); - proto_tree_add_uint(parameter_tree, hf_m3ua_dpc_pc, parameter_tvb, DPC_PC_OFFSET, DPC_PC_LENGTH, pc); - proto_item_set_text(parameter_item, "Destination point code (%u)", pc); + proto_tree_add_item(parameter_tree, hf_dpc_mask, parameter_tvb, DPC_MASK_OFFSET, DPC_MASK_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_dpc_pc, parameter_tvb, DPC_PC_OFFSET, DPC_PC_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%u)", tvb_get_ntoh24(parameter_tvb, DPC_PC_OFFSET)); } #define SI_LENGTH 1 static void -dissect_m3ua_service_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_service_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint8 si; guint16 length, number_of_sis, si_number; gint si_offset; @@ -1035,19 +937,17 @@ dissect_m3ua_service_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *p si_offset = PARAMETER_VALUE_OFFSET; for(si_number=1; si_number <= number_of_sis; si_number++) { - si = tvb_get_guint8(parameter_tvb, si_offset); - proto_tree_add_uint(parameter_tree, hf_m3ua_si, parameter_tvb, si_offset, SI_LENGTH, si); + proto_tree_add_item(parameter_tree, hf_si, parameter_tvb, si_offset, SI_LENGTH, NETWORK_BYTE_ORDER); si_offset += SI_LENGTH; }; - proto_item_set_text(parameter_item, "Service indicators (%u indicator%s)", number_of_sis, plurality(number_of_sis, "", "s")); + proto_item_append_text(parameter_item, " (%u indicator%s)", number_of_sis, plurality(number_of_sis, "", "s")); } #define SSN_LENGTH 1 static void -dissect_m3ua_subsystem_numbers_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_subsystem_numbers_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint8 ssn; guint16 length, number_of_ssns, ssn_number; gint ssn_offset; @@ -1056,11 +956,10 @@ dissect_m3ua_subsystem_numbers_parameter(tvbuff_t *parameter_tvb, proto_tree *pa ssn_offset = PARAMETER_VALUE_OFFSET; for(ssn_number=1; ssn_number <= number_of_ssns; ssn_number++) { - ssn = tvb_get_guint8(parameter_tvb, ssn_offset); - proto_tree_add_uint(parameter_tree, hf_m3ua_ssn, parameter_tvb, ssn_offset, SSN_LENGTH, ssn); + proto_tree_add_item(parameter_tree, hf_ssn, parameter_tvb, ssn_offset, SSN_LENGTH, NETWORK_BYTE_ORDER); ssn_offset += SSN_LENGTH; }; - proto_item_set_text(parameter_item, "Subsystem numbers (%u number%s)", number_of_ssns, plurality(number_of_ssns, "", "s")); + proto_item_append_text(parameter_item, " (%u number%s)", number_of_ssns, plurality(number_of_ssns, "", "s")); } @@ -1071,11 +970,9 @@ dissect_m3ua_subsystem_numbers_parameter(tvbuff_t *parameter_tvb, proto_tree *pa #define OPC_PC_OFFSET (OPC_MASK_OFFSET + OPC_MASK_LENGTH) static void -dissect_m3ua_originating_point_code_list_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_originating_point_code_list_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint8 mask; guint16 length, number_of_point_codes, point_code_number; - guint32 pc; gint point_code_offset; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); @@ -1083,13 +980,11 @@ dissect_m3ua_originating_point_code_list_parameter(tvbuff_t *parameter_tvb, prot point_code_offset = PARAMETER_VALUE_OFFSET; for(point_code_number=1; point_code_number <= number_of_point_codes; point_code_number++) { - mask = tvb_get_guint8(parameter_tvb, point_code_offset + AFFECTED_MASK_OFFSET); - pc = tvb_get_ntoh24(parameter_tvb, point_code_offset + AFFECTED_PC_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_opc_list_mask, parameter_tvb, point_code_offset + OPC_MASK_OFFSET, OPC_MASK_LENGTH, mask); - proto_tree_add_uint(parameter_tree, hf_m3ua_opc_list_pc, parameter_tvb, point_code_offset + OPC_PC_OFFSET, OPC_PC_LENGTH, pc); + proto_tree_add_item(parameter_tree, hf_opc_list_mask, parameter_tvb, point_code_offset + OPC_MASK_OFFSET, OPC_MASK_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_opc_list_pc, parameter_tvb, point_code_offset + OPC_PC_OFFSET, OPC_PC_LENGTH, NETWORK_BYTE_ORDER); point_code_offset += OPC_LENGTH; }; - proto_item_set_text(parameter_item, "Originating point code list (%u point code%s)", number_of_point_codes, plurality(number_of_point_codes, "", "s")); + proto_item_append_text(parameter_item, " (%u point code%s)", number_of_point_codes, plurality(number_of_point_codes, "", "s")); } #define CIC_RANGE_MASK_LENGTH 1 @@ -1103,11 +998,9 @@ dissect_m3ua_originating_point_code_list_parameter(tvbuff_t *parameter_tvb, prot #define CIC_RANGE_UPPER_OFFSET (CIC_RANGE_LOWER_OFFSET + CIC_RANGE_LOWER_LENGTH) static void -dissect_m3ua_circuit_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_circuit_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint8 mask; - guint16 length, number_of_point_codes, point_code_number, lower, upper; - guint32 pc; + guint16 length, number_of_point_codes, point_code_number; gint point_code_offset; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); @@ -1115,18 +1008,13 @@ dissect_m3ua_circuit_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parame point_code_offset = PARAMETER_VALUE_OFFSET; for(point_code_number = 1; point_code_number <= number_of_point_codes; point_code_number++) { - mask = tvb_get_guint8(parameter_tvb, point_code_offset + CIC_RANGE_MASK_OFFSET); - pc = tvb_get_ntoh24(parameter_tvb, point_code_offset + CIC_RANGE_PC_OFFSET); - lower = tvb_get_ntohs(parameter_tvb, point_code_offset + CIC_RANGE_LOWER_OFFSET); - upper = tvb_get_ntohs(parameter_tvb, point_code_offset + CIC_RANGE_UPPER_OFFSET); - - proto_tree_add_uint(parameter_tree, hf_m3ua_cic_range_mask, parameter_tvb, point_code_offset + CIC_RANGE_MASK_OFFSET, CIC_RANGE_MASK_LENGTH, mask); - proto_tree_add_uint(parameter_tree, hf_m3ua_cic_range_pc, parameter_tvb, point_code_offset + CIC_RANGE_PC_OFFSET, CIC_RANGE_PC_LENGTH, pc); - proto_tree_add_uint(parameter_tree, hf_m3ua_cic_range_lower, parameter_tvb, point_code_offset + CIC_RANGE_LOWER_OFFSET, CIC_RANGE_LOWER_LENGTH, lower); - proto_tree_add_uint(parameter_tree, hf_m3ua_cic_range_upper, parameter_tvb, point_code_offset + CIC_RANGE_UPPER_OFFSET, CIC_RANGE_UPPER_LENGTH, upper); + proto_tree_add_item(parameter_tree, hf_cic_range_mask, parameter_tvb, point_code_offset + CIC_RANGE_MASK_OFFSET, CIC_RANGE_MASK_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_cic_range_pc, parameter_tvb, point_code_offset + CIC_RANGE_PC_OFFSET, CIC_RANGE_PC_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_cic_range_lower, parameter_tvb, point_code_offset + CIC_RANGE_LOWER_OFFSET, CIC_RANGE_LOWER_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_cic_range_upper, parameter_tvb, point_code_offset + CIC_RANGE_UPPER_OFFSET, CIC_RANGE_UPPER_LENGTH, NETWORK_BYTE_ORDER); point_code_offset += CIC_RANGE_LENGTH; }; - proto_item_set_text(parameter_item, "Circuit range (%u range%s)", number_of_point_codes, plurality(number_of_point_codes, "", "s")); + proto_item_append_text(parameter_item, " (%u range%s)", number_of_point_codes, plurality(number_of_point_codes, "", "s")); } #define DATA_OPC_LENGTH 4 @@ -1146,33 +1034,27 @@ dissect_m3ua_circuit_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parame #define DATA_ULP_OFFSET (DATA_SLS_OFFSET + DATA_SLS_LENGTH) static void -dissect_m3ua_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 opc, dpc; guint16 length, ulp_length; - guint8 si, ni, mp, sls; + guint8 si; tvbuff_t *payload_tvb; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); ulp_length = length - PARAMETER_HEADER_LENGTH - DATA_HDR_LENGTH; payload_tvb = tvb_new_subset(parameter_tvb, DATA_ULP_OFFSET, ulp_length, ulp_length); - opc = tvb_get_ntohl(parameter_tvb, DATA_OPC_OFFSET); - dpc = tvb_get_ntohl(parameter_tvb, DATA_DPC_OFFSET); si = tvb_get_guint8(parameter_tvb, DATA_SI_OFFSET); - ni = tvb_get_guint8(parameter_tvb, DATA_NI_OFFSET); - mp = tvb_get_guint8(parameter_tvb, DATA_MP_OFFSET); - sls = tvb_get_guint8(parameter_tvb, DATA_SLS_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_protocol_data_opc, parameter_tvb, DATA_OPC_OFFSET, DATA_OPC_LENGTH, opc); - proto_tree_add_uint(parameter_tree, hf_m3ua_protocol_data_dpc, parameter_tvb, DATA_DPC_OFFSET, DATA_DPC_LENGTH, dpc); - proto_tree_add_uint(parameter_tree, hf_m3ua_protocol_data_si, parameter_tvb, DATA_SI_OFFSET, DATA_SI_LENGTH, si); - proto_tree_add_uint(parameter_tree, hf_m3ua_protocol_data_ni, parameter_tvb, DATA_NI_OFFSET, DATA_NI_LENGTH, ni); - proto_tree_add_uint(parameter_tree, hf_m3ua_protocol_data_mp, parameter_tvb, DATA_MP_OFFSET, DATA_MP_LENGTH, mp); - proto_tree_add_uint(parameter_tree, hf_m3ua_protocol_data_sls, parameter_tvb, DATA_SLS_OFFSET, DATA_SLS_LENGTH, sls); - - proto_item_set_text(parameter_item, "Protocol data (SS7 message of %u byte%s)", ulp_length, plurality(ulp_length, "", "s")); + proto_tree_add_item(parameter_tree, hf_protocol_data_opc, parameter_tvb, DATA_OPC_OFFSET, DATA_OPC_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_protocol_data_dpc, parameter_tvb, DATA_DPC_OFFSET, DATA_DPC_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_protocol_data_si, parameter_tvb, DATA_SI_OFFSET, DATA_SI_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_protocol_data_ni, parameter_tvb, DATA_NI_OFFSET, DATA_NI_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_protocol_data_mp, parameter_tvb, DATA_MP_OFFSET, DATA_MP_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_protocol_data_sls, parameter_tvb, DATA_SLS_OFFSET, DATA_SLS_LENGTH, NETWORK_BYTE_ORDER); + + proto_item_append_text(parameter_item, " (SS7 message of %u byte%s)", ulp_length, plurality(ulp_length, "", "s")); proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH + DATA_HDR_LENGTH); - if (!dissector_try_port(m3ua_si_dissector_table, si, payload_tvb, pinfo, tree)) { + if (!dissector_try_port(si_dissector_table, si, payload_tvb, pinfo, tree)) { call_dissector(data_handle, payload_tvb, pinfo, tree); } } @@ -1181,19 +1063,16 @@ dissect_m3ua_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo #define CORR_ID_LENGTH 4 static void -dissect_m3ua_correlation_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_correlation_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 id; - - id = tvb_get_ntohl(parameter_tvb, CORR_ID_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_correlation_identifier, parameter_tvb, CORR_ID_OFFSET, CORR_ID_LENGTH, id); - proto_item_set_text(parameter_item, "Correlation Identifer (%u)", id); + proto_tree_add_item(parameter_tree, hf_correlation_identifier, parameter_tvb, CORR_ID_OFFSET, CORR_ID_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%u)", tvb_get_ntohl(parameter_tvb, CORR_ID_OFFSET)); } #define REG_STATUS_LENGTH 4 #define REG_STATUS_OFFSET PARAMETER_VALUE_OFFSET -static const value_string m3ua_registration_status_values[] = { +static const value_string registration_status_values[] = { { 0, "Successfully Registered" }, { 1, "Error - Unknown" }, { 2, "Error - Invalid DPC" }, @@ -1208,19 +1087,16 @@ static const value_string m3ua_registration_status_values[] = { { 0, NULL } }; static void -dissect_m3ua_registration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_registration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 status; - - status = tvb_get_ntohl(parameter_tvb, REG_STATUS_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_registration_status, parameter_tvb, REG_STATUS_OFFSET, REG_STATUS_LENGTH, status); - proto_item_set_text(parameter_item, "Registration status (%s)", val_to_str(status, m3ua_registration_status_values, "unknown")); + proto_tree_add_item(parameter_tree, hf_registration_status, parameter_tvb, REG_STATUS_OFFSET, REG_STATUS_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, REG_STATUS_OFFSET), registration_status_values, "unknown")); } #define DEREG_STATUS_LENGTH 4 #define DEREG_STATUS_OFFSET PARAMETER_VALUE_OFFSET -static const value_string m3ua_deregistration_status_values[] = { +static const value_string deregistration_status_values[] = { { 0, "Successfully Deregistered" }, { 1, "Error - Unknown" }, { 2, "Error - Invalid Routing Context" }, @@ -1230,17 +1106,14 @@ static const value_string m3ua_deregistration_status_values[] = { { 0, NULL } }; static void -dissect_m3ua_deregistration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_deregistration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint32 status; - - status = tvb_get_ntohl(parameter_tvb, DEREG_STATUS_OFFSET); - proto_tree_add_uint(parameter_tree, hf_m3ua_deregistration_status, parameter_tvb, DEREG_STATUS_OFFSET, DEREG_STATUS_LENGTH, status); - proto_item_set_text(parameter_item, "Deregistration status (%s)", val_to_str(status, m3ua_deregistration_status_values, "unknown")); + proto_tree_add_item(parameter_tree, hf_deregistration_status, parameter_tvb, DEREG_STATUS_OFFSET, DEREG_STATUS_LENGTH, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, DEREG_STATUS_OFFSET), deregistration_status_values, "unknown")); } static void -dissect_m3ua_registration_results_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_registration_results_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree) { tvbuff_t *parameters_tvb; guint16 length, parameters_length; @@ -1248,12 +1121,11 @@ dissect_m3ua_registration_results_parameter(tvbuff_t *parameter_tvb, packet_info length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); - dissect_m3ua_parameters(parameters_tvb, pinfo, tree, parameter_tree); - proto_item_set_text(parameter_item, "Registration results"); + dissect_parameters(parameters_tvb, pinfo, tree, parameter_tree); } static void -dissect_m3ua_deregistration_results_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_deregistration_results_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree) { tvbuff_t *parameters_tvb; guint16 length, parameters_length; @@ -1261,271 +1133,463 @@ dissect_m3ua_deregistration_results_parameter(tvbuff_t *parameter_tvb, packet_in length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); parameters_length = length - PARAMETER_HEADER_LENGTH; parameters_tvb = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length); - dissect_m3ua_parameters(parameters_tvb, pinfo, tree, parameter_tree); - proto_item_set_text(parameter_item, "Deregistration results"); + dissect_parameters(parameters_tvb, pinfo, tree, parameter_tree); } static void -dissect_m3ua_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint16 tag, length, parameter_value_length; + guint16 tag, parameter_value_length; - tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); - length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); + tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); + parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; + proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, NETWORK_BYTE_ORDER); + proto_item_append_text(parameter_item, " (tag %u and %u byte%s value)", tag, parameter_value_length, plurality(parameter_value_length, "", "s")); +} + +#define V5_NETWORK_APPEARANCE_PARAMETER_TAG 1 +#define V5_PROTOCOL_DATA_PARAMETER_TAG 3 +#define V5_INFO_PARAMETER_TAG 4 +#define V5_AFFECTED_DESTINATIONS_PARAMETER_TAG 5 +#define V5_ROUTING_CONTEXT_PARAMETER_TAG 6 +#define V5_DIAGNOSTIC_INFORMATION_PARAMETER_TAG 7 +#define V5_HEARTBEAT_DATA_PARAMETER_TAG 8 +#define V5_USER_CAUSE_PARAMETER_TAG 9 +#define V5_REASON_PARAMETER_TAG 10 +#define V5_TRAFFIC_MODE_TYPE_PARAMETER_TAG 11 +#define V5_ERROR_CODE_PARAMETER_TAG 12 +#define V5_STATUS_PARAMETER_TAG 13 +#define V5_CONGESTION_INDICATION_PARAMETER_TAG 14 + +static const value_string v5_parameter_tag_values[] = { + { V5_NETWORK_APPEARANCE_PARAMETER_TAG, "Network appearance" }, + { V5_PROTOCOL_DATA_PARAMETER_TAG, "Protocol data" }, + { V5_INFO_PARAMETER_TAG, "Info" }, + { V5_AFFECTED_DESTINATIONS_PARAMETER_TAG, "Affected destinations" }, + { V5_ROUTING_CONTEXT_PARAMETER_TAG, "Routing context" }, + { V5_DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" }, + { V5_HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" }, + { V5_USER_CAUSE_PARAMETER_TAG, "User / Cause" }, + { V5_REASON_PARAMETER_TAG, "Reason" }, + { V5_TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" }, + { V5_ERROR_CODE_PARAMETER_TAG, "Error code" }, + { V5_STATUS_PARAMETER_TAG, "Status" }, + { V5_CONGESTION_INDICATION_PARAMETER_TAG, "Congestion indication" }, + { 0, NULL } }; + +static void +dissect_v5_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) +{ + guint16 tag, length, padding_length; + proto_item *parameter_item; + proto_tree *parameter_tree; - parameter_value_length = length - PARAMETER_HEADER_LENGTH; + /* extract tag and length from the parameter */ + tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); + length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); + padding_length = tvb_length(parameter_tvb) - length; - proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, - tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length)); + /* create proto_tree stuff */ + parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(tag, v5_parameter_tag_values, "Unknown parameter")); + parameter_tree = proto_item_add_subtree(parameter_item, ett_parameter); - proto_item_set_text(parameter_item, "Parameter with tag %u and %u byte%s value", tag, parameter_value_length, plurality(parameter_value_length, "", "s")); + /* add tag and length to the sua tree */ + proto_tree_add_item(parameter_tree, hf_v5_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, NETWORK_BYTE_ORDER); + switch(tag) { + case V5_NETWORK_APPEARANCE_PARAMETER_TAG: + dissect_network_appearance_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_PROTOCOL_DATA_PARAMETER_TAG: + dissect_v5_protocol_data_parameter(parameter_tvb, pinfo, tree, parameter_item); + break; + case V5_INFO_PARAMETER_TAG: + dissect_info_string_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_AFFECTED_DESTINATIONS_PARAMETER_TAG: + dissect_affected_destinations_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_ROUTING_CONTEXT_PARAMETER_TAG: + dissect_routing_context_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_DIAGNOSTIC_INFORMATION_PARAMETER_TAG: + dissect_diagnostic_information_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_HEARTBEAT_DATA_PARAMETER_TAG: + dissect_heartbeat_data_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_USER_CAUSE_PARAMETER_TAG: + dissect_user_cause_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_REASON_PARAMETER_TAG: + dissect_reason_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_TRAFFIC_MODE_TYPE_PARAMETER_TAG: + dissect_v5_traffic_mode_type_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_ERROR_CODE_PARAMETER_TAG: + dissect_v5_error_code_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_STATUS_PARAMETER_TAG: + dissect_v56_status_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case V5_CONGESTION_INDICATION_PARAMETER_TAG: + dissect_congestion_indication_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + default: + dissect_unknown_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + }; + if (padding_length > 0) + proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER); } +#define V6_NETWORK_APPEARANCE_PARAMETER_TAG 1 +#define V6_PROTOCOL_DATA_1_PARAMETER_TAG 2 +#define V6_PROTOCOL_DATA_2_PARAMETER_TAG 3 +#define V6_INFO_PARAMETER_TAG 4 +#define V6_AFFECTED_DESTINATIONS_PARAMETER_TAG 5 +#define V6_ROUTING_CONTEXT_PARAMETER_TAG 6 +#define V6_DIAGNOSTIC_INFORMATION_PARAMETER_TAG 7 +#define V6_HEARTBEAT_DATA_PARAMETER_TAG 8 +#define V6_USER_CAUSE_PARAMETER_TAG 9 +#define V6_REASON_PARAMETER_TAG 10 +#define V6_TRAFFIC_MODE_TYPE_PARAMETER_TAG 11 +#define V6_ERROR_CODE_PARAMETER_TAG 12 +#define V6_STATUS_PARAMETER_TAG 13 +#define V6_CONGESTION_INDICATION_PARAMETER_TAG 14 +#define V6_CONCERNED_DESTINATION_PARAMETER_TAG 15 +#define V6_ROUTING_KEY_PARAMETER_TAG 16 +#define V6_REGISTRATION_RESULT_PARAMETER_TAG 17 +#define V6_DEREGISTRATION_RESULT_PARAMETER_TAG 18 +#define V6_LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG 19 +#define V6_DESTINATION_POINT_CODE_PARAMETER_TAG 20 +#define V6_SERVICE_INDICATORS_PARAMETER_TAG 21 +#define V6_SUBSYSTEM_NUMBERS_PARAMETER_TAG 22 +#define V6_ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG 23 +#define V6_CIRCUIT_RANGE_PARAMETER_TAG 24 +#define V6_REGISTRATION_RESULTS_PARAMETER_TAG 25 +#define V6_DEREGISTRATION_RESULTS_PARAMETER_TAG 26 + +static const value_string v6_parameter_tag_values[] = { + { V6_NETWORK_APPEARANCE_PARAMETER_TAG, "Network appearance" }, + { V6_PROTOCOL_DATA_1_PARAMETER_TAG, "Protocol data 1" }, + { V6_PROTOCOL_DATA_2_PARAMETER_TAG, "Protocol data 2" }, + { V6_INFO_PARAMETER_TAG, "Info" }, + { V6_AFFECTED_DESTINATIONS_PARAMETER_TAG, "Affected destinations" }, + { V6_ROUTING_CONTEXT_PARAMETER_TAG, "Routing context" }, + { V6_DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" }, + { V6_HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" }, + { V6_USER_CAUSE_PARAMETER_TAG, "User / Cause" }, + { V6_REASON_PARAMETER_TAG, "Reason" }, + { V6_TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" }, + { V6_ERROR_CODE_PARAMETER_TAG, "Error code" }, + { V6_STATUS_PARAMETER_TAG, "Status" }, + { V6_CONGESTION_INDICATION_PARAMETER_TAG, "Congestion indication" }, + { V6_CONCERNED_DESTINATION_PARAMETER_TAG, "Concerned destination" }, + { V6_ROUTING_KEY_PARAMETER_TAG, "Routing Key" }, + { V6_REGISTRATION_RESULT_PARAMETER_TAG, "Registration result" }, + { V6_DEREGISTRATION_RESULT_PARAMETER_TAG, "De-registration result" }, + { V6_LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG, "Local routing key identifier" }, + { V6_DESTINATION_POINT_CODE_PARAMETER_TAG, "Destination point code" }, + { V6_SERVICE_INDICATORS_PARAMETER_TAG, "Service indicators" }, + { V6_SUBSYSTEM_NUMBERS_PARAMETER_TAG, "Subsystem numbers" }, + { V6_ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG, "Originating point code list" }, + { V6_CIRCUIT_RANGE_PARAMETER_TAG, "Circuit range" }, + { V6_REGISTRATION_RESULTS_PARAMETER_TAG, "Registration results" }, + { V6_DEREGISTRATION_RESULTS_PARAMETER_TAG, "De-registration results" }, + { 0, NULL } }; static void -dissect_m3ua_v6_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) +dissect_v6_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) { - guint16 tag, length, padding_length, total_length; + guint16 tag, length, padding_length; proto_item *parameter_item; proto_tree *parameter_tree; /* extract tag and length from the parameter */ tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - - /* calculate padding and total length */ padding_length = tvb_length(parameter_tvb) - length; - total_length = length + padding_length; /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, total_length, "Incomplete parameter"); - parameter_tree = proto_item_add_subtree(parameter_item, ett_m3ua_parameter); + parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(tag, v6_parameter_tag_values, "Unknown parameter")); + parameter_tree = proto_item_add_subtree(parameter_item, ett_parameter); - /* add tag and length to the m3ua tree */ - proto_tree_add_uint_format(parameter_tree, hf_m3ua_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag, - "Parameter tag: %s (0x%x)", val_to_str(tag, m3ua_v6_parameter_tag_values, "unknown"), tag); - proto_tree_add_uint(parameter_tree, hf_m3ua_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); + /* add tag and length to the sua tree */ + proto_tree_add_item(parameter_tree, hf_v5_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, NETWORK_BYTE_ORDER); switch(tag) { case V6_NETWORK_APPEARANCE_PARAMETER_TAG: - dissect_m3ua_network_appearance_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_network_appearance_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_PROTOCOL_DATA_1_PARAMETER_TAG: - dissect_m3ua_protocol_data_1_parameter(parameter_tvb, pinfo, tree, parameter_item); + dissect_protocol_data_1_parameter(parameter_tvb, pinfo, tree, parameter_item); break; case V6_PROTOCOL_DATA_2_PARAMETER_TAG: - dissect_m3ua_protocol_data_2_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); + dissect_protocol_data_2_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); break; case V6_INFO_PARAMETER_TAG: - dissect_m3ua_info_string_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_info_string_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_AFFECTED_DESTINATIONS_PARAMETER_TAG: - dissect_m3ua_affected_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_affected_destinations_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_ROUTING_CONTEXT_PARAMETER_TAG: - dissect_m3ua_routing_context_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_routing_context_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_DIAGNOSTIC_INFORMATION_PARAMETER_TAG: - dissect_m3ua_diagnostic_information_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_diagnostic_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_HEARTBEAT_DATA_PARAMETER_TAG: - dissect_m3ua_heartbeat_data_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_heartbeat_data_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_USER_CAUSE_PARAMETER_TAG: - dissect_m3ua_user_cause_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_user_cause_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_REASON_PARAMETER_TAG: - dissect_m3ua_reason_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_reason_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_TRAFFIC_MODE_TYPE_PARAMETER_TAG: - dissect_m3ua_v6_traffic_mode_type_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_v6_traffic_mode_type_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_ERROR_CODE_PARAMETER_TAG: - dissect_m3ua_v6_error_code_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_v6_error_code_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_STATUS_PARAMETER_TAG: - dissect_m3ua_status_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_v56_status_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_CONGESTION_INDICATION_PARAMETER_TAG: - dissect_m3ua_congestion_indication_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_congestion_indication_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_CONCERNED_DESTINATION_PARAMETER_TAG: - dissect_m3ua_concerned_destination_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_concerned_destination_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_ROUTING_KEY_PARAMETER_TAG: - dissect_m3ua_routing_key_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); + dissect_routing_key_parameter(parameter_tvb, pinfo, tree, parameter_tree); break; case V6_REGISTRATION_RESULT_PARAMETER_TAG: - dissect_m3ua_v6_registration_result_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_v6_registration_result_parameter(parameter_tvb, parameter_tree); break; case V6_DEREGISTRATION_RESULT_PARAMETER_TAG: - dissect_m3ua_v6_deregistration_result_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_v6_deregistration_result_parameter(parameter_tvb, parameter_tree); break; case V6_LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG: - dissect_m3ua_local_routing_key_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_local_routing_key_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_DESTINATION_POINT_CODE_PARAMETER_TAG: - dissect_m3ua_destination_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_destination_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_SERVICE_INDICATORS_PARAMETER_TAG: - dissect_m3ua_service_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_service_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_SUBSYSTEM_NUMBERS_PARAMETER_TAG: - dissect_m3ua_subsystem_numbers_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_subsystem_numbers_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG: - dissect_m3ua_originating_point_code_list_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_originating_point_code_list_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_CIRCUIT_RANGE_PARAMETER_TAG: - dissect_m3ua_circuit_range_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_circuit_range_parameter(parameter_tvb, parameter_tree, parameter_item); break; case V6_REGISTRATION_RESULTS_PARAMETER_TAG: - dissect_m3ua_registration_results_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); + dissect_registration_results_parameter(parameter_tvb, pinfo, tree, parameter_tree); break; case V6_DEREGISTRATION_RESULTS_PARAMETER_TAG: - dissect_m3ua_deregistration_results_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); + dissect_deregistration_results_parameter(parameter_tvb, pinfo, tree, parameter_tree); break; default: - dissect_m3ua_unknown_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_unknown_parameter(parameter_tvb, parameter_tree, parameter_item); break; }; if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, - tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length)); + proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER); } +#define INFO_STRING_PARAMETER_TAG 0x0004 +#define ROUTING_CONTEXT_PARAMETER_TAG 0x0006 +#define DIAGNOSTIC_INFORMATION_PARAMETER_TAG 0x0007 +#define HEARTBEAT_DATA_PARAMETER_TAG 0x0009 +#define TRAFFIC_MODE_TYPE_PARAMETER_TAG 0x000b +#define ERROR_CODE_PARAMETER_TAG 0x000c +#define STATUS_PARAMETER_TAG 0x000d +#define ASP_IDENTIFIER_PARAMETER_TAG 0x0011 +#define AFFECTED_POINT_CODE_PARAMETER_TAG 0x0012 +#define CORRELATION_IDENTIFIER_PARAMETER_TAG 0x0013 + +#define NETWORK_APPEARANCE_PARAMETER_TAG 0x0200 +#define USER_CAUSE_PARAMETER_TAG 0x0204 +#define CONGESTION_INDICATIONS_PARAMETER_TAG 0x0205 +#define CONCERNED_DESTINATION_PARAMETER_TAG 0x0206 +#define ROUTING_KEY_PARAMETER_TAG 0x0207 +#define REGISTRATION_RESULT_PARAMETER_TAG 0x0208 +#define DEREGISTRATION_RESULT_PARAMETER_TAG 0x0209 +#define LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG 0x020a +#define DESTINATION_POINT_CODE_PARAMETER_TAG 0x020b +#define SERVICE_INDICATORS_PARAMETER_TAG 0x020c +#define ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG 0x020e +#define CIRCUIT_RANGE_PARAMETER_TAG 0x020f +#define PROTOCOL_DATA_PARAMETER_TAG 0x0210 +#define REGISTRATION_STATUS_PARAMETER_TAG 0x0212 +#define DEREGISTRATION_STATUS_PARAMETER_TAG 0x0213 + +static const value_string parameter_tag_values[] = { + { INFO_STRING_PARAMETER_TAG, "Info string" } , + { ROUTING_CONTEXT_PARAMETER_TAG, "Routing context" } , + { DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic Information" } , + { HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" } , + { TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" } , + { ERROR_CODE_PARAMETER_TAG, "Error code" } , + { STATUS_PARAMETER_TAG, "Status" } , + { ASP_IDENTIFIER_PARAMETER_TAG, "ASP identifier" } , + { AFFECTED_POINT_CODE_PARAMETER_TAG, "Affected point code" } , + { CORRELATION_IDENTIFIER_PARAMETER_TAG, "Correlation identifier" } , + { NETWORK_APPEARANCE_PARAMETER_TAG, "Network appearance" } , + { USER_CAUSE_PARAMETER_TAG, "User / cause" } , + { CONGESTION_INDICATIONS_PARAMETER_TAG, "Congestion indications" } , + { CONCERNED_DESTINATION_PARAMETER_TAG, "Concerned destination" } , + { ROUTING_KEY_PARAMETER_TAG, "Routing key" } , + { REGISTRATION_RESULT_PARAMETER_TAG, "Registration result" } , + { DEREGISTRATION_RESULT_PARAMETER_TAG, "Deregistration result" } , + { LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG, "Local routing key identifier" } , + { DESTINATION_POINT_CODE_PARAMETER_TAG, "Destination point code" } , + { SERVICE_INDICATORS_PARAMETER_TAG, "Service indicators" } , + { ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG, "Originating point code list" } , + { CIRCUIT_RANGE_PARAMETER_TAG, "Circuit range" } , + { PROTOCOL_DATA_PARAMETER_TAG, "Protocol data" } , + { REGISTRATION_STATUS_PARAMETER_TAG, "Registration status" } , + { DEREGISTRATION_STATUS_PARAMETER_TAG, "Deregistration status" } , + { 0, NULL } }; + static void -dissect_m3ua_v12_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) +dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) { - guint16 tag, length, padding_length, total_length; + guint16 tag, length, padding_length; proto_item *parameter_item; proto_tree *parameter_tree; /* extract tag and length from the parameter */ tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - - /* calculate padding and total length */ padding_length = tvb_length(parameter_tvb) - length; - total_length = length + padding_length; /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, total_length, "Incomplete parameter"); - parameter_tree = proto_item_add_subtree(parameter_item, ett_m3ua_parameter); + parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(tag, parameter_tag_values, "Unknown parameter")); + parameter_tree = proto_item_add_subtree(parameter_item, ett_parameter); - /* add tag and length to the m3ua tree */ - proto_tree_add_uint_format(parameter_tree, hf_m3ua_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag, - "Parameter tag: %s (0x%x)", val_to_str(tag, m3ua_v12_parameter_tag_values, "unknown"), tag); - proto_tree_add_uint(parameter_tree, hf_m3ua_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); + /* add tag and length to the sua tree */ + proto_tree_add_item(parameter_tree, hf_v5_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, NETWORK_BYTE_ORDER); switch(tag) { - case V12_INFO_STRING_PARAMETER_TAG: - dissect_m3ua_info_string_parameter(parameter_tvb, parameter_tree, parameter_item); + case INFO_STRING_PARAMETER_TAG: + dissect_info_string_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_ROUTING_CONTEXT_PARAMETER_TAG: - dissect_m3ua_routing_context_parameter(parameter_tvb, parameter_tree, parameter_item); + case ROUTING_CONTEXT_PARAMETER_TAG: + dissect_routing_context_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_DIAGNOSTIC_INFORMATION_PARAMETER_TAG: - dissect_m3ua_diagnostic_information_parameter(parameter_tvb, parameter_tree, parameter_item); + case DIAGNOSTIC_INFORMATION_PARAMETER_TAG: + dissect_diagnostic_information_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_HEARTBEAT_DATA_PARAMETER_TAG: - dissect_m3ua_heartbeat_data_parameter(parameter_tvb, parameter_tree, parameter_item); + case HEARTBEAT_DATA_PARAMETER_TAG: + dissect_heartbeat_data_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_TRAFFIC_MODE_TYPE_PARAMETER_TAG: - dissect_m3ua_v12_traffic_mode_type_parameter(parameter_tvb, parameter_tree, parameter_item); + case TRAFFIC_MODE_TYPE_PARAMETER_TAG: + dissect_traffic_mode_type_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_ERROR_CODE_PARAMETER_TAG: - dissect_m3ua_v12_error_code_parameter(parameter_tvb, parameter_tree, parameter_item); + case ERROR_CODE_PARAMETER_TAG: + dissect_error_code_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_STATUS_PARAMETER_TAG: - dissect_m3ua_status_parameter(parameter_tvb, parameter_tree, parameter_item); + case STATUS_PARAMETER_TAG: + dissect_status_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_ASP_IDENTIFIER_PARAMETER_TAG: - dissect_m3ua_asp_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); + case ASP_IDENTIFIER_PARAMETER_TAG: + dissect_asp_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_AFFECTED_POINT_CODE_PARAMETER_TAG: - dissect_m3ua_affected_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); + case AFFECTED_POINT_CODE_PARAMETER_TAG: + dissect_affected_destinations_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_NETWORK_APPEARANCE_PARAMETER_TAG: - dissect_m3ua_network_appearance_parameter(parameter_tvb, parameter_tree, parameter_item); + case NETWORK_APPEARANCE_PARAMETER_TAG: + dissect_network_appearance_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_USER_CAUSE_PARAMETER_TAG: - dissect_m3ua_user_cause_parameter(parameter_tvb, parameter_tree, parameter_item); + case USER_CAUSE_PARAMETER_TAG: + dissect_user_cause_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_CONGESTION_INDICATIONS_PARAMETER_TAG: - dissect_m3ua_congestion_indication_parameter(parameter_tvb, parameter_tree, parameter_item); + case CONGESTION_INDICATIONS_PARAMETER_TAG: + dissect_congestion_indication_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_CONCERNED_DESTINATION_PARAMETER_TAG: - dissect_m3ua_concerned_destination_parameter(parameter_tvb, parameter_tree, parameter_item); + case CONCERNED_DESTINATION_PARAMETER_TAG: + dissect_concerned_destination_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_ROUTING_KEY_PARAMETER_TAG: - dissect_m3ua_routing_key_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); + case ROUTING_KEY_PARAMETER_TAG: + dissect_routing_key_parameter(parameter_tvb, pinfo, tree, parameter_tree); break; - case V12_REGISTRATION_RESULT_PARAMETER_TAG: - dissect_m3ua_v12_registration_result_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); + case REGISTRATION_RESULT_PARAMETER_TAG: + dissect_registration_result_parameter(parameter_tvb, pinfo, tree, parameter_tree); break; - case V12_DEREGISTRATION_RESULT_PARAMETER_TAG: - dissect_m3ua_v12_deregistration_result_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); + case DEREGISTRATION_RESULT_PARAMETER_TAG: + dissect_deregistration_result_parameter(parameter_tvb, pinfo, tree, parameter_tree); break; - case V12_LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG: - dissect_m3ua_local_routing_key_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); + case LOCAL_ROUTING_KEY_IDENTIFIER_PARAMETER_TAG: + dissect_local_routing_key_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_DESTINATION_POINT_CODE_PARAMETER_TAG: - dissect_m3ua_destination_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); + case DESTINATION_POINT_CODE_PARAMETER_TAG: + dissect_destination_point_code_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_SERVICE_INDICATORS_PARAMETER_TAG: - dissect_m3ua_service_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); + case SERVICE_INDICATORS_PARAMETER_TAG: + dissect_service_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG: - dissect_m3ua_originating_point_code_list_parameter(parameter_tvb, parameter_tree, parameter_item); + case ORIGINATING_POINT_CODE_LIST_PARAMETER_TAG: + dissect_originating_point_code_list_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_CIRCUIT_RANGE_PARAMETER_TAG: - dissect_m3ua_circuit_range_parameter(parameter_tvb, parameter_tree, parameter_item); + case CIRCUIT_RANGE_PARAMETER_TAG: + dissect_circuit_range_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_PROTOCOL_DATA_PARAMETER_TAG: - dissect_m3ua_protocol_data_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); + case PROTOCOL_DATA_PARAMETER_TAG: + dissect_protocol_data_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item); break; - case V12_CORRELATION_IDENTIFIER_PARAMETER_TAG: - dissect_m3ua_correlation_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); + case CORRELATION_IDENTIFIER_PARAMETER_TAG: + dissect_correlation_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_REGISTRATION_STATUS_PARAMETER_TAG: - dissect_m3ua_registration_status_parameter(parameter_tvb, parameter_tree, parameter_item); + case REGISTRATION_STATUS_PARAMETER_TAG: + dissect_registration_status_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case V12_DEREGISTRATION_STATUS_PARAMETER_TAG: - dissect_m3ua_deregistration_status_parameter(parameter_tvb, parameter_tree, parameter_item); + case DEREGISTRATION_STATUS_PARAMETER_TAG: + dissect_deregistration_status_parameter(parameter_tvb, parameter_tree, parameter_item); break; default: - dissect_m3ua_unknown_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_unknown_parameter(parameter_tvb, parameter_tree, parameter_item); break; }; if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_m3ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, - tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length)); + proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER); } static void -dissect_m3ua_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) +dissect_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) { - gint offset, length, padding_length, total_length, remaining_length; + gint offset, length, total_length, remaining_length; tvbuff_t *parameter_tvb; offset = 0; - while((remaining_length = tvb_reported_length_remaining(parameters_tvb, offset))) { - length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); - padding_length = nr_of_padding_bytes(length); + while((remaining_length = tvb_length_remaining(parameters_tvb, offset))) { + length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); + total_length = ADD_PADDING(length); if (remaining_length >= length) - total_length = MIN(length + padding_length, remaining_length); - else - total_length = length + padding_length; + total_length = MIN(total_length, remaining_length); /* create a tvb for the parameter including the padding bytes */ parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length); - switch(m3ua_version) { + switch(version) { + case M3UA_V5: + dissect_v5_parameter(parameter_tvb, pinfo, tree, m3ua_tree); + break; case M3UA_V6: - dissect_m3ua_v6_parameter(parameter_tvb, pinfo, tree, m3ua_tree); + dissect_v6_parameter(parameter_tvb, pinfo, tree, m3ua_tree); break; - case M3UA_V12: - dissect_m3ua_v12_parameter(parameter_tvb, pinfo, tree, m3ua_tree); + case M3UA_RFC: + dissect_parameter(parameter_tvb, pinfo, tree, m3ua_tree); break; } /* get rid of the handled parameter */ @@ -1535,15 +1599,18 @@ dissect_m3ua_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree static void -dissect_m3ua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) +dissect_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m3ua_tree) { tvbuff_t *common_header_tvb, *parameters_tvb; common_header_tvb = tvb_new_subset(message_tvb, 0, COMMON_HEADER_LENGTH, COMMON_HEADER_LENGTH); parameters_tvb = tvb_new_subset(message_tvb, COMMON_HEADER_LENGTH, -1, -1); - dissect_m3ua_common_header(common_header_tvb, pinfo, m3ua_tree); + if (version == M3UA_V5) + dissect_v5_common_header(common_header_tvb, pinfo, m3ua_tree); + else + dissect_common_header(common_header_tvb, pinfo, m3ua_tree); if (m3ua_tree) - dissect_m3ua_parameters(parameters_tvb, pinfo, tree, m3ua_tree); + dissect_parameters(parameters_tvb, pinfo, tree, m3ua_tree); } static void @@ -1566,7 +1633,7 @@ dissect_m3ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) m3ua_tree = NULL; }; /* dissect the message */ - dissect_m3ua_message(message_tvb, pinfo, tree, m3ua_tree); + dissect_message(message_tvb, pinfo, tree, m3ua_tree); } /* Register the protocol with Ethereal */ @@ -1576,301 +1643,93 @@ proto_register_m3ua(void) /* Setup list of header fields */ static hf_register_info hf[] = { - { &hf_m3ua_version, - { "Version", "m3ua.version", - FT_UINT8, BASE_DEC, VALS(m3ua_protocol_version_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_reserved, - { "Reserved", "m3ua.reserved", - FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_message_class, - { "Message class", "m3ua.message_class", - FT_UINT8, BASE_DEC, VALS(m3ua_message_class_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_message_type, - { "Message Type", "m3ua.message_type", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_message_length, - { "Message length", "m3ua.message_length", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_parameter_tag, - { "Parameter Tag", "m3ua.parameter_tag", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_parameter_length, - { "Parameter length", "m3ua.parameter_length", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_parameter_value, - { "Parameter value", "m3ua.parameter_value", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_parameter_padding, - { "Padding", "m3ua.parameter_padding", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_info_string, - { "Info string", "m3ua.info_string", - FT_STRING, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_routing_context, - { "Routing context", "m3ua.routing_context", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_diagnostic_information, - { "Diagnostic information", "m3ua.diagnostic_information", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_heartbeat_data, - { "Heartbeat data", "m3ua.heartbeat_data", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_error_code, - { "Error code", "m3ua.error_code", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_status_type, - { "Status type", "m3ua.status_type", - FT_UINT16, BASE_DEC, VALS(m3ua_status_type_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_status_info, - { "Status info", "m3ua.status_info", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_asp_identifier, - { "ASP identifier", "m3ua.asp_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_affected_point_code_mask, - { "Mask", "m3ua.affected_point_code_mask", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_affected_point_code_pc, - { "Affected point code", "m3ua.affected_point_code_pc", - FT_UINT24, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_network_appearance, - { "Network appearance", "m3ua.network_appearance", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_unavailability_cause, - { "Unavailability cause", "m3ua.unavailability_cause", - FT_UINT16, BASE_DEC, VALS(m3ua_unavailability_cause_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_user_identity, - { "User Identity", "m3ua.user_identity", - FT_UINT16, BASE_DEC, VALS(m3ua_user_identity_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_congestion_reserved, - { "Reserved", "m3ua.congestion_reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_congestion_level, - { "Congestion level", "m3ua.congestion_level", - FT_UINT8, BASE_DEC, VALS(m3ua_congestion_level_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_concerned_dest_reserved, - { "Reserved", "m3ua.concerned_reserved", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_concerned_dest_pc, - { "Concerned DPC", "m3ua.concerned_dpc", - FT_UINT24, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_dpc_mask, - { "Mask", "m3ua.dpc_mask", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_dpc_pc, - { "Destination point code", "m3ua.dpc_pc", - FT_UINT24, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_si, - { "Service indicator", "m3ua_si", - FT_UINT8, BASE_DEC, VALS(m3ua_user_identity_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_ssn, - { "Subsystem number", "m3ua_ssn", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_opc_list_mask, - { "Mask", "m3ua.opc_list_mask", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_opc_list_pc, - { "Originating point code", "m3ua.opc_list_pc", - FT_UINT24, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_cic_range_mask, - { "Mask", "m3ua.cic_range_mask", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_cic_range_pc, - { "Originating point code", "m3ua.cic_range_pc", - FT_UINT24, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_cic_range_lower, - { "Lower CIC value", "m3ua.cic_range_lower", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_cic_range_upper, - { "Upper CIC value", "m3ua.cic_range_upper", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_local_rk_identifier, - { "Local routing key identifier", "m3ua.local_rk_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_li, - { "Length indicator", "m3ua.protocol_data_2_li", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_protocol_data_opc, - { "OPC", "m3ua.protocol_data_opc", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_protocol_data_dpc, - { "DPC", "m3ua.protocol_data_dpc", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_protocol_data_si, - { "SI", "m3ua.protocol_data_si", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_protocol_data_ni, - { "NI", "m3ua.protocol_data_ni", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_protocol_data_mp, - { "MP", "m3ua.protocol_data_mp", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_protocol_data_sls, - { "SLS", "m3ua.protocol_data_sls", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_correlation_identifier, - { "Correlation Identifier", "m3ua.correlation_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_registration_status, - { "Registration status", "m3ua.registration_status", - FT_UINT32, BASE_DEC, VALS(m3ua_registration_status_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_deregistration_status, - { "Deregistration status", "m3ua.deregistration_status", - FT_UINT32, BASE_DEC, VALS(m3ua_deregistration_status_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_reason, - { "Reason", "m3ua_reason", - FT_UINT32, BASE_DEC, VALS(m3ua_reason_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_traffic_mode_type, - { "Traffic mode Type", "m3ua.traffic_mode_type", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_registration_result_identifier, - { "Local RK-identifier value", "m3ua.registration_result_identifier", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_registration_result_status, - { "Registration status", "m3ua.registration_results_status", - FT_UINT32, BASE_DEC, VALS(m3ua_registration_result_status_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_registration_result_context, - { "Routing context", "m3ua.registration_result_routing_context", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_m3ua_deregistration_result_status, - { "De-Registration status", "m3ua.deregistration_results_status", - FT_UINT32, BASE_DEC, VALS(m3ua_deregistration_result_status_values), 0x0, - "", HFILL } - }, - { &hf_m3ua_deregistration_result_context, - { "Routing context", "m3ua.deregistration_result_routing_context", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, + { &hf_version, { "Version", "m3ua.version", FT_UINT8, BASE_DEC, VALS(protocol_version_values), 0x0, "", HFILL } }, + { &hf_reserved, { "Reserved", "m3ua.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } }, + { &hf_v5_message_class, { "Message class", "m3ua.message_class", FT_UINT8, BASE_DEC, VALS(v5_message_class_values), 0x0, "", HFILL } }, + { &hf_message_class, { "Message class", "m3ua.message_class", FT_UINT8, BASE_DEC, VALS(message_class_values), 0x0, "", HFILL } }, + { &hf_message_type, { "Message Type", "m3ua.message_type", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_message_length, { "Message length", "m3ua.message_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_v5_parameter_tag, { "Parameter Tag", "m3ua.parameter_tag", FT_UINT16, BASE_DEC, VALS(v5_parameter_tag_values), 0x0, "", HFILL } }, + { &hf_v6_parameter_tag, { "Parameter Tag", "m3ua.parameter_tag", FT_UINT16, BASE_DEC, VALS(v6_parameter_tag_values), 0x0, "", HFILL } }, + { &hf_parameter_tag, { "Parameter Tag", "m3ua.parameter_tag", FT_UINT16, BASE_DEC, VALS(parameter_tag_values), 0x0, "", HFILL } }, + { &hf_parameter_length, { "Parameter length", "m3ua.parameter_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_parameter_value, { "Parameter value", "m3ua.parameter_value", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_parameter_padding, { "Padding", "m3ua.parameter_padding", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_parameter_trailer, { "Trailer", "m3ua.paramter_trailer", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_network_appearance, { "Network appearance", "m3ua.network_appearance", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_info_string, { "Info string", "m3ua.info_string", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_routing_context, { "Routing context", "m3ua.routing_context", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_diagnostic_information, { "Diagnostic information", "m3ua.diagnostic_information", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_heartbeat_data, { "Heartbeat data", "m3ua.heartbeat_data", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_v5_error_code, { "Error code", "m3ua.error_code", FT_UINT32, BASE_DEC, VALS(v5_error_code_values), 0x0, "", HFILL } }, + { &hf_v6_error_code, { "Error code", "m3ua.error_code", FT_UINT32, BASE_DEC, VALS(v6_error_code_values), 0x0, "", HFILL } }, + { &hf_error_code, { "Error code", "m3ua.error_code", FT_UINT32, BASE_DEC, VALS(error_code_values), 0x0, "", HFILL } }, + { &hf_status_type, { "Status type", "m3ua.status_type", FT_UINT16, BASE_DEC, VALS(status_type_values), 0x0, "", HFILL } }, + { &hf_status_info, { "Status info", "m3ua.status_info", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_asp_identifier, { "ASP identifier", "m3ua.asp_identifier", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_affected_point_code_mask, { "Mask", "m3ua.affected_point_code_mask", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_affected_point_code_pc, { "Affected point code", "m3ua.affected_point_code_pc", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_cause, { "Unavailability cause", "m3ua.unavailability_cause", FT_UINT16, BASE_DEC, VALS(unavailability_cause_values), 0x0, "", HFILL } }, + { &hf_user, { "User Identity", "m3ua.user_identity", FT_UINT16, BASE_DEC, VALS(user_identity_values), 0x0, "", HFILL } }, + { &hf_reason, { "Reason", "m3ua.reason", FT_UINT32, BASE_DEC, VALS(reason_values), 0x0, "", HFILL } }, + { &hf_v5_traffic_mode_type, { "Traffic mode Type", "m3ua.traffic_mode_type", FT_UINT32, BASE_DEC, VALS(v5_traffic_mode_type_values), 0x0, "", HFILL } }, + { &hf_v6_traffic_mode_type, { "Traffic mode Type", "m3ua.traffic_mode_type", FT_UINT32, BASE_DEC, VALS(v6_traffic_mode_type_values), 0x0, "", HFILL } }, + { &hf_traffic_mode_type, { "Traffic mode Type", "m3ua.traffic_mode_type", FT_UINT32, BASE_DEC, VALS(traffic_mode_type_values), 0x0, "", HFILL } }, + { &hf_congestion_reserved, { "Reserved", "m3ua.congestion_reserved", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_congestion_level, { "Congestion level", "m3ua.congestion_level", FT_UINT8, BASE_DEC, VALS(congestion_level_values), 0x0, "", HFILL } }, + { &hf_concerned_dest_reserved, { "Reserved", "m3ua.concerned_reserved", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_concerned_dest_pc, { "Concerned DPC", "m3ua.concerned_dpc", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_local_rk_identifier, { "Local routing key identifier", "m3ua.local_rk_identifier", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_dpc_mask, { "Mask", "m3ua.dpc_mask", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_dpc_pc, { "Destination point code", "m3ua.dpc_pc", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_si, { "Service indicator", "m3ua.si", FT_UINT8, BASE_DEC, VALS(user_identity_values), 0x0, "", HFILL } }, + { &hf_ssn, { "Subsystem number", "m3ua.ssn", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_opc_list_mask, { "Mask", "m3ua.opc_list_mask", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_opc_list_pc, { "Originating point code", "m3ua.opc_list_pc", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_cic_range_mask, { "Mask", "m3ua.cic_range_mask", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_cic_range_pc, { "Originating point code", "m3ua.cic_range_pc", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_cic_range_lower, { "Lower CIC value", "m3ua.cic_range_lower", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_cic_range_upper, { "Upper CIC value", "m3ua.cic_range_upper", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_li, { "Length indicator", "m3ua.protocol_data_2_li", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_protocol_data_opc, { "OPC", "m3ua.protocol_data_opc", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_protocol_data_dpc, { "DPC", "m3ua.protocol_data_dpc", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_protocol_data_si, { "SI", "m3ua.protocol_data_si", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_protocol_data_ni, { "NI", "m3ua.protocol_data_ni", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_protocol_data_mp, { "MP", "m3ua.protocol_data_mp", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_protocol_data_sls, { "SLS", "m3ua.protocol_data_sls", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_correlation_identifier, { "Correlation Identifier", "m3ua.correlation_identifier", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_registration_status, { "Registration status", "m3ua.registration_status", FT_UINT32, BASE_DEC, VALS(registration_status_values), 0x0, "", HFILL } }, + { &hf_deregistration_status, { "Deregistration status", "m3ua.deregistration_status", FT_UINT32, BASE_DEC, VALS(deregistration_status_values), 0x0, "", HFILL } }, + { &hf_traffic_mode_type, { "Traffic mode Type", "m3ua.traffic_mode_type", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_registration_result_identifier, { "Local RK-identifier value", "m3ua.registration_result_identifier", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_registration_result_status, { "Registration status", "m3ua.registration_results_status", FT_UINT32, BASE_DEC, VALS(registration_result_status_values), 0x0, "", HFILL } }, + { &hf_registration_result_context, { "Routing context", "m3ua.registration_result_routing_context", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_v6_deregistration_result_status, { "De-Registration status", "m3ua.deregistration_results_status", FT_UINT32, BASE_DEC, VALS(v6_deregistration_result_status_values), 0x0, "", HFILL } }, + { &hf_v6_deregistration_result_context, { "Routing context", "m3ua.deregistration_result_routing_context", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, }; /* Setup protocol subtree array */ static gint *ett[] = { &ett_m3ua, - &ett_m3ua_parameter, + &ett_parameter, }; - static enum_val_t m3ua_options[] = { - { "Internet Draft version 6", M3UA_V6 }, - { "Internet Draft version 12", M3UA_V12 }, + static enum_val_t options[] = { + { "Internet Draft version 5", M3UA_V5 }, + { "Internet Draft version 6", M3UA_V6 }, + { "RFC 3332", M3UA_RFC }, { NULL, 0 } }; /* Register the protocol name and description */ proto_m3ua = proto_register_protocol("MTP 3 User Adaptation Layer", "M3UA", "m3ua"); m3ua_module = prefs_register_protocol(proto_m3ua, NULL); - prefs_register_enum_preference(m3ua_module, - "version", "M3UA Version", "Internet Draft version used by Ethereal", - &m3ua_version, m3ua_options, FALSE); + prefs_register_enum_preference(m3ua_module, "version", "M3UA Version", "Version used by Ethereal", (gint *)&version, options, FALSE); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_m3ua, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - m3ua_si_dissector_table = register_dissector_table("m3ua.protocol_data_si", "MTP3 Service indicator", FT_UINT8, BASE_HEX); + si_dissector_table = register_dissector_table("m3ua.protocol_data_si", "MTP3 Service indicator", FT_UINT8, BASE_HEX); }; |