Moved common definitions from packet-asap.c to packet-asap+enrp-common.h.

1 files changed, 0 insertions, 101 deletions

diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index 88e6de112d..3ca941fee3 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -97,15 +97,6 @@ dissect_asap(tvbuff_t *, packet_info *, proto_tree *, void *);
 
 /* Dissectors for error causes. This is common for ASAP and ENRP. */
 
-#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)
 {
@@ -195,18 +186,6 @@ dissect_error_causes(tvbuff_t *error_causes_tvb, proto_tree *parameter_tree)
 
 /* Dissectors for parameters. This is common for ASAP and ENRP. */
 
-#define PARAMETER_TYPE_LENGTH   2
-#define PARAMETER_LENGTH_LENGTH 2
-#define PARAMETER_HEADER_LENGTH (PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_LENGTH)
-
-#define PARAMETER_HEADER_OFFSET 0
-#define PARAMETER_TYPE_OFFSET   PARAMETER_HEADER_OFFSET
-#define PARAMETER_LENGTH_OFFSET (PARAMETER_TYPE_OFFSET + PARAMETER_TYPE_LENGTH)
-#define PARAMETER_VALUE_OFFSET  (PARAMETER_LENGTH_OFFSET + PARAMETER_LENGTH_LENGTH)
-
-#define IPV4_ADDRESS_LENGTH 4
-#define IPV4_ADDRESS_OFFSET PARAMETER_VALUE_OFFSET
-
 static void
 dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
@@ -214,9 +193,6 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot
   proto_item_append_text(parameter_item, " (%s)", tvb_ip_to_str(parameter_tvb, IPV4_ADDRESS_OFFSET));
 }
 
-#define IPV6_ADDRESS_LENGTH 16
-#define IPV6_ADDRESS_OFFSET PARAMETER_VALUE_OFFSET
-
 static void
 dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
@@ -224,14 +200,6 @@ dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot
   proto_item_append_text(parameter_item, " (%s)", tvb_ip6_to_str(parameter_tvb, IPV6_ADDRESS_OFFSET));
 }
 
-#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)
 {
@@ -245,12 +213,6 @@ dissect_dccp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_
   dissect_parameters(parameters_tvb, parameter_tree);
 }
 
-#define SCTP_PORT_LENGTH          2
-#define SCTP_TRANSPORT_USE_LENGTH 2
-#define SCTP_PORT_OFFSET          PARAMETER_VALUE_OFFSET
-#define SCTP_TRANSPORT_USE_OFFSET (SCTP_PORT_OFFSET + SCTP_PORT_LENGTH)
-#define SCTP_ADDRESS_OFFSET       (SCTP_TRANSPORT_USE_OFFSET + SCTP_TRANSPORT_USE_LENGTH)
-
 static void
 dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
 {
@@ -263,12 +225,6 @@ dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_
   dissect_parameters(parameters_tvb, parameter_tree);
 }
 
-#define TCP_PORT_LENGTH          2
-#define TCP_TRANSPORT_USE_LENGTH 2
-#define TCP_PORT_OFFSET          PARAMETER_VALUE_OFFSET
-#define TCP_TRANSPORT_USE_OFFSET (TCP_PORT_OFFSET + TCP_PORT_LENGTH)
-#define TCP_ADDRESS_OFFSET       (TCP_TRANSPORT_USE_OFFSET + TCP_TRANSPORT_USE_LENGTH)
-
 static void
 dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
 {
@@ -281,12 +237,6 @@ dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t
   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)
 {
@@ -299,12 +249,6 @@ 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)
 {
@@ -317,28 +261,6 @@ dissect_udp_lite_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
   dissect_parameters(parameters_tvb, parameter_tree);
 }
 
-#define POLICY_TYPE_LENGTH               4
-#define POLICY_WEIGHT_LENGTH             4
-#define POLICY_PRIORITY_LENGTH           4
-#define POLICY_LOAD_LENGTH               4
-#define POLICY_DEGRADATION_LENGTH        4
-#define POLICY_LUDPF_LOADDPF_LENGTH      4
-#define POLICY_LUDPF_DISTANCE_LENGTH     4
-#define POLICY_WRANDDPF_WEIGHTDPF_LENGTH 4
-#define POLICY_WRANDDPF_DISTANCE_LENGTH  4
-
-#define POLICY_TYPE_OFFSET        PARAMETER_VALUE_OFFSET
-#define POLICY_VALUE_OFFSET       (POLICY_TYPE_OFFSET + POLICY_TYPE_LENGTH)
-#define POLICY_WEIGHT_OFFSET      POLICY_VALUE_OFFSET
-#define POLICY_PRIORITY_OFFSET    POLICY_VALUE_OFFSET
-#define POLICY_LOAD_OFFSET        POLICY_VALUE_OFFSET
-#define POLICY_DEGRADATION_OFFSET (POLICY_LOAD_OFFSET + POLICY_LOAD_LENGTH)
-
-#define POLICY_LUDPF_LOADDPF_OFFSET      (POLICY_LOAD_OFFSET + POLICY_LOAD_LENGTH)
-#define POLICY_LUDPF_DISTANCE_OFFSET     (POLICY_LUDPF_LOADDPF_OFFSET + POLICY_LUDPF_LOADDPF_LENGTH)
-#define POLICY_WRANDDPF_WEIGHTDPF_OFFSET (POLICY_WEIGHT_OFFSET + POLICY_WEIGHT_LENGTH)
-#define POLICY_WRANDDPF_DISTANCE_OFFSET  (POLICY_WRANDDPF_WEIGHTDPF_OFFSET + POLICY_WRANDDPF_WEIGHTDPF_LENGTH)
-
 static void
 dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
 {
@@ -398,8 +320,6 @@ dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tr
   }
 }
 
-#define POOL_HANDLE_OFFSET PARAMETER_VALUE_OFFSET
-
 static void
 dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
 {
@@ -413,15 +333,6 @@ dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
                          tvb_format_text(parameter_tvb, POOL_HANDLE_OFFSET, handle_length));
 }
 
-#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_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
 {
@@ -435,10 +346,6 @@ dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr
   dissect_parameters(parameters_tvb, parameter_tree);
 }
 
-#define SERVER_ID_LENGTH         4
-#define SERVER_ID_OFFSET         PARAMETER_VALUE_OFFSET
-#define SERVER_TRANSPORT_OFFSET  (SERVER_ID_OFFSET + SERVER_ID_LENGTH)
-
 static void
 dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
 {
@@ -474,9 +381,6 @@ dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, pr
   proto_item_append_text(parameter_item, " (%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)
 {
@@ -484,8 +388,6 @@ dissect_pe_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t
   proto_item_append_text(parameter_item, " (0x%x)", tvb_get_ntohl(parameter_tvb, PE_IDENTIFIER_OFFSET));
 }
 
-#define PE_CHECKSUM_OFFSET PARAMETER_VALUE_OFFSET
-
 static void
 dissect_pe_checksum_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
@@ -493,9 +395,6 @@ dissect_pe_checksum_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre
   proto_item_append_text(parameter_item, " (0x%x)", tvb_get_ntohs(parameter_tvb, PE_CHECKSUM_OFFSET));
 }
 
-#define HROPT_ITEMS_LENGTH 4
-#define HROPT_ITEMS_OFFSET PARAMETER_VALUE_OFFSET
-
 static void
 dissect_handle_resolution_option_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
 {