Skip to content

Commit

Permalink
Fix duplicate diplay filter names found by checkfiltername.pl
Browse files Browse the repository at this point in the history 
svn path=/trunk/; revision=50396
  • Loading branch information
@mmann78
mmann78 committed Jul 6, 2013
1 parent 6de3257 commit eec311e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions asn1/acse/acse.asn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ ABRT-diagnostic ::= ENUMERATED {
authentication-required(6), ...
}

ABRT-source ::= INTEGER {acse-service-user(0), acse-service-provider(1)
ABRT-source ::= INTEGER {service-user(0), service-provider(1)
}(0..1, ...)

ACSE-requirements ::= BIT STRING {
Expand Down Expand Up @@ -347,7 +347,7 @@ Associate-result ::= INTEGER {
accepted(0), rejected-permanent(1), rejected-transient(2)}(0..2, ...)

Associate-source-diagnostic ::= CHOICE {
acse-service-user
service-user
[1] INTEGER {null(0), no-reason-given(1),
application-context-name-not-supported(2),
calling-AP-title-not-recognized(3),
Expand All @@ -362,7 +362,7 @@ Associate-source-diagnostic ::= CHOICE {
authentication-mechanism-name-required(12),
authentication-failure(13), authentication-required(14)}
(0..14, ...),
acse-service-provider
service-provider
[2] INTEGER {null(0), no-reason-given(1), no-common-acse-version(2)}
(0..2, ...)
}
Expand Down
36 changes: 18 additions & 18 deletions epan/dissectors/packet-acse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ static int hf_acse_P_context_result_list_item = -1; /* P_context_result_list_it
static int hf_acse_pcontext_result = -1; /* Result */
static int hf_acse_concrete_syntax_name = -1; /* Concrete_syntax_name */
static int hf_acse_provider_reason = -1; /* T_provider_reason */
static int hf_acse_acse_service_user = -1; /* T_acse_service_user */
static int hf_acse_acse_service_provider = -1; /* T_acse_service_provider */
static int hf_acse_service_user = -1; /* T_service_user */
static int hf_acse_service_provider = -1; /* T_service_provider */
static int hf_acse_Association_data_item = -1; /* EXTERNALt */
static int hf_acse_simply_encoded_data = -1; /* Simply_encoded_data */
static int hf_acse_fully_encoded_data = -1; /* PDV_list */
Expand Down Expand Up @@ -1017,7 +1017,7 @@ dissect_acse_Associate_result(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
}


static const value_string acse_T_acse_service_user_vals[] = {
static const value_string acse_T_service_user_vals[] = {
{ 0, "null" },
{ 1, "no-reason-given" },
{ 2, "application-context-name-not-supported" },
Expand All @@ -1038,15 +1038,15 @@ static const value_string acse_T_acse_service_user_vals[] = {


static int
dissect_acse_T_acse_service_user(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_acse_T_service_user(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset,
0U, 14U, hf_index, NULL);

return offset;
}


static const value_string acse_T_acse_service_provider_vals[] = {
static const value_string acse_T_service_provider_vals[] = {
{ 0, "null" },
{ 1, "no-reason-given" },
{ 2, "no-common-acse-version" },
Expand All @@ -1055,7 +1055,7 @@ static const value_string acse_T_acse_service_provider_vals[] = {


static int
dissect_acse_T_acse_service_provider(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_acse_T_service_provider(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset,
0U, 2U, hf_index, NULL);

Expand All @@ -1064,14 +1064,14 @@ dissect_acse_T_acse_service_provider(gboolean implicit_tag _U_, tvbuff_t *tvb _U


static const value_string acse_Associate_source_diagnostic_vals[] = {
{ 1, "acse-service-user" },
{ 2, "acse-service-provider" },
{ 1, "service-user" },
{ 2, "service-provider" },
{ 0, NULL }
};

static const ber_choice_t Associate_source_diagnostic_choice[] = {
{ 1, &hf_acse_acse_service_user, BER_CLASS_CON, 1, 0, dissect_acse_T_acse_service_user },
{ 2, &hf_acse_acse_service_provider, BER_CLASS_CON, 2, 0, dissect_acse_T_acse_service_provider },
{ 1, &hf_acse_service_user , BER_CLASS_CON, 1, 0, dissect_acse_T_service_user },
{ 2, &hf_acse_service_provider, BER_CLASS_CON, 2, 0, dissect_acse_T_service_provider },
{ 0, NULL, 0, 0, 0, NULL }
};

Expand Down Expand Up @@ -1323,8 +1323,8 @@ dissect_acse_RLRE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset


static const value_string acse_ABRT_source_vals[] = {
{ 0, "acse-service-user" },
{ 1, "acse-service-provider" },
{ 0, "service-user" },
{ 1, "service-provider" },
{ 0, NULL }
};

Expand Down Expand Up @@ -2155,13 +2155,13 @@ void proto_register_acse(void) {
{ "provider-reason", "acse.provider_reason",
FT_INT32, BASE_DEC, VALS(acse_T_provider_reason_vals), 0,
NULL, HFILL }},
{ &hf_acse_acse_service_user,
{ "acse-service-user", "acse.acse_service_user",
FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_user_vals), 0,
{ &hf_acse_service_user,
{ "service-user", "acse.service_user",
FT_UINT32, BASE_DEC, VALS(acse_T_service_user_vals), 0,
NULL, HFILL }},
{ &hf_acse_acse_service_provider,
{ "acse-service-provider", "acse.acse_service_provider",
FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_provider_vals), 0,
{ &hf_acse_service_provider,
{ "service-provider", "acse.service_provider",
FT_UINT32, BASE_DEC, VALS(acse_T_service_provider_vals), 0,
NULL, HFILL }},
{ &hf_acse_Association_data_item,
{ "Association-data", "acse.EXTERNALt_element",
Expand Down

0 comments on commit eec311e

Please sign in to comment.