diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-06 15:31:47 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-13 11:24:07 +0000 |
| commit | 4e1b5ea866dd332294246c4800efe77431010ad8 (patch) | |
| tree | 8cda568a450b29fd7bbfcbbf03d840ab9f123190 /epan/dissectors/packet-x2ap.c | |
| parent | 94d35481b773e785c3aec31f81dea4300fdb5669 (diff) | |
ASN1: Register PDU-dissectors as NEW
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan/dissectors/packet-x2ap.c')
| -rw-r--r-- | epan/dissectors/packet-x2ap.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index bd550fff98..a63ed9a9ce 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -6210,10 +6210,13 @@ static int dissect_X2AP_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p offset += 7; offset >>= 3; return offset; } -static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - dissect_x2ap_X2AP_PDU(tvb, 0, &asn1_ctx, tree, hf_x2ap_X2AP_PDU_PDU); + offset = dissect_x2ap_X2AP_PDU(tvb, offset, &asn1_ctx, tree, hf_x2ap_X2AP_PDU_PDU); + offset += 7; offset >>= 3; + return offset; } @@ -6245,8 +6248,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p return (dissector_try_uint(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; } -static void -dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *x2ap_item = NULL; proto_tree *x2ap_tree = NULL; @@ -6258,7 +6261,7 @@ dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, ENC_NA); x2ap_tree = proto_item_add_subtree(x2ap_item, ett_x2ap); - dissect_X2AP_PDU_PDU(tvb, pinfo, x2ap_tree); + return dissect_X2AP_PDU_PDU(tvb, pinfo, x2ap_tree, data); } /*--- proto_register_x2ap -------------------------------------------*/ @@ -7903,7 +7906,7 @@ void proto_register_x2ap(void) { proto_register_subtree_array(ett, array_length(ett)); /* Register dissector */ - register_dissector("x2ap", dissect_x2ap, proto_x2ap); + new_register_dissector("x2ap", dissect_x2ap, proto_x2ap); /* Register dissector tables */ x2ap_ies_dissector_table = register_dissector_table("x2ap.ies", "X2AP-PROTOCOL-IES", FT_UINT32, BASE_DEC); |