osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Removed defines from packet-enrp.c, since they are now already defined in packet-asap+enrp-common.h.

This commit is contained in:
Thomas Dreibholz 2021-03-02 09:52:09 +01:00 committed by Wireshark GitLab Utility
parent 80b723dc1b
commit 957ab6370a
3 changed files with 8 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-asap+enrp-common.h
View File

@ -178,6 +178,14 @@ extern const value_string parameter_type_values[];
#define PE_IDENTIFIER_OFFSET PARAMETER_VALUE_OFFSET
#define ERROR_CAUSES_OFFSET PARAMETER_VALUE_OFFSET
#define COOKIE_OFFSET PARAMETER_VALUE_OFFSET
#define PE_CHECKSUM_LENGTH 2
#define PE_CHECKSUM_OFFSET PARAMETER_VALUE_OFFSET

4
epan/dissectors/packet-asap.c
View File

@ -357,8 +357,6 @@ dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
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)
{
@ -368,8 +366,6 @@ dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter
dissect_error_causes(error_causes_tvb, parameter_tree);
}
#define COOKIE_OFFSET PARAMETER_VALUE_OFFSET
static void
dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{

104
epan/dissectors/packet-enrp.c
View File

@ -103,15 +103,6 @@ dissect_enrp(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)
{
@ -201,18 +192,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)
{
@ -220,9 +199,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)
{
@ -230,14 +206,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)
{
@ -251,12 +219,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)
{
@ -269,12 +231,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)
{
@ -287,12 +243,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)
{
@ -305,12 +255,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)
{
@ -323,28 +267,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)
{
@ -404,8 +326,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)
{
@ -419,15 +339,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)
{
@ -441,10 +352,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)
{
@ -456,8 +363,6 @@ dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
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)
{
@ -467,8 +372,6 @@ dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter
dissect_error_causes(error_causes_tvb, parameter_tree);
}
#define COOKIE_OFFSET PARAMETER_VALUE_OFFSET
static void
dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
{
@ -480,9 +383,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)
{
@ -490,10 +390,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_LENGTH 2
#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)
{