diff options
author | Anders Broman <anders.broman@ericsson.com> | 2007-05-22 16:17:54 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2007-05-22 16:17:54 +0000 |
commit | dca634c4de4fb7e0cf17ca2bd616faa1e4d9348d (patch) | |
tree | 729f5dc1ed800790661b93fe56ac019bdb41130b /epan/dissectors/packet-q932-ros.c | |
parent | 5e33afbf50f7690a39415e0e4696ddbbbc64caff (diff) |
Prepare for the use of the new -X parameter for BER encoded protocols.
svn path=/trunk/; revision=21889
Diffstat (limited to 'epan/dissectors/packet-q932-ros.c')
-rw-r--r-- | epan/dissectors/packet-q932-ros.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 41916ccb36..d55a0e0f5b 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -160,7 +160,7 @@ static const value_string q932_ros_Code_vals[] = { { 0, NULL } }; -static const ber_choice_t Code_choice[] = { +static const ber_old_choice_t Code_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_local }, { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_global }, { 0, 0, 0, 0, NULL } @@ -173,9 +173,9 @@ dissect_q932_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ code_local = -1; code_global = ""; - offset = dissect_ber_choice(actx, tree, tvb, offset, - Code_choice, hf_index, ett_q932_ros_Code, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + Code_choice, hf_index, ett_q932_ros_Code, + NULL); return offset; } @@ -221,7 +221,7 @@ static const value_string q932_ros_InvokeId_vals[] = { { 0, NULL } }; -static const ber_choice_t InvokeId_choice[] = { +static const ber_old_choice_t InvokeId_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_present }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent }, { 0, 0, 0, 0, NULL } @@ -229,9 +229,9 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_q932_ros_InvokeId(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_choice(actx, tree, tvb, offset, - InvokeId_choice, hf_index, ett_q932_ros_InvokeId, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + InvokeId_choice, hf_index, ett_q932_ros_InvokeId, + NULL); return offset; } @@ -249,7 +249,7 @@ static const value_string q932_ros_T_linkedId_vals[] = { { 0, NULL } }; -static const ber_choice_t T_linkedId_choice[] = { +static const ber_old_choice_t T_linkedId_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_linkedIdPresent_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_absent_impl }, { 0, 0, 0, 0, NULL } @@ -257,9 +257,9 @@ static const ber_choice_t T_linkedId_choice[] = { static int dissect_q932_ros_T_linkedId(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_choice(actx, tree, tvb, offset, - T_linkedId_choice, hf_index, ett_q932_ros_T_linkedId, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + T_linkedId_choice, hf_index, ett_q932_ros_T_linkedId, + NULL); return offset; } @@ -290,7 +290,7 @@ static int dissect_argument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset } -static const ber_sequence_t Invoke_sequence[] = { +static const ber_old_sequence_t Invoke_sequence[] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_linkedId }, { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opcode }, @@ -305,8 +305,8 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset arg_next_tvb = NULL; - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - Invoke_sequence, hf_index, ett_q932_ros_Invoke); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + Invoke_sequence, hf_index, ett_q932_ros_Invoke); #line 73 "q932-ros.cnf" if (code_choice == 0) { @@ -359,7 +359,7 @@ static int dissect_resultArgument(proto_tree *tree _U_, tvbuff_t *tvb _U_, int o } -static const ber_sequence_t T_result_sequence[] = { +static const ber_old_sequence_t T_result_sequence[] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_opcode }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_resultArgument }, { 0, 0, 0, NULL } @@ -367,8 +367,8 @@ static const ber_sequence_t T_result_sequence[] = { static int dissect_q932_ros_T_result(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_sequence(implicit_tag, actx, tree, tvb, offset, - T_result_sequence, hf_index, ett_q932_ros_T_result); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + T_result_sequence, hf_index, ett_q932_ros_T_result); return offset; } @@ -377,7 +377,7 @@ static int dissect_result(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U } -static const ber_sequence_t ReturnResult_sequence[] = { +static const ber_old_sequence_t ReturnResult_sequence[] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_result }, { 0, 0, 0, NULL } @@ -390,8 +390,8 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int res_next_tvb = NULL; - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - ReturnResult_sequence, hf_index, ett_q932_ros_ReturnResult); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + ReturnResult_sequence, hf_index, ett_q932_ros_ReturnResult); #line 116 "q932-ros.cnf" if (code_choice == 0) { @@ -445,7 +445,7 @@ static int dissect_parameter(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset } -static const ber_sequence_t ReturnError_sequence[] = { +static const ber_old_sequence_t ReturnError_sequence[] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errcode }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameter }, @@ -459,8 +459,8 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o err_next_tvb = NULL; - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - ReturnError_sequence, hf_index, ett_q932_ros_ReturnError); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + ReturnError_sequence, hf_index, ett_q932_ros_ReturnError); #line 159 "q932-ros.cnf" if (code_choice == 0) { @@ -598,7 +598,7 @@ static const value_string q932_ros_T_problem_vals[] = { { 0, NULL } }; -static const ber_choice_t T_problem_choice[] = { +static const ber_old_choice_t T_problem_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_general_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl }, @@ -608,9 +608,9 @@ static const ber_choice_t T_problem_choice[] = { static int dissect_q932_ros_T_problem(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_choice(actx, tree, tvb, offset, - T_problem_choice, hf_index, ett_q932_ros_T_problem, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + T_problem_choice, hf_index, ett_q932_ros_T_problem, + NULL); return offset; } @@ -619,7 +619,7 @@ static int dissect_problem(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _ } -static const ber_sequence_t Reject_sequence[] = { +static const ber_old_sequence_t Reject_sequence[] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_problem }, { 0, 0, 0, NULL } @@ -630,8 +630,8 @@ dissect_q932_ros_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset #line 184 "q932-ros.cnf" problem_str[0] = '\0'; - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - Reject_sequence, hf_index, ett_q932_ros_Reject); + offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset, + Reject_sequence, hf_index, ett_q932_ros_Reject); #line 186 "q932-ros.cnf" proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rose_ctx->apdu_depth), " REJ: %s", problem_str); @@ -651,7 +651,7 @@ static const value_string q932_ros_RoseAPDU_vals[] = { { 0, NULL } }; -static const ber_choice_t RoseAPDU_choice[] = { +static const ber_old_choice_t RoseAPDU_choice[] = { { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl }, { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl }, @@ -661,9 +661,9 @@ static const ber_choice_t RoseAPDU_choice[] = { static int dissect_q932_ros_RoseAPDU(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_choice(actx, tree, tvb, offset, - RoseAPDU_choice, hf_index, ett_q932_ros_RoseAPDU, - NULL); + offset = dissect_ber_old_choice(actx, tree, tvb, offset, + RoseAPDU_choice, hf_index, ett_q932_ros_RoseAPDU, + NULL); return offset; } |