diff options
Diffstat (limited to 'asn1/ftam/packet-ftam-template.c')
| -rw-r--r-- | asn1/ftam/packet-ftam-template.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index db96aa3ba4..0016c5bc0e 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -83,8 +83,8 @@ dissect_ftam_unstructured_binary(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr /* * Dissect FTAM PDUs inside a PPDU. */ -static void -dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +static int +dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { int offset = 0; int old_offset; @@ -109,6 +109,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) break; } } + return tvb_captured_length(tvb); } @@ -140,7 +141,7 @@ void proto_register_ftam(void) { /* Register protocol */ proto_ftam = proto_register_protocol(PNAME, PSNAME, PFNAME); - register_dissector("ftam", dissect_ftam, proto_ftam); + new_register_dissector("ftam", dissect_ftam, proto_ftam); /* Register fields and subtrees */ proto_register_field_array(proto_ftam, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -152,9 +153,9 @@ void proto_register_ftam(void) { /*--- proto_reg_handoff_ftam --- */ void proto_reg_handoff_ftam(void) { - register_ber_oid_dissector("1.0.8571.1.1", dissect_ftam, proto_ftam,"iso-ftam(1)"); - register_ber_oid_dissector("1.0.8571.2.1", dissect_ftam, proto_ftam,"ftam-pci(1)"); - register_ber_oid_dissector("1.3.14.5.2.2", dissect_ftam, proto_ftam,"NIST file directory entry abstract syntax"); + new_register_ber_oid_dissector("1.0.8571.1.1", dissect_ftam, proto_ftam,"iso-ftam(1)"); + new_register_ber_oid_dissector("1.0.8571.2.1", dissect_ftam, proto_ftam,"ftam-pci(1)"); + new_register_ber_oid_dissector("1.3.14.5.2.2", dissect_ftam, proto_ftam,"NIST file directory entry abstract syntax"); /* Unstructured text file document type FTAM-1 */ register_ber_oid_dissector("1.0.8571.5.1", dissect_ftam_unstructured_text, proto_ftam,"ISO FTAM unstructured text"); |