diff options
Diffstat (limited to 'packet-asap.c')
| -rw-r--r-- | packet-asap.c | 800 |
1 files changed, 546 insertions, 254 deletions
diff --git a/packet-asap.c b/packet-asap.c index e1a6624d48..e6b2f0eac3 100644 --- a/packet-asap.c +++ b/packet-asap.c @@ -1,11 +1,12 @@ /* packet-asap.c * Routines for Aggregate Server Access Protocol * It is hopefully (needs testing) compilant to - * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-02.txt + * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-01.txt + * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-04.txt * * Copyright 2002, Michael Tuexen <Michael.Tuexen@icn.siemens.de> * - * $Id: packet-asap.c,v 1.3 2002/05/02 07:49:43 guy Exp $ + * $Id: packet-asap.c,v 1.4 2002/07/08 21:09:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -34,42 +35,50 @@ #include <epan/packet.h> -#define ASAP_PAYLOAD_PROTO_ID 0xFAEEB5D1 +#define ASAP_PAYLOAD_PROTO_ID 4209948113u /* = 0xFAEEB5D1 */ /* Initialize the protocol and registered fields */ static int proto_asap = -1; -static int hf_asap_message_type = -1; -static int hf_asap_message_flags = -1; -static int hf_asap_message_length = -1; -#ifdef ASAP_UNUSED_HANDLES -static int hf_asap_message_value = -1; -#endif -static int hf_asap_parameter_type = -1; -static int hf_asap_parameter_length = -1; -static int hf_asap_parameter_value = -1; -static int hf_asap_parameter_padding = -1; -static int hf_asap_parameter_ipv4_address = -1; -static int hf_asap_parameter_ipv6_address = -1; -static int hf_asap_parameter_port = -1; -static int hf_asap_parameter_number_of_addr = -1; -static int hf_asap_parameter_load_policy = -1; -static int hf_asap_parameter_load_value = -1; -static int hf_asap_parameter_reg_life = -1; -static int hf_asap_parameter_pool_handle = -1; -static int hf_asap_parameter_signature = -1; -static int hf_asap_parameter_action_code = -1; -static int hf_asap_parameter_result_code = -1; -static int hf_asap_parameter_reserved = -1; +static int hf_cause_code = -1; +static int hf_cause_length = -1; +static int hf_cause_info = -1; +static int hf_cause_padding = -1; +static int hf_message_type = -1; +static int hf_message_flags = -1; +static int hf_message_length = -1; +static int hf_parameter_type = -1; +static int hf_parameter_length = -1; +static int hf_parameter_value = -1; +static int hf_parameter_padding = -1; +static int hf_parameter_ipv4_address = -1; +static int hf_parameter_ipv6_address = -1; +static int hf_sctp_port = -1; +static int hf_sctp_reserved = -1; +static int hf_tcp_port = -1; +static int hf_tcp_reserved = -1; +static int hf_udp_port = -1; +static int hf_udp_reserved = -1; +static int hf_policy_type = -1; +static int hf_policy_value = -1; +static int hf_pool_handle = -1; +static int hf_pe_pe_identifier = -1; +static int hf_home_enrp_id = -1; +static int hf_reg_life = -1; +static int hf_server_identifier = -1; +static int hf_m_bit = -1; +static int hf_reserved = -1; +static int hf_cookie = -1; +static int hf_pe_identifier = -1; /* Initialize the subtree pointers */ static gint ett_asap = -1; static gint ett_asap_parameter = -1; +static gint ett_asap_cause = -1; static void -dissect_all_asap_parameters(tvbuff_t *, proto_tree *); +dissect_parameters(tvbuff_t *, proto_tree *); -static gint -dissect_next_asap_parameters(guint, gint, tvbuff_t *, proto_tree *); +/* Helper functions */ static guint nr_of_padding_bytes (guint length) @@ -84,6 +93,94 @@ nr_of_padding_bytes (guint length) return 4 - remainder; } +/* Dissectors for error causes */ +#define CAUSE_CODE_LENGTH 2 +#define CAUSE_LENGTH_LENGTH 2 +#define CAUSE_HEADER_LENGTH (CAUSE_CODE_LENGTH + CAUSE_LENGTH_LENGTH) + +#define CAUSE_HEADER_OFFSET 0 +#define CAUSE_CODE_OFFSET CAUSE_HEADER_OFFSET +#define CAUSE_LENGTH_OFFSET (CAUSE_CODE_OFFSET + CAUSE_CODE_LENGTH) +#define CAUSE_INFO_OFFSET (CAUSE_LENGTH_OFFSET + CAUSE_LENGTH_LENGTH) + +static void +dissect_unknown_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *cause_item) +{ + guint16 code, length, cause_info_length; + + code = tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET); + length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); + cause_info_length = length - CAUSE_HEADER_LENGTH; + if (cause_info_length > 0) + proto_tree_add_bytes(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length, + tvb_get_ptr(cause_tvb, CAUSE_INFO_OFFSET, cause_info_length)); + proto_item_set_text(cause_item, "Error cause with code %u and %u byte%s information", code, cause_info_length, plurality(cause_info_length, "", "s")); +} + +#define UNRECOGNIZED_PARAMETER_CAUSE_CODE 1 +#define UNRECONGNIZED_MESSAGE_CAUSE_CODE 2 +#define AUTHORIZATION_FAILURE_CAUSE_CODE 3 /* This is an error in the ID */ +#define INVALID_VALUES 4 +#define NON_UNIQUE_PE_IDENTIFIER 5 +#define POOLING_POLICY_INCONSISTENT_CAUSE_CODE 6 + +static const value_string cause_code_values[] = { + { UNRECOGNIZED_PARAMETER_CAUSE_CODE, "Unrecognized parameter" }, + { UNRECONGNIZED_MESSAGE_CAUSE_CODE, "Unrecognized message" }, + { AUTHORIZATION_FAILURE_CAUSE_CODE, "Authorization failure" }, + { INVALID_VALUES, "Invalid values" }, + { NON_UNIQUE_PE_IDENTIFIER, "Non-unique PE identifier" }, + { POOLING_POLICY_INCONSISTENT_CAUSE_CODE, "Pooling policy inconsistent" }, + { 0, NULL } }; + +static void +dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree) +{ + guint16 code, length, padding_length, total_length; + proto_item *cause_item; + proto_tree *cause_tree; + + code = tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET); + length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); + padding_length = nr_of_padding_bytes(length); + total_length = length + padding_length; + + cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, total_length, "BAD ERROR CAUSE"); + cause_tree = proto_item_add_subtree(cause_item, ett_asap_cause); + + proto_tree_add_uint(cause_tree, hf_cause_code, cause_tvb, CAUSE_CODE_OFFSET, CAUSE_CODE_LENGTH, code); + proto_tree_add_uint(cause_tree, hf_cause_length, cause_tvb, CAUSE_LENGTH_OFFSET, CAUSE_LENGTH_LENGTH, length); + + switch(code) { + default: + dissect_unknown_cause(cause_tvb, cause_tree, cause_item); + break; + } + if (padding_length > 0) + proto_tree_add_bytes(cause_tree, hf_cause_padding, cause_tvb, CAUSE_HEADER_OFFSET + length, padding_length, + tvb_get_ptr(cause_tvb, CAUSE_HEADER_OFFSET + length, padding_length)); +} + +static void +dissect_error_causes(tvbuff_t *error_causes_tvb, proto_tree *parameter_tree) +{ + guint16 length, padding_length, total_length; + gint offset; + tvbuff_t *error_cause_tvb; + + offset = 0; + while(tvb_reported_length_remaining(error_causes_tvb, offset)) { + length = tvb_get_ntohs(error_causes_tvb, offset + CAUSE_LENGTH_OFFSET); + padding_length = nr_of_padding_bytes(length); + total_length = length + padding_length; + error_cause_tvb = tvb_new_subset(error_causes_tvb, offset , total_length, total_length); + dissect_error_cause(error_cause_tvb, parameter_tree); + offset += total_length; + } +} + +/* Dissectors for parameters */ + #define PARAMETER_TYPE_LENGTH 2 #define PARAMETER_LENGTH_LENGTH 2 #define PARAMETER_HEADER_LENGTH (PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_LENGTH) @@ -102,8 +199,8 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot guint32 ipv4_address; tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH); - proto_tree_add_ipv4(parameter_tree, hf_asap_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ipv4_address); - proto_item_set_text(parameter_item, "IPV4 address parameter"); + proto_tree_add_ipv4(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, ipv4_address); + proto_item_set_text(parameter_item, "IPV4 address parameter: %s", ip_to_str((const guint8 *)&ipv4_address)); } #define IPV6_ADDRESS_LENGTH 16 @@ -112,46 +209,117 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot static void dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_ipv6(parameter_tree, hf_asap_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, - tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH)); + guint8 *ip6_address_ptr; - proto_item_set_text(parameter_item, "IPV6 address parameter"); + ip6_address_ptr = (guint8 *)tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH); + proto_tree_add_ipv6(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, + (const guint8 *)ip6_address_ptr); + + proto_item_set_text(parameter_item, "IPV6 address parameter: %s", ip6_to_str((struct e_in6_addr *)ip6_address_ptr)); } -#define PORT_LENGTH 2 -#define NUMBER_OF_ADDRESSES_LENGTH 2 -#define LOAD_POLICY_LENGTH 2 -#define LOAD_VALUE_LENGTH 2 -#define REGISTRATION_LIFE_LENGTH 4 +#define SCTP_PORT_LENGTH 2 +#define SCTP_RESERVED_LENGTH 2 +#define SCTP_PORT_OFFSET PARAMETER_VALUE_OFFSET +#define SCTP_RESERVED_OFFSET (SCTP_PORT_OFFSET + SCTP_PORT_LENGTH) +#define SCTP_ADDRESS_OFFSET (SCTP_RESERVED_OFFSET + SCTP_RESERVED_LENGTH) + +static void +dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + tvbuff_t *parameters_tvb; + guint16 port, reserved; + + port = tvb_get_ntohs(parameter_tvb, SCTP_PORT_OFFSET); + reserved = tvb_get_ntohs(parameter_tvb, SCTP_RESERVED_OFFSET); + + proto_tree_add_uint(parameter_tree, hf_sctp_port, parameter_tvb, SCTP_PORT_OFFSET, SCTP_PORT_LENGTH, port); + proto_tree_add_uint(parameter_tree, hf_sctp_reserved, parameter_tvb, SCTP_RESERVED_OFFSET, SCTP_RESERVED_LENGTH, reserved); + + proto_item_set_text(parameter_item, "SCTP transport parameter"); + + parameters_tvb = tvb_new_subset(parameter_tvb, SCTP_ADDRESS_OFFSET, -1, -1); + dissect_parameters(parameters_tvb, parameter_tree); +} -#define PORT_OFFSET PARAMETER_VALUE_OFFSET -#define NUMBER_OF_ADDRESSES_OFFSET (PORT_OFFSET + PORT_LENGTH) -#define ADDRESS_LIST_OFFSET (NUMBER_OF_ADDRESSES_OFFSET + NUMBER_OF_ADDRESSES_LENGTH) -#define LOAD_POLICY_OFFSET 0 -#define LOAD_VALUE_OFFSET (LOAD_POLICY_OFFSET + LOAD_POLICY_LENGTH) -#define REGISTRATION_LIFE_OFFSET (LOAD_VALUE_OFFSET + LOAD_VALUE_LENGTH) +#define TCP_PORT_LENGTH 2 +#define TCP_RESERVED_LENGTH 2 +#define TCP_PORT_OFFSET PARAMETER_VALUE_OFFSET +#define TCP_RESERVED_OFFSET (TCP_PORT_OFFSET + TCP_PORT_LENGTH) +#define TCP_ADDRESS_OFFSET (TCP_RESERVED_OFFSET + TCP_RESERVED_LENGTH) static void -dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) -{ - guint16 port, number_of_addresses, load_policy, load_value; - guint32 reg_life; - gint offset; +dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + tvbuff_t *parameters_tvb; + guint16 port, reserved; - port = tvb_get_ntohs(parameter_tvb, PORT_OFFSET); - number_of_addresses = tvb_get_ntohs(parameter_tvb, NUMBER_OF_ADDRESSES_OFFSET); - proto_tree_add_uint(parameter_tree, hf_asap_parameter_port, parameter_tvb, PORT_OFFSET, PORT_LENGTH, port); - proto_tree_add_uint(parameter_tree, hf_asap_parameter_number_of_addr, parameter_tvb, NUMBER_OF_ADDRESSES_OFFSET, NUMBER_OF_ADDRESSES_LENGTH, number_of_addresses); - - offset = dissect_next_asap_parameters(number_of_addresses, ADDRESS_LIST_OFFSET, parameter_tvb, parameter_tree); - load_policy = tvb_get_ntohs(parameter_tvb, offset + LOAD_POLICY_OFFSET); - load_value = tvb_get_ntohs(parameter_tvb, offset + LOAD_VALUE_OFFSET); - reg_life = tvb_get_ntohs(parameter_tvb, offset + REGISTRATION_LIFE_OFFSET); + port = tvb_get_ntohs(parameter_tvb, TCP_PORT_OFFSET); + reserved = tvb_get_ntohs(parameter_tvb, TCP_RESERVED_OFFSET); - proto_tree_add_uint(parameter_tree, hf_asap_parameter_load_policy, parameter_tvb, offset + LOAD_POLICY_OFFSET, LOAD_POLICY_LENGTH, load_policy); - proto_tree_add_uint(parameter_tree, hf_asap_parameter_load_value, parameter_tvb, offset + LOAD_VALUE_OFFSET, LOAD_VALUE_LENGTH, load_value); - proto_tree_add_uint(parameter_tree, hf_asap_parameter_reg_life, parameter_tvb, offset + REGISTRATION_LIFE_OFFSET, REGISTRATION_LIFE_LENGTH, reg_life); - proto_item_set_text(parameter_item, "Pool element"); + proto_tree_add_uint(parameter_tree, hf_tcp_port, parameter_tvb, TCP_PORT_OFFSET, TCP_PORT_LENGTH, port); + proto_tree_add_uint(parameter_tree, hf_tcp_reserved, parameter_tvb, TCP_RESERVED_OFFSET, TCP_RESERVED_LENGTH, reserved); + + proto_item_set_text(parameter_item, "TCP transport parameter"); + + parameters_tvb = tvb_new_subset(parameter_tvb, TCP_ADDRESS_OFFSET, -1, -1); + dissect_parameters(parameters_tvb, parameter_tree); +} + +#define UDP_PORT_LENGTH 2 +#define UDP_RESERVED_LENGTH 2 +#define UDP_PORT_OFFSET PARAMETER_VALUE_OFFSET +#define UDP_RESERVED_OFFSET (UDP_PORT_OFFSET + UDP_PORT_LENGTH) +#define UDP_ADDRESS_OFFSET (UDP_RESERVED_OFFSET + UDP_RESERVED_LENGTH) + +static void +dissect_udp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + tvbuff_t *parameters_tvb; + guint16 port, reserved; + + port = tvb_get_ntohs(parameter_tvb, UDP_PORT_OFFSET); + reserved = tvb_get_ntohs(parameter_tvb, UDP_RESERVED_OFFSET); + + proto_tree_add_uint(parameter_tree, hf_udp_port, parameter_tvb, UDP_PORT_OFFSET, UDP_PORT_LENGTH, port); + proto_tree_add_uint(parameter_tree, hf_udp_reserved, parameter_tvb, UDP_RESERVED_OFFSET, UDP_RESERVED_LENGTH, reserved); + + proto_item_set_text(parameter_item, "UDP transport parameter"); + + parameters_tvb = tvb_new_subset(parameter_tvb, UDP_ADDRESS_OFFSET, -1, -1); + dissect_parameters(parameters_tvb, parameter_tree); +} + +#define POLICY_TYPE_LENGTH 1 +#define POLICY_VALUE_LENGTH 3 + +#define POLICY_TYPE_OFFSET PARAMETER_VALUE_OFFSET +#define POLICY_VALUE_OFFSET (POLICY_TYPE_OFFSET + POLICY_TYPE_LENGTH) + +#define ROUND_ROBIN_POLICY 1 +#define LEAST_USED_POLICY 2 +#define LEAST_USED_WITH_DEG 3 +#define WEIGHTED_ROUND_ROBIN 4 + +static const value_string policy_type_values[] = { + { ROUND_ROBIN_POLICY, "Round robin" }, + { LEAST_USED_POLICY, "Least used" }, + { LEAST_USED_WITH_DEG, "Least used with degradation" }, + { WEIGHTED_ROUND_ROBIN, "Weighted round robin" }, + { 0, NULL } }; + +static void +dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + guint8 policy_type; + gint32 policy_value; + + policy_type = tvb_get_guint8(parameter_tvb, POLICY_TYPE_OFFSET); + policy_value = tvb_get_ntoh24(parameter_tvb, POLICY_VALUE_OFFSET); + proto_tree_add_uint(parameter_tree, hf_policy_type, parameter_tvb, POLICY_TYPE_OFFSET, POLICY_TYPE_LENGTH, policy_type); + proto_tree_add_int(parameter_tree, hf_policy_value, parameter_tvb, POLICY_VALUE_OFFSET, POLICY_VALUE_LENGTH, policy_value); + + proto_item_set_text(parameter_item, "Pool member selection policy"); } @@ -161,31 +329,112 @@ static void dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, handle_length; - char *handle; + char *handle_ptr; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); handle_length = length - PARAMETER_HEADER_LENGTH; - handle = (char *)tvb_get_ptr(parameter_tvb, POOL_HANDLE_OFFSET, handle_length); - proto_tree_add_string(parameter_tree, hf_asap_parameter_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, handle); - proto_item_set_text(parameter_item, "Pool handle (%.*s)", handle_length, handle); + handle_ptr = (char *)tvb_get_ptr(parameter_tvb, POOL_HANDLE_OFFSET, handle_length); + proto_tree_add_bytes(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, handle_ptr); + proto_item_set_text(parameter_item, "Pool handle"); } -#define SIGNATURE_OFFSET PARAMETER_VALUE_OFFSET +#define PE_PE_IDENTIFIER_LENGTH 4 +#define HOME_ENRP_INDENTIFIER_LENGTH 4 +#define REGISTRATION_LIFE_LENGTH 4 + +#define PE_PE_IDENTIFIER_OFFSET PARAMETER_VALUE_OFFSET +#define HOME_ENRP_INDENTIFIER_OFFSET (PE_PE_IDENTIFIER_OFFSET + PE_PE_IDENTIFIER_LENGTH) +#define REGISTRATION_LIFE_OFFSET (HOME_ENRP_INDENTIFIER_OFFSET + HOME_ENRP_INDENTIFIER_LENGTH) +#define USER_TRANSPORT_PARAMETER_OFFSET (REGISTRATION_LIFE_OFFSET + REGISTRATION_LIFE_LENGTH) static void -dissect_authorization_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint16 length, signature_length; + tvbuff_t *parameters_tvb; + guint32 pe_identifier, home_enrp_identifier; + gint32 reg_life; + + pe_identifier = tvb_get_ntohl(parameter_tvb, PE_PE_IDENTIFIER_OFFSET); + home_enrp_identifier = tvb_get_ntohl(parameter_tvb, HOME_ENRP_INDENTIFIER_OFFSET); + reg_life = tvb_get_ntohl(parameter_tvb, REGISTRATION_LIFE_OFFSET); - length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - signature_length = length - PARAMETER_HEADER_LENGTH; + proto_tree_add_uint(parameter_tree, hf_pe_pe_identifier, parameter_tvb, PE_PE_IDENTIFIER_OFFSET, PE_PE_IDENTIFIER_LENGTH, pe_identifier); + proto_tree_add_uint(parameter_tree, hf_home_enrp_id, parameter_tvb, HOME_ENRP_INDENTIFIER_OFFSET, HOME_ENRP_INDENTIFIER_LENGTH, home_enrp_identifier); + proto_tree_add_int(parameter_tree, hf_reg_life, parameter_tvb, REGISTRATION_LIFE_OFFSET, REGISTRATION_LIFE_LENGTH, reg_life); + + parameters_tvb = tvb_new_subset(parameter_tvb, USER_TRANSPORT_PARAMETER_OFFSET, -1, -1); + dissect_parameters(parameters_tvb, parameter_tree); + + proto_item_set_text(parameter_item, "Pool element"); +} - if (signature_length > 0) - proto_tree_add_bytes(parameter_tree, hf_asap_parameter_signature, parameter_tvb, SIGNATURE_OFFSET, signature_length, - tvb_get_ptr(parameter_tvb, SIGNATURE_OFFSET, signature_length)); +#define SERVER_ID_LENGTH 4 +#define RESERVED_LENGTH 4 - proto_item_set_text(parameter_item, "Authorization signature (%u byte%s)", signature_length, plurality(signature_length, "", "s")); +#define SERVER_ID_OFFSET PARAMETER_VALUE_OFFSET +#define RESERVED_OFFSET (SERVER_ID_OFFSET + SERVER_ID_LENGTH) +#define SERVER_TRANSPORT_OFFSET (RESERVED_OFFSET + RESERVED_LENGTH) + +#define M_BIT_MASK 0x80000000 +#define RESERVED_MASK 0x7fffffff + +static void +dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + tvbuff_t *parameters_tvb; + guint32 server_identifier, reserved; + + server_identifier = tvb_get_ntohl(parameter_tvb, SERVER_ID_OFFSET); + reserved = tvb_get_ntohl(parameter_tvb, RESERVED_OFFSET); + + proto_tree_add_uint(parameter_tree, hf_server_identifier, parameter_tvb, SERVER_ID_OFFSET, SERVER_ID_LENGTH, server_identifier); + proto_tree_add_boolean(parameter_tree, hf_m_bit, parameter_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved); + proto_tree_add_uint(parameter_tree, hf_reserved, parameter_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved); + + proto_item_set_text(parameter_item, "Server information"); + + parameters_tvb = tvb_new_subset(parameter_tvb, SERVER_TRANSPORT_OFFSET, -1, -1); + dissect_parameters(parameters_tvb, parameter_tree); +} + +#define ERROR_CAUSES_OFFSET PARAMETER_VALUE_OFFSET + +static void +dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + tvbuff_t *error_causes_tvb; + + error_causes_tvb = tvb_new_subset(parameter_tvb, ERROR_CAUSES_OFFSET, -1,-1); + dissect_error_causes(error_causes_tvb, parameter_tree); + proto_item_set_text(parameter_item, "Operation Error"); +} + +#define COOKIE_OFFSET PARAMETER_VALUE_OFFSET + +static void +dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + guint16 cookie_length; + + cookie_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; + if (cookie_length > 0) + proto_tree_add_bytes(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, + tvb_get_ptr(parameter_tvb, COOKIE_OFFSET, cookie_length)); + proto_item_set_text(parameter_item, "Cookie (%u byte%s)", cookie_length, plurality(cookie_length, "", "s")); +} + +#define PE_IDENTIFIER_LENGTH 4 +#define PE_IDENTIFIER_OFFSET PARAMETER_VALUE_OFFSET + +static void +dissect_pe_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +{ + guint32 pe_identifer; + + pe_identifer = tvb_get_ntohl(parameter_tvb, PE_IDENTIFIER_OFFSET); + proto_tree_add_uint(parameter_tree, hf_pe_identifier, parameter_tvb, PE_IDENTIFIER_OFFSET, PE_IDENTIFIER_LENGTH, pe_identifer); + proto_item_set_text(parameter_item, "PE identifier: 0x%x", pe_identifer); } static void @@ -199,24 +448,37 @@ dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p parameter_value_length = length - PARAMETER_HEADER_LENGTH; if (parameter_value_length > 0) - proto_tree_add_bytes(parameter_tree, hf_asap_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, + proto_tree_add_bytes(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length)); proto_item_set_text(parameter_item, "Parameter with type %u and %u byte%s value", type, parameter_value_length, plurality(parameter_value_length, "", "s")); } -#define IPV4_ADDRESS_PARAMETER_TYPE 0x01 -#define IPV6_ADDRESS_PARAMETER_TYPE 0x02 -#define POOL_ELEMENT_PARAMETER_TYPE 0x03 -#define POOL_HANDLE_PARAMETER_TYPE 0x04 -#define AUTHORIZATION_PARAMETER_TYPE 0x05 - -static const value_string asap_parameter_type_values[] = { - { IPV4_ADDRESS_PARAMETER_TYPE, "IPV4 address" }, - { IPV6_ADDRESS_PARAMETER_TYPE, "IPV6 address" }, - { POOL_ELEMENT_PARAMETER_TYPE, "Pool element" }, - { POOL_HANDLE_PARAMETER_TYPE, "Pool handle" }, - { AUTHORIZATION_PARAMETER_TYPE, "Authorization parameter" }, +#define IPV4_ADDRESS_PARAMETER_TYPE 0x01 +#define IPV6_ADDRESS_PARAMETER_TYPE 0x02 +#define SCTP_TRANSPORT_PARAMETER_TYPE 0x03 +#define TCP_TRANSPORT_PARAMETER_TYPE 0x04 +#define UDP_TRANSPORT_PARAMETER_TYPE 0x05 +#define POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE 0x06 +#define POOL_HANDLE_PARAMETER_TYPE 0x07 +#define POOL_ELEMENT_PARAMETER_TYPE 0x08 +#define SERVER_INFORMATION_PARAMETER_TYPE 0x09 +#define OPERATION_ERROR_PARAMETER_TYPE 0x0a +#define COOKIE_PARAMETER_TYPE 0x0b +#define PE_IDENTIFIER_PARAMETER_TYPE 0x0c + +static const value_string parameter_type_values[] = { + { IPV4_ADDRESS_PARAMETER_TYPE, "IPV4 address" }, + { IPV6_ADDRESS_PARAMETER_TYPE, "IPV6 address" }, + { SCTP_TRANSPORT_PARAMETER_TYPE, "SCTP transport address" }, + { TCP_TRANSPORT_PARAMETER_TYPE, "TCP transport address" }, + { UDP_TRANSPORT_PARAMETER_TYPE, "UDP transport address" }, + { POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE, "Pool member selection policy" }, + { POOL_HANDLE_PARAMETER_TYPE, "Pool handle" }, + { SERVER_INFORMATION_PARAMETER_TYPE, "Server Information" }, + { OPERATION_ERROR_PARAMETER_TYPE, "Operation error" }, + { COOKIE_PARAMETER_TYPE, "Cookie" }, + { PE_IDENTIFIER_PARAMETER_TYPE, "Pool Element identifier" }, { 0, NULL } }; @@ -240,8 +502,8 @@ dissect_asap_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree) parameter_tree = proto_item_add_subtree(parameter_item, ett_asap_parameter); /* add tag and length to the asap tree */ - proto_tree_add_uint(parameter_tree, hf_asap_parameter_type, parameter_tvb, PARAMETER_TYPE_OFFSET, PARAMETER_TYPE_LENGTH, type); - proto_tree_add_uint(parameter_tree, hf_asap_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); + proto_tree_add_uint(parameter_tree, hf_parameter_type, parameter_tvb, PARAMETER_TYPE_OFFSET, PARAMETER_TYPE_LENGTH, type); + proto_tree_add_uint(parameter_tree, hf_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length); switch(type) { case IPV4_ADDRESS_PARAMETER_TYPE: @@ -250,14 +512,35 @@ dissect_asap_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree) case IPV6_ADDRESS_PARAMETER_TYPE: dissect_ipv6_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case POOL_ELEMENT_PARAMETER_TYPE: - dissect_pool_element_parameter(parameter_tvb, parameter_tree, parameter_item); + case SCTP_TRANSPORT_PARAMETER_TYPE: + dissect_sctp_transport_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case TCP_TRANSPORT_PARAMETER_TYPE: + dissect_tcp_transport_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case UDP_TRANSPORT_PARAMETER_TYPE: + dissect_udp_transport_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE: + dissect_pool_member_selection_policy_parameter(parameter_tvb, parameter_tree, parameter_item); break; case POOL_HANDLE_PARAMETER_TYPE: dissect_pool_handle_parameter(parameter_tvb, parameter_tree, parameter_item); break; - case AUTHORIZATION_PARAMETER_TYPE: - dissect_authorization_parameter(parameter_tvb, parameter_tree, parameter_item); + case POOL_ELEMENT_PARAMETER_TYPE: + dissect_pool_element_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case SERVER_INFORMATION_PARAMETER_TYPE: + dissect_server_information_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case OPERATION_ERROR_PARAMETER_TYPE: + dissect_operation_error_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case COOKIE_PARAMETER_TYPE: + dissect_cookie_parameter(parameter_tvb, parameter_tree, parameter_item); + break; + case PE_IDENTIFIER_PARAMETER_TYPE: + dissect_pe_identifier_parameter(parameter_tvb, parameter_tree, parameter_item); break; default: dissect_unknown_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -265,40 +548,18 @@ dissect_asap_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree) }; if (padding_length > 0) - proto_tree_add_bytes(parameter_tree, hf_asap_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, + proto_tree_add_bytes(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length)); } - -static gint -dissect_next_asap_parameters(guint number_of_parameters, gint initial_offset, tvbuff_t *parameters_tvb, proto_tree *asap_tree) -{ - gint offset, length, padding_length, total_length; - tvbuff_t *parameter_tvb; - guint parameter_number; - - offset = initial_offset; - for(parameter_number=1; parameter_number <= number_of_parameters; parameter_number++) { - length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); - padding_length = nr_of_padding_bytes(length); - total_length = length + padding_length; - /* create a tvb for the parameter including the padding bytes */ - parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length); - dissect_asap_parameter(parameter_tvb, asap_tree); - /* get rid of the handled parameter */ - offset += total_length; - } - return(offset); -} - static void -dissect_all_asap_parameters(tvbuff_t *parameters_tvb, proto_tree *asap_tree) +dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree) { gint offset, length, padding_length, total_length, remaining_length; tvbuff_t *parameter_tvb; offset = 0; - while((remaining_length = tvb_reported_length_remaining(parameters_tvb, offset))) { + while((remaining_length = tvb_length_remaining(parameters_tvb, offset))) { length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); padding_length = nr_of_padding_bytes(length); if (remaining_length >= length) @@ -306,41 +567,13 @@ dissect_all_asap_parameters(tvbuff_t *parameters_tvb, proto_tree *asap_tree) else total_length = length + padding_length; /* create a tvb for the parameter including the padding bytes */ - parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length); - dissect_asap_parameter(parameter_tvb, asap_tree); + parameter_tvb = tvb_new_subset(parameters_tvb, offset, total_length, total_length); + dissect_asap_parameter(parameter_tvb, tree); /* get rid of the handled parameter */ offset += total_length; } } -#define ACTION_CODE_LENGTH 1 -#define RESULT_CODE_LENGTH 1 -#define RESERVED_LENGTH 2 - -#define ACTION_CODE_OFFSET 0 -#define RESULT_CODE_OFFSET (ACTION_CODE_OFFSET + ACTION_CODE_LENGTH) -#define RESERVED_OFFSET (RESULT_CODE_OFFSET + RESULT_CODE_LENGTH) - -static void -dissect_registration_response_message(tvbuff_t *parameters_tvb, proto_tree *asap_tree) -{ - gint offset; - guint8 action_code, result_code; - guint16 reserved; - tvbuff_t *last_parameter_tvb; - - offset = dissect_next_asap_parameters(2, 0, parameters_tvb, asap_tree); - action_code = tvb_get_guint8(parameters_tvb, offset + ACTION_CODE_OFFSET); - result_code = tvb_get_guint8(parameters_tvb, offset + RESULT_CODE_OFFSET); - reserved = tvb_get_ntohs(parameters_tvb, offset + RESERVED_OFFSET); - proto_tree_add_uint(asap_tree, hf_asap_parameter_action_code, parameters_tvb, offset + ACTION_CODE_OFFSET, ACTION_CODE_LENGTH, action_code); - proto_tree_add_uint(asap_tree, hf_asap_parameter_result_code, parameters_tvb, offset + RESULT_CODE_OFFSET, RESULT_CODE_LENGTH, result_code); - proto_tree_add_uint(asap_tree, hf_asap_parameter_reserved, parameters_tvb, offset + RESERVED_OFFSET, RESERVED_LENGTH, reserved); - - last_parameter_tvb = tvb_new_subset(parameters_tvb, offset + 4 , -1, -1); - dissect_all_asap_parameters(last_parameter_tvb, asap_tree); -} - #define MESSAGE_TYPE_LENGTH 1 #define MESSAGE_FLAGS_LENGTH 1 #define MESSAGE_LENGTH_LENGTH 2 @@ -353,29 +586,37 @@ dissect_registration_response_message(tvbuff_t *parameters_tvb, proto_tree *asap #define REGISTRATION_MESSAGE_TYPE 0x01 #define DEREGISTRATION_MESSAGE_TYPE 0x02 #define REGISTRATION_RESPONSE_MESSAGE_TYPE 0x03 -#define NAME_RESOLUTION_MESSAGE_TYPE 0x04 -#define NAME_RESOLUTION_RESPONSE_MESSAGE_TYPE 0x05 -#define NAME_UNKNOWN_MESSAGE_TYPE 0x06 +#define DEREGISTRATION_RESPONSE_MESSAGE_TYPE 0x04 +#define NAME_RESOLUTION_MESSAGE_TYPE 0x05 +#define NAME_RESOLUTION_RESPONSE_MESSAGE_TYPE 0x06 +#define NAME_UNKNOWN_MESSAGE_TYPE 0x07 #define ENDPOINT_KEEP_ALIVE_MESSAGE_TYPE 0x08 -#define ENDPOINT_UNREACHABLE_MESSAGE_TYPE 0x09 -#define SERVER_HUNT_MESSAGE_TYPE 0x0a -#define SERVER_HUNT_RESPONSE_MESSAGE_TYPE 0x0b - -static const value_string asap_message_type_values[] = { +#define ENDPOINT_KEEP_ALIVE_ACK_MESSAGE_TYPE 0x09 +#define ENDPOINT_UNREACHABLE_MESSAGE_TYPE 0x0a +#define SERVER_HUNT_MESSAGE_TYPE 0x0b +#define SERVER_HUNT_RESPONSE_MESSAGE_TYPE 0x0c +#define COOKIE_MESSAGE_TYPE 0x0d +#define COOKIE_ECHO_MESSAGE_TYPE 0x0e + +static const value_string message_type_values[] = { { REGISTRATION_MESSAGE_TYPE, "Registration" }, { DEREGISTRATION_MESSAGE_TYPE, "Deregistration" }, { REGISTRATION_RESPONSE_MESSAGE_TYPE, "Registration response" }, + { DEREGISTRATION_RESPONSE_MESSAGE_TYPE, "Deregistration response" }, { NAME_RESOLUTION_MESSAGE_TYPE, "Name resolution" }, { NAME_RESOLUTION_RESPONSE_MESSAGE_TYPE, "Name resolution response" }, { NAME_UNKNOWN_MESSAGE_TYPE, "Name unknown" }, { ENDPOINT_KEEP_ALIVE_MESSAGE_TYPE, "Endpoint keep alive" }, + { ENDPOINT_KEEP_ALIVE_ACK_MESSAGE_TYPE, "Endpoint keep alive acknowledgement" }, { ENDPOINT_UNREACHABLE_MESSAGE_TYPE, "Endpoint unreachable" }, { SERVER_HUNT_MESSAGE_TYPE, "Server hunt" }, { SERVER_HUNT_RESPONSE_MESSAGE_TYPE, "Server hunt response" }, - { 0, NULL } }; + { COOKIE_MESSAGE_TYPE, "Cookie" }, + { COOKIE_ECHO_MESSAGE_TYPE, "Cookie echo" }, + { 0, NULL } }; static void -dissect_asap_message(tvbuff_t *message_tvb, proto_tree *asap_tree) +dissect_asap_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *asap_tree) { tvbuff_t *parameters_tvb; guint8 type, flags; @@ -385,22 +626,17 @@ dissect_asap_message(tvbuff_t *message_tvb, proto_tree *asap_tree) flags = tvb_get_guint8(message_tvb, MESSAGE_FLAGS_OFFSET); length = tvb_get_ntohs (message_tvb, MESSAGE_LENGTH_OFFSET); - if (asap_tree) { - proto_tree_add_uint(asap_tree, hf_asap_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, type); - proto_tree_add_uint(asap_tree, hf_asap_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, flags); - proto_tree_add_uint(asap_tree, hf_asap_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, length); + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(type, message_type_values, "Unknown ASAP type")); + col_append_str(pinfo->cinfo, COL_INFO, " "); } - - parameters_tvb = tvb_new_subset(message_tvb, MESSAGE_VALUE_OFFSET, -1, -1); - switch(type) { - case REGISTRATION_RESPONSE_MESSAGE_TYPE: - dissect_registration_response_message(parameters_tvb, asap_tree); - break; - default: - dissect_all_asap_parameters(parameters_tvb, asap_tree); - break; - } - + if (asap_tree) { + proto_tree_add_uint(asap_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, type); + proto_tree_add_uint(asap_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, flags); + proto_tree_add_uint(asap_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, length); + parameters_tvb = tvb_new_subset(message_tvb, MESSAGE_VALUE_OFFSET, -1, -1); + dissect_parameters(parameters_tvb, asap_tree); + } } static void @@ -423,117 +659,173 @@ dissect_asap(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) asap_tree = NULL; }; /* dissect the message */ - dissect_asap_message(message_tvb, asap_tree); + dissect_asap_message(message_tvb, pinfo, asap_tree); } /* Register the protocol with Ethereal */ void proto_register_asap(void) -{ +{ /* Setup list of header fields */ static hf_register_info hf[] = { - { &hf_asap_message_type, + { &hf_message_type, { "Type", "asap.message_type", - FT_UINT8, BASE_DEC, VALS(asap_message_type_values), 0x0, + FT_UINT8, BASE_DEC, VALS(message_type_values), 0x0, "", HFILL } }, - { &hf_asap_message_flags, + { &hf_message_flags, { "Flags", "asap.message_flags", - FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL } + FT_UINT8, BASE_HEX, NULL, 0x0, + "", HFILL } }, - { &hf_asap_message_length, + { &hf_message_length, { "Length", "asap.message_length", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } }, - { &hf_asap_parameter_type, - { "Parameter Type", "asap.parameter_type", - FT_UINT16, BASE_HEX, VALS(asap_parameter_type_values), 0x0, - "", HFILL } + { &hf_cause_code, + { "Cause code", "asap.cause.code", + FT_UINT16, BASE_HEX, VALS(cause_code_values), 0x0, + "", HFILL } }, - { &hf_asap_parameter_length, - { "Parameter length", "asap.message_length", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_value, - { "Parameter value", "asap.parameter_value", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_padding, - { "Padding", "asap.parameter_padding", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - {&hf_asap_parameter_ipv4_address, - { "IP Version 4 address", "asap.ipv4_address", + { &hf_cause_length, + { "Cause length", "asap.cause.length", + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_cause_info, + { "Cause info", "asap.cause.info", + FT_BYTES, BASE_NONE, NULL, 0x0, + "", HFILL } + }, + { &hf_cause_padding, + { "Padding", "asap.cause.padding", + FT_BYTES, BASE_NONE, NULL, 0x0, + "", HFILL } + }, + { &hf_parameter_type, + { "Parameter Type", "asap.parameter.type", + FT_UINT16, BASE_HEX, VALS(parameter_type_values), 0x0, + "", HFILL } + }, + { &hf_parameter_length, + { "Parameter length", "asap.parameter.length", + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_parameter_value, + { "Parameter value", "asap.parameter.value", + FT_BYTES, BASE_NONE, NULL, 0x0, + "", HFILL } + }, + { &hf_parameter_padding, + { "Padding", "asap.parameter.padding", + FT_BYTES, BASE_NONE, NULL, 0x0, + "", HFILL } + }, + {&hf_parameter_ipv4_address, + { "IP Version 4 address", "asap.ipv4_address.ipv4_address", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL } }, - {&hf_asap_parameter_ipv6_address, - { "IP Version 6 address", "asap.ipv6_address", + {&hf_parameter_ipv6_address, + { "IP Version 6 address", "asap.ipv6_address.ipv6_address", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL } }, - { &hf_asap_parameter_port, - { "SCTP port", "asap.message_port", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_number_of_addr, - { "Number of IP addresses", "asap.message_number_of_addresses", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_load_policy, - { "Load policy", "asap.message_load_policy", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_load_value, - { "Load value", "asap.message_load_value", - FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_reg_life, - { "Registration life", "asap.message_registration_life", - FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_pool_handle, - { "Pool handle", "asap.pool_handle", - FT_STRING, BASE_DEC, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_signature, - { "Signature", "asap.parameter_signature", - FT_BYTES, BASE_NONE, NULL, 0x0, - "", HFILL } - }, - { &hf_asap_parameter_action_code, - { "Action code", "asap.message_action_code", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + { &hf_sctp_port, + { "Port", "asap.sctp_transport.port", + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } }, - { &hf_asap_parameter_result_code, - { "Result code", "asap.message_result_code", - FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL } + { &hf_sctp_reserved, + { "Reserved", "asap.sctp_transport.reserved", + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_tcp_port, + { "Port", "asap.tcp_transport.port", + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_tcp_reserved, + { "Reserved", "asap.tcp_transport.reserved", + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_udp_port, + { "Port", "asap.udp_transport.port", + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_udp_reserved, + { "Reserved", "asap.udp_transport.reserved", + FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_policy_type, + { "Policy type", "asap.pool_member_slection_policy.type", + FT_UINT8, BASE_DEC, VALS(policy_type_values), 0x0, + "", HFILL } + }, + { &hf_policy_value, + { "Policy value", "asap.pool_member_slection_policy.value", + FT_INT24, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_pool_handle, + { "Pool handle", "asap.pool_handle.pool_handle", + FT_BYTES, BASE_HEX, NULL, 0x0, + "", HFILL } }, - { &hf_asap_parameter_reserved, - { "Reserved", "asap.message_reserved", - FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL } + { &hf_pe_pe_identifier, + { "PE identifier", "asap.pool_element.pe_identifier", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_home_enrp_id, + { "Home ENRP server identifier", "asap.pool_element.home_enrp_server_identifier", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } }, + { &hf_reg_life, + { "Registration life", "asap.pool_element.registration_life", + FT_INT32, BASE_DEC, NULL, 0x0, + "", HFILL } + }, + { &hf_server_identifier, + { "Server identifier", "asap.server_information.server_identifier", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_m_bit, + { "M-Bit", "asap.server_information.m_bit", + FT_BOOLEAN, 32, NULL, M_BIT_MASK, + "", HFILL } + }, + { &hf_reserved, + { "Reserved", "asap.server_information.reserved", + FT_UINT32, BASE_HEX, NULL, RESERVED_MASK, + "", HFILL } + }, + { &hf_cookie, + { "Cookie", "asap.cookie.cookie", + FT_BYTES, BASE_HEX, NULL, 0x0, + "", HFILL } + }, + { &hf_pe_identifier, + { "PE identifier", "asap.pe_identifier.pe_identifier", + FT_UINT32, BASE_HEX, NULL, 0x0, + "", HFILL } + }, }; /* Setup protocol subtree array */ static gint *ett[] = { &ett_asap, &ett_asap_parameter, + &ett_asap_cause, }; /* Register the protocol name and description */ |