diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-21 22:03:26 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-22 08:38:50 +0000 |
| commit | bcabd8df0f3d527d81ed7bc2ee4717ae225733bd (patch) | |
| tree | c845dfe3c3ad2186910971f3fe27bda627ba10be /epan/dissectors/packet-p22.c | |
| parent | f9f88ff226835367972a1ceaf97b3c6d8844e330 (diff) | |
register_dissector -> new_register_dissector for ASN.1 dissectors.
Change-Id: I0476519c02ffdd426b4fdfe8a206d61b728c327a
Reviewed-on: https://code.wireshark.org/review/12026
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-p22.c')
| -rw-r--r-- | epan/dissectors/packet-p22.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index 02a63a0a88..e298cb07cc 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -4675,8 +4675,8 @@ static int dissect_ForwardedContentToken_PDU(tvbuff_t *tvb _U_, packet_info *pin /* * Dissect P22 PDUs inside a PPDU. */ -static void -dissect_p22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +static int +dissect_p22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { int offset = 0; proto_item *item=NULL; @@ -4693,6 +4693,7 @@ dissect_p22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal"); dissect_p22_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1); + return tvb_captured_length(tvb); } @@ -6215,7 +6216,7 @@ void proto_register_p22(void) { NULL, HFILL }}, /*--- End of included file: packet-p22-hfarr.c ---*/ -#line 119 "../../asn1/p22/packet-p22-template.c" +#line 120 "../../asn1/p22/packet-p22-template.c" }; /* List of subtrees */ @@ -6351,12 +6352,12 @@ void proto_register_p22(void) { &ett_p22_T_choice, /*--- End of included file: packet-p22-ettarr.c ---*/ -#line 125 "../../asn1/p22/packet-p22-template.c" +#line 126 "../../asn1/p22/packet-p22-template.c" }; /* Register protocol */ proto_p22 = proto_register_protocol(PNAME, PSNAME, PFNAME); - register_dissector("p22", dissect_p22, proto_p22); + new_register_dissector("p22", dissect_p22, proto_p22); /* Register fields and subtrees */ proto_register_field_array(proto_p22, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -6471,10 +6472,10 @@ void proto_reg_handoff_p22(void) { /*--- End of included file: packet-p22-dis-tab.c ---*/ -#line 141 "../../asn1/p22/packet-p22-template.c" +#line 142 "../../asn1/p22/packet-p22-template.c" - register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)"); - register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)"); + new_register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)"); + new_register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)"); } |