diff options
Diffstat (limited to 'epan')
26 files changed, 62 insertions, 62 deletions
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index 3368ba411c..a3d57d19e1 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -559,7 +559,7 @@ dissect_amr_wb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ typedef struct _amr_capability_t { const gchar *id; const gchar *name; - new_dissector_t content_pdu; + dissector_t content_pdu; } amr_capability_t; static amr_capability_t amr_capability_tab[] = { diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index dbe5175dc7..c049a51840 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -27,7 +27,7 @@ * Specification of Basic Encoding Rules (BER), Canonical Encoding Rules (CER) and Distinguished Encoding Rules (DER) * */ -/* TODO: change #.REGISTER signature to new_dissector_t and +/* TODO: change #.REGISTER signature to dissector_t and * update call_ber_oid_callback() accordingly. * * Since we don't pass the TAG/LENGTH from the CHOICE/SEQUENCE/SEQUENCE OF/ @@ -432,7 +432,7 @@ register_ber_oid_dissector_handle(const char *oid, dissector_handle_t dissector, } void -register_ber_oid_dissector(const char *oid, new_dissector_t dissector, int proto, const char *name) +register_ber_oid_dissector(const char *oid, dissector_t dissector, int proto, const char *name) { dissector_handle_t dissector_handle; @@ -442,7 +442,7 @@ register_ber_oid_dissector(const char *oid, new_dissector_t dissector, int proto } void -register_ber_syntax_dissector(const char *syntax, int proto, new_dissector_t dissector) +register_ber_syntax_dissector(const char *syntax, int proto, dissector_t dissector) { dissector_handle_t dissector_handle; diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index 51eafc0cd7..bb3edbb67e 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -199,9 +199,9 @@ int call_ber_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_inf WS_DLL_PUBLIC void register_ber_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto, const char *name); WS_DLL_PUBLIC -void register_ber_oid_dissector(const char *oid, new_dissector_t dissector, int proto, const char *name); +void register_ber_oid_dissector(const char *oid, dissector_t dissector, int proto, const char *name); WS_DLL_PUBLIC -void register_ber_syntax_dissector(const char *syntax, int proto, new_dissector_t dissector); +void register_ber_syntax_dissector(const char *syntax, int proto, dissector_t dissector); void register_ber_oid_name(const char *oid, const char *name); WS_DLL_PUBLIC void register_ber_oid_syntax(const char *oid, const char *name, const char *syntax); diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index a44b17259c..85e1954f53 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -4801,7 +4801,7 @@ static const ros_opr_t dap_opr_tab[] = { { id_opcode_modifyEntry , dissect_ModifyEntryArgument_PDU, dissect_ModifyEntryResult_PDU }, /* modifyDN */ { id_opcode_modifyDN , dissect_ModifyDNArgument_PDU, dissect_ModifyDNResult_PDU }, - { 0, (new_dissector_t)(-1), (new_dissector_t)(-1) }, + { 0, (dissector_t)(-1), (dissector_t)(-1) }, }; @@ -4830,7 +4830,7 @@ static const ros_err_t dap_err_tab[] = { { id_errcode_serviceError, dissect_ServiceError_PDU }, /* updateError*/ { id_errcode_updateError, dissect_UpdateError_PDU }, - { 0, (new_dissector_t)(-1) }, + { 0, (dissector_t)(-1) }, }; diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index e77e7837a1..4a846da314 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -2650,7 +2650,7 @@ dissect_h264_par_DecoderConfigurationInformation(tvbuff_t *tvb, packet_info *pin typedef struct _h264_capability_t { const gchar *id; const gchar *name; - new_dissector_t content_pdu; + dissector_t content_pdu; } h264_capability_t; static h264_capability_t h264_capability_tab[] = { diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index f21104fbf8..1c0ac21d58 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -4489,8 +4489,8 @@ static int dissect_h450_12_CmnArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, typedef struct _h450_op_t { gint32 opcode; - new_dissector_t arg_pdu; - new_dissector_t res_pdu; + dissector_t arg_pdu; + dissector_t res_pdu; } h450_op_t; static const h450_op_t h450_op_tab[] = { @@ -4599,7 +4599,7 @@ static const h450_op_t h450_op_tab[] = { typedef struct _h450_err_t { gint32 errcode; - new_dissector_t err_pdu; + dissector_t err_pdu; } h450_err_t; static const h450_err_t h450_err_tab[] = { diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index 7ede4f5cdd..375a95e4fe 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -1990,7 +1990,7 @@ typedef struct _h460_feature_t { guint32 opt; const gchar *id; const gchar *name; - new_dissector_t content_pdu; + dissector_t content_pdu; /*---*/ const gchar *key_gd; const gchar *key_fd; diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c index 29667520b9..9f26a7b81a 100644 --- a/epan/dissectors/packet-isdn-sup.c +++ b/epan/dissectors/packet-isdn-sup.c @@ -67,20 +67,20 @@ static rose_ctx_t isdn_sup_rose_ctx; typedef struct _isdn_sup_op_t { gint32 opcode; - new_dissector_t arg_pdu; - new_dissector_t res_pdu; + dissector_t arg_pdu; + dissector_t res_pdu; } isdn_sup_op_t; typedef struct _isdn_global_sup_op_t { const char* oid; - new_dissector_t arg_pdu; - new_dissector_t res_pdu; + dissector_t arg_pdu; + dissector_t res_pdu; } isdn_sup_global_op_t; typedef struct isdn_sup_err_t { gint32 errcode; - new_dissector_t err_pdu; + dissector_t err_pdu; } isdn_sup_err_t; static const value_string isdn_sup_str_operation[] = { diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index 7c5d40c2f7..d86db9ad8a 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -851,7 +851,7 @@ dissect_mp4ves_par_decoderConfigurationInformation(tvbuff_t *tvb, packet_info *p typedef struct _mp4ves_capability_t { const gchar *id; const gchar *name; - new_dissector_t content_pdu; + dissector_t content_pdu; } mp4ves_capability_t; static mp4ves_capability_t mp4ves_capability_tab[] = { diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index c2dfc89363..c10e3a046e 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -8413,7 +8413,7 @@ static const ros_opr_t p3_opr_tab[] = { { op_register , dissect_RegisterArgument_PDU, dissect_RegisterResult_PDU }, /* change-credentials */ { op_change_credentials , dissect_ChangeCredentialsArgument_PDU, dissect_RES_change_credentials_PDU }, - { 0, (new_dissector_t)(-1), (new_dissector_t)(-1) }, + { 0, (dissector_t)(-1), (dissector_t)(-1) }, }; @@ -8458,7 +8458,7 @@ static const ros_err_t p3_err_tab[] = { { err_new_credentials_unacceptable, dissect_PAR_new_credentials_unacceptable_PDU }, /* old-credentials-incorrectly-specified*/ { err_old_credentials_incorrectly_specified, dissect_PAR_old_credentials_incorrectly_specified_PDU }, - { 0, (new_dissector_t)(-1) }, + { 0, (dissector_t)(-1) }, }; diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index 6a93d232e9..e0ca83b397 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -4150,7 +4150,7 @@ static const ros_opr_t p7_opr_tab[] = { { op_ms_message_submission , dissect_MSMessageSubmissionArgument_PDU, dissect_MSMessageSubmissionResult_PDU }, /* ms-probe-submission */ { op_ms_probe_submission , dissect_MSProbeSubmissionArgument_PDU, dissect_MSProbeSubmissionResult_PDU }, - { 0, (new_dissector_t)(-1), (new_dissector_t)(-1) }, + { 0, (dissector_t)(-1), (dissector_t)(-1) }, }; @@ -4189,7 +4189,7 @@ static const ros_err_t p7_err_tab[] = { { err_modify_error, dissect_ModifyErrorParameter_PDU }, /* entry-class-error*/ { err_entry_class_error, dissect_EntryClassErrorParameter_PDU }, - { 0, (new_dissector_t)(-1) }, + { 0, (dissector_t)(-1) }, }; diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index f070808350..6ad2620012 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -239,7 +239,7 @@ dissect_per_open_type_internal(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, ((per_type_fn)type_cb)(tvb, offset, actx, tree, hf_index); break; case CB_NEW_DISSECTOR: - ((new_dissector_t)type_cb)(val_tvb, actx->pinfo, subtree, NULL); + ((dissector_t)type_cb)(val_tvb, actx->pinfo, subtree, NULL); break; case CB_DISSECTOR_HANDLE: break; @@ -258,7 +258,7 @@ dissect_per_open_type(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tre } guint32 -dissect_per_open_type_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, new_dissector_t type_cb) +dissect_per_open_type_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, dissector_t type_cb) { return dissect_per_open_type_internal(tvb, offset, actx, tree, hf_index, (void*)type_cb, CB_NEW_DISSECTOR); } @@ -2201,7 +2201,7 @@ DEBUG_ENTRY("dissect_per_bit_string"); return offset; } -guint32 dissect_per_bit_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, new_dissector_t type_cb) +guint32 dissect_per_bit_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, dissector_t type_cb) { tvbuff_t *val_tvb = NULL; proto_tree *subtree = tree; @@ -2326,7 +2326,7 @@ DEBUG_ENTRY("dissect_per_octet_string"); return offset; } -guint32 dissect_per_octet_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, new_dissector_t type_cb) +guint32 dissect_per_octet_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, dissector_t type_cb) { tvbuff_t *val_tvb = NULL; proto_tree *subtree = tree; @@ -2551,7 +2551,7 @@ call_per_oid_callback(const char *oid, tvbuff_t *tvb, packet_info *pinfo, proto_ } void -new_register_per_oid_dissector(const char *oid, new_dissector_t dissector, int proto, const char *name) +new_register_per_oid_dissector(const char *oid, dissector_t dissector, int proto, const char *name) { dissector_handle_t dissector_handle; diff --git a/epan/dissectors/packet-per.h b/epan/dissectors/packet-per.h index a55c331008..e60e6bddeb 100644 --- a/epan/dissectors/packet-per.h +++ b/epan/dissectors/packet-per.h @@ -109,17 +109,17 @@ WS_DLL_PUBLIC guint32 dissect_per_sequence(tvbuff_t *tvb, guint32 offset, asn1_c WS_DLL_PUBLIC guint32 dissect_per_sequence_eag(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, const per_sequence_t *sequence); WS_DLL_PUBLIC guint32 dissect_per_octet_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, tvbuff_t **value_tvb); -WS_DLL_PUBLIC guint32 dissect_per_octet_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, new_dissector_t type_cb); +WS_DLL_PUBLIC guint32 dissect_per_octet_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, dissector_t type_cb); WS_DLL_PUBLIC guint32 dissect_per_bit_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, tvbuff_t **value_tvb, int *len); -WS_DLL_PUBLIC guint32 dissect_per_bit_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, new_dissector_t type_cb); +WS_DLL_PUBLIC guint32 dissect_per_bit_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, dissector_t type_cb); WS_DLL_PUBLIC guint32 dissect_per_restricted_character_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, const char *alphabet, int alphabet_length, tvbuff_t **value_tvb); WS_DLL_PUBLIC guint32 dissect_per_enumerated(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, guint32 root_num, guint32 *value, gboolean has_extension, guint32 ext_num, guint32 *value_map); WS_DLL_PUBLIC guint32 dissect_per_open_type(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, per_type_fn type_cb); -WS_DLL_PUBLIC guint32 dissect_per_open_type_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, new_dissector_t type_cb); +WS_DLL_PUBLIC guint32 dissect_per_open_type_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, dissector_t type_cb); WS_DLL_PUBLIC guint32 dissect_per_external_type(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, per_type_fn type_cb); @@ -129,6 +129,6 @@ extern gboolean get_size_constraint_from_stack(asn1_ctx_t *actx, const gchar *na extern guint32 dissect_per_length_determinant(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index, guint32 *length); WS_DLL_PUBLIC int call_per_oid_callback(const char *oid, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, asn1_ctx_t *actx, int hf_index); -WS_DLL_PUBLIC void new_register_per_oid_dissector(const char *oid, new_dissector_t dissector, int proto, const char *name); +WS_DLL_PUBLIC void new_register_per_oid_dissector(const char *oid, dissector_t dissector, int proto, const char *name); #endif /* __PACKET_PER_H__ */ diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 2db2daeafc..8ce5c74e45 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -11935,8 +11935,8 @@ static int dissect_qsig_mid_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo typedef struct _qsig_op_t { gint32 opcode; - new_dissector_t arg_pdu; - new_dissector_t res_pdu; + dissector_t arg_pdu; + dissector_t res_pdu; } qsig_op_t; static const qsig_op_t qsig_op_tab[] = { @@ -12158,7 +12158,7 @@ static const qsig_op_t qsig_op_tab[] = { typedef struct _qsig_err_t { gint32 errcode; - new_dissector_t err_pdu; + dissector_t err_pdu; } qsig_err_t; static const qsig_err_t qsig_err_tab[] = { diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c index b1c45b8f4e..18194b5cff 100644 --- a/epan/dissectors/packet-raknet.c +++ b/epan/dissectors/packet-raknet.c @@ -81,7 +81,7 @@ static proto_tree *init_raknet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr struct raknet_handler_entry { value_string vs; - new_dissector_t dissector_fp; + dissector_t dissector_fp; }; static int diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 4009164517..99be46411b 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -168,11 +168,11 @@ register_ros_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _ register_ber_oid_dissector_handle(oid, ros_handle, proto, name); } -static new_dissector_t ros_lookup_opr_dissector(gint32 opcode_lcl, const ros_opr_t *operations, gboolean argument) +static dissector_t ros_lookup_opr_dissector(gint32 opcode_lcl, const ros_opr_t *operations, gboolean argument) { /* we don't know what order asn2wrs/module definition is, so ... */ if(operations) { - for(;operations->arg_pdu != (new_dissector_t)(-1); operations++) + for(;operations->arg_pdu != (dissector_t)(-1); operations++) if(operations->opcode == opcode_lcl) return argument ? operations->arg_pdu : operations->res_pdu; @@ -180,11 +180,11 @@ static new_dissector_t ros_lookup_opr_dissector(gint32 opcode_lcl, const ros_opr return NULL; } -static new_dissector_t ros_lookup_err_dissector(gint32 errcode, const ros_err_t *errors) +static dissector_t ros_lookup_err_dissector(gint32 errcode, const ros_err_t *errors) { /* we don't know what order asn2wrs/module definition is, so ... */ if(errors) { - for(;errors->err_pdu != (new_dissector_t) (-1); errors++) { + for(;errors->err_pdu != (dissector_t) (-1); errors++) { if(errors->errcode == errcode) return errors->err_pdu; } @@ -200,7 +200,7 @@ ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinfo, proto_tree *t gint32 opcode_lcl = 0; const gchar *opname = NULL; const gchar *suffix = NULL; - new_dissector_t opdissector = NULL; + dissector_t opdissector = NULL; const value_string *lookup; proto_item *item=NULL; proto_tree *ros_tree=NULL; diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h index f468451816..69f2870aa3 100644 --- a/epan/dissectors/packet-ros.h +++ b/epan/dissectors/packet-ros.h @@ -71,13 +71,13 @@ int dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U typedef struct _ros_opr_t { gint32 opcode; - new_dissector_t arg_pdu; - new_dissector_t res_pdu; + dissector_t arg_pdu; + dissector_t res_pdu; } ros_opr_t; typedef struct _ros_err_t { gint32 errcode; - new_dissector_t err_pdu; + dissector_t err_pdu; } ros_err_t; typedef struct _ros_info_t { diff --git a/epan/dissectors/packet-rpc.h b/epan/dissectors/packet-rpc.h index b72112d991..4b4851df57 100644 --- a/epan/dissectors/packet-rpc.h +++ b/epan/dissectors/packet-rpc.h @@ -142,8 +142,8 @@ typedef int (dissect_function_t)(tvbuff_t *tvb, int offset, packet_info *pinfo, typedef struct _vsff { guint32 value; const gchar *strptr; - new_dissector_t dissect_call; - new_dissector_t dissect_reply; + dissector_t dissect_call; + dissector_t dissect_reply; } vsff; typedef struct _rpc_proc_list { diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index b0f314ff16..d7c606322f 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -2884,7 +2884,7 @@ static const per_sequence_t t124Heur_sequence[] = { }; void -register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int proto) +register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto) { dissector_handle_t dissector_handle; @@ -2892,7 +2892,7 @@ register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int pro dissector_add_string("t124.ns", nsKey, dissector_handle); } -void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param, new_dissector_t dissector, int proto) +void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param, dissector_t dissector, int proto) { /* XXX: we should keep the sub-dissectors list per conversation as the same channels may be used. diff --git a/epan/dissectors/packet-t124.h b/epan/dissectors/packet-t124.h index 802001445c..48c15accc8 100644 --- a/epan/dissectors/packet-t124.h +++ b/epan/dissectors/packet-t124.h @@ -39,8 +39,8 @@ extern int dissect_DomainMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p extern guint32 t124_get_last_channelId(void); extern void t124_set_top_tree(proto_tree *tree); -extern void register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int proto); -extern void register_t124_sd_dissector(packet_info *pinfo, guint32 channelId, new_dissector_t dissector, int proto); +extern void register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto); +extern void register_t124_sd_dissector(packet_info *pinfo, guint32 channelId, dissector_t dissector, int proto); /*--- Included file: packet-t124-exp.h ---*/ diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 0c7acf3526..ec4ce83926 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2643,7 +2643,7 @@ void tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean proto_desegment, guint fixed_len, guint (*get_pdu_len)(packet_info *, tvbuff_t *, int, void*), - new_dissector_t dissect_pdu, void* dissector_data) + dissector_t dissect_pdu, void* dissector_data) { volatile int offset = 0; int offset_before; diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h index 39009e00a9..efc45bb23d 100644 --- a/epan/dissectors/packet-tcp.h +++ b/epan/dissectors/packet-tcp.h @@ -136,7 +136,7 @@ WS_DLL_PUBLIC void tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean proto_desegment, guint fixed_len, guint (*get_pdu_len)(packet_info *, tvbuff_t *, int, void*), - new_dissector_t dissect_pdu, void* dissector_data); + dissector_t dissect_pdu, void* dissector_data); extern struct tcp_multisegment_pdu * pdu_store_sequencenumber_of_next_pdu(packet_info *pinfo, guint32 seq, guint32 nxtpdu, wmem_tree_t *multisegment_pdus); diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index cdda182c24..1904bc2f42 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -603,7 +603,7 @@ int udp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint fixed_len, gboolean (*heuristic_check)(packet_info *, tvbuff_t *, int, void*), guint (*get_pdu_len)(packet_info *, tvbuff_t *, int, void*), - new_dissector_t dissect_pdu, void* dissector_data) + dissector_t dissect_pdu, void* dissector_data) { volatile int offset = 0; int offset_before; diff --git a/epan/dissectors/packet-udp.h b/epan/dissectors/packet-udp.h index a3c9bc646d..0e5498af28 100644 --- a/epan/dissectors/packet-udp.h +++ b/epan/dissectors/packet-udp.h @@ -131,7 +131,7 @@ WS_DLL_PUBLIC int udp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint fixed_len, gboolean (*heuristic_check)(packet_info *, tvbuff_t *, int, void*), guint (*get_pdu_len)(packet_info *, tvbuff_t *, int, void*), - new_dissector_t dissect_pdu, void* dissector_data); + dissector_t dissect_pdu, void* dissector_data); #ifdef __cplusplus } diff --git a/epan/packet.c b/epan/packet.c index d204f03544..e7f0586714 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -588,7 +588,7 @@ dissect_file(epan_dissect_t *edt, struct wtap_pkthdr *phdr, */ struct dissector_handle { const char *name; /* dissector name */ - new_dissector_t dissector; + dissector_t dissector; protocol_t *protocol; }; @@ -2585,7 +2585,7 @@ dissector_handle_get_dissector_name(const dissector_handle_t handle) /* Create an anonymous handle for a new dissector. */ dissector_handle_t -create_dissector_handle(new_dissector_t dissector, const int proto) +create_dissector_handle(dissector_t dissector, const int proto) { struct dissector_handle *handle; @@ -2597,7 +2597,7 @@ create_dissector_handle(new_dissector_t dissector, const int proto) return handle; } -dissector_handle_t create_dissector_handle_with_name(new_dissector_t dissector, +dissector_handle_t create_dissector_handle_with_name(dissector_t dissector, const int proto, const char* name) { struct dissector_handle *handle; @@ -2623,7 +2623,7 @@ destroy_dissector_handle(dissector_handle_t handle) /* Register a new dissector by name. */ dissector_handle_t -register_dissector(const char *name, new_dissector_t dissector, const int proto) +register_dissector(const char *name, dissector_t dissector, const int proto) { struct dissector_handle *handle; diff --git a/epan/packet.h b/epan/packet.h index 0bb96da3e2..f8e9ae9db0 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -86,7 +86,7 @@ typedef struct dissector_table *dissector_table_t; * we need more data (e.g., from subsequent TCP segments) to * dissect the entire PDU. */ -typedef int (*new_dissector_t)(tvbuff_t *, packet_info *, proto_tree *, void *); +typedef int (*dissector_t)(tvbuff_t *, packet_info *, proto_tree *, void *); /** Type of a heuristic dissector, used in heur_dissector_add(). * @@ -495,7 +495,7 @@ WS_DLL_PUBLIC void heur_dissector_add(const char *name, heur_dissector_t dissect WS_DLL_PUBLIC void heur_dissector_delete(const char *name, heur_dissector_t dissector, const int proto); /** Register a new dissector. */ -WS_DLL_PUBLIC dissector_handle_t register_dissector(const char *name, new_dissector_t dissector, const int proto); +WS_DLL_PUBLIC dissector_handle_t register_dissector(const char *name, dissector_t dissector, const int proto); /** Deregister a dissector. */ void deregister_dissector(const char *name); @@ -519,9 +519,9 @@ WS_DLL_PUBLIC dissector_handle_t find_dissector(const char *name); WS_DLL_PUBLIC const char *dissector_handle_get_dissector_name(const dissector_handle_t handle); /** Create an anonymous handle for a dissector. */ -WS_DLL_PUBLIC dissector_handle_t create_dissector_handle(new_dissector_t dissector, +WS_DLL_PUBLIC dissector_handle_t create_dissector_handle(dissector_t dissector, const int proto); -WS_DLL_PUBLIC dissector_handle_t create_dissector_handle_with_name(new_dissector_t dissector, +WS_DLL_PUBLIC dissector_handle_t create_dissector_handle_with_name(dissector_t dissector, const int proto, const char* name); /** Call a dissector through a handle and if no dissector was found |