diff options
author | Anders Broman <anders.broman@ericsson.com> | 2007-11-06 20:26:13 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2007-11-06 20:26:13 +0000 |
commit | e0937a59921ad7332d0751b7f4b1dc7e75aa8ac3 (patch) | |
tree | fd9d41c0b5bb0abb4dc0354df068e2562c7ce485 /epan/dissectors/packet-dop.c | |
parent | 998eabe31f309e59858b86ae9b0641f9da6f68e5 (diff) |
as2wrs now handles EXTERNAL(direct-reference requires no special handling).
svn path=/trunk/; revision=23384
Diffstat (limited to 'epan/dissectors/packet-dop.c')
-rw-r--r-- | epan/dissectors/packet-dop.c | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 856a76cc82..e6e54387f4 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -224,7 +224,7 @@ static int hf_dop_basicLevels = -1; /* T_basicLevels */ static int hf_dop_level = -1; /* T_level */ static int hf_dop_localQualifier = -1; /* INTEGER */ static int hf_dop_signed = -1; /* BOOLEAN */ -static int hf_dop_other = -1; /* EXTERNALt */ +static int hf_dop_other = -1; /* EXTERNAL */ /* named bits */ static int hf_dop_DSEType_root = -1; static int hf_dop_DSEType_glue = -1; @@ -414,7 +414,7 @@ dissect_dop_SET_OF_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_dop_T_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 173 "dop.cnf" +#line 172 "dop.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -436,7 +436,7 @@ dissect_dop_T_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_dop_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 184 "dop.cnf" +#line 183 "dop.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -584,7 +584,7 @@ static int dissect_dop_BindingType(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_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &binding_type); -#line 104 "dop.cnf" +#line 103 "dop.cnf" append_oid(actx->pinfo, binding_type); return offset; @@ -594,7 +594,7 @@ dissect_dop_BindingType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_dop_EstablishSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 108 "dop.cnf" +#line 107 "dop.cnf" offset = call_dop_oid_callback("establish.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); @@ -607,7 +607,7 @@ dissect_dop_EstablishSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_dop_EstablishRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 112 "dop.cnf" +#line 111 "dop.cnf" offset = call_dop_oid_callback("establish.rolea", tvb, offset, actx->pinfo, tree, "roleA"); @@ -620,7 +620,7 @@ dissect_dop_EstablishRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_dop_EstablishRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 116 "dop.cnf" +#line 115 "dop.cnf" offset = call_dop_oid_callback("establish.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -657,7 +657,7 @@ dissect_dop_EstablishArgumentInitiator(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_dop_T_agreement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 144 "dop.cnf" +#line 143 "dop.cnf" offset = call_dop_oid_callback("agreement", tvb, offset, actx->pinfo, tree, NULL); @@ -849,7 +849,7 @@ dissect_dop_EstablishOperationalBindingArgument(gboolean implicit_tag _U_, tvbuf static int dissect_dop_T_symmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 148 "dop.cnf" +#line 147 "dop.cnf" offset = call_dop_oid_callback("establish.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); @@ -862,7 +862,7 @@ dissect_dop_T_symmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_dop_T_roleA_replies(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 152 "dop.cnf" +#line 151 "dop.cnf" offset = call_dop_oid_callback("establish.rolea", tvb, offset, actx->pinfo, tree, "roleA"); @@ -875,7 +875,7 @@ dissect_dop_T_roleA_replies(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_dop_T_roleB_replies(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 156 "dop.cnf" +#line 155 "dop.cnf" offset = call_dop_oid_callback("establish.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -946,7 +946,7 @@ dissect_dop_EstablishOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_ static int dissect_dop_ModifySymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 120 "dop.cnf" +#line 119 "dop.cnf" offset = call_dop_oid_callback("modify.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); @@ -959,7 +959,7 @@ dissect_dop_ModifySymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_dop_ModifyRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 124 "dop.cnf" +#line 123 "dop.cnf" offset = call_dop_oid_callback("modify.rolea", tvb, offset, actx->pinfo, tree, "roleA"); @@ -972,7 +972,7 @@ dissect_dop_ModifyRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_dop_ModifyRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 128 "dop.cnf" +#line 127 "dop.cnf" offset = call_dop_oid_callback("modify.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -1009,7 +1009,7 @@ dissect_dop_ModifyArgumentInitiator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_dop_ArgumentNewAgreement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 168 "dop.cnf" +#line 167 "dop.cnf" offset = call_dop_oid_callback("agreement", tvb, offset, actx->pinfo, tree, NULL); @@ -1082,7 +1082,7 @@ dissect_dop_ModifyOperationalBindingArgument(gboolean implicit_tag _U_, tvbuff_t static int dissect_dop_ResultNewAgreement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 164 "dop.cnf" +#line 163 "dop.cnf" offset = call_dop_oid_callback("agreement", tvb, offset, actx->pinfo, tree, NULL); @@ -1154,7 +1154,7 @@ dissect_dop_ModifyOperationalBindingResult(gboolean implicit_tag _U_, tvbuff_t * static int dissect_dop_TerminateSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 132 "dop.cnf" +#line 131 "dop.cnf" offset = call_dop_oid_callback("terminate.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); @@ -1167,7 +1167,7 @@ dissect_dop_TerminateSymmetric(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_dop_TerminateRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 136 "dop.cnf" +#line 135 "dop.cnf" offset = call_dop_oid_callback("terminate.rolea", tvb, offset, actx->pinfo, tree, "roleA"); @@ -1180,7 +1180,7 @@ dissect_dop_TerminateRoleAInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_dop_TerminateRoleBInitiates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 140 "dop.cnf" +#line 139 "dop.cnf" offset = call_dop_oid_callback("terminate.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -1356,7 +1356,7 @@ dissect_dop_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_dop_T_agreementProposal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 160 "dop.cnf" +#line 159 "dop.cnf" offset = call_dop_oid_callback("agreement", tvb, offset, actx->pinfo, tree, NULL); @@ -1568,7 +1568,7 @@ dissect_dop_NHOBSubordinateToSuperior(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_dop_Precedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 195 "dop.cnf" +#line 194 "dop.cnf" guint32 precedence = 0; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1626,6 +1626,15 @@ dissect_dop_T_basicLevels(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } + +static int +dissect_dop_EXTERNAL(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_external_type(implicit_tag, tree, tvb, offset, actx, hf_index, NULL); + + return offset; +} + + static const value_string dop_AuthenticationLevel_vals[] = { { 0, "basicLevels" }, { 1, "other" }, @@ -1634,7 +1643,7 @@ static const value_string dop_AuthenticationLevel_vals[] = { static const ber_choice_t AuthenticationLevel_choice[] = { { 0, &hf_dop_basicLevels , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dop_T_basicLevels }, - { 1, &hf_dop_other , BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_acse_EXTERNALt }, + { 1, &hf_dop_other , BER_CLASS_UNI, BER_UNI_TAG_EXTERNAL, BER_FLAGS_NOOWNTAG, dissect_dop_EXTERNAL }, { 0, NULL, 0, 0, 0, NULL } }; @@ -2786,7 +2795,7 @@ void proto_register_dop(void) { { &hf_dop_other, { "other", "dop.other", FT_NONE, BASE_NONE, NULL, 0, - "acse.EXTERNALt", HFILL }}, + "dop.EXTERNAL", HFILL }}, { &hf_dop_DSEType_root, { "root", "dop.root", FT_BOOLEAN, 8, NULL, 0x80, |