From 8983ae005a175f04f34bd37d4e7447d583d8256c Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Sun, 8 Dec 2013 16:40:49 +0000 Subject: [PATCH] - Forward declaration of register functions. svn path=/trunk/; revision=53861 --- asn1/hnbap/packet-hnbap-template.c | 2 ++ asn1/inap/packet-inap-template.c | 4 ++++ asn1/lpp/packet-lpp-template.c | 4 ++++ asn1/lppe/packet-lppe-template.c | 3 +++ asn1/pres/packet-pres-template.c | 3 +++ asn1/q932/packet-q932-template.c | 2 ++ asn1/rtse/packet-rtse-template.c | 3 +++ epan/dissectors/packet-hnbap.c | 16 +++++++++------- epan/dissectors/packet-inap.c | 20 ++++++++++++-------- epan/dissectors/packet-lpp.c | 16 ++++++++++------ epan/dissectors/packet-lppe.c | 15 +++++++++------ epan/dissectors/packet-pres.c | 13 ++++++++----- epan/dissectors/packet-q932.c | 12 +++++++----- epan/dissectors/packet-rtse.c | 13 ++++++++----- 14 files changed, 84 insertions(+), 42 deletions(-) diff --git a/asn1/hnbap/packet-hnbap-template.c b/asn1/hnbap/packet-hnbap-template.c index 479f8b82fd..9f3557fee3 100644 --- a/asn1/hnbap/packet-hnbap-template.c +++ b/asn1/hnbap/packet-hnbap-template.c @@ -48,6 +48,8 @@ /* Dissector will use SCTP PPID 20 or SCTP port. IANA assigned port = 29169*/ #define SCTP_PORT_HNBAP 29169 +void proto_register_hnbap(void); + #include "packet-hnbap-val.h" /* Initialize the protocol and registered fields */ diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index 59943d4cac..774d8ffe25 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -47,6 +47,10 @@ #define PSNAME "INAP" #define PFNAME "inap" +void proto_register_inap(void); +void proto_reg_handoff_inap(void); + + /* Initialize the protocol and registered fields */ static int proto_inap = -1; diff --git a/asn1/lpp/packet-lpp-template.c b/asn1/lpp/packet-lpp-template.c index e64081b8de..d516d7dbda 100644 --- a/asn1/lpp/packet-lpp-template.c +++ b/asn1/lpp/packet-lpp-template.c @@ -34,11 +34,15 @@ #include #include "packet-per.h" +#include "packet-lpp.h" #define PNAME "LTE Positioning Protocol (LLP)" #define PSNAME "LPP" #define PFNAME "lpp" +void proto_register_lpp(void); +void proto_reg_handoff_lpp(void); + /* Initialize the protocol and registered fields */ static int proto_lpp = -1; diff --git a/asn1/lppe/packet-lppe-template.c b/asn1/lppe/packet-lppe-template.c index c89252128f..9f0afc1058 100644 --- a/asn1/lppe/packet-lppe-template.c +++ b/asn1/lppe/packet-lppe-template.c @@ -43,6 +43,9 @@ #pragma warning(disable:4146) #endif +void proto_register_lppe(void); +void proto_reg_handoff_lppe(void); + /* Initialize the protocol and registered fields */ static int proto_lppe = -1; diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index 24d911da78..9e7711b4c6 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -53,6 +53,9 @@ #define CLPSNAME "CLPRES" #define CLPFNAME "clpres" +void proto_register_pres(void); +void proto_reg_handoff_pres(void); + /* Initialize the protocol and registered fields */ static int proto_pres = -1; diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index 3ee787e61f..7578582192 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -37,6 +37,8 @@ #define PSNAME "Q932" #define PFNAME "q932" +void proto_register_q932(void); + /* Initialize the protocol and registered fields */ static int proto_q932 = -1; static int hf_q932_ie_type = -1; diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 6ddd05d159..83386f5d6e 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -43,6 +43,9 @@ #define PSNAME "RTSE" #define PFNAME "rtse" +void proto_register_rtse(void); +void proto_reg_handoff_rtse(void); + /* Initialize the protocol and registered fields */ static int proto_rtse = -1; diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c index 98551ee604..8ec8f45a71 100644 --- a/epan/dissectors/packet-hnbap.c +++ b/epan/dissectors/packet-hnbap.c @@ -56,6 +56,8 @@ /* Dissector will use SCTP PPID 20 or SCTP port. IANA assigned port = 29169*/ #define SCTP_PORT_HNBAP 29169 +void proto_register_hnbap(void); + /*--- Included file: packet-hnbap-val.h ---*/ #line 1 "../../asn1/hnbap/packet-hnbap-val.h" @@ -114,7 +116,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-hnbap-val.h ---*/ -#line 52 "../../asn1/hnbap/packet-hnbap-template.c" +#line 54 "../../asn1/hnbap/packet-hnbap-template.c" /* Initialize the protocol and registered fields */ static int proto_hnbap = -1; @@ -260,7 +262,7 @@ static int hf_hnbap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_hnbap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-hnbap-hf.c ---*/ -#line 57 "../../asn1/hnbap/packet-hnbap-template.c" +#line 59 "../../asn1/hnbap/packet-hnbap-template.c" /* Initialize the subtree pointers */ static int ett_hnbap = -1; @@ -334,7 +336,7 @@ static gint ett_hnbap_SuccessfulOutcome = -1; static gint ett_hnbap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-hnbap-ett.c ---*/ -#line 62 "../../asn1/hnbap/packet-hnbap-template.c" +#line 64 "../../asn1/hnbap/packet-hnbap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -2588,7 +2590,7 @@ static void dissect_HNBAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-hnbap-fn.c ---*/ -#line 83 "../../asn1/hnbap/packet-hnbap-template.c" +#line 85 "../../asn1/hnbap/packet-hnbap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -3207,7 +3209,7 @@ module_t *hnbap_module; "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-hnbap-hfarr.c ---*/ -#line 153 "../../asn1/hnbap/packet-hnbap-template.c" +#line 155 "../../asn1/hnbap/packet-hnbap-template.c" }; /* List of subtrees */ @@ -3282,7 +3284,7 @@ module_t *hnbap_module; &ett_hnbap_UnsuccessfulOutcome, /*--- End of included file: packet-hnbap-ettarr.c ---*/ -#line 159 "../../asn1/hnbap/packet-hnbap-template.c" +#line 161 "../../asn1/hnbap/packet-hnbap-template.c" }; @@ -3369,7 +3371,7 @@ proto_reg_handoff_hnbap(void) /*--- End of included file: packet-hnbap-dis-tab.c ---*/ -#line 196 "../../asn1/hnbap/packet-hnbap-template.c" +#line 198 "../../asn1/hnbap/packet-hnbap-template.c" } else { dissector_delete_uint("sctp.port", sctp_port, hnbap_handle); diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index cf1fa0a8df..daadc42d27 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -55,6 +55,10 @@ #define PSNAME "INAP" #define PFNAME "inap" +void proto_register_inap(void); +void proto_reg_handoff_inap(void); + + /* Initialize the protocol and registered fields */ static int proto_inap = -1; @@ -457,7 +461,7 @@ static int proto_inap = -1; #define noInvokeId NULL /*--- End of included file: packet-inap-val.h ---*/ -#line 55 "../../asn1/inap/packet-inap-template.c" +#line 59 "../../asn1/inap/packet-inap-template.c" /*--- Included file: packet-inap-hf.c ---*/ @@ -1024,7 +1028,7 @@ static int hf_inap_present = -1; /* INTEGER */ static int hf_inap_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-inap-hf.c ---*/ -#line 57 "../../asn1/inap/packet-inap-template.c" +#line 61 "../../asn1/inap/packet-inap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1288,7 +1292,7 @@ static gint ett_inap_T_problem_01 = -1; static gint ett_inap_InvokeId = -1; /*--- End of included file: packet-inap-ett.c ---*/ -#line 80 "../../asn1/inap/packet-inap-template.c" +#line 84 "../../asn1/inap/packet-inap-template.c" static expert_field ei_inap_unknown_invokeData = EI_INIT; static expert_field ei_inap_unknown_returnResultData = EI_INIT; @@ -1418,7 +1422,7 @@ static const value_string inap_err_code_string_vals[] = { /*--- End of included file: packet-inap-table.c ---*/ -#line 86 "../../asn1/inap/packet-inap-template.c" +#line 90 "../../asn1/inap/packet-inap-template.c" const value_string inap_general_problem_strings[] = { {0,"General Problem Unrecognized Component"}, @@ -8986,7 +8990,7 @@ static int dissect_PAR_taskRefused_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-inap-fn.c ---*/ -#line 100 "../../asn1/inap/packet-inap-template.c" +#line 104 "../../asn1/inap/packet-inap-template.c" /* TC-Invokable OPERATION ::= {activateServiceFiltering | activityTest | analysedInformation | @@ -9336,7 +9340,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-inap-table2.c ---*/ -#line 121 "../../asn1/inap/packet-inap-template.c" +#line 125 "../../asn1/inap/packet-inap-template.c" static guint8 inap_pdu_type = 0; @@ -11662,7 +11666,7 @@ void proto_register_inap(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-inap-hfarr.c ---*/ -#line 202 "../../asn1/inap/packet-inap-template.c" +#line 206 "../../asn1/inap/packet-inap-template.c" }; @@ -11916,7 +11920,7 @@ void proto_register_inap(void) { &ett_inap_InvokeId, /*--- End of included file: packet-inap-ettarr.c ---*/ -#line 215 "../../asn1/inap/packet-inap-template.c" +#line 219 "../../asn1/inap/packet-inap-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 6b29f55498..9c21de4dd3 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -42,11 +42,15 @@ #include #include "packet-per.h" +#include "packet-lpp.h" #define PNAME "LTE Positioning Protocol (LLP)" #define PSNAME "LPP" #define PFNAME "lpp" +void proto_register_lpp(void); +void proto_reg_handoff_lpp(void); + /* Initialize the protocol and registered fields */ static int proto_lpp = -1; @@ -904,7 +908,7 @@ static int hf_lpp_T_ecid_MeasSupported_ueRxTxSup = -1; static int hf_lpp_dummy_eag_field = -1; /* never registered */ /*--- End of included file: packet-lpp-hf.c ---*/ -#line 46 "../../asn1/lpp/packet-lpp-template.c" +#line 50 "../../asn1/lpp/packet-lpp-template.c" static dissector_handle_t lppe_handle = NULL; @@ -1212,7 +1216,7 @@ static gint ett_lpp_ECID_LocationServerErrorCauses = -1; static gint ett_lpp_ECID_TargetDeviceErrorCauses = -1; /*--- End of included file: packet-lpp-ett.c ---*/ -#line 55 "../../asn1/lpp/packet-lpp-template.c" +#line 59 "../../asn1/lpp/packet-lpp-template.c" /* Include constants */ @@ -1229,7 +1233,7 @@ static gint ett_lpp_ECID_TargetDeviceErrorCauses = -1; #define maxFBI2 256 /*--- End of included file: packet-lpp-val.h ---*/ -#line 58 "../../asn1/lpp/packet-lpp-template.c" +#line 62 "../../asn1/lpp/packet-lpp-template.c" static const value_string lpp_ePDU_ID_vals[] = { { 1, "OMA LPP extensions (LPPe)"}, @@ -10550,7 +10554,7 @@ int dissect_lpp_Polygon_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-lpp-fn.c ---*/ -#line 1344 "../../asn1/lpp/packet-lpp-template.c" +#line 1348 "../../asn1/lpp/packet-lpp-template.c" static int dissect_lpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_tree *subtree; @@ -13962,7 +13966,7 @@ void proto_register_lpp(void) { NULL, HFILL }}, /*--- End of included file: packet-lpp-hfarr.c ---*/ -#line 1363 "../../asn1/lpp/packet-lpp-template.c" +#line 1367 "../../asn1/lpp/packet-lpp-template.c" }; /* List of subtrees */ @@ -14268,7 +14272,7 @@ void proto_register_lpp(void) { &ett_lpp_ECID_TargetDeviceErrorCauses, /*--- End of included file: packet-lpp-ettarr.c ---*/ -#line 1370 "../../asn1/lpp/packet-lpp-template.c" +#line 1374 "../../asn1/lpp/packet-lpp-template.c" }; diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c index d5f1960e95..5c5a39c369 100644 --- a/epan/dissectors/packet-lppe.c +++ b/epan/dissectors/packet-lppe.c @@ -51,6 +51,9 @@ #pragma warning(disable:4146) #endif +void proto_register_lppe(void); +void proto_reg_handoff_lppe(void); + /* Initialize the protocol and registered fields */ static int proto_lppe = -1; @@ -1586,7 +1589,7 @@ static int hf_lppe_T_srnMeasurements_rssi = -1; static int hf_lppe_T_srnMeasurements_rtd = -1; /*--- End of included file: packet-lppe-hf.c ---*/ -#line 50 "../../asn1/lppe/packet-lppe-template.c" +#line 53 "../../asn1/lppe/packet-lppe-template.c" /* Initialize the subtree pointers */ static gint ett_lppe = -1; @@ -2215,7 +2218,7 @@ static gint ett_lppe_OMA_LPPe_SRN_MeasurementMask = -1; static gint ett_lppe_T_srnMeasurements = -1; /*--- End of included file: packet-lppe-ett.c ---*/ -#line 54 "../../asn1/lppe/packet-lppe-template.c" +#line 57 "../../asn1/lppe/packet-lppe-template.c" /* Include constants */ @@ -2254,7 +2257,7 @@ static gint ett_lppe_T_srnMeasurements = -1; #define maxChannels 512 /*--- End of included file: packet-lppe-val.h ---*/ -#line 57 "../../asn1/lppe/packet-lppe-template.c" +#line 60 "../../asn1/lppe/packet-lppe-template.c" @@ -14958,7 +14961,7 @@ static int dissect_OMA_LPPe_MessageExtension_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-lppe-fn.c ---*/ -#line 60 "../../asn1/lppe/packet-lppe-template.c" +#line 63 "../../asn1/lppe/packet-lppe-template.c" /*--- proto_register_lpp -------------------------------------------*/ @@ -21076,7 +21079,7 @@ void proto_register_lppe(void) { NULL, HFILL }}, /*--- End of included file: packet-lppe-hfarr.c ---*/ -#line 69 "../../asn1/lppe/packet-lppe-template.c" +#line 72 "../../asn1/lppe/packet-lppe-template.c" }; /* List of subtrees */ @@ -21707,7 +21710,7 @@ void proto_register_lppe(void) { &ett_lppe_T_srnMeasurements, /*--- End of included file: packet-lppe-ettarr.c ---*/ -#line 75 "../../asn1/lppe/packet-lppe-template.c" +#line 78 "../../asn1/lppe/packet-lppe-template.c" }; diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index e9196acc43..a624b025a1 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -61,6 +61,9 @@ #define CLPSNAME "CLPRES" #define CLPFNAME "clpres" +void proto_register_pres(void); +void proto_reg_handoff_pres(void); + /* Initialize the protocol and registered fields */ static int proto_pres = -1; @@ -179,7 +182,7 @@ static int hf_pres_User_session_requirements_symmetric_synchronize = -1; static int hf_pres_User_session_requirements_data_separation = -1; /*--- End of included file: packet-pres-hf.c ---*/ -#line 92 "../../asn1/pres/packet-pres-template.c" +#line 95 "../../asn1/pres/packet-pres-template.c" /* Initialize the subtree pointers */ static gint ett_pres = -1; @@ -225,7 +228,7 @@ static gint ett_pres_User_session_requirements = -1; static gint ett_pres_UD_type = -1; /*--- End of included file: packet-pres-ett.c ---*/ -#line 97 "../../asn1/pres/packet-pres-template.c" +#line 100 "../../asn1/pres/packet-pres-template.c" static expert_field ei_pres_dissector_not_available = EI_INIT; @@ -1357,7 +1360,7 @@ static void dissect_UD_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pres-fn.c ---*/ -#line 224 "../../asn1/pres/packet-pres-template.c" +#line 227 "../../asn1/pres/packet-pres-template.c" /* @@ -1843,7 +1846,7 @@ void proto_register_pres(void) { NULL, HFILL }}, /*--- End of included file: packet-pres-hfarr.c ---*/ -#line 397 "../../asn1/pres/packet-pres-template.c" +#line 400 "../../asn1/pres/packet-pres-template.c" }; /* List of subtrees */ @@ -1890,7 +1893,7 @@ void proto_register_pres(void) { &ett_pres_UD_type, /*--- End of included file: packet-pres-ettarr.c ---*/ -#line 403 "../../asn1/pres/packet-pres-template.c" +#line 406 "../../asn1/pres/packet-pres-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index e2ebb1b915..21972a9311 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -45,6 +45,8 @@ #define PSNAME "Q932" #define PFNAME "q932" +void proto_register_q932(void); + /* Initialize the protocol and registered fields */ static int proto_q932 = -1; static int hf_q932_ie_type = -1; @@ -94,7 +96,7 @@ static int hf_q932_destinationEntity = -1; /* EntityType */ static int hf_q932_destinationEntityAddress = -1; /* AddressInformation */ /*--- End of included file: packet-q932-hf.c ---*/ -#line 48 "../../asn1/q932/packet-q932-template.c" +#line 50 "../../asn1/q932/packet-q932-template.c" /* Initialize the subtree pointers */ static gint ett_q932 = -1; @@ -117,7 +119,7 @@ static gint ett_q932_UserSpecifiedSubaddress = -1; static gint ett_q932_NetworkFacilityExtension_U = -1; /*--- End of included file: packet-q932-ett.c ---*/ -#line 53 "../../asn1/q932/packet-q932-template.c" +#line 55 "../../asn1/q932/packet-q932-template.c" /* Preferences */ @@ -644,7 +646,7 @@ static void dissect_InterpretationComponent_PDU(tvbuff_t *tvb _U_, packet_info * /*--- End of included file: packet-q932-fn.c ---*/ -#line 134 "../../asn1/q932/packet-q932-template.c" +#line 136 "../../asn1/q932/packet-q932-template.c" /*--- dissect_q932_facility_ie -------------------------------------------------------*/ /*static*/ void @@ -965,7 +967,7 @@ void proto_register_q932(void) { "AddressInformation", HFILL }}, /*--- End of included file: packet-q932-hfarr.c ---*/ -#line 302 "../../asn1/q932/packet-q932-template.c" +#line 304 "../../asn1/q932/packet-q932-template.c" }; /* List of subtrees */ @@ -990,7 +992,7 @@ void proto_register_q932(void) { &ett_q932_NetworkFacilityExtension_U, /*--- End of included file: packet-q932-ettarr.c ---*/ -#line 309 "../../asn1/q932/packet-q932-template.c" +#line 311 "../../asn1/q932/packet-q932-template.c" }; module_t *q932_module; diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index bebc552832..7e2607b816 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -51,6 +51,9 @@ #define PSNAME "RTSE" #define PFNAME "rtse" +void proto_register_rtse(void); +void proto_reg_handoff_rtse(void); + /* Initialize the protocol and registered fields */ static int proto_rtse = -1; @@ -91,7 +94,7 @@ static int hf_rtse_t61String = -1; /* T_t61String */ static int hf_rtse_octetString = -1; /* T_octetString */ /*--- End of included file: packet-rtse-hf.c ---*/ -#line 58 "../../asn1/rtse/packet-rtse-template.c" +#line 61 "../../asn1/rtse/packet-rtse-template.c" /* Initialize the subtree pointers */ static gint ett_rtse = -1; @@ -108,7 +111,7 @@ static gint ett_rtse_SessionConnectionIdentifier = -1; static gint ett_rtse_CallingSSuserReference = -1; /*--- End of included file: packet-rtse-ett.c ---*/ -#line 62 "../../asn1/rtse/packet-rtse-template.c" +#line 65 "../../asn1/rtse/packet-rtse-template.c" static expert_field ei_rtse_dissector_oid_not_implemented = EI_INIT; static expert_field ei_rtse_unknown_rtse_pdu = EI_INIT; @@ -736,7 +739,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-rtse-fn.c ---*/ -#line 184 "../../asn1/rtse/packet-rtse-template.c" +#line 187 "../../asn1/rtse/packet-rtse-template.c" /* * Dissect RTSE PDUs inside a PPDU. @@ -1007,7 +1010,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 354 "../../asn1/rtse/packet-rtse-template.c" +#line 357 "../../asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1029,7 +1032,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 363 "../../asn1/rtse/packet-rtse-template.c" +#line 366 "../../asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = {