forked from osmocom/wireshark
Updated to support latest versions of the Internet Drafts:
http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-02.txt http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-05.txt svn path=/trunk/; revision=6949
This commit is contained in:
Michael Tüxen
parent
91767f9d29
commit
0930480b09
472
packet-asap.c
472
packet-asap.c
|
|
@ -1,12 +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-common-param-01.txt
|
||||
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-04.txt
|
||||
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-02.txt
|
||||
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-05.txt
|
||||
*
|
||||
* Copyright 2002, Michael Tuexen <Michael.Tuexen@icn.siemens.de>
|
||||
* Copyright 2002, Michael Tuexen <Michael.Tuexen@siemens.com>
|
||||
*
|
||||
* $Id: packet-asap.c,v 1.7 2003/01/14 23:53:32 guy Exp $
|
||||
* $Id: packet-asap.c,v 1.8 2003/01/20 22:49:36 tuexen Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -77,20 +77,8 @@ static gint ett_asap_cause = -1;
|
|||
static void
|
||||
dissect_parameters(tvbuff_t *, proto_tree *);
|
||||
|
||||
/* Helper functions */
|
||||
|
||||
static guint
|
||||
nr_of_padding_bytes (guint length)
|
||||
{
|
||||
guint remainder;
|
||||
|
||||
remainder = length % 4;
|
||||
|
||||
if (remainder == 0)
|
||||
return 0;
|
||||
else
|
||||
return 4 - remainder;
|
||||
}
|
||||
#define NETWORK_BYTE_ORDER FALSE
|
||||
#define ADD_PADDING(x) ((((x) + 3) >> 2) << 2)
|
||||
|
||||
/* Dissectors for error causes */
|
||||
#define CAUSE_CODE_LENGTH 2
|
||||
|
|
@ -113,42 +101,41 @@ dissect_unknown_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *c
|
|||
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"));
|
||||
proto_item_append_text(cause_item, " (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
|
||||
#define INVALID_VALUES 3
|
||||
#define NON_UNIQUE_PE_IDENTIFIER 4
|
||||
#define POOLING_POLICY_INCONSISTENT_CAUSE_CODE 5
|
||||
#define LACK_OF_RESOURCES_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" },
|
||||
{ UNRECOGNIZED_PARAMETER_CAUSE_CODE, "Unrecognized parameter" },
|
||||
{ UNRECONGNIZED_MESSAGE_CAUSE_CODE, "Unrecognized message" },
|
||||
{ INVALID_VALUES, "Invalid values" },
|
||||
{ NON_UNIQUE_PE_IDENTIFIER, "Non-unique PE identifier" },
|
||||
{ POOLING_POLICY_INCONSISTENT_CAUSE_CODE, "Pooling policy inconsistent" },
|
||||
{ 0, NULL } };
|
||||
{ LACK_OF_RESOURCES_CAUSE_CODE, "Lack of resources" },
|
||||
{ 0, NULL } };
|
||||
|
||||
static void
|
||||
dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
guint16 code, length, padding_length, total_length;
|
||||
guint16 code, length, padding_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;
|
||||
padding_length = tvb_length(cause_tvb) - length;
|
||||
|
||||
cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, total_length, "BAD ERROR CAUSE");
|
||||
cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, tvb_length(cause_tvb), val_to_str(code, cause_code_values, "Unknown 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);
|
||||
proto_tree_add_item(cause_tree, hf_cause_code, cause_tvb, CAUSE_CODE_OFFSET, CAUSE_CODE_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(cause_tree, hf_cause_length, cause_tvb, CAUSE_LENGTH_OFFSET, CAUSE_LENGTH_LENGTH, NETWORK_BYTE_ORDER);
|
||||
|
||||
switch(code) {
|
||||
default:
|
||||
|
|
@ -156,22 +143,20 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree)
|
|||
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));
|
||||
proto_tree_add_item(cause_tree, hf_cause_padding, cause_tvb, CAUSE_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER);
|
||||
}
|
||||
|
||||
static void
|
||||
dissect_error_causes(tvbuff_t *error_causes_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
guint16 length, padding_length, total_length;
|
||||
guint16 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;
|
||||
total_length = ADD_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;
|
||||
|
|
@ -195,11 +180,8 @@ dissect_error_causes(tvbuff_t *error_causes_tvb, proto_tree *parameter_tree)
|
|||
static void
|
||||
dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
|
||||
{
|
||||
guint32 ipv4_address;
|
||||
|
||||
tvb_memcpy(parameter_tvb, (guint8 *)&ipv4_address, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH);
|
||||
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));
|
||||
proto_tree_add_item(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_item_append_text(parameter_item, " (%s)", ip_to_str((const guint8 *)tvb_get_ptr(parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH)));
|
||||
}
|
||||
|
||||
#define IPV6_ADDRESS_LENGTH 16
|
||||
|
|
@ -208,14 +190,8 @@ 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)
|
||||
{
|
||||
const guint8 *ip6_address_ptr;
|
||||
|
||||
ip6_address_ptr = 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,
|
||||
ip6_address_ptr);
|
||||
|
||||
proto_item_set_text(parameter_item, "IPV6 address parameter: %s",
|
||||
ip6_to_str((const struct e_in6_addr *)ip6_address_ptr));
|
||||
proto_tree_add_item(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_item_append_text(parameter_item, " (%s)", ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH)));
|
||||
}
|
||||
|
||||
#define SCTP_PORT_LENGTH 2
|
||||
|
|
@ -225,18 +201,12 @@ dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot
|
|||
#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)
|
||||
dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
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");
|
||||
proto_tree_add_item(parameter_tree, hf_sctp_port, parameter_tvb, SCTP_PORT_OFFSET, SCTP_PORT_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(parameter_tree, hf_sctp_reserved, parameter_tvb, SCTP_RESERVED_OFFSET, SCTP_RESERVED_LENGTH, NETWORK_BYTE_ORDER);
|
||||
|
||||
parameters_tvb = tvb_new_subset(parameter_tvb, SCTP_ADDRESS_OFFSET, -1, -1);
|
||||
dissect_parameters(parameters_tvb, parameter_tree);
|
||||
|
|
@ -249,18 +219,12 @@ dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_
|
|||
#define TCP_ADDRESS_OFFSET (TCP_RESERVED_OFFSET + TCP_RESERVED_LENGTH)
|
||||
|
||||
static void
|
||||
dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
|
||||
dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
tvbuff_t *parameters_tvb;
|
||||
guint16 port, reserved;
|
||||
|
||||
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_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");
|
||||
proto_tree_add_item(parameter_tree, hf_tcp_port, parameter_tvb, TCP_PORT_OFFSET, TCP_PORT_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(parameter_tree, hf_tcp_reserved, parameter_tvb, TCP_RESERVED_OFFSET, TCP_RESERVED_LENGTH, NETWORK_BYTE_ORDER);
|
||||
|
||||
parameters_tvb = tvb_new_subset(parameter_tvb, TCP_ADDRESS_OFFSET, -1, -1);
|
||||
dissect_parameters(parameters_tvb, parameter_tree);
|
||||
|
|
@ -273,18 +237,12 @@ dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t
|
|||
#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)
|
||||
dissect_udp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
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");
|
||||
proto_tree_add_item(parameter_tree, hf_udp_port, parameter_tvb, UDP_PORT_OFFSET, UDP_PORT_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(parameter_tree, hf_udp_reserved, parameter_tvb, UDP_RESERVED_OFFSET, UDP_RESERVED_LENGTH, NETWORK_BYTE_ORDER);
|
||||
|
||||
parameters_tvb = tvb_new_subset(parameter_tvb, UDP_ADDRESS_OFFSET, -1, -1);
|
||||
dissect_parameters(parameters_tvb, parameter_tree);
|
||||
|
|
@ -309,34 +267,21 @@ static const value_string policy_type_values[] = {
|
|||
{ 0, NULL } };
|
||||
|
||||
static void
|
||||
dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
|
||||
dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
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");
|
||||
|
||||
proto_tree_add_item(parameter_tree, hf_policy_type, parameter_tvb, POLICY_TYPE_OFFSET, POLICY_TYPE_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(parameter_tree, hf_policy_value, parameter_tvb, POLICY_VALUE_OFFSET, POLICY_VALUE_LENGTH, NETWORK_BYTE_ORDER);
|
||||
}
|
||||
|
||||
#define POOL_HANDLE_OFFSET PARAMETER_VALUE_OFFSET
|
||||
|
||||
static void
|
||||
dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
|
||||
dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
guint16 length, handle_length;
|
||||
const char *handle_ptr;
|
||||
guint16 handle_length;
|
||||
|
||||
length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
|
||||
|
||||
handle_length = length - PARAMETER_HEADER_LENGTH;
|
||||
handle_ptr = (const 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");
|
||||
handle_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
|
||||
proto_tree_add_item(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, NETWORK_BYTE_ORDER);
|
||||
}
|
||||
|
||||
#define PE_PE_IDENTIFIER_LENGTH 4
|
||||
|
|
@ -349,24 +294,16 @@ dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
|
|||
#define USER_TRANSPORT_PARAMETER_OFFSET (REGISTRATION_LIFE_OFFSET + REGISTRATION_LIFE_LENGTH)
|
||||
|
||||
static void
|
||||
dissect_pool_element_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)
|
||||
{
|
||||
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);
|
||||
|
||||
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);
|
||||
proto_tree_add_item(parameter_tree, hf_pe_pe_identifier, parameter_tvb, PE_PE_IDENTIFIER_OFFSET, PE_PE_IDENTIFIER_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(parameter_tree, hf_home_enrp_id, parameter_tvb, HOME_ENRP_INDENTIFIER_OFFSET, HOME_ENRP_INDENTIFIER_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(parameter_tree, hf_reg_life, parameter_tvb, REGISTRATION_LIFE_OFFSET, REGISTRATION_LIFE_LENGTH, NETWORK_BYTE_ORDER);
|
||||
|
||||
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");
|
||||
}
|
||||
|
||||
#define SERVER_ID_LENGTH 4
|
||||
|
|
@ -380,19 +317,13 @@ dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr
|
|||
#define RESERVED_MASK 0x7fffffff
|
||||
|
||||
static void
|
||||
dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
|
||||
dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
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");
|
||||
proto_tree_add_item(parameter_tree, hf_server_identifier, parameter_tvb, SERVER_ID_OFFSET, SERVER_ID_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(parameter_tree, hf_m_bit, parameter_tvb, RESERVED_OFFSET, RESERVED_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(parameter_tree, hf_reserved, parameter_tvb, RESERVED_OFFSET, RESERVED_LENGTH, NETWORK_BYTE_ORDER);
|
||||
|
||||
parameters_tvb = tvb_new_subset(parameter_tvb, SERVER_TRANSPORT_OFFSET, -1, -1);
|
||||
dissect_parameters(parameters_tvb, parameter_tree);
|
||||
|
|
@ -401,13 +332,12 @@ dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
|
|||
#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)
|
||||
dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
|
||||
{
|
||||
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
|
||||
|
|
@ -419,9 +349,8 @@ dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, pr
|
|||
|
||||
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"));
|
||||
proto_tree_add_item(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, NETWORK_BYTE_ORDER);
|
||||
proto_item_append_text(parameter_item, " (%u byte%s)", cookie_length, plurality(cookie_length, "", "s"));
|
||||
}
|
||||
|
||||
#define PE_IDENTIFIER_LENGTH 4
|
||||
|
|
@ -430,28 +359,22 @@ dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, pr
|
|||
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);
|
||||
proto_tree_add_item(parameter_tree, hf_pe_identifier, parameter_tvb, PE_IDENTIFIER_OFFSET, PE_IDENTIFIER_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_item_append_text(parameter_item, " (0x%x)", tvb_get_ntohl(parameter_tvb, PE_IDENTIFIER_OFFSET));
|
||||
}
|
||||
|
||||
static void
|
||||
dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
|
||||
{
|
||||
guint16 type, length, parameter_value_length;
|
||||
guint16 type, parameter_value_length;
|
||||
|
||||
type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET);
|
||||
length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
|
||||
|
||||
parameter_value_length = length - PARAMETER_HEADER_LENGTH;
|
||||
type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET);
|
||||
parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
|
||||
|
||||
if (parameter_value_length > 0)
|
||||
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_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, NETWORK_BYTE_ORDER);
|
||||
|
||||
proto_item_set_text(parameter_item, "Parameter with type %u and %u byte%s value", type, parameter_value_length, plurality(parameter_value_length, "", "s"));
|
||||
proto_item_append_text(parameter_item, " (type %u and %u byte%s value)", type, parameter_value_length, plurality(parameter_value_length, "", "s"));
|
||||
}
|
||||
|
||||
#define IPV4_ADDRESS_PARAMETER_TYPE 0x01
|
||||
|
|
@ -475,35 +398,33 @@ static const value_string parameter_type_values[] = {
|
|||
{ UDP_TRANSPORT_PARAMETER_TYPE, "UDP transport address" },
|
||||
{ POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE, "Pool member selection policy" },
|
||||
{ POOL_HANDLE_PARAMETER_TYPE, "Pool handle" },
|
||||
{ POOL_ELEMENT_PARAMETER_TYPE, "Pool element" },
|
||||
{ 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 } };
|
||||
{ 0, NULL } };
|
||||
|
||||
|
||||
static void
|
||||
dissect_asap_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree)
|
||||
dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree)
|
||||
{
|
||||
guint16 type, length, padding_length, total_length;
|
||||
guint16 type, length, padding_length;
|
||||
proto_item *parameter_item;
|
||||
proto_tree *parameter_tree;
|
||||
|
||||
/* extract tag and length from the parameter */
|
||||
type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_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(asap_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, total_length, "Incomplete parameter");
|
||||
parameter_item = proto_tree_add_text(asap_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(type, parameter_type_values, "Unknown parameter"));
|
||||
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_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);
|
||||
proto_tree_add_item(parameter_tree, hf_parameter_type, parameter_tvb, PARAMETER_TYPE_OFFSET, PARAMETER_TYPE_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(type) {
|
||||
case IPV4_ADDRESS_PARAMETER_TYPE:
|
||||
|
|
@ -513,28 +434,28 @@ dissect_asap_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree)
|
|||
dissect_ipv6_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
break;
|
||||
case SCTP_TRANSPORT_PARAMETER_TYPE:
|
||||
dissect_sctp_transport_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
dissect_sctp_transport_parameter(parameter_tvb, parameter_tree);
|
||||
break;
|
||||
case TCP_TRANSPORT_PARAMETER_TYPE:
|
||||
dissect_tcp_transport_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
dissect_tcp_transport_parameter(parameter_tvb, parameter_tree);
|
||||
break;
|
||||
case UDP_TRANSPORT_PARAMETER_TYPE:
|
||||
dissect_udp_transport_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
dissect_udp_transport_parameter(parameter_tvb, parameter_tree);
|
||||
break;
|
||||
case POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE:
|
||||
dissect_pool_member_selection_policy_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
dissect_pool_member_selection_policy_parameter(parameter_tvb, parameter_tree);
|
||||
break;
|
||||
case POOL_HANDLE_PARAMETER_TYPE:
|
||||
dissect_pool_handle_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
dissect_pool_handle_parameter(parameter_tvb, parameter_tree);
|
||||
break;
|
||||
case POOL_ELEMENT_PARAMETER_TYPE:
|
||||
dissect_pool_element_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
dissect_pool_element_parameter(parameter_tvb, parameter_tree);
|
||||
break;
|
||||
case SERVER_INFORMATION_PARAMETER_TYPE:
|
||||
dissect_server_information_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
dissect_server_information_parameter(parameter_tvb, parameter_tree);
|
||||
break;
|
||||
case OPERATION_ERROR_PARAMETER_TYPE:
|
||||
dissect_operation_error_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
dissect_operation_error_parameter(parameter_tvb, parameter_tree);
|
||||
break;
|
||||
case COOKIE_PARAMETER_TYPE:
|
||||
dissect_cookie_parameter(parameter_tvb, parameter_tree, parameter_item);
|
||||
|
|
@ -548,27 +469,24 @@ dissect_asap_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree)
|
|||
};
|
||||
|
||||
if (padding_length > 0)
|
||||
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));
|
||||
proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER);
|
||||
}
|
||||
|
||||
static void
|
||||
dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *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_length_remaining(parameters_tvb, offset))) {
|
||||
length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET);
|
||||
padding_length = nr_of_padding_bytes(length);
|
||||
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);
|
||||
dissect_asap_parameter(parameter_tvb, tree);
|
||||
dissect_parameter(parameter_tvb, tree);
|
||||
/* get rid of the handled parameter */
|
||||
offset += total_length;
|
||||
}
|
||||
|
|
@ -579,8 +497,8 @@ dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree)
|
|||
#define MESSAGE_LENGTH_LENGTH 2
|
||||
|
||||
#define MESSAGE_TYPE_OFFSET 0
|
||||
#define MESSAGE_FLAGS_OFFSET (MESSAGE_TYPE_OFFSET + MESSAGE_TYPE_LENGTH)
|
||||
#define MESSAGE_LENGTH_OFFSET (MESSAGE_FLAGS_OFFSET + MESSAGE_FLAGS_LENGTH)
|
||||
#define MESSAGE_FLAGS_OFFSET (MESSAGE_TYPE_OFFSET + MESSAGE_TYPE_LENGTH)
|
||||
#define MESSAGE_LENGTH_OFFSET (MESSAGE_FLAGS_OFFSET + MESSAGE_FLAGS_LENGTH)
|
||||
#define MESSAGE_VALUE_OFFSET (MESSAGE_LENGTH_OFFSET + MESSAGE_LENGTH_LENGTH)
|
||||
|
||||
#define REGISTRATION_MESSAGE_TYPE 0x01
|
||||
|
|
@ -589,14 +507,14 @@ dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree)
|
|||
#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_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
|
||||
#define ENDPOINT_KEEP_ALIVE_MESSAGE_TYPE 0x07
|
||||
#define ENDPOINT_KEEP_ALIVE_ACK_MESSAGE_TYPE 0x08
|
||||
#define ENDPOINT_UNREACHABLE_MESSAGE_TYPE 0x09
|
||||
#define SERVER_ANNOUNCE_MESSAGE_TYPE 0x0a
|
||||
#define COOKIE_MESSAGE_TYPE 0x0b
|
||||
#define COOKIE_ECHO_MESSAGE_TYPE 0x0c
|
||||
#define BUSINESS_CARD_MESSAGE_TYPE 0x0d
|
||||
#define PEER_ERROR_MESSAGE_TYPE 0x0e
|
||||
|
||||
static const value_string message_type_values[] = {
|
||||
{ REGISTRATION_MESSAGE_TYPE, "Registration" },
|
||||
|
|
@ -605,35 +523,29 @@ static const value_string message_type_values[] = {
|
|||
{ 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" },
|
||||
{ SERVER_ANNOUNCE_MESSAGE_TYPE, "Server announce" },
|
||||
{ COOKIE_MESSAGE_TYPE, "Cookie" },
|
||||
{ COOKIE_ECHO_MESSAGE_TYPE, "Cookie echo" },
|
||||
{ BUSINESS_CARD_MESSAGE_TYPE, "Business card" },
|
||||
{ PEER_ERROR_MESSAGE_TYPE, "Peer error" },
|
||||
{ 0, NULL } };
|
||||
|
||||
static void
|
||||
dissect_asap_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *asap_tree)
|
||||
{
|
||||
tvbuff_t *parameters_tvb;
|
||||
guint8 type, flags;
|
||||
guint16 length;
|
||||
|
||||
type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET);
|
||||
flags = tvb_get_guint8(message_tvb, MESSAGE_FLAGS_OFFSET);
|
||||
length = tvb_get_ntohs (message_tvb, MESSAGE_LENGTH_OFFSET);
|
||||
|
||||
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, val_to_str(tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET), message_type_values, "Unknown ASAP type"));
|
||||
col_append_str(pinfo->cinfo, COL_INFO, " ");
|
||||
}
|
||||
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);
|
||||
proto_tree_add_item(asap_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(asap_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, NETWORK_BYTE_ORDER);
|
||||
proto_tree_add_item(asap_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, NETWORK_BYTE_ORDER);
|
||||
parameters_tvb = tvb_new_subset(message_tvb, MESSAGE_VALUE_OFFSET, -1, -1);
|
||||
dissect_parameters(parameters_tvb, asap_tree);
|
||||
}
|
||||
|
|
@ -669,156 +581,36 @@ proto_register_asap(void)
|
|||
|
||||
/* Setup list of header fields */
|
||||
static hf_register_info hf[] = {
|
||||
{ &hf_message_type,
|
||||
{ "Type", "asap.message_type",
|
||||
FT_UINT8, BASE_DEC, VALS(message_type_values), 0x0,
|
||||
"", HFILL }
|
||||
},
|
||||
{ &hf_message_flags,
|
||||
{ "Flags", "asap.message_flags",
|
||||
FT_UINT8, BASE_HEX, NULL, 0x0,
|
||||
"", HFILL }
|
||||
},
|
||||
{ &hf_message_length,
|
||||
{ "Length", "asap.message_length",
|
||||
FT_UINT16, BASE_DEC, NULL, 0x0,
|
||||
"", HFILL }
|
||||
},
|
||||
{ &hf_cause_code,
|
||||
{ "Cause code", "asap.cause.code",
|
||||
FT_UINT16, BASE_HEX, VALS(cause_code_values), 0x0,
|
||||
"", HFILL }
|
||||
},
|
||||
{ &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_parameter_ipv6_address,
|
||||
{ "IP Version 6 address", "asap.ipv6_address.ipv6_address",
|
||||
FT_IPv6, BASE_NONE, NULL, 0x0,
|
||||
"", HFILL }
|
||||
},
|
||||
{ &hf_sctp_port,
|
||||
{ "Port", "asap.sctp_transport.port",
|
||||
FT_UINT16, 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_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 }
|
||||
},
|
||||
{ &hf_message_type, { "Type", "asap.message_type", FT_UINT8, BASE_DEC, VALS(message_type_values), 0x0, "", HFILL } },
|
||||
{ &hf_message_flags, { "Flags", "asap.message_flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_message_length, { "Length", "asap.message_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_cause_code, { "Cause code", "asap.cause.code", FT_UINT16, BASE_HEX, VALS(cause_code_values), 0x0, "", HFILL } },
|
||||
{ &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_parameter_ipv6_address, { "IP Version 6 address", "asap.ipv6_address.ipv6_address", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_sctp_port, { "Port", "asap.sctp_transport.port", FT_UINT16, 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_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 */
|
||||
|
|
@ -844,6 +636,4 @@ proto_reg_handoff_asap(void)
|
|||
|
||||
asap_handle = create_dissector_handle(dissect_asap, proto_asap);
|
||||
dissector_add("sctp.ppi", ASAP_PAYLOAD_PROTOCOL_ID, asap_handle);
|
||||
/* XXX - is 0xFAEEB5D1 still being used? */
|
||||
dissector_add("sctp.ppi", ASAP_OLD_PAYLOAD_PROTOCOL_ID, asap_handle);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue