diff options
author | Michael Tüxen <tuexen@fh-muenster.de> | 2007-11-20 21:21:56 +0000 |
---|---|---|
committer | Michael Tüxen <tuexen@fh-muenster.de> | 2007-11-20 21:21:56 +0000 |
commit | 928bebeb017be5793dd41d0e41e195893eea122e (patch) | |
tree | 0920a6b4aed9574b4e08043b18ff905c76451759 /epan/dissectors/packet-asap.c | |
parent | 40fe8e9a1f4502118d348dc7c7d54ac3509bf1b5 (diff) |
Update to draft-ietf-rserpool-common-param-15.txt. (Will
be published soon...)
svn path=/trunk/; revision=23520
Diffstat (limited to 'epan/dissectors/packet-asap.c')
-rw-r--r-- | epan/dissectors/packet-asap.c | 104 |
1 files changed, 73 insertions, 31 deletions
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c index bc006d8304..dbcb821851 100644 --- a/epan/dissectors/packet-asap.c +++ b/epan/dissectors/packet-asap.c @@ -1,7 +1,7 @@ /* packet-asap.c * Routines for Aggregate Server Access Protocol (ASAP) * It is hopefully (needs testing) compilant to - * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-09.txt + * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-15.txt * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-policies-04.txt * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-12.txt * @@ -59,11 +59,16 @@ 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_dccp_port = -1; +static int hf_dccp_reserved = -1; +static int hf_dccp_service_code = -1; static int hf_sctp_port = -1; static int hf_transport_use = -1; static int hf_tcp_port = -1; static int hf_udp_port = -1; static int hf_udp_reserved = -1; +static int hf_udp_lite_port = -1; +static int hf_udp_lite_reserved = -1; static int hf_policy_type = -1; static int hf_policy_value = -1; static int hf_policy_weight = -1; @@ -75,12 +80,9 @@ 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; static int hf_pe_checksum = -1; -static int hf_pe_checksum_reserved = -1; static int hf_home_enrp_server_bit = -1; static int hf_reject_bit = -1; @@ -255,6 +257,27 @@ dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot 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 DCCP_PORT_LENGTH 2 +#define DCCP_RESERVED_LENGTH 2 +#define DCCP_SERVICE_CODE_LENGTH 4 +#define DCCP_PORT_OFFSET PARAMETER_VALUE_OFFSET +#define DCCP_RESERVED_OFFSET (DCCP_PORT_OFFSET + DCCP_PORT_LENGTH) +#define DCCP_SERVICE_CODE_OFFSET (DCCP_RESERVED_OFFSET + DCCP_RESERVED_LENGTH) +#define DCCP_ADDRESS_OFFSET (DCCP_SERVICE_CODE_OFFSET + DCCP_SERVICE_CODE_LENGTH) + +static void +dissect_dccp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) +{ + tvbuff_t *parameters_tvb; + + proto_tree_add_item(parameter_tree, hf_dccp_port, parameter_tvb, DCCP_PORT_OFFSET, DCCP_PORT_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_dccp_reserved, parameter_tvb, DCCP_RESERVED_OFFSET, DCCP_RESERVED_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_dccp_service_code, parameter_tvb, DCCP_SERVICE_CODE_OFFSET, DCCP_SERVICE_CODE_LENGTH, NETWORK_BYTE_ORDER); + + parameters_tvb = tvb_new_subset(parameter_tvb, DCCP_ADDRESS_OFFSET, -1, -1); + dissect_parameters(parameters_tvb, parameter_tree); +} + #define TRANSPORT_USE_DATA_ONLY 0 #define TRANSPORT_USE_DATA_PLUS_CONTROL 1 @@ -317,6 +340,24 @@ dissect_udp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t dissect_parameters(parameters_tvb, parameter_tree); } +#define UDP_LITE_PORT_LENGTH 2 +#define UDP_LITE_RESERVED_LENGTH 2 +#define UDP_LITE_PORT_OFFSET PARAMETER_VALUE_OFFSET +#define UDP_LITE_RESERVED_OFFSET (UDP_LITE_PORT_OFFSET + UDP_LITE_PORT_LENGTH) +#define UDP_LITE_ADDRESS_OFFSET (UDP_LITE_RESERVED_OFFSET + UDP_LITE_RESERVED_LENGTH) + +static void +dissect_udp_lite_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) +{ + tvbuff_t *parameters_tvb; + + proto_tree_add_item(parameter_tree, hf_udp_lite_port, parameter_tvb, UDP_LITE_PORT_OFFSET, UDP_LITE_PORT_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_udp_lite_reserved, parameter_tvb, UDP_LITE_RESERVED_OFFSET, UDP_LITE_RESERVED_LENGTH, NETWORK_BYTE_ORDER); + + parameters_tvb = tvb_new_subset(parameter_tvb, UDP_LITE_ADDRESS_OFFSET, -1, -1); + dissect_parameters(parameters_tvb, parameter_tree); +} + #define POLICY_TYPE_LENGTH 4 #define POLICY_WEIGHT_LENGTH 4 #define POLICY_PRIORITY_LENGTH 4 @@ -431,14 +472,8 @@ dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr } #define SERVER_ID_LENGTH 4 -#define RESERVED_LENGTH 4 - #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 +#define SERVER_TRANSPORT_OFFSET (SERVER_ID_OFFSET + SERVER_ID_LENGTH) static void dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) @@ -446,8 +481,6 @@ dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parame tvbuff_t *parameters_tvb; 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); @@ -488,16 +521,13 @@ dissect_pe_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t } #define PE_CHECKSUM_LENGTH 2 -#define PE_CHECKSUM_RESERVED_LENGTH 2 #define PE_CHECKSUM_OFFSET PARAMETER_VALUE_OFFSET -#define PE_CHECKSUM_RESERVED_OFFSET (PE_CHECKSUM_OFFSET + PE_CHECKSUM_LENGTH) static void dissect_pe_checksum_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - proto_tree_add_item(parameter_tree, hf_pe_checksum, parameter_tvb, PE_CHECKSUM_OFFSET, PE_CHECKSUM_LENGTH, NETWORK_BYTE_ORDER); - proto_tree_add_item(parameter_tree, hf_pe_checksum_reserved, parameter_tvb, PE_CHECKSUM_RESERVED_OFFSET, PE_CHECKSUM_RESERVED_LENGTH, NETWORK_BYTE_ORDER); + proto_tree_add_item(parameter_tree, hf_pe_checksum, parameter_tvb, PE_CHECKSUM_OFFSET, PE_CHECKSUM_LENGTH, NETWORK_BYTE_ORDER); proto_item_append_text(parameter_item, " (0x%x)", tvb_get_ntohs(parameter_tvb, PE_CHECKSUM_OFFSET)); } @@ -517,24 +547,28 @@ dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p #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 -#define PE_CHECKSUM_PARAMETER_TYPE 0x0d +#define DCCP_TRANSPORT_PARAMETER_TYPE 0x03 +#define SCTP_TRANSPORT_PARAMETER_TYPE 0x04 +#define TCP_TRANSPORT_PARAMETER_TYPE 0x05 +#define UDP_TRANSPORT_PARAMETER_TYPE 0x06 +#define UDP_LITE_TRANSPORT_PARAMETER_TYPE 0x07 +#define POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE 0x08 +#define POOL_HANDLE_PARAMETER_TYPE 0x09 +#define POOL_ELEMENT_PARAMETER_TYPE 0x0a +#define SERVER_INFORMATION_PARAMETER_TYPE 0x0b +#define OPERATION_ERROR_PARAMETER_TYPE 0x0c +#define COOKIE_PARAMETER_TYPE 0x0d +#define PE_IDENTIFIER_PARAMETER_TYPE 0x0e +#define PE_CHECKSUM_PARAMETER_TYPE 0x0f static const value_string parameter_type_values[] = { { IPV4_ADDRESS_PARAMETER_TYPE, "IPV4 address" }, { IPV6_ADDRESS_PARAMETER_TYPE, "IPV6 address" }, + { DCCP_TRANSPORT_PARAMETER_TYPE, "DCCP transport address" }, { SCTP_TRANSPORT_PARAMETER_TYPE, "SCTP transport address" }, { TCP_TRANSPORT_PARAMETER_TYPE, "TCP transport address" }, { UDP_TRANSPORT_PARAMETER_TYPE, "UDP transport address" }, + { UDP_LITE_TRANSPORT_PARAMETER_TYPE, "UDP-Lite transport address" }, { POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE, "Pool member selection policy" }, { POOL_HANDLE_PARAMETER_TYPE, "Pool handle" }, { POOL_ELEMENT_PARAMETER_TYPE, "Pool element" }, @@ -573,6 +607,9 @@ dissect_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 DCCP_TRANSPORT_PARAMETER_TYPE: + dissect_dccp_transport_parameter(parameter_tvb, parameter_tree); + break; case SCTP_TRANSPORT_PARAMETER_TYPE: dissect_sctp_transport_parameter(parameter_tvb, parameter_tree); break; @@ -582,6 +619,9 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree) case UDP_TRANSPORT_PARAMETER_TYPE: dissect_udp_transport_parameter(parameter_tvb, parameter_tree); break; + case UDP_LITE_TRANSPORT_PARAMETER_TYPE: + dissect_udp_lite_transport_parameter(parameter_tvb, parameter_tree); + break; case POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE: dissect_pool_member_selection_policy_parameter(parameter_tvb, parameter_tree); break; @@ -772,11 +812,16 @@ proto_register_asap(void) { &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", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL } }, { &hf_parameter_ipv6_address, { "IP Version 6 address", "asap.ipv6_address", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL } }, + { &hf_dccp_port, { "Port", "enrp.dccp_transport_port", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_dccp_reserved, { "Reserved", "enrp.dccp_transport_reserved", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_dccp_service_code, { "Service code", "enrp.dccp_transport_service_code", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_sctp_port, { "Port", "asap.sctp_transport_port", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_transport_use, { "Transport use", "asap.transport_use", FT_UINT16, BASE_DEC, VALS(transport_use_values), 0x0, "", HFILL } }, { &hf_tcp_port, { "Port", "asap.tcp_transport_port", 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_udp_lite_port, { "Port", "enrp.udp_lite_transport_port", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, + { &hf_udp_lite_reserved, { "Reserved", "enrp.udp_lite_transport_reserved", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_policy_type, { "Policy type", "asap.pool_member_slection_policy_type", FT_UINT32, BASE_DEC, VALS(policy_type_values), 0x0, "", HFILL } }, { &hf_policy_weight, { "Policy weight", "asap.pool_member_slection_policy_weight", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, { &hf_policy_priority, { "Policy priority", "asap.pool_member_slection_policy_priority", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } }, @@ -787,12 +832,9 @@ proto_register_asap(void) { &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_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", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_pe_identifier, { "PE identifier", "asap.pe_identifier", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_pe_checksum, { "PE checksum", "asap.pe_checksum", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, - { &hf_pe_checksum_reserved, { "Reserved", "asap.pe_checksum_reserved", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_server_identifier, { "Server identifier", "asap.server_identifier", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } }, { &hf_home_enrp_server_bit, { "H bit", "asap.h_bit", FT_BOOLEAN, 8, TFS(&home_enrp_server_bit_value), HOME_ENRP_SERVER_BIT_MASK, "", HFILL } }, { &hf_reject_bit, { "R bit", "asap.r_bit", FT_BOOLEAN, 8, TFS(&reject_bit_value), REJECT_BIT_MASK, "", HFILL } }, |