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-rua.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-rua.c')
| -rw-r--r-- | epan/dissectors/packet-rua.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c index 83260f1abb..a30a02d18a 100644 --- a/epan/dissectors/packet-rua.c +++ b/epan/dissectors/packet-rua.c @@ -1349,10 +1349,13 @@ static int dissect_PrivateMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, offset += 7; offset >>= 3; return offset; } -static void dissect_RUA_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_RUA_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_rua_RUA_PDU(tvb, 0, &asn1_ctx, tree, hf_rua_RUA_PDU_PDU); + offset = dissect_rua_RUA_PDU(tvb, offset, &asn1_ctx, tree, hf_rua_RUA_PDU_PDU); + offset += 7; offset >>= 3; + return offset; } @@ -1384,8 +1387,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p return (dissector_try_uint_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; } -static void -dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *rua_item = NULL; proto_tree *rua_tree = NULL; @@ -1397,7 +1400,7 @@ dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rua_item = proto_tree_add_item(tree, proto_rua, tvb, 0, -1, ENC_NA); rua_tree = proto_item_add_subtree(rua_item, ett_rua); - dissect_RUA_PDU_PDU(tvb, pinfo, rua_tree); + return dissect_RUA_PDU_PDU(tvb, pinfo, rua_tree, data); } /*--- proto_register_rua -------------------------------------------*/ @@ -1739,7 +1742,7 @@ module_t *rua_module; proto_register_subtree_array(ett, array_length(ett)); /* Register dissector */ - register_dissector("rua", dissect_rua, proto_rua); + new_register_dissector("rua", dissect_rua, proto_rua); /* Register dissector tables */ rua_ies_dissector_table = register_dissector_table("rua.ies", "RUA-PROTOCOL-IES", FT_UINT32, BASE_DEC); |