diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-09 23:01:28 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-13 17:44:24 +0000 |
| commit | 01f7356f85d33567a25e722e6488addd72ff64d4 (patch) | |
| tree | 2d8623b57706cc924f76293f0f5b6ce8d83124ab /epan/dissectors/packet-app-pkix-cert.c | |
| parent | b776707af540d7431e815818e21ea1efac326d9f (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8
Reviewed-on: https://code.wireshark.org/review/11805
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-app-pkix-cert.c')
| -rw-r--r-- | epan/dissectors/packet-app-pkix-cert.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c index 595ab0d3fa..04f149be3a 100644 --- a/epan/dissectors/packet-app-pkix-cert.c +++ b/epan/dissectors/packet-app-pkix-cert.c @@ -45,8 +45,8 @@ static gint hf_cert = -1; static gint ett_cert = -1; -static void -dissect_cert(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static int +dissect_cert(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { proto_tree *subtree = NULL; proto_item *ti; @@ -61,7 +61,7 @@ dissect_cert(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) } dissect_x509af_Certificate(FALSE, tvb, 0, &asn1_ctx, subtree, hf_cert); - return; + return tvb_captured_length(tvb); } @@ -99,7 +99,7 @@ proto_register_cert(void) proto_register_field_array(proto_cert, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("application/pkix-cert", dissect_cert, proto_cert); + new_register_dissector("application/pkix-cert", dissect_cert, proto_cert); } @@ -108,7 +108,7 @@ proto_reg_handoff_cert(void) { dissector_handle_t cert_handle; - cert_handle = create_dissector_handle(dissect_cert, proto_cert); + cert_handle = new_create_dissector_handle(dissect_cert, proto_cert); /* Register the PKIX-CERT media type */ dissector_add_string("media_type", "application/pkix-cert", cert_handle); |