From 5a8783f5b12e017967ce178bac3d1826630dea1a Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Mon, 10 Sep 2012 21:40:21 +0000 Subject: Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860 --- asn1/nbap/nbap.cnf | 12 ++++++------ asn1/nbap/packet-nbap-template.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'asn1/nbap') diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index f982d4e332..1dcbbf12fc 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -562,27 +562,27 @@ actx->pinfo->link_dir=P2P_DIR_UL; switch(ib_type){ case 0: /* mIB */ - dissect_rrc_MasterInformationBlock_PDU(parameter_tvb, actx->pinfo, subtree); + dissect_rrc_MasterInformationBlock_PDU(parameter_tvb, actx->pinfo, subtree, NULL); break; case 3: /* iB-Type: sIB1 (3) */ - dissect_rrc_SysInfoType1_PDU(parameter_tvb, actx->pinfo, subtree); + dissect_rrc_SysInfoType1_PDU(parameter_tvb, actx->pinfo, subtree, NULL); break; case 4: /* iB-Type: sIB2 (4) */ - dissect_rrc_SysInfoType2_PDU(parameter_tvb, actx->pinfo, subtree); + dissect_rrc_SysInfoType2_PDU(parameter_tvb, actx->pinfo, subtree, NULL); break; case 5: /* iB-Type: sIB3 (5) */ - dissect_rrc_SysInfoType3_PDU(parameter_tvb, actx->pinfo, subtree); + dissect_rrc_SysInfoType3_PDU(parameter_tvb, actx->pinfo, subtree, NULL); break; case 9: /* iB-Type: sIB7 (9) */ - dissect_rrc_SysInfoType7_PDU(parameter_tvb, actx->pinfo, subtree); + dissect_rrc_SysInfoType7_PDU(parameter_tvb, actx->pinfo, subtree, NULL); break; case 14: /* iB-Type: sIB12 (14) */ - dissect_rrc_SysInfoType12_PDU(parameter_tvb, actx->pinfo, subtree); + dissect_rrc_SysInfoType12_PDU(parameter_tvb, actx->pinfo, subtree, NULL); break; default: break; diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 960076d54c..fd106ab65c 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -304,40 +304,40 @@ static dissector_table_t nbap_proc_imsg_dissector_table; static dissector_table_t nbap_proc_sout_dissector_table; static dissector_table_t nbap_proc_uout_dissector_table; -static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); +static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); +static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); +static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); +static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *); /*Easy way to add hsdhsch binds for corner cases*/ static void add_hsdsch_bind(packet_info * pinfo, proto_tree * tree); #include "packet-nbap-fn.c" -static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint_new(nbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0; } -static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { return (dissector_try_uint_new(nbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0; } -static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { if (!ProcedureID) return 0; return (dissector_try_string(nbap_proc_imsg_dissector_table, ProcedureID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; } -static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { if (!ProcedureID) return 0; return (dissector_try_string(nbap_proc_sout_dissector_table, ProcedureID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; } -static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { if (!ProcedureID) return 0; return (dissector_try_string(nbap_proc_uout_dissector_table, ProcedureID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; -- cgit v1.2.3