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 /asn1/credssp | |
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 'asn1/credssp')
-rw-r--r-- | asn1/credssp/credssp.cnf | 2 | ||||
-rw-r--r-- | asn1/credssp/packet-credssp-template.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/credssp/credssp.cnf b/asn1/credssp/credssp.cnf index 6a2f301c04..5e943ac693 100644 --- a/asn1/credssp/credssp.cnf +++ b/asn1/credssp/credssp.cnf @@ -1,7 +1,7 @@ # credssp.cnf # Credential Security Support Provider (CredSSP) conformance file -#.PDU +#.PDU_NEW TSRequest #.FN_PARS TSRequest/authInfo VAL_PTR = &auth_tvb diff --git a/asn1/credssp/packet-credssp-template.c b/asn1/credssp/packet-credssp-template.c index 7649d8307a..63ed931ddb 100644 --- a/asn1/credssp/packet-credssp-template.c +++ b/asn1/credssp/packet-credssp-template.c @@ -63,8 +63,8 @@ static gint ett_credssp = -1; /* * Dissect CredSSP PDUs */ -static void -dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +static int +dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -77,7 +77,7 @@ dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_clear(pinfo->cinfo, COL_INFO); creds_type = -1; - dissect_TSRequest_PDU(tvb, pinfo, tree); + return dissect_TSRequest_PDU(tvb, pinfo, tree, data); } static gboolean @@ -121,7 +121,7 @@ dissect_credssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data); } - dissect_credssp(tvb, pinfo, parent_tree); + dissect_credssp(tvb, pinfo, parent_tree, NULL); return TRUE; } } @@ -162,7 +162,7 @@ void proto_register_credssp(void) { /* Register protocol */ proto_credssp = proto_register_protocol(PNAME, PSNAME, PFNAME); - register_dissector("credssp", dissect_credssp, proto_credssp); + new_register_dissector("credssp", dissect_credssp, proto_credssp); /* Register fields and subtrees */ proto_register_field_array(proto_credssp, hf, array_length(hf)); |