From 3fbb5836b7efc02045f5d0c628be3f29e1d22ba6 Mon Sep 17 00:00:00 2001 From: Tomas Kukosa Date: Tue, 16 May 2017 12:24:43 +0200 Subject: [PATCH] More exports from Q.932 and QSIG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ife78a95712b47166735fd48b1b55193e37eef833 Reviewed-on: https://code.wireshark.org/review/21682 Reviewed-by: Anders Broman Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Tomáš Kukosa --- epan/dissectors/asn1/q932/q932.cnf | 10 +++++----- epan/dissectors/asn1/qsig/qsig.cnf | 2 ++ epan/dissectors/packet-q932.h | 16 ++++++++-------- epan/dissectors/packet-qsig.c | 12 ++++++------ epan/dissectors/packet-qsig.h | 2 ++ 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/epan/dissectors/asn1/q932/q932.cnf b/epan/dissectors/asn1/q932/q932.cnf index b2dbcb4da0..90e6092e79 100644 --- a/epan/dissectors/asn1/q932/q932.cnf +++ b/epan/dissectors/asn1/q932/q932.cnf @@ -8,16 +8,16 @@ InterpretationComponent NetworkFacilityExtension NetworkProtocolProfile -#.EXPORTS EXTERN +#.EXPORTS EXTERN WS_DLL # Addressing-Data-Elements PresentedAddressScreened PresentedAddressUnscreened -PresentedNumberScreened WS_DLL -PresentedNumberUnscreened WS_DLL +PresentedNumberScreened +PresentedNumberUnscreened Address -PartyNumber WS_DLL -PartySubaddress WS_DLL +PartyNumber +PartySubaddress ScreeningIndicator PresentationAllowedIndicator diff --git a/epan/dissectors/asn1/qsig/qsig.cnf b/epan/dissectors/asn1/qsig/qsig.cnf index ad2a75ff7b..2fd438c23f 100644 --- a/epan/dissectors/asn1/qsig/qsig.cnf +++ b/epan/dissectors/asn1/qsig/qsig.cnf @@ -11,6 +11,8 @@ GROUP_BY_PROT #.EXPORTS EXTERN VALS_WITH_TABLE WS_DLL Name +PSS1InformationElement +Extension #.MODULE Addressing-Data-Elements-asn1-97 qsig diff --git a/epan/dissectors/packet-q932.h b/epan/dissectors/packet-q932.h index 39799ae613..e4929e1cf1 100644 --- a/epan/dissectors/packet-q932.h +++ b/epan/dissectors/packet-q932.h @@ -35,22 +35,22 @@ /*--- Included file: packet-q932-exp.h ---*/ #line 1 "./asn1/q932/packet-q932-exp.h" -extern const value_string q932_PresentedAddressScreened_vals[]; -extern const value_string q932_PresentedAddressUnscreened_vals[]; +WS_DLL_PUBLIC const value_string q932_PresentedAddressScreened_vals[]; +WS_DLL_PUBLIC const value_string q932_PresentedAddressUnscreened_vals[]; WS_DLL_PUBLIC const value_string q932_PresentedNumberScreened_vals[]; WS_DLL_PUBLIC const value_string q932_PresentedNumberUnscreened_vals[]; WS_DLL_PUBLIC const value_string q932_PartyNumber_vals[]; WS_DLL_PUBLIC const value_string q932_PartySubaddress_vals[]; -extern const value_string q932_ScreeningIndicator_vals[]; -extern int dissect_q932_PresentedAddressScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -extern int dissect_q932_PresentedAddressUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +WS_DLL_PUBLIC const value_string q932_ScreeningIndicator_vals[]; +WS_DLL_PUBLIC int dissect_q932_PresentedAddressScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +WS_DLL_PUBLIC int dissect_q932_PresentedAddressUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); WS_DLL_PUBLIC int dissect_q932_PresentedNumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); WS_DLL_PUBLIC int dissect_q932_PresentedNumberUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -extern int dissect_q932_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +WS_DLL_PUBLIC int dissect_q932_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); WS_DLL_PUBLIC int dissect_q932_PartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); WS_DLL_PUBLIC int dissect_q932_PartySubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -extern int dissect_q932_ScreeningIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -extern int dissect_q932_PresentationAllowedIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +WS_DLL_PUBLIC int dissect_q932_ScreeningIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +WS_DLL_PUBLIC int dissect_q932_PresentationAllowedIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-q932-exp.h ---*/ #line 28 "./asn1/q932/packet-q932-template.h" diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 3a9604389d..feecaa1927 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -2074,7 +2074,7 @@ dissect_qsig_T_extensionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_qsig_T_extensionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 144 "./asn1/qsig/qsig.cnf" +#line 146 "./asn1/qsig/qsig.cnf" tvbuff_t *next_tvb; next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -2100,9 +2100,9 @@ static const ber_sequence_t qsig_Extension_sequence[] = { { NULL, 0, 0, 0, NULL } }; -static int +int dissect_qsig_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 141 "./asn1/qsig/qsig.cnf" +#line 143 "./asn1/qsig/qsig.cnf" extension_oid = NULL; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -2115,7 +2115,7 @@ dissect_qsig_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_qsig_PSS1InformationElement_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 164 "./asn1/qsig/qsig.cnf" +#line 166 "./asn1/qsig/qsig.cnf" tvbuff_t *out_tvb = NULL; proto_tree *data_tree; @@ -2132,7 +2132,7 @@ dissect_qsig_PSS1InformationElement_U(gboolean implicit_tag _U_, tvbuff_t *tvb _ -static int +int dissect_qsig_PSS1InformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 0, TRUE, dissect_qsig_PSS1InformationElement_U); @@ -9203,7 +9203,7 @@ dissect_qsig_wtmau_DefinedIDs(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_qsig_wtmau_T_param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 160 "./asn1/qsig/qsig.cnf" +#line 162 "./asn1/qsig/qsig.cnf" diff --git a/epan/dissectors/packet-qsig.h b/epan/dissectors/packet-qsig.h index f24ed20097..22a9709053 100644 --- a/epan/dissectors/packet-qsig.h +++ b/epan/dissectors/packet-qsig.h @@ -41,6 +41,8 @@ /* --- Modules Manufacturer-specific-service-extension-class-asn1-97 PSS1-generic-parameters-definition-asn1-97 Addressing-Data-Elements-asn1-97 --- --- --- */ +WS_DLL_PUBLIC int dissect_qsig_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +WS_DLL_PUBLIC int dissect_qsig_PSS1InformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /* --- Module Name-Operations-asn1-97 --- --- --- */