diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-15 23:44:12 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-15 23:44:12 +0000 |
commit | c45475ab45cdca7e8ea9de3c88bc07769a0983cd (patch) | |
tree | a076d8008305c9772404f613d49e9914044f5451 /epan/dissectors | |
parent | 59dddc25ec39be11e00cfe1ff0a839f63d75a26f (diff) |
Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
Diffstat (limited to 'epan/dissectors')
227 files changed, 629 insertions, 105 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 03c2274072..26383bd8db 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -57,6 +57,9 @@ #include "packet-ieee802154.h" #include "packet-6lowpan.h" +void proto_register_6lowpan(void); +void proto_reg_handoff_6lowpan(void); + /* Definitions for 6lowpan packet disassembly structures and routines */ /* 6LoWPAN Patterns */ diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 03dc18a790..409f602f9d 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -45,6 +45,9 @@ #include <epan/wmem/wmem.h> #include "packet-tcp.h" +void proto_register_amqp(void); +void proto_reg_handoff_amqp(void); + /* Generic data */ static int amqp_port = 5672; diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index 4ee847e07d..28c04f6737 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -38,6 +38,9 @@ #include <epan/prefs.h> +void proto_register_amr(void); +void proto_reg_handoff_amr(void); + #define AMR_NB_SID 8 #define AMR_WB_SID 9 #define AMR_NO_TRANS 15 @@ -617,8 +620,6 @@ dissect_amr_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree, void* return tvb_length(tvb); } -void proto_reg_handoff_amr(void); - void proto_register_amr(void) { diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c index e1733126d6..1510a4e6f0 100644 --- a/epan/dissectors/packet-ascend.c +++ b/epan/dissectors/packet-ascend.c @@ -29,7 +29,7 @@ #include <wiretap/wtap.h> void proto_register_ascend(void); -void proto_reg_handoff_acend(void); +void proto_reg_handoff_ascend(void); static int proto_ascend = -1; static int hf_link_type = -1; diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index 460131f50c..dfa2bbe72e 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -34,6 +34,9 @@ #include "wmem/wmem.h" #include <stdio.h> +void proto_register_asterix(void); +void proto_reg_handoff_asterix(void); + #define PROTO_TAG_ASTERIX "ASTERIX" #define ASTERIX_PORT 8600 diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index a74b915fa2..ed2fe51679 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.c @@ -31,6 +31,9 @@ #include <epan/addr_resolv.h> #include <epan/wmem/wmem.h> +void proto_register_bat(void); +void proto_reg_handoff_bat(void); + /* Start content from packet-bat.h */ #define BAT_BATMAN_PORT 4305 #define BAT_GW_PORT 4306 @@ -156,9 +159,6 @@ static const value_string vis_packettypenames[] = { { 0, NULL } }; -/* forward declaration */ -void proto_reg_handoff_bat(void); - /* supported packet dissectors */ static void dissect_bat_batman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static int dissect_bat_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 39aee30a35..0d610b799b 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -35,6 +35,9 @@ #include <epan/prefs.h> #include <epan/wmem/wmem.h> +void proto_register_bt_dht(void); +void proto_reg_handoff_bt_dht(void); + /* Specifications: BEP-0005 * http://www.bittorrent.org/beps/bep_0005.html */ @@ -495,8 +498,6 @@ gboolean dissect_bt_dht_heur (tvbuff_t *tvb, packet_info *pinfo, return FALSE; } -void proto_reg_handoff_bt_dht(void); - void proto_register_bt_dht(void) { diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index 328118586e..78162662a5 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -34,6 +34,9 @@ #include <epan/packet.h> +void proto_register_bvlc(void); +void proto_reg_handoff_bvlc(void); + /* Taken from add-135a (BACnet-IP-standard paper): * * The default UDP port for both directed messages and broadcasts shall @@ -312,8 +315,6 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ return tvb_reported_length(tvb); } -void proto_reg_handoff_bvlc(void); - void proto_register_bvlc(void) { diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 47ccda01d4..d5052f035e 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -34,6 +34,9 @@ #include <epan/sminmpec.h> +void proto_register_capwap_control(void); +void proto_reg_handoff_capwap(void); + #define UDP_PORT_CAPWAP_CONTROL 5246 #define UDP_PORT_CAPWAP_DATA 5247 @@ -50,9 +53,6 @@ static reassembly_table capwap_reassembly_table; * add support of all Messages Element Type */ -/* Forward declaration we need below */ -void proto_reg_handoff_capwap(void); - /* Initialize the protocol and registered fields */ static int proto_capwap = -1; diff --git a/epan/dissectors/packet-carp.c b/epan/dissectors/packet-carp.c index 4b4aa88b37..d99698ab0c 100644 --- a/epan/dissectors/packet-carp.c +++ b/epan/dissectors/packet-carp.c @@ -31,6 +31,9 @@ #include <epan/ipproto.h> #include <epan/in_cksum.h> +void proto_register_carp(void); +void proto_reg_handoff_carp(void); + static gint proto_carp = -1; static gint ett_carp = -1; static gint ett_carp_ver_type = -1; diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index fce2fd63b7..3a538687b8 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -47,6 +47,9 @@ #include "packet-rlc-lte.h" #include "packet-pdcp-lte.h" +void proto_reg_handoff_catapult_dct2000(void); +void proto_register_catapult_dct2000(void); + /* Protocol and registered fields. */ static int proto_catapult_dct2000 = -1; @@ -296,8 +299,6 @@ static dissector_handle_t mac_lte_handle; static dissector_handle_t rlc_lte_handle; static dissector_handle_t pdcp_lte_handle; -void proto_register_catapult_dct2000(void); - static dissector_handle_t look_for_dissector(const char *protocol_name); static void parse_outhdr_string(const guchar *outhdr_string, gint outhdr_length); diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c index aba006c9ea..c8490af2a0 100644 --- a/epan/dissectors/packet-cell_broadcast.c +++ b/epan/dissectors/packet-cell_broadcast.c @@ -38,6 +38,8 @@ #include "packet-gsm_map.h" #include "packet-gsm_sms.h" +void proto_register_cbs(void); + #define GSM_CBS_PAGE_SIZE 88 const value_string message_id_values[] = { diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index 6576424f9f..390476e627 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -65,6 +65,9 @@ #include <epan/prefs.h> #include <epan/expert.h> +void proto_register_erspan(void); +void proto_reg_handoff_erspan(void); + static int proto_erspan = -1; static gint ett_erspan = -1; diff --git a/epan/dissectors/packet-cisco-metadata.c b/epan/dissectors/packet-cisco-metadata.c index 7d42fed385..8e27c589a6 100644 --- a/epan/dissectors/packet-cisco-metadata.c +++ b/epan/dissectors/packet-cisco-metadata.c @@ -32,6 +32,9 @@ #include "packet-ieee8023.h" #endif +void proto_register_cmd(void); +void proto_reg_handoff_cmd(void); + static dissector_handle_t ethertype_handle; static int proto_cmd = -1; diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index e1e5fe9458..b75bf0fc07 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -230,6 +230,9 @@ #include "packet-dcm.h" +void proto_register_dcm(void); +void proto_reg_handoff_dcm(void); + #define DICOM_DEFAULT_RANGE "104" /* Many thanks to http://medicalconnections.co.uk/ for the GUID */ diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index d12d700a74..4a81d35c3b 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -33,6 +33,8 @@ #include "packet-dcom.h" #include "packet-dcom-dispatch.h" +void proto_register_dcom_dispatch(void); +void proto_reg_handoff_dcom_dispatch(void); static int hf_dispatch_opnum = -1; diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c index 47800bb971..cbc52a5daa 100644 --- a/epan/dissectors/packet-dcom-oxid.c +++ b/epan/dissectors/packet-dcom-oxid.c @@ -32,6 +32,9 @@ #include "packet-dcerpc.h" #include "packet-dcom.h" +void proto_register_oxid(void); +void proto_reg_handoff_oxid(void); + static int proto_oxid = -1; static int hf_oxid_opnum = -1; diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c index b44c8e65cf..3962d36ff9 100644 --- a/epan/dissectors/packet-dcom-remact.c +++ b/epan/dissectors/packet-dcom-remact.c @@ -33,8 +33,8 @@ #include "packet-dcom.h" -void proto_register_dcom_remact(void); -void proto_reg_handoff_dcom_remact(void); +void proto_register_remact(void); +void proto_reg_handoff_remact(void); static int hf_remact_opnum = -1; diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index 40bd1ebfa4..b75dc158b4 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -34,6 +34,8 @@ #include "packet-dcom.h" #include "guid-utils.h" +void proto_register_remunk(void); +void proto_reg_handoff_remunk(void); static int hf_remunk_opnum = -1; diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c index 7ac9c83856..cf5613d476 100644 --- a/epan/dissectors/packet-dcom-sysact.c +++ b/epan/dissectors/packet-dcom-sysact.c @@ -32,6 +32,8 @@ #include "packet-dcerpc.h" #include "packet-dcom.h" +void proto_register_ISystemActivator(void); +void proto_reg_handoff_ISystemActivator(void); static int proto_ISystemActivator = -1; diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index 007de5963e..66cf439997 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -37,6 +37,8 @@ #include <epan/reassemble.h> #include "packet-cip.h" +void proto_register_devicenet(void); + #define DEVICENET_CANID_MASK 0x7FF #define MESSAGE_GROUP_1_ID 0x3FF #define MESSAGE_GROUP_1_MSG_MASK 0x3C0 diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index a117e1e9e1..f4f60c2270 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -56,6 +56,9 @@ #include "packet-p1.h" #include "packet-p22.h" +void proto_register_dmp(void); +void proto_reg_handoff_dmp(void); + #define PNAME "Direct Message Profile" #define PSNAME "DMP" #define PFNAME "dmp" @@ -162,8 +165,6 @@ /* Maximum lengths */ #define MAX_SIC_LEN 30 -void proto_reg_handoff_dmp (void); - static int proto_dmp = -1; static int hf_dmp_id = -1; diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index 6869d0f93d..82f127606d 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -46,6 +46,7 @@ * but it's all I could find.... */ void proto_register_dtp(void); +void proto_reg_handoff_dtp(void); static int proto_dtp = -1; static int hf_dtp_version = -1; diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index 12674c767c..878b5a385d 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -38,6 +38,7 @@ #include "packet-e212.h" #include "expert.h" +void proto_register_e212(void); /* * Annex to ITU Operational Bulletin diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c index 57f94cbc2e..a4f879961f 100644 --- a/epan/dissectors/packet-ecp-oui.c +++ b/epan/dissectors/packet-ecp-oui.c @@ -35,6 +35,9 @@ #include "packet-ieee802a.h" #include "packet-lldp.h" +void proto_register_ecp_oui(void); +void proto_reg_handoff_ecp(void); + #define ECP_SUBTYPE 0 #define VDP_TLV_TYPE 0x02 @@ -45,9 +48,6 @@ #define VDP_FIF_GROUPVID 0x03 #define VDP_FIF_GROUPVMACVID 0x04 -void proto_register_ecp_oui(void); -void proto_reg_handoff_ecp_oui(void); - static gint proto_ecp = -1; static gint hf_ecp_pid = -1; static gint hf_ecp_subtype = -1; diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 2a28c82dd2..81a2705e0b 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -51,6 +51,9 @@ #include "packet-enip.h" #include "packet-cipsafety.h" +void proto_register_enip(void); +void proto_reg_handoff_enip(void); + /* Communication Ports */ #define ENIP_ENCAP_PORT 44818 /* EtherNet/IP located on port 44818 */ #define ENIP_IO_PORT 2222 /* EtherNet/IP IO located on port 2222 */ diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 3cf2ef2f05..d5d542e518 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -54,6 +54,9 @@ #include <epan/etypes.h> #include <epan/prefs.h> +void proto_register_epl(void); +void proto_reg_handoff_epl(void); + #ifndef UDP_PORT_EPL #define UDP_PORT_EPL 3819 #endif diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index 3de9fd96ac..d863dcca9c 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -39,6 +39,8 @@ #include <epan/etypes.h> #include <epan/emem.h> +void proto_register_epl_v1(void); +void proto_reg_handoff_epl_v1(void); /* Offsets of fields within an EPL_V1 packet. */ #define EPL_V1_SERVICE_OFFSET 0 /* same offset for all message types*/ diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 162572d565..2975fc5206 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -37,6 +37,9 @@ */ #include "wiretap/erf.h" +void proto_register_erf(void); +void proto_reg_handoff_erf(void); + #define EXT_HDR_TYPE_CLASSIFICATION 3 #define EXT_HDR_TYPE_INTERCEPTID 4 #define EXT_HDR_TYPE_RAW_LINK 5 diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index 843015a7ba..ad25bb999a 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -44,6 +44,9 @@ #include <epan/dissectors/packet-tcp.h> #include <epan/wmem/wmem.h> +void proto_register_etch(void); +void proto_reg_handoff_etch(void); + /* * maximum numbers for symbols from config files */ @@ -162,7 +165,6 @@ static void read_struct(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree, int add_type_field); static int read_value(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree, int asWhat); -void proto_reg_handoff_etch(void); /************************************************************************ * Symbol value-string functions diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index 400597e5bc..74705bfc4f 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -37,6 +37,7 @@ #include "packet-mtp3.h" #include "packet-dvbci.h" +void proto_register_exported_pdu(void); void proto_reg_handoff_exported_pdu(void); static int proto_exported_pdu = -1; diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 7f69314b1f..b6fdde8f04 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -44,6 +44,9 @@ #include <epan/crc32-tvb.h> #include <epan/expert.h> +void proto_register_fc(void); +void proto_reg_handoff_fc(void); + #define FC_HEADER_SIZE 24 #define FC_RCTL_VFT 0x50 #define MDSHDR_TRAILER_SIZE 6 diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index 11bd002df3..8afb36edd8 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -35,6 +35,9 @@ #include "packet-fc.h" #include "packet-fcct.h" +void proto_register_fcct(void); +void proto_reg_handoff_fcct(void); + /* Initialize the protocol and registered fields */ static int proto_fcct = -1; static int hf_fcct_revision = -1; diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 2d4bf71269..9969673742 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -44,6 +44,9 @@ #include "packet-fcdns.h" #include "packet-fcswils.h" +void proto_register_fcdns(void); +void proto_reg_handoff_fcdns(void); + /* * See FC-GS-2. */ diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index aea5dbadb0..027dbb93c6 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -42,6 +42,9 @@ #include "packet-fc.h" #include "packet-fcels.h" +void proto_register_fcels(void); +void proto_reg_handoff_fcels(void); + #define FC_ELS_RPLY 0 #define FC_ELS_REQ 1 diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index ef86c94ea7..34fbccaa38 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -37,6 +37,9 @@ #include "packet-fcct.h" #include "packet-fcfcs.h" +void proto_register_fcfcs(void); +void proto_reg_handoff_fcfcs(void); + /* * See the FC-GS3 specification. */ diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index a6250cdbb9..f26b916779 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -37,6 +37,9 @@ #include "packet-fcct.h" #include "packet-fcfzs.h" +void proto_register_fcfzs(void); +void proto_reg_handoff_fcfzs(void); + /* Initialize the protocol and registered fields */ static int proto_fcfzs = -1; static int hf_fcfzs_opcode = -1; diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index d468d3d345..e95ee87c9e 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -29,6 +29,9 @@ #include <epan/prefs.h> #include "packet-tcp.h" +void proto_register_fcgi(void); +void proto_reg_handoff_fcgi(void); + static int proto_fcgi = -1; static guint tcp_port = 0; @@ -97,8 +100,6 @@ static const value_string protocol_statuses[] = { { 0, NULL } }; -void proto_reg_handoff_fcgi(void); - static void dissect_nv_pairs(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) { diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index b272270893..752fca46dd 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -32,6 +32,9 @@ #include <epan/prefs.h> #include "packet-fc.h" +void proto_register_fcip(void); +void proto_reg_handoff_fcip(void); + #define FCIP_ENCAP_HEADER_LEN 28 #define FCIP_MIN_HEADER_LEN 16 /* upto frame len field */ #define FCIP_IS_SF(pflags) ((pflags & 0x1) == 0x1) diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index a5743e07bf..36d834848b 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -42,6 +42,9 @@ #include <epan/wmem/wmem.h> #include "packet-fc.h" +void proto_register_fcoe(void); +void proto_reg_handoff_fcoe(void); + #define FCOE_HEADER_LEN 14 /* header: version, SOF, and padding */ #define FCOE_TRAILER_LEN 8 /* trailer: CRC, EOF, and padding */ diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c index 2ab8ed3967..7de20ea565 100644 --- a/epan/dissectors/packet-fcoib.c +++ b/epan/dissectors/packet-fcoib.c @@ -52,13 +52,13 @@ # include "wsutil/inet_v6defs.h" #endif +void proto_register_fcoib(void); +void proto_reg_handoff_fcoib(void); + #define FCOIB_HEADER_LEN 16 /* header: encap. header, SOF, and padding */ #define FCOIB_TRAILER_LEN 8 /* trailer: FC-CRC, EOF and padding */ #define FCOIB_VER_OFFSET 2 /* offset of ver field (in bytes) inside FCoIB Encap. header */ -/* Forward declaration we need below (for using proto_reg_handoff as a prefs callback) */ -void proto_reg_handoff_fcoib(void); - typedef enum { FCOIB_EOFn = 0x41, FCOIB_EOFt = 0x42, diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index eb1bca08ae..7942819ad4 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -36,6 +36,9 @@ #include "packet-fcp.h" #include "packet-fcels.h" +void proto_register_fcp(void); +void proto_reg_handoff_fcp(void); + typedef struct _fcp_proto_data_t { guint16 lun; } fcp_proto_data_t; diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 4e51ee643b..035c440567 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -35,6 +35,9 @@ #include "packet-fc.h" #include "packet-fcsb3.h" +void proto_register_fcsbccs(void); +void proto_reg_handoff_fcsbccs(void); + /* Initialize the protocol and registered fields */ static int proto_fc_sbccs = -1; static int hf_sbccs_chid = -1; diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c index 60a0dcdf01..05f2bee9b1 100644 --- a/epan/dissectors/packet-fcsp.c +++ b/epan/dissectors/packet-fcsp.c @@ -35,6 +35,8 @@ #include "packet-scsi.h" #include "packet-fc.h" +void proto_register_fcsp(void); + /* Message Codes */ #define FC_AUTH_MSG_AUTH_REJECT 0x0A #define FC_AUTH_MSG_AUTH_NEGOTIATE 0x0B diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index c6dc254916..040a07be7b 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -37,6 +37,9 @@ #include "packet-fcswils.h" #include "packet-fcct.h" +void proto_register_fcswils(void); +void proto_reg_handoff_fcswils(void); + /* * See the FC-SW specifications. */ diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index fe75ae2e8e..b097a8f1ac 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -32,7 +32,8 @@ #include <epan/oui.h> #include <epan/nlpid.h> - +void proto_register_fefd(void); +void proto_reg_handoff_fefd(void); /* Offsets in TLV structure. */ #define TLV_TYPE 0 diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 0bd5e27fc5..615be89b23 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -49,7 +49,8 @@ #include "packet-ff.h" #include "packet-tcp.h" - +void proto_register_ff(void); +void proto_reg_handoff_ff(void); static int proto_ff = -1; static gint ett_ff = -1; diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index f1732e849b..0ce44e7132 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -44,6 +44,9 @@ #include <epan/expert.h> #include "packet-fc.h" +void proto_register_fip(void); +void proto_reg_handoff_fip(void); + /* * FIP protocol information. */ diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 8a7e45a9b3..8a9cac7e19 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -42,6 +42,9 @@ #include "packet-tcp.h" #include "packet-ssl.h" +void proto_register_fix(void); +void proto_reg_handoff_fix(void); + typedef struct _fix_parameter { int field_len; int tag_len; diff --git a/epan/dissectors/packet-flexnet.c b/epan/dissectors/packet-flexnet.c index 7406609891..9f7867a0ed 100644 --- a/epan/dissectors/packet-flexnet.c +++ b/epan/dissectors/packet-flexnet.c @@ -43,6 +43,9 @@ #include <epan/packet.h> #include <epan/ax25_pids.h> +void proto_register_flexnet(void); +void proto_reg_handoff_flexnet(void); + #define FLEXNET_ADRLEN 15 #define FLEXNET_CTLLEN 15 #define FLEXNET_HDRLEN (FLEXNET_ADRLEN + FLEXNET_ADRLEN + FLEXNET_CTLLEN) diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index 54b9b3565f..f323e62312 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -57,6 +57,9 @@ #include <epan/rtp_pt.h> +void proto_register_flip(void); +void proto_reg_handoff_flip(void); + static int proto_flip = -1; /* BASIC */ @@ -135,8 +138,6 @@ static dissector_handle_t data_handle; static dissector_handle_t forced_handle; /* Forward declaration. */ -void -proto_reg_handoff_flip(void); static gboolean is_payload_rtp(tvbuff_t *tvb); static gboolean diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c index e44e139465..4eda8a9272 100644 --- a/epan/dissectors/packet-fmp.c +++ b/epan/dissectors/packet-fmp.c @@ -29,6 +29,8 @@ #include "packet-fmp.h" #include "packet-rpc.h" +void proto_register_fmp(void); +void proto_reg_handoff_fmp(void); static int hf_fmp_procedure = -1; static int hf_fmp_fsID = -1; diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c index 79943ac018..62bf95668d 100644 --- a/epan/dissectors/packet-fmp_notify.c +++ b/epan/dissectors/packet-fmp_notify.c @@ -32,6 +32,9 @@ #include "packet-rpc.h" #include "packet-fmp.h" +void proto_register_fmp_notify(void); +void proto_reg_handoff_fmp_notify(void); + #define FMP_NOTIFY_PROG 1001912 #define FMP_NOTIFY_VERSION_2 2 diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c index 9fe2f8e92d..ce4b3690a6 100644 --- a/epan/dissectors/packet-fmtp.c +++ b/epan/dissectors/packet-fmtp.c @@ -33,6 +33,9 @@ #include <epan/packet.h> #include "packet-tcp.h" +void proto_register_fmtp(void); +void proto_reg_handoff_fmtp(void); + static int proto_fmtp = -1; static int hf_fmtp_pdu_version = -1; static int hf_fmtp_pdu_reserved = -1; diff --git a/epan/dissectors/packet-force10-oui.c b/epan/dissectors/packet-force10-oui.c index 89be6135d4..de22639497 100644 --- a/epan/dissectors/packet-force10-oui.c +++ b/epan/dissectors/packet-force10-oui.c @@ -27,6 +27,8 @@ #include "packet-llc.h" #include <epan/oui.h> +void proto_register_force10_oui(void); + static int hf_llc_force10_pid = -1; static const value_string force10_pid_vals[] = { diff --git a/epan/dissectors/packet-forces.c b/epan/dissectors/packet-forces.c index 7c1d447bd7..068d14294d 100644 --- a/epan/dissectors/packet-forces.c +++ b/epan/dissectors/packet-forces.c @@ -32,6 +32,9 @@ #include <epan/prefs.h> #include <epan/expert.h> +void proto_register_forces(void); +void proto_reg_handoff_forces(void); + static dissector_handle_t ip_handle; /* Initialize the ForCES protocol and registered fields */ @@ -613,8 +616,6 @@ dissect_forces_not_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_forces(tvb, pinfo, tree, 0); } -void proto_reg_handoff_forces(void); - void proto_register_forces(void) { diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index 5c4eb3f8f9..c250d4aede 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -34,6 +34,10 @@ #include "packet-llc.h" #include <epan/oui.h> +void proto_register_fdp(void); +void proto_reg_handoff_fdp(void); +void proto_register_foundry_oui(void); + static int hf_llc_foundry_pid = -1; static int proto_fdp = -1; diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index 5fe0ae9294..5e0682421d 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -35,6 +35,9 @@ #include "packet-umts_mac.h" #include "packet-rlc.h" +void proto_register_fp_hint(void); +void proto_reg_handoff_fp_hint(void); + static int proto_fp_hint = -1; extern int proto_fp; extern int proto_umts_mac; diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index f0fa3fccad..9dffe606d9 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -52,6 +52,9 @@ #include <epan/nlpid.h> #include <epan/greproto.h> +void proto_register_fr(void); +void proto_reg_handoff_fr(void); + /* * Bits in the address field. */ diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index 9615e96d14..01c2e626ba 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -33,6 +33,8 @@ #include <epan/packet.h> #include <epan/sctpppids.h> +void proto_register_fractalgeneratorprotocol(void); +void proto_reg_handoff_fractalgeneratorprotocol(void); #define FRACTALGENERATORPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY 0x29097601 diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 01f5e3e88d..3163063023 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -47,6 +47,9 @@ #include "color.h" #include "color_filters.h" +void proto_register_frame(void); +void proto_reg_handoff_frame(void); + int proto_frame = -1; static int proto_pkt_comment = -1; int hf_frame_arrival_time = -1; diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 16c96b2730..9f66a16438 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -53,7 +53,8 @@ #include "wsutil/inet_v6defs.h" /* if not a *NIX system */ #endif - +void proto_register_ftp(void); +void proto_reg_handoff_ftp(void); static int proto_ftp = -1; static int proto_ftp_data = -1; diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c index 522c0a76af..e0c149559e 100644 --- a/epan/dissectors/packet-g723.c +++ b/epan/dissectors/packet-g723.c @@ -32,6 +32,8 @@ #include <epan/packet.h> #include <epan/rtp_pt.h> +void proto_reg_handoff_g723(void); +void proto_register_g723(void); /* Initialize the protocol and registered fields */ static int proto_g723 = -1; diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 97b198dd99..cd734a42aa 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -29,6 +29,9 @@ #include <epan/packet.h> +void proto_register_gdsdb(void); +void proto_reg_handoff_gdsdb(void); + #define TCP_PORT 3050 static int proto_gdsdb = -1; diff --git a/epan/dissectors/packet-gearman.c b/epan/dissectors/packet-gearman.c index 5408cfbd78..1a3fd8285c 100644 --- a/epan/dissectors/packet-gearman.c +++ b/epan/dissectors/packet-gearman.c @@ -35,6 +35,9 @@ #include <epan/expert.h> #include "packet-tcp.h" +void proto_register_gearman(void); +void proto_reg_handoff_gearman(void); + static int proto_gearman = -1; static int hf_gearman_mgr_cmd = -1; diff --git a/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c index 27e5794a9f..2d6c9924a6 100644 --- a/epan/dissectors/packet-ged125.c +++ b/epan/dissectors/packet-ged125.c @@ -49,6 +49,9 @@ #include <epan/prefs.h> #include "packet-tcp.h" +void proto_register_ged125(void); +void proto_reg_handoff_ged125(void); + static int proto_ged125 = -1; static gint hf_ged125_length = -1; diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index 68c68ee236..bd15d133ce 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.c @@ -32,6 +32,9 @@ #include <epan/packet.h> #include <epan/strutil.h> +void proto_register_gift(void); +void proto_reg_handoff_gift(void); + #define TCP_PORT_GIFT 1213 static int proto_gift = -1; diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index df7124d433..bd377bee5d 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -302,6 +302,8 @@ #include <wsutil/file_util.h> #include <wsutil/pint.h> +void proto_register_giop(void); +void proto_reg_handoff_giop(void); /* * Set to 1 for DEBUG output - TODO make this a runtime option diff --git a/epan/dissectors/packet-gluster_cli.c b/epan/dissectors/packet-gluster_cli.c index dd3dcd56dd..f12633cdf3 100644 --- a/epan/dissectors/packet-gluster_cli.c +++ b/epan/dissectors/packet-gluster_cli.c @@ -42,6 +42,9 @@ #include "packet-rpc.h" #include "packet-gluster.h" +void proto_register_gluster_cli(void); +void proto_reg_handoff_gluster_cli(void); + /* Initialize the protocol and registered fields */ static gint proto_gluster_cli = -1; diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index 5e82b1675a..af12e569e5 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -42,6 +42,11 @@ #include "packet-rpc.h" #include "packet-gluster.h" +void proto_register_gluster_pmap(void); +void proto_reg_handoff_gluster_pmap(void); +void proto_register_gluster_dump(void); +void proto_reg_handoff_gluster_dump(void); + /* Initialize the protocol and registered fields */ static gint proto_gluster_pmap = -1; static gint proto_gluster_dump = -1; diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index a3b6230566..b87a5d542b 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -44,6 +44,9 @@ #include "packet-rpc.h" #include "packet-gluster.h" +void proto_register_glusterfs(void); +void proto_reg_handoff_glusterfs(void); + /* Initialize the protocol and registered fields */ static gint proto_glusterfs = -1; diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index 72957159fa..3df6125f9e 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -42,6 +42,11 @@ #include "packet-rpc.h" #include "packet-gluster.h" +void proto_register_gluster_hndsk(void); +void proto_reg_handoff_gluster_hndsk(void); +void proto_register_gluster_cbk(void); +void proto_reg_handoff_gluster_cbk(void); + /* Initialize the protocol and registered fields */ static gint proto_gluster_cbk = -1; static gint proto_gluster_hndsk = -1; diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c index 34964f073b..80311a4c2b 100644 --- a/epan/dissectors/packet-gmr1_bcch.c +++ b/epan/dissectors/packet-gmr1_bcch.c @@ -37,6 +37,7 @@ #include "packet-csn1.h" +void proto_register_gmr1_bcch(void); /* GMR-1 BCCH proto */ static int proto_gmr1_bcch = -1; diff --git a/epan/dissectors/packet-gmr1_common.c b/epan/dissectors/packet-gmr1_common.c index bc3b58da9b..843629f3b3 100644 --- a/epan/dissectors/packet-gmr1_common.c +++ b/epan/dissectors/packet-gmr1_common.c @@ -39,6 +39,7 @@ #include "packet-gmr1_common.h" +void proto_register_gmr1_common(void); /* GMR-1 Common proto */ static int proto_gmr1_common = -1; @@ -370,9 +371,3 @@ proto_register_gmr1_common(void) proto_register_field_array(proto_gmr1_common, hf, array_length(hf)); } - -void -proto_reg_handoff_gmr1_common(void) -{ - /* Nothing to do */ -} diff --git a/epan/dissectors/packet-gmr1_dtap.c b/epan/dissectors/packet-gmr1_dtap.c index 3893790644..b6e308918f 100644 --- a/epan/dissectors/packet-gmr1_dtap.c +++ b/epan/dissectors/packet-gmr1_dtap.c @@ -36,6 +36,8 @@ #include "packet-gmr1_common.h" +void proto_register_gmr1_dtap(void); +void proto_reg_handoff_gmr1_dtap(void); /* GMR-1 DTAP proto */ static int proto_gmr1_dtap = -1; diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c index 08507a68fe..c2a16b92dc 100644 --- a/epan/dissectors/packet-gmr1_rach.c +++ b/epan/dissectors/packet-gmr1_rach.c @@ -41,6 +41,8 @@ #include "packet-csn1.h" +void proto_register_gmr1_rach(void); +void proto_reg_handoff_gmr1_rach(void); /* GMR-1 RACH proto */ static int proto_gmr1_rach = -1; diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index 19a91e8dd1..ce530cc88f 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.c @@ -40,6 +40,9 @@ #include "packet-gmr1_common.h" #include "packet-gsm_sms.h" +void proto_register_gmr1_rr(void); +void proto_reg_handoff_gmr1_rr(void); + /* GMR-1 RR and CCCH proto */ static int proto_gmr1_rr = -1; static int proto_gmr1_ccch = -1; diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index 2e7d753751..b9c9164387 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -33,6 +33,9 @@ #include <epan/packet.h> #include <epan/llcsaps.h> +void proto_register_gmrp(void); +void proto_reg_handoff_gmrp(void); + /* Initialize the protocol and registered fields */ static int proto_gmrp = -1; static int hf_gmrp_proto_id = -1; diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index df7890dacd..d24c5df7e8 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -31,6 +31,9 @@ #include "packet-gnutella.h" #include "packet-tcp.h" +void proto_register_gnutella(void); +void proto_reg_handoff_gnutella(void); + /* * See * diff --git a/epan/dissectors/packet-gnutella.h b/epan/dissectors/packet-gnutella.h index 080e95a668..ffb1cfab0f 100644 --- a/epan/dissectors/packet-gnutella.h +++ b/epan/dissectors/packet-gnutella.h @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -void proto_register_gnutella(void); - #define GNUTELLA_TCP_PORT 6346 /* diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index d40acd0eab..23c6dbd0f2 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -37,6 +37,9 @@ #include <epan/packet.h> #include <epan/prefs.h> +void proto_register_gopher(void); +void proto_reg_handoff_gopher(void); + /* Initialize the protocol and registered fields */ static int proto_gopher = -1; static int hf_gopher_request = -1; diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c index c3162897fc..6da3d15873 100644 --- a/epan/dissectors/packet-gprs-llc.c +++ b/epan/dissectors/packet-gprs-llc.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include <epan/prefs.h> +void proto_register_llcgprs(void); +void proto_reg_handoff_llcgprs(void); + #define I_FORMAT 1 #define S_FORMAT 2 #define UI_FORMAT 3 diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index d96eeeb348..b4b27c055c 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -36,6 +36,9 @@ #include "packet-gre.h" #include "packet-wccp.h" +void proto_register_gre(void); +void proto_reg_handoff_gre(void); + /* * See RFC 1701 "Generic Routing Encapsulation (GRE)", RFC 1702 * "Generic Routing Encapsulation over IPv4 networks", RFC 2637 diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 959b72e598..303fc54392 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -60,6 +60,9 @@ #include "packet-rtp.h" #include "packet-gsm_map.h" +void proto_register_gsm_a_bssmap(void); +void proto_reg_handoff_gsm_a_bssmap(void); + /* PROTOTYPES/FORWARDS */ /* TS 48.008 3.2.2.1 Message Type */ diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index e38ea3727e..f5c5442610 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -45,6 +45,7 @@ #include "packet-gmr1_common.h" #include "packet-e212.h" +void proto_register_gsm_a_common(void); static const value_string gsm_common_elem_strings[] = { /* Common Information Elements 10.5.1 */ diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index d0f5ac67cf..c2b2215ada 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -120,6 +120,9 @@ #include "expert.h" #include "packet-isup.h" +void proto_register_gsm_a_dtap(void); +void proto_reg_handoff_gsm_a_dtap(void); + /* PROTOTYPES/FORWARDS */ const value_string gsm_a_dtap_msg_mm_strings[] = { diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 201820136b..f752196231 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -88,6 +88,9 @@ #include "packet-ppp.h" #include "ipproto.h" +void proto_register_gsm_a_gm(void); +void proto_reg_handoff_gsm_a_gm(void); + /* PROTOTYPES/FORWARDS */ const value_string gsm_a_dtap_msg_gmm_strings[] = { diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c index fff57207e4..ecdbd4e034 100644 --- a/epan/dissectors/packet-gsm_a_rp.c +++ b/epan/dissectors/packet-gsm_a_rp.c @@ -43,6 +43,9 @@ #include "packet-sccp.h" #include "packet-gsm_a_common.h" +void proto_register_gsm_a_rp(void); +void proto_reg_handoff_gsm_a_rp(void); + /* PROTOTYPES/FORWARDS */ static const value_string gsm_rp_msg_strings[] = { diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 774d02d316..8c08eaa6c7 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -59,6 +59,9 @@ #include "packet-e212.h" #include "packet-ppp.h" +void proto_register_gsm_a_rr(void); +void proto_reg_handoff_gsm_a_rr(void); + static dissector_handle_t rrc_irat_ho_info_handle; static dissector_handle_t rrc_irat_ho_to_utran_cmd_handle; diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c index 968e590a58..b0901661e2 100644 --- a/epan/dissectors/packet-gsm_abis_om2000.c +++ b/epan/dissectors/packet-gsm_abis_om2000.c @@ -40,6 +40,8 @@ #include <stdio.h> +void proto_register_abis_om2000(void); + /* initialize the protocol and registered fields */ static int proto_abis_om2000 = -1; diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index 080f8c7779..8ed4aa3127 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.c @@ -36,6 +36,9 @@ #include "packet-gsm_a_common.h" +void proto_register_abis_oml(void); +void proto_reg_handoff_abis_oml(void); + /* From openbsc/include/openbsc/abis_nm.h */ #define ABIS_OM_MDISC_FOM 0x80 diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index 88ca2fb9c5..83add2bea2 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -33,6 +33,9 @@ #include "packet-gsm_a_common.h" +void proto_reg_handoff_gsm_bsslap(void); +void proto_register_gsm_bsslap(void); + static dissector_handle_t bsslap_rrlp_handle = NULL; /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index 8c09505a5d..c7f29e76bb 100644 --- a/epan/dissectors/packet-gsm_bssmap_le.c +++ b/epan/dissectors/packet-gsm_bssmap_le.c @@ -39,6 +39,9 @@ #include "packet-gsm_a_common.h" #include "packet-e212.h" +void proto_register_gsm_bssmap_le(void); +void proto_reg_handoff_gsm_bssmap_le(void); + /* PROTOTYPES/FORWARDS */ /* Message Type definitions */ diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c index a93a2affaa..2278a0da7e 100644 --- a/epan/dissectors/packet-gsm_cbch.c +++ b/epan/dissectors/packet-gsm_cbch.c @@ -30,6 +30,9 @@ #include <epan/reassemble.h> #include "packet-cell_broadcast.h" +void proto_register_gsm_cbch(void); +void proto_reg_handoff_gsm_cbch(void); + #define CBCH_FRAGMENT_SIZE 22 const value_string block_type_lpd_strings[] = { diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index 6ed9a06f9c..258b6c0f1e 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -32,6 +32,9 @@ #include <epan/ipproto.h> #include <epan/prefs.h> +void proto_register_ipa(void); +void proto_reg_handoff_gsm_ipa(void); + /* * Protocol used by ip.access's nanoBTS/nanoGSM GSM picocells: * @@ -371,8 +374,6 @@ dissect_ipa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -void proto_reg_handoff_gsm_ipa(void); - void proto_register_ipa(void) { module_t *ipa_module; diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index 79800e0fd3..640f2364c2 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -58,6 +58,9 @@ #include "packet-csn1.h" #include "packet-gsm_rlcmac.h" +void proto_register_gsm_rlcmac(void); +void proto_reg_handoff_gsm_rlcmac(void); + /* private typedefs */ typedef struct { diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index 23dc1018f3..98676b4052 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.c @@ -35,6 +35,9 @@ #include <epan/lapd_sapi.h> #include <epan/prefs.h> +void proto_register_gsm_sim(void); +void proto_reg_handoff_gsm_sim(void); + static int proto_gsm_sim = -1; /* ISO 7816-4 APDU */ @@ -1458,9 +1461,6 @@ dissect_gsm_sim_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } void -proto_reg_handoff_gsm_sim(void); - -void proto_register_gsm_sim(void) { static hf_register_info hf[] = { diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index e78ffee4a1..d748a5a86b 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -48,6 +48,8 @@ #include "packet-gsm_sms.h" +void proto_register_gsm_sms(void); + #define MAX_SMS_FRAG_LEN 134 /* PROTOTYPES/FORWARDS */ @@ -3832,12 +3834,6 @@ proto_register_gsm_sms(void) register_init_routine (gsm_sms_defragment_init); } - -void -proto_reg_handoff_gsm_sms(void) -{ -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index 7982c49e3d..e3cfd762fb 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -65,6 +65,9 @@ #include <epan/prefs.h> #include <epan/reassemble.h> +void proto_register_gsm_sms_ud(void); +void proto_reg_handoff_gsm_sms_ud(void); + static void dissect_gsm_sms_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static int proto_gsm_sms_ud = -1; diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c index 55792ba704..77f0f16633 100644 --- a/epan/dissectors/packet-gsm_um.c +++ b/epan/dissectors/packet-gsm_um.c @@ -31,6 +31,9 @@ #include <epan/prefs.h> #include <epan/circuit.h> +void proto_register_gsm_um(void); +void proto_reg_handoff_gsm_um(void); + static int proto_gsm_um = -1; static int hf_gsm_um_direction = -1; static int hf_gsm_um_channel = -1; diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c index b67d5d3a65..56ab4fa077 100644 --- a/epan/dissectors/packet-gsmtap.c +++ b/epan/dissectors/packet-gsmtap.c @@ -49,6 +49,9 @@ #include "packet-tetra.h" #include "packet-rrc.h" +void proto_register_gsmtap(void); +void proto_reg_handoff_gsmtap(void); + /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */ /* The following types and definitions are imported from libosmocore, * the original source of the GSMTAP format. diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index f2bdd80b25..b30512135f 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -45,6 +45,9 @@ #include <epan/dissectors/packet-dcerpc.h> #include <epan/dissectors/packet-gssapi.h> +void proto_register_gssapi(void); +void proto_reg_handoff_gssapi(void); + static int proto_gssapi = -1; static int hf_gssapi_oid = -1; diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 99254f7926..08e6fa9f9a 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -74,6 +74,9 @@ #include "packet-e212.h" #include "packet-gtp.h" +void proto_register_gtp(void); +void proto_reg_handoff_gtp(void); + static dissector_table_t ppp_subdissector_table; static dissector_table_t gtp_priv_ext_dissector_table; static dissector_table_t gtp_cdr_fmt_dissector_table; @@ -101,8 +104,6 @@ static guint g_gtpv0_port = GTPv0_PORT; static guint g_gtpv1c_port = GTPv1C_PORT; static guint g_gtpv1u_port = GTPv1U_PORT; -void proto_reg_handoff_gtp(void); - static int proto_gtp = -1; /*KTi*/ diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index de05566c20..4536f9b539 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -44,6 +44,9 @@ #include "packet-bssgp.h" #include "packet-ntp.h" +void proto_register_gtpv2(void); +void proto_reg_handoff_gtpv2(void); + static dissector_handle_t nas_eps_handle; static dissector_table_t gtpv2_priv_ext_dissector_table; diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 46ce56ba42..09dc18dfab 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -50,6 +50,9 @@ #include <epan/packet.h> #include <epan/wmem/wmem.h> +void proto_register_gvcp(void); +void proto_reg_handoff_gvcp(void); + #define GVCP_PORT 3956 static int proto_gvcp = -1; diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c index 1be9259a1d..f1d006cdeb 100644 --- a/epan/dissectors/packet-h1.c +++ b/epan/dissectors/packet-h1.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include <epan/exceptions.h> +void proto_register_h1(void); +void proto_reg_handoff_h1(void); + static int proto_h1 = -1; static int hf_h1_header = -1; static int hf_h1_len = -1; diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c index ef0993aa54..ab5cd659ba 100644 --- a/epan/dissectors/packet-h221_nonstd.c +++ b/epan/dissectors/packet-h221_nonstd.c @@ -27,6 +27,9 @@ #include <glib.h> #include <epan/packet.h> +void proto_register_nonstd(void); +void proto_reg_handoff_nonstd(void); + /* Define the nonstd proto */ static int proto_nonstd = -1; diff --git a/epan/dissectors/packet-h248_10.c b/epan/dissectors/packet-h248_10.c index 2bc3c62dab..4680723727 100644 --- a/epan/dissectors/packet-h248_10.c +++ b/epan/dissectors/packet-h248_10.c @@ -32,6 +32,9 @@ #include "config.h" #include "packet-h248.h" + +void proto_register_h248_dot10(void); + #define PNAME "H.248.10" #define PSNAME "H248CHP" #define PFNAME "h248.chp" diff --git a/epan/dissectors/packet-h248_2.c b/epan/dissectors/packet-h248_2.c index ff6e588106..ad58c13cd2 100644 --- a/epan/dissectors/packet-h248_2.c +++ b/epan/dissectors/packet-h248_2.c @@ -31,6 +31,9 @@ #include "config.h" #include "packet-h248.h" + +void proto_register_h248_dot2(void); + #define PNAME "H.248.2" #define PSNAME "H248_2" #define PFNAME "h248.2" diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c index 013b6cb029..60f258108a 100644 --- a/epan/dissectors/packet-h248_3gpp.c +++ b/epan/dissectors/packet-h248_3gpp.c @@ -28,6 +28,9 @@ #include "config.h" #include "packet-h248.h" + +void proto_register_h248_3gpp(void); + #define PNAME "H.248 3GPP" #define PSNAME "H2483GPP" #define PFNAME "h248.3gpp" diff --git a/epan/dissectors/packet-h248_7.c b/epan/dissectors/packet-h248_7.c index 2e12f0377a..4b7e7374d5 100644 --- a/epan/dissectors/packet-h248_7.c +++ b/epan/dissectors/packet-h248_7.c @@ -30,6 +30,8 @@ #include "packet-h248.h" +void proto_register_h248_7(void); + #define PNAME "H.248.7" #define PSNAME "H248AN" #define PFNAME "h248.an" diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index 8afc8c3970..a4fc5ae646 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -30,6 +30,9 @@ #include <epan/wmem/wmem.h> #include "packet-h248.h" + +void proto_register_h248_annex_c(void); + #define PNAME "H.248 Annex C" #define PSNAME "H248C" #define PFNAME "h248c" diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c index 346d400f9a..1d7e06e08d 100644 --- a/epan/dissectors/packet-h248_annex_e.c +++ b/epan/dissectors/packet-h248_annex_e.c @@ -36,6 +36,9 @@ /*****/ #include "packet-h248.h" + +void proto_register_h248_annex_e(void); + #define PNAME "H.248 Annex E" #define PSNAME "H248E" #define PFNAME "h248e" diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c index b62b910448..d9f5d84425 100644 --- a/epan/dissectors/packet-h248_q1950.c +++ b/epan/dissectors/packet-h248_q1950.c @@ -32,6 +32,9 @@ #include "packet-h248.h" #include "packet-isup.h" +void proto_reg_handoff_q1950(void); +void proto_register_q1950(void); + #define PNAME "H.248 Q.1950 Annex A" #define PSNAME "H248Q1950" #define PFNAME "h248q1950" diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c index 397b36b4d6..03faa85cb1 100644 --- a/epan/dissectors/packet-h261.c +++ b/epan/dissectors/packet-h261.c @@ -40,6 +40,9 @@ #include <epan/rtp_pt.h> #include <epan/iax2_codec_type.h> +void proto_register_h261(void); +void proto_reg_handoff_h261(void); + /* H.261 header fields */ static int proto_h261 = -1; static int hf_h261_sbit = -1; diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index ff98dfca93..70850221c5 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -39,6 +39,8 @@ #include "packet-h263.h" +void proto_register_h263_data(void); + static int proto_h263_data = -1; /* Fields for the data section */ diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index 4c21b67fd7..651222ce48 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -38,6 +38,9 @@ #include "packet-h263.h" +void proto_reg_handoff_h263P(void); +void proto_register_h263P(void); + static int proto_h263P = -1; /* H.263 RFC 4629 fields */ diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 1e39a27689..cd0ce717c1 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -40,6 +40,9 @@ #include <epan/prefs.h> #include <epan/wmem/wmem.h> +void proto_register_h264(void); +void proto_reg_handoff_h264(void); + /* Initialize the protocol and registered fields */ static int proto_h264 = -1; static int hf_h264_type = -1; @@ -2130,8 +2133,6 @@ static void range_add_h264_rtp_pt_callback(guint32 rtp_pt) { dissector_add_uint("rtp.pt", rtp_pt, h264_handle); } -void proto_reg_handoff_h264(void); - void proto_register_h264(void) { diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c index 14f650bf77..ad7ca0748b 100644 --- a/epan/dissectors/packet-hartip.c +++ b/epan/dissectors/packet-hartip.c @@ -36,6 +36,9 @@ #include <epan/wmem/wmem.h> #include "packet-tcp.h" +void proto_register_hartip(void); +void proto_reg_handoff_hartip(void); + static dissector_handle_t hartip_tcp_handle; static dissector_handle_t hartip_udp_handle; diff --git a/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c index b5517ac29b..3ffe5315aa 100644 --- a/epan/dissectors/packet-hazelcast.c +++ b/epan/dissectors/packet-hazelcast.c @@ -38,6 +38,8 @@ #include <epan/tap.h> #include <packet-tcp.h> +void proto_register_hazelcast(void); +void proto_reg_handoff_hazelcast(void); static int proto_hazelcast = -1; static int hazelcast_tap = -1; diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index ef40d663cf..5b95cada5d 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -34,6 +34,9 @@ #include <epan/wmem/wmem.h> +void proto_register_hclnfsd(void); +void proto_reg_handoff_hclnfsd(void); + #define HCLNFSD_PROGRAM 0x2f00dbad #define HCLNFSDPROC_NULL 0 diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c index 9fcfc196a9..0f898475ec 100644 --- a/epan/dissectors/packet-hdcp.c +++ b/epan/dissectors/packet-hdcp.c @@ -40,6 +40,7 @@ #include <epan/wmem/wmem.h> #include "packet-hdcp.h" +void proto_register_hdcp(void); static int proto_hdcp = -1; diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c index 55a0b110b1..3ed78c3ac6 100644 --- a/epan/dissectors/packet-hdcp2.c +++ b/epan/dissectors/packet-hdcp2.c @@ -39,13 +39,13 @@ #include <epan/ptvcursor.h> #include <epan/expert.h> +void proto_register_hdcp2(void); +void proto_reg_handoff_hdcp2(void); static int proto_hdcp2 = -1; static gboolean hdcp2_enable_dissector = FALSE; -void proto_reg_handoff_hdcp2(void); - static gint ett_hdcp2 = -1; static gint ett_hdcp2_cert = -1; diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c index b96427a10e..a0d2d4605f 100644 --- a/epan/dissectors/packet-hdfs.c +++ b/epan/dissectors/packet-hdfs.c @@ -35,6 +35,9 @@ #include <epan/dissectors/packet-tcp.h> #include <epan/prefs.h> +void proto_register_hdfs(void); +void proto_reg_handoff_hdfs(void); + #if 0 #define NAMENODE_PORT 8020 #endif @@ -120,8 +123,6 @@ static gint ett_hdfs = -1; static dissector_handle_t hdfs_handle; -void proto_reg_handoff_hdfs(void); - /* Parses the parameters of a function. Parses the type length which is always in 2 bytes. Next the type which is the previously found length. diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c index a3f0ba7958..43200a397c 100644 --- a/epan/dissectors/packet-hdfsdata.c +++ b/epan/dissectors/packet-hdfsdata.c @@ -33,6 +33,8 @@ #include <epan/prefs.h> #include "epan/dissectors/packet-tcp.h" +void proto_register_hdfsdata(void); +void proto_reg_handoff_hdfsdata(void); #if 0 #define NAMENODE_PORT 8020 @@ -110,8 +112,6 @@ static gint ett_hdfsdata = -1; static dissector_handle_t hdfsdata_handle; -void proto_reg_handoff_hdfsdata(void); - /* Taken from HDFS Parse the first byte of a vint/vlong to determine the number of bytes value is the first byte of the vint/vlong diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 42bcd17b14..59431bca34 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -42,6 +42,9 @@ #include <epan/ipproto.h> #include <epan/in_cksum.h> +void proto_register_hip(void); +void proto_reg_handoff_hip(void); + #define HI_ALG_DSA 3 #define HI_ALG_RSA 5 diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c index 64e87d3f4e..60c8373b59 100644 --- a/epan/dissectors/packet-homeplug-av.c +++ b/epan/dissectors/packet-homeplug-av.c @@ -30,6 +30,9 @@ #include <epan/etypes.h> #include <epan/ptvcursor.h> +void proto_register_homeplug_av(void); +void proto_reg_handoff_homeplug_av(void); + static int proto_homeplug_av = -1; static int hf_homeplug_av_mmhdr = -1; diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index dd621c3b9c..1a752d13b8 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -35,6 +35,9 @@ #include <epan/ptvcursor.h> +void proto_reg_handoff_homeplug(void); +void proto_register_homeplug(void); + static int proto_homeplug = -1; static int hf_homeplug_mctrl = -1; diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index 5540dbf24e..063166af2c 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -51,6 +51,9 @@ #include <epan/packet.h> #include <epan/prefs.h> +void proto_register_hp_erm(void); +void proto_reg_handoff_hp_erm(void); + #define PROTO_SHORT_NAME "HP_ERM" #define PROTO_LONG_NAME "HP encapsulated remote mirroring" @@ -119,8 +122,6 @@ dissect_hp_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_hp_erm(void) { - void proto_reg_handoff_hp_erm(void); - static hf_register_info hf[] = { { &hf_hp_erm_unknown1, diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index 065523f812..357db6c4e1 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -37,6 +37,9 @@ #include "packet-tcp.h" +void proto_register_hpfeeds(void); +void proto_reg_handoff_hpfeeds(void); + /* Preferences */ static guint hpfeeds_port_pref = 0; static gboolean hpfeeds_desegment = TRUE; @@ -116,8 +119,6 @@ static const value_string chan_vals[] = { { CH_EINVAL, NULL } }; -void proto_reg_handoff_hpfeeds(void); - static void dissect_hpfeeds_error_pdu(tvbuff_t *tvb, proto_tree *tree, guint offset) { diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c index 4bc37f42fd..98372a7cd6 100644 --- a/epan/dissectors/packet-hpsw.c +++ b/epan/dissectors/packet-hpsw.c @@ -32,6 +32,9 @@ #include "packet-hpext.h" +void proto_register_hpsw(void); +void proto_reg_handoff_hpsw(void); + static int proto_hpsw = -1; static int hf_hpsw_version = -1; diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 9c1ef63e16..54e0d0d2bc 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -33,6 +33,8 @@ #include <epan/oui.h> #include <packet-llc.h> +void proto_register_hpteam(void); +void proto_reg_handoff_hpteam(void); static int proto_hpteam = -1; diff --git a/epan/dissectors/packet-hsr-prp-supervision.c b/epan/dissectors/packet-hsr-prp-supervision.c index 38fba01476..4c37f10c09 100644 --- a/epan/dissectors/packet-hsr-prp-supervision.c +++ b/epan/dissectors/packet-hsr-prp-supervision.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include <epan/etypes.h> +void proto_register_hsr_prp_supervision(void); +void proto_reg_handoff_hsr_prp_supervision(void); + /**********************************************************/ /* Channel values for the supervision type field */ /**********************************************************/ diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c index 9d5c80e8c5..4df50db030 100644 --- a/epan/dissectors/packet-hsr.c +++ b/epan/dissectors/packet-hsr.c @@ -29,6 +29,9 @@ #include <epan/packet.h> #include <epan/etypes.h> +void proto_register_hsr(void); +void proto_reg_handoff_hsr(void); + /**********************************************************/ /* Lengths of fields within a HSR packet. */ /**********************************************************/ diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index e45c0788d0..1964123113 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -141,6 +141,9 @@ #include <epan/packet.h> #include <epan/to_str.h> +void proto_register_hsrp(void); +void proto_reg_handoff_hsrp(void); + static gint proto_hsrp = -1; static dissector_handle_t data_handle; diff --git a/epan/dissectors/packet-http-urlencoded.c b/epan/dissectors/packet-http-urlencoded.c index d066263009..7236022bf9 100644 --- a/epan/dissectors/packet-http-urlencoded.c +++ b/epan/dissectors/packet-http-urlencoded.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include <epan/wmem/wmem.h> +void proto_register_http_urlencoded(void); +void proto_reg_handoff_http_urlencoded(void); + static dissector_handle_t form_urlencoded_handle; static header_field_info *hfi_urlencoded = NULL; diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index a1e3d4147e..6815fec2e7 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -62,6 +62,10 @@ typedef enum _http_type { #include <epan/tap.h> +void proto_register_http(void); +void proto_reg_handoff_http(void); +void proto_register_message_http(void); +void proto_reg_handoff_message_http(void); static int http_tap = -1; static int http_eo_tap = -1; diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index b3f80ed78a..db99a70e2b 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -46,6 +46,9 @@ #include "packet-tcp.h" +void proto_register_http2(void); +void proto_reg_handoff_http2(void); + /* Packet Header */ static int proto_http2 = -1; static int hf_http2 = -1; diff --git a/epan/dissectors/packet-iana-oui.c b/epan/dissectors/packet-iana-oui.c index 068720c377..10118426f9 100644 --- a/epan/dissectors/packet-iana-oui.c +++ b/epan/dissectors/packet-iana-oui.c @@ -29,6 +29,8 @@ #include <epan/oui.h> #include <epan/iana_snap_pid.h> +void proto_register_iana_oui(void); + static int hf_llc_iana_pid = -1; static const value_string iana_pid_vals[] = { diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 22ebaa2a2a..a1de8c99a6 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -29,6 +29,9 @@ #include <epan/to_str.h> #include <epan/oui.h> +void proto_register_iapp(void); +void proto_reg_handoff_iapp(void); + /* Initialize the protocol and registered fields */ static int proto_iapp = -1; static int hf_iapp_version = -1; diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 9debfab13a..daaa87d10f 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -50,6 +50,9 @@ #include "packet-iax2.h" #include <epan/iax2_codec_type.h> +void proto_register_iax2(void); +void proto_reg_handoff_iax2(void); + #define IAX2_PORT 4569 #define PROTO_TAG_IAX2 "IAX2" diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index fa60c1d1ca..ea1407ec9f 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -34,6 +34,9 @@ #include <epan/packet.h> #include <epan/strutil.h> +void proto_register_icap(void); +void proto_reg_handoff_icap(void); + typedef enum _icap_type { ICAP_OPTIONS, ICAP_REQMOD, diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 7c2dd8f85d..541af1a6d8 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -48,6 +48,9 @@ #include <epan/wmem/wmem.h> #include "packet-tcp.h" +void proto_register_icep(void); +void proto_reg_handoff_icep(void); + #if 0 #define DBG(str, args...) do {\ fprintf(stdout, \ diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index d698d6e8b8..e0adfb01d2 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -37,6 +37,9 @@ #include <epan/to_str.h> #include <epan/expert.h> +void proto_register_icq(void); +void proto_reg_handoff_icq(void); + static int proto_icq = -1; static int hf_icq_version = -1; static int hf_icq_uin = -1; diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index d8caf61e5a..a69b5cfc16 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -42,6 +42,10 @@ #include <epan/dissectors/packet-tcp.h> #include <epan/wmem/wmem.h> +void proto_register_iec104apci(void); +void proto_register_iec104asdu(void); +void proto_reg_handoff_iec104(void); + /* IEC-104 comment: Fields are little endian. */ #define MAXS 256 diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index d93cf1e08f..e094590aeb 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -36,6 +36,9 @@ #include <epan/packet.h> #include <epan/etypes.h> +void proto_register_1722(void); +void proto_reg_handoff_1722(void); + /* 1722 Offsets */ #define IEEE_1722_CD_OFFSET 0 #define IEEE_1722_VERSION_OFFSET 1 diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index e46cfc60eb..62bfab7bd3 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -39,6 +39,9 @@ #include <epan/packet.h> #include <epan/etypes.h> +void proto_register_17221(void); +void proto_reg_handoff_17221(void); + /* 17221 Offsets */ #define P1722_HEADER_OFFSET 12 diff --git a/epan/dissectors/packet-ieee80211-airopeek.c b/epan/dissectors/packet-ieee80211-airopeek.c index de908831e3..53ea2f59f1 100644 --- a/epan/dissectors/packet-ieee80211-airopeek.c +++ b/epan/dissectors/packet-ieee80211-airopeek.c @@ -29,6 +29,9 @@ #include "packet-ieee80211.h" +void proto_register_ieee80211_airopeek(void); +void proto_reg_handoff_ieee80211_airopeek(void); + static dissector_handle_t ieee80211_handle; static int proto_airopeek = -1; diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c index bcfe465690..9248c658fa 100644 --- a/epan/dissectors/packet-ieee80211-netmon.c +++ b/epan/dissectors/packet-ieee80211-netmon.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include <wiretap/wtap.h> +void proto_register_netmon_802_11(void); +void proto_reg_handoff_netmon_802_11(void); + /* protocol */ static int proto_netmon_802_11 = -1; diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index 4d2a237326..b8693e61e4 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -33,6 +33,9 @@ #include "packet-ieee80211.h" +void proto_register_ieee80211_prism(void); +void proto_reg_handoff_ieee80211_prism(void); + #define SHORT_STR 256 static dissector_handle_t wlancap_handle; diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index 0f1c546de9..8f19a11d33 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -31,6 +31,9 @@ #include "packet-ieee80211.h" +void proto_register_ieee80211_radio(void); +void proto_reg_handoff_ieee80211_radio(void); + static dissector_handle_t ieee80211_handle; static int proto_radio = -1; diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c index a76495255b..cdfa035b16 100644 --- a/epan/dissectors/packet-ieee80211-wlancap.c +++ b/epan/dissectors/packet-ieee80211-wlancap.c @@ -32,6 +32,9 @@ #include "packet-ieee80211.h" +void proto_register_ieee80211_wlancap(void); +void proto_reg_handoff_ieee80211_wlancap(void); + static dissector_handle_t ieee80211_handle; static int proto_wlancap = -1; diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index cace426134..37192761a0 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -108,6 +108,9 @@ #include <epan/crypt/airpdcap_ws.h> /* Davide Schiera (2006-11-22) ---------------------------------------------- */ +void proto_register_ieee80211(void); +void proto_reg_handoff_ieee80211(void); + extern value_string_ext eap_type_vals_ext; /* from packet-eap.c */ /* To Avoid Compilation warnings/errors because diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 7e39fcf521..7e39345f23 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -87,6 +87,9 @@ #include "packet-ieee802154.h" #include "packet-sll.h" +void proto_register_ieee802154(void); +void proto_reg_handoff_ieee802154(void); + /* Dissection Options for dissect_ieee802154_common */ #define DISSECT_IEEE802154_OPTION_CC24xx 0x00000001 /* FCS field contains a TI CC24xx style FCS. */ #define DISSECT_IEEE802154_OPTION_LINUX 0x00000002 /* Addressing fields are padded DLT_IEEE802_15_4_LINUX, not implemented. */ @@ -160,8 +163,6 @@ UAT_BUFFER_CB_DEF(addr_uat, eui64, static_addr_t, eui64, eui64_len) * Dissector Function Prototypes *------------------------------------- */ -/* Register Functions. Loads the dissector into Wireshark. */ -void proto_reg_handoff_ieee802154 (void); /* Dissection Routines. */ static void dissect_ieee802154_nonask_phy (tvbuff_t *, packet_info *, proto_tree *); diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index 8ad9c309a4..a8f5d739c5 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -36,9 +36,11 @@ #include <epan/etypes.h> #include <epan/prefs.h> +void proto_register_ieee8021ah(void); +void proto_reg_handoff_ieee8021ah(void); + static dissector_handle_t ethertype_handle; -void proto_reg_handoff_ieee8021ah(void); void dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parent, int tree_index); diff --git a/epan/dissectors/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c index 49d4da15bb..ef8fbe32af 100644 --- a/epan/dissectors/packet-ieee8023.c +++ b/epan/dissectors/packet-ieee8023.c @@ -32,6 +32,8 @@ #include "packet-ieee8023.h" #include "packet-eth.h" +void proto_reg_handoff_ieee802_3(void); + static dissector_handle_t ipx_handle; static dissector_handle_t llc_handle; static dissector_handle_t ccsds_handle; diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index af5c9dd6fc..afc796152d 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.c @@ -32,6 +32,9 @@ #include "packet-ieee802a.h" +void proto_register_ieee802a(void); +void proto_reg_handoff_ieee802a(void); + static int proto_ieee802a = -1; static int hf_ieee802a_oui = -1; static int hf_ieee802a_pid = -1; diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 33851364fd..6084b194ae 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -50,6 +50,7 @@ #include "packet-igmp.h" #include "packet-igap.h" +void proto_register_igap(void); static int proto_igap = -1; static int hf_type = -1; diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 0a531f085d..9c8e859ec3 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -125,6 +125,9 @@ #include "packet-igap.h" #include "packet-rgmp.h" +void proto_register_igmp(void); +void proto_reg_handoff_igmp(void); + static int proto_igmp = -1; static int hf_type = -1; static int hf_version = -1; diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c index d2effc366b..4474577320 100644 --- a/epan/dissectors/packet-image-jfif.c +++ b/epan/dissectors/packet-image-jfif.c @@ -45,6 +45,9 @@ #include <epan/packet.h> #include <wiretap/wtap.h> +void proto_register_jfif(void); +void proto_reg_handoff_jfif(void); + /* General-purpose debug logger. * Requires double parentheses because of variable arguments of printf(). * diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index e7cda7533b..aae586e49c 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -36,6 +36,9 @@ #include <epan/packet.h> #include <epan/exceptions.h> +void proto_register_png(void); +void proto_reg_handoff_png(void); + static header_field_info *hfi_png = NULL; #define PNG_HFI_INIT HFI_INIT(proto_png) diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index 63cac7ab0a..714698c798 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.c @@ -35,6 +35,9 @@ #include <stdio.h> #include <ctype.h> +void proto_register_imap(void); +void proto_reg_handoff_imap(void); + static int proto_imap = -1; static int hf_imap_isrequest = -1; static int hf_imap_line = -1; diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index e6df778c55..3ee6a02621 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -43,6 +43,9 @@ #include "packet-ess.h" #include "packet-p1.h" +void proto_register_imf(void); +void proto_reg_handoff_imf(void); + #define PNAME "Internet Message Format" #define PSNAME "IMF" #define PFNAME "imf" diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index b26e23e272..33a223c4f5 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -39,6 +39,9 @@ #include <epan/show_exception.h> #include "packet-infiniband.h" +void proto_register_infiniband(void); +void proto_reg_handoff_infiniband(void); + #define PROTO_TAG_INFINIBAND "Infiniband" /* Wireshark ID */ diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index ad7a9c5f19..67966767dc 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -50,13 +50,13 @@ #include "packet-infiniband.h" +void proto_register_ib_sdp(void); +void proto_reg_handoff_ib_sdp(void); + /* If the service-id is non-zero after being ANDed with the following mask then this is SDP traffic */ #define SERVICE_ID_MASK 0x0000000000010000 -/* Forward declaration we need below (for using proto_reg_handoff as a prefs callback) */ -void proto_reg_handoff_ib_sdp(void); - static int proto_infiniband = -1; /* we'll need the Infiniband protocol index sometimes, so keep it here */ /* Initialize the protocol and registered fields... */ diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index cd4f6157fa..7665d2f2e5 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -47,6 +47,9 @@ #include "packet-tcp.h" #include <epan/prefs.h> +void proto_register_ipdc(void); +void proto_reg_handoff_ipdc(void); + #define TCP_PORT_IPDC 6668 #define TRANS_ID_SIZE_IPDC 4 @@ -698,8 +701,6 @@ static guint ipdc_port_pref = TCP_PORT_IPDC; static dissector_handle_t q931_handle; -void proto_reg_handoff_ipdc(void); - static guint get_ipdc_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c index 459ca88a82..e06f9ee1b6 100644 --- a/epan/dissectors/packet-ipnet.c +++ b/epan/dissectors/packet-ipnet.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include <wiretap/wtap.h> +void proto_register_ipnet(void); +void proto_reg_handoff_ipnet(void); + static int proto_ipnet = -1; static int hf_version = -1; static int hf_family = -1; diff --git a/epan/dissectors/packet-ipoib.c b/epan/dissectors/packet-ipoib.c index 363b4545ac..d19cf48bc8 100644 --- a/epan/dissectors/packet-ipoib.c +++ b/epan/dissectors/packet-ipoib.c @@ -31,6 +31,9 @@ #include <epan/etypes.h> #include <wiretap/wtap.h> +void proto_register_ipoib(void); +void proto_reg_handoff_ipoib(void); + static int proto_ipoib = -1; static int hf_type = -1; static int hf_reserved = -1; diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index b42caafb6a..51da0e7f59 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -38,6 +38,9 @@ #include <epan/prefs.h> #include "packet-ndmp.h" +void proto_register_tcpencap(void); +void proto_reg_handoff_tcpencap(void); + static int hf_tcpencap_unknown = -1; static int hf_tcpencap_zero = -1; static int hf_tcpencap_seq = -1; @@ -226,8 +229,6 @@ proto_register_tcpencap(void) module_t *tcpencap_module; - void proto_reg_handoff_tcpencap(void); - proto_tcpencap = proto_register_protocol( "TCP Encapsulation of IPsec Packets", "TCPENCAP", "tcpencap"); proto_register_field_array(proto_tcpencap, hf, array_length(hf)); diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c index 6ec8b1b525..3f6195289e 100644 --- a/epan/dissectors/packet-ipsec-udp.c +++ b/epan/dissectors/packet-ipsec-udp.c @@ -28,6 +28,9 @@ #include <glib.h> #include <epan/packet.h> +void proto_register_udpencap(void); +void proto_reg_handoff_udpencap(void); + static int proto_udpencap = -1; static gint ett_udpencap = -1; diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c index 884a961a3c..5775251b09 100644 --- a/epan/dissectors/packet-ipsi-ctl.c +++ b/epan/dissectors/packet-ipsi-ctl.c @@ -31,6 +31,9 @@ #include <glib.h> #include <epan/packet.h> +void proto_register_ipsictl(void); +void proto_reg_handoff_ipsictl(void); + #define IPSICTL_PORT 5010 #define IPSICTL_PDU_MAGIC 0x0300 diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index 9d2d5e18d5..d23f4289ce 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -30,6 +30,9 @@ #include <epan/ipproto.h> #include <epan/in_cksum.h> +void proto_register_ipvs_syncd(void); +void proto_reg_handoff_ipvs_syncd(void); + static int proto_ipvs_syncd = -1; static int hf_conn_count = -1; static int hf_syncid = -1; diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index cb62de6376..89a30c77b0 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -43,6 +43,9 @@ #include <epan/tap.h> #include <epan/wmem/wmem.h> +void proto_register_ipx(void); +void proto_reg_handoff_ipx(void); + static int ipx_tap = -1; /* The information in this module (IPX, SPX, NCP) comes from: diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 15e12c991e..34893a829d 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -29,6 +29,9 @@ #include <epan/expert.h> #include "packet-ipx.h" +void proto_register_ipxwan(void); +void proto_reg_handoff_ipxwan(void); + /* * See RFC 1362 for version 1 of this protocol; see the NetWare Link * Services Protocol Specification, chapter 3, for version 2. diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index 5c03f98cfa..54ce100e6a 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -47,6 +47,9 @@ #include <epan/packet.h> #include <epan/expert.h> +void proto_register_irc(void); +void proto_reg_handoff_irc(void); + static int proto_irc = -1; static int hf_irc_request = -1; static int hf_irc_request_prefix = -1; diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index b5874e8466..3a853b43c3 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -64,6 +64,9 @@ #include <epan/uat.h> #endif +void proto_register_isakmp(void); +void proto_reg_handoff_isakmp(void); + /* Struct for the byte_to_str, match_bytestr_idx, and match_bytestr functions */ typedef struct _byte_string { diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 0e354024ab..093dca00a3 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -48,6 +48,9 @@ #include <epan/range.h> #include <wsutil/crc32.h> +void proto_register_iscsi(void); +void proto_reg_handoff_iscsi(void); + /* the absolute values of these constants don't matter as long as * latter revisions of the protocol are assigned a larger number */ #define ISCSI_PROTOCOL_DRAFT08 1 diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index 458a675fc3..8a71b6ba0d 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -29,6 +29,9 @@ #include <epan/prefs.h> #include <epan/circuit.h> +void proto_register_isdn(void); +void proto_reg_handoff_isdn(void); + static int proto_isdn = -1; static int hf_isdn_channel = -1; diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index 04860dd140..b7a7d96376 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -36,6 +36,8 @@ #include "packet-isis-hello.h" #include "packet-isis-snp.h" +void proto_register_isis(void); +void proto_reg_handoff_isis(void); /* isis base header */ static int proto_isis = -1; @@ -254,7 +256,8 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * void */ void -proto_register_isis(void) { +proto_register_isis(void) +{ static hf_register_info hf[] = { { &hf_isis_irpd, { "Intra Domain Routing Protocol Discriminator", "isis.irpd", diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index e6a3b2973f..ba08b4a006 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -35,6 +35,9 @@ #include "packet-eth.h" #include "packet-tr.h" +void proto_register_isl(void); +void proto_reg_handoff_isl(void); + /* * See * diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 157273faf1..f5c3ab9b29 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -36,6 +36,9 @@ #include <epan/packet.h> #include <epan/prefs.h> +void proto_register_ismacryp(void); +void proto_reg_handoff_ismacryp(void); + /* keeps track of current position in buffer in terms of bit and byte offset */ typedef struct Toffset_struct { @@ -46,7 +49,6 @@ typedef struct Toffset_struct static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint ismacryp_version); static offset_struct* dissect_auheader( tvbuff_t *tvb, offset_struct *poffset, packet_info *pinfo, proto_tree *tree, guint set_version ); -void proto_reg_handoff_ismacryp(void); static void add_bits(offset_struct* poffset, gint len_bits); #define PROTO_TAG_ISMACRYP "ISMACRYP" diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 380b8eb9ef..6602b3f143 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -33,6 +33,8 @@ #include <epan/strutil.h> #include <epan/etypes.h> +void proto_register_ismp(void); +void proto_reg_handoff_ismp(void); /* Initialize the protocol and registered fields */ static int proto_ismp = -1; diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index d978e0b5c4..6db4cd4e72 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -39,6 +39,9 @@ #include "packet-tcp.h" #include <epan/prefs.h> +void proto_register_isns(void); +void proto_reg_handoff_isns(void); + #define ISNS_PROTO_VER 0x1 #define ISNS_HEADER_SIZE 12 diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 3e39e88e89..0b84127e0a 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -63,6 +63,11 @@ #include <epan/reassemble.h> #include <packet-mtp3.h> +void proto_register_isup(void); +void proto_reg_handoff_isup(void); +void proto_register_bicc(void); +void proto_reg_handoff_bicc(void); + #define ISUP_ITU_STANDARD_VARIANT 0 #define ISUP_FRENCH_VARIANT 1 #define ISUP_ISRAELI_VARIANT 2 diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index 81c3911d7a..c84d5eebb6 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include <epan/prefs.h> +void proto_register_itdm(void); +void proto_reg_handoff_itdm(void); + /* Initialize the protocol and registered fields */ static int proto_itdm = -1; static int hf_itdm_timestamp = -1; @@ -378,8 +381,6 @@ dissect_itdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_itdm_125usec(tvb, pinfo, tree); } -void proto_reg_handoff_itdm(void); - void proto_register_itdm(void) { diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c index 43e9245e17..41d93c3d48 100644 --- a/epan/dissectors/packet-iua.c +++ b/epan/dissectors/packet-iua.c @@ -38,6 +38,9 @@ #include <epan/sctpppids.h> #include <epan/lapd_sapi.h> +void proto_register_iua(void); +void proto_reg_handoff_iua(void); + static module_t *iua_module; static dissector_handle_t data_handle; diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c index 7843935ee8..46509358d7 100644 --- a/epan/dissectors/packet-iuup.c +++ b/epan/dissectors/packet-iuup.c @@ -41,6 +41,8 @@ #include <wsutil/crc10.h> #include <wsutil/crc6.h> +void proto_reg_handoff_iuup(void); +void proto_register_iuup(void); typedef struct _iuup_rfci_t { guint id; diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 0d12b6a6be..c363c0f0c8 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -34,6 +34,9 @@ #include <epan/packet.h> +void proto_register_iwarp_ddp_rdmap(void); +void proto_reg_handoff_iwarp_ddp_rdmap(void); + /* DEFINES */ /* header field byte lengths */ diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 05c5b86226..0588f280b9 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -36,6 +36,9 @@ #include <epan/expert.h> #include <wsutil/crc32.h> +void proto_register_mpa(void); +void proto_reg_handoff_mpa(void); + /* DEFINES */ /* header field byte lengths */ diff --git a/epan/dissectors/packet-ixiatrailer.c b/epan/dissectors/packet-ixiatrailer.c index a106575c42..87e92ea3f1 100644 --- a/epan/dissectors/packet-ixiatrailer.c +++ b/epan/dissectors/packet-ixiatrailer.c @@ -33,6 +33,9 @@ #include <epan/in_cksum.h> #include <epan/expert.h> +void proto_register_ixiatrailer(void); +void proto_reg_handoff_ixiatrailer(void); + #define IXIA_PATTERN 0xAF12 /* TODO: which of these typestamp types are currently supported? diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 015b03d749..b90efc9c54 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -35,6 +35,9 @@ #include "packet-eth.h" +void proto_register_ixveriwave(void); +void proto_reg_handoff_ixveriwave(void); + static void dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static void ethernettap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *tap_tree); static void wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *tap_tree); diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index bda056d520..54739440ae 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -29,6 +29,8 @@ #include <glib.h> #include <epan/packet.h> +void proto_register_j1939(void); + #define J1939_CANID_MASK 0x1FFFFFFF #define J1939_11BIT_ID 0x000003FF diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index b71e6f08d7..c16abaf21a 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -35,6 +35,9 @@ #include "packet-ip.h" #include <epan/nlpid.h> +void proto_register_juniper(void); +void proto_reg_handoff_juniper(void); + #define JUNIPER_FLAG_PKT_OUT 0x00 /* Outgoing packet */ #define JUNIPER_FLAG_PKT_IN 0x01 /* Incoming packet */ #define JUNIPER_FLAG_NO_L2 0x02 /* L2 header stripped */ diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 46851153b3..28d058bc58 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -48,6 +48,9 @@ #include "packet-jxta.h" +void proto_register_jxta(void); +void proto_reg_handoff_jxta(void); + #define JXTA_UDP_MAGIC 0x4a5a5441 /* JXTA */ static const gchar JXTA_UDP_SIG[] = { 'J', 'X', 'T', 'A' }; static const gchar JXTA_MSG_SIG[] = { 'j', 'x', 'm', 'g' }; @@ -211,8 +214,6 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p const gchar ** namespaces); static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree); -void proto_reg_handoff_jxta(void); - /** * Heuristically dissect a tvbuff containing a JXTA UDP Message * diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 6fe9f4f14b..e100ad1cfc 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -41,6 +41,9 @@ #include "packet-sscop.h" #include "packet-umts_fp.h" +void proto_reg_handoff_k12(void); +void proto_register_k12(void); + typedef struct _k12_hdls_t { char* match; char* protos; diff --git a/epan/dissectors/packet-kadm5.c b/epan/dissectors/packet-kadm5.c index bddc273360..77a5942b3d 100644 --- a/epan/dissectors/packet-kadm5.c +++ b/epan/dissectors/packet-kadm5.c @@ -32,6 +32,9 @@ #include "packet-rpc.h" +void proto_register_kadm5(void); +void proto_reg_handoff_kadm5(void); + #define KADM5_PROGRAM 2112 #define KADM5PROC_NULL 0 #define KADM5PROC_CREATE_PRINCIPAL 1 diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index 1e2e492de0..ca998cc93f 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -35,6 +35,7 @@ #include <epan/prefs.h> #include <epan/wmem/wmem.h> +void proto_register_kafka(void); void proto_reg_handoff_kafka(void); static int proto_kafka = -1; diff --git a/epan/dissectors/packet-kdsp.c b/epan/dissectors/packet-kdsp.c index beca2ccf4b..b9fabab45b 100644 --- a/epan/dissectors/packet-kdsp.c +++ b/epan/dissectors/packet-kdsp.c @@ -32,6 +32,9 @@ #include <epan/expert.h> #include "packet-tcp.h" +void proto_register_kdsp(void); +void proto_reg_handoff_kdsp(void); + #define KDSP_PORT 2502 #define FRAME_HEADER_LEN 12 @@ -97,8 +100,6 @@ #define DATALINK_WLAN 0x69 #define DATALINK_RADIOTAP 0x7F -void proto_reg_handoff_kdsp(void); - static int proto_kdsp = -1; static dissector_table_t subdissector_dlt_table; diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 4d1b00137e..7b624d791c 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -105,6 +105,9 @@ #include <wsutil/file_util.h> +void proto_register_kerberos(void); +void proto_reg_handoff_kerberos(void); + #define UDP_PORT_KERBEROS 88 #define TCP_PORT_KERBEROS 88 diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index fffa6c773a..125888aec0 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -38,6 +38,9 @@ #include <glib.h> #include <epan/packet.h> +void proto_register_krb4(void); +void proto_reg_handoff_krb4(void); + static int proto_krb4 = -1; static int hf_krb4_version = -1; static int hf_krb4_auth_msg_type = -1; diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c index bde958db5e..5966c30f02 100644 --- a/epan/dissectors/packet-knet.c +++ b/epan/dissectors/packet-knet.c @@ -31,6 +31,9 @@ #include <epan/wmem/wmem.h> #include <epan/dissectors/packet-tcp.h> +void proto_register_knet(void); +void proto_reg_handoff_knet(void); + #define PROTO_TAG_KNET "KNET" /*!< Definition of kNet Protocol */ #define PORT 2345 @@ -57,8 +60,6 @@ #define UDP_DATAGRAM_RELIABLE_FLAG 0x40 #define UDP_MSG_BLOCK_RELIABLE_FLAG 0x10 -void proto_reg_handoff_knet(void); /* Forward declaration for use in preferences registration */ - /** * @addtogroup protocols Protocol Variables * Protocol variables. diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 06976336a2..5dd3384fc5 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -73,6 +73,9 @@ #include "packet-l2tp.h" +void proto_register_l2tp(void); +void proto_reg_handoff_l2tp(void); + static int proto_l2tp = -1; static int hf_l2tp_type = -1; static int hf_l2tp_length_bit = -1; diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index b257b4a0cc..3d52afb08f 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -31,6 +31,9 @@ #include <wiretap/wtap.h> #include <epan/xdlc.h> +void proto_register_lapb(void); +void proto_reg_handoff_lapb(void); + static int proto_lapb = -1; static int hf_lapb_address = -1; static int hf_lapb_control = -1; diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c index 92aa8ccefd..29801927a7 100644 --- a/epan/dissectors/packet-lapbether.c +++ b/epan/dissectors/packet-lapbether.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include <epan/etypes.h> +void proto_register_lapbether(void); +void proto_reg_handoff_lapbether(void); + static int proto_lapbether = -1; static int hf_lapbether_length = -1; diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c index 3e447169d6..39cbb011b5 100644 --- a/epan/dissectors/packet-lge_monitor.c +++ b/epan/dissectors/packet-lge_monitor.c @@ -32,6 +32,8 @@ #include <epan/packet.h> #include <epan/prefs.h> +void proto_reg_handoff_lge_monitor(void); +void proto_register_lge_monitor(void); /* Initialize the protocol and registered fields */ static int proto_lge_monitor = -1; diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c index 23335a7c07..8c2e3c6eeb 100644 --- a/epan/dissectors/packet-lisp-data.c +++ b/epan/dissectors/packet-lisp-data.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include <epan/expert.h> +void proto_register_lisp_data(void); +void proto_reg_handoff_lisp_data(void); + /* See RFC 6830 "Locator/ID Separation Protocol (LISP)" */ /* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 27111fb091..c2af88a1e1 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -50,6 +50,9 @@ #include "packet-llc.h" +void proto_register_basicxid(void); +void proto_reg_handoff_llc(void); + #define UDP_PORT_LLC1 12000 #define UDP_PORT_LLC2 12001 #define UDP_PORT_LLC3 12002 diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 3a32c7b9ce..a6a976d7a9 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -31,14 +31,14 @@ #include <epan/prefs.h> #include <epan/etypes.h> +void proto_register_llt(void); +void proto_reg_handoff_llt(void); + static const value_string message_type_vs[] = { { 0x0a, "heartbeat" }, { 0, NULL} }; -/* Forward declaration we need below */ -void proto_reg_handoff_llt(void); - /* Variables for our preferences */ static guint preference_alternate_ethertype = 0x0; diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index 9241a76986..7f1760c840 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -40,6 +40,9 @@ #include <epan/packet.h> #include <epan/nlpid.h> +void proto_register_lmi(void); +void proto_reg_handoff_lmi(void); + static int proto_lmi = -1; static int hf_lmi_call_ref = -1; static int hf_lmi_msg_type = -1; diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 6d38fda882..26948670ad 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -59,6 +59,9 @@ #include "packet-ip.h" #include "packet-rsvp.h" +void proto_register_lmp(void); +void proto_reg_handoff_lmp(void); + static int proto_lmp = -1; #define UDP_PORT_LMP_DEFAULT 701 diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index ec69bb0031..fd22e81221 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -35,6 +35,8 @@ #include <epan/packet.h> #include <epan/expert.h> +void proto_register_lon(void); +void proto_reg_handoff_lon(void); static const value_string pdu_fmt_vs[]= { @@ -123,8 +125,6 @@ static const value_string nd_code_vs[]= {0, NULL} }; -void proto_reg_handoff_lon(void); - static gint hf_lon_ppdu = -1; static gint hf_lon_ppdu_prio = -1; static gint hf_lon_ppdu_alt = -1; diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index 48f94f511c..bb3c3dda06 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -28,6 +28,9 @@ #include <glib.h> #include <epan/packet.h> +void proto_register_lpd(void); +void proto_reg_handoff_lpd(void); + #define TCP_PORT_PRINTER 515 static int proto_lpd = -1; diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index 464ec8fe1c..50064b0821 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.c @@ -32,7 +32,7 @@ #include <packet-tcp.h> -/* Forward declaration we need below */ +void proto_register_lsc(void); void proto_reg_handoff_lsc(void); #define LSC_PAUSE 0x01 diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 624c9745c8..ac4ab41ecd 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -37,12 +37,13 @@ #include "packet-dtn.h" +void proto_register_ltp(void); +void proto_reg_handoff_ltp(void); + #define LTP_MIN_DATA_BUFFER 5 #define LTP_MAX_HDR_EXTN 16 #define LTP_MAX_TRL_EXTN 16 -void proto_reg_handoff_ltp(void); - /* For reassembling LTP segments */ static reassembly_table ltp_reassembly_table; diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index b148ea4afb..ae1e4edb11 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -34,6 +34,8 @@ #include <epan/addr_resolv.h> #include <epan/prefs.h> +void proto_register_lwapp(void); +void proto_reg_handoff_lwapp(void); #define LWAPP_FLAGS_T 0x04 #define LWAPP_FLAGS_F 0x02 @@ -535,7 +537,7 @@ proto_register_lwapp(void) "Swap frame control bytes (needed for some APs", &swap_frame_control); -} /* proto_register_diameter */ +} void proto_reg_handoff_lwapp(void) diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index ac1903c4c2..e74eeb892c 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -34,6 +34,9 @@ #include <epan/prefs.h> #include "packet-dns.h" +void proto_register_lwres(void); +void proto_reg_handoff_lwres(void); + #define LWRES_LWPACKET_LENGTH (4 * 5 + 2 * 4) #define LWRES_LWPACKETFLAG_RESPONSE 0x0001U /* if set, pkt is a response */ #define LWRES_LWPACKETVERSION_0 0 @@ -182,8 +185,6 @@ static int ett_ns_rec_item = -1; static guint global_lwres_port = LWRES_UDP_PORT; -void proto_reg_handoff_lwres(void); - /* Define the lwres proto */ static int proto_lwres = -1; diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c index 0c8a840c54..32bb53db96 100644 --- a/epan/dissectors/packet-m2pa.c +++ b/epan/dissectors/packet-m2pa.c @@ -40,12 +40,13 @@ #include <epan/sctpppids.h> #include <epan/expert.h> +void proto_register_m2pa(void); +void proto_reg_handoff_m2pa(void); + #define SCTP_PORT_M2PA 3565 static guint global_sctp_port = SCTP_PORT_M2PA; -void proto_reg_handoff_m2pa(void); - static int proto_m2pa = -1; static module_t *m2pa_module; diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index bb54c4d16f..efed5e9b78 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -36,6 +36,9 @@ #include <epan/packet.h> #include <epan/sctpppids.h> +void proto_register_m2tp(void); +void proto_reg_handoff_m2tp(void); + #define SCTP_PORT_M2TP 9908 /* unassigned port number (not assigned by IANA) */ #define VERSION_LENGTH 1 diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index 33243bf328..3095bbbf8e 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -35,6 +35,9 @@ #include <epan/prefs.h> #include <epan/sctpppids.h> +void proto_register_m2ua(void); +void proto_reg_handoff_m2ua(void); + #define SCTP_PORT_M2UA 2904 /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 9c7af8f37f..c548769861 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -46,6 +46,9 @@ #include "packet-q708.h" #include <epan/tap.h> +void proto_register_m3ua(void); +void proto_reg_handoff_m3ua(void); + static gint m3ua_pref_mtp3_standard; #define SCTP_PORT_M3UA 2905 diff --git a/epan/dissectors/packet-maap.c b/epan/dissectors/packet-maap.c index 2880e82c75..fda21b5dd3 100644 --- a/epan/dissectors/packet-maap.c +++ b/epan/dissectors/packet-maap.c @@ -31,6 +31,9 @@ #include <epan/to_str.h> #include <epan/etypes.h> +void proto_register_maap(void); +void proto_reg_handoff_maap(void); + /* MAAP starts after common 1722 header */ #define MAAP_START_OFFSET 1 diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index 93ad6c1034..0fbc579be7 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -30,6 +30,8 @@ #include <epan/packet.h> #include <epan/dissectors/packet-mpeg-sect.h> +void proto_register_mpeg_descriptor(void); + static int proto_mpeg_descriptor = -1; static int hf_mpeg_descriptor_tag = -1; static int hf_mpeg_descriptor_length = -1; diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c index 03f845577b..d3e0837f03 100644 --- a/epan/dissectors/packet-mrp-mmrp.c +++ b/epan/dissectors/packet-mrp-mmrp.c @@ -37,6 +37,9 @@ #include <epan/packet.h> #include <epan/etypes.h> +void proto_register_mrp_mmrp(void); +void proto_reg_handoff_mrp_mmrp(void); + /* MMRP End Mark Sequence */ #define MMRP_END_MARK 0x0000 diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index c762d520e0..84c894193b 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -37,6 +37,9 @@ #include <epan/packet.h> #include <epan/etypes.h> +void proto_register_mrp_msrp(void); +void proto_reg_handoff_mrp_msrp(void); + /* MSRP End Mark Sequence */ #define MSRP_END_MARK 0x0000 diff --git a/epan/dissectors/packet-mrp-mvrp.c b/epan/dissectors/packet-mrp-mvrp.c index fa61276320..596701d942 100644 --- a/epan/dissectors/packet-mrp-mvrp.c +++ b/epan/dissectors/packet-mrp-mvrp.c @@ -37,6 +37,9 @@ #include <epan/packet.h> #include <epan/etypes.h> +void proto_register_mrp_mvrp(void); +void proto_reg_handoff_mrp_mvrp(void); + /* MVRP End Mark Sequence */ #define MVRP_END_MARK 0x0000 diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c index 30e58e1c48..c56840aacb 100644 --- a/epan/dissectors/packet-ndp.c +++ b/epan/dissectors/packet-ndp.c @@ -40,7 +40,7 @@ #include <epan/nlpid.h> void proto_register_ndp(void); -void proto_reg_handoff_ndps(void); +void proto_reg_handoff_ndp(void); /* Although this protocol is proprietary it is documented in the SynOptics MIB's * So I'm not giving anything away :-) diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index abab51268b..9779536455 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -58,6 +58,8 @@ /* We need the function tvb_get_guintvar() */ #include "packet-wap.h" +void proto_register_wbxml(void); +void proto_reg_handoff_wbxml(void); /* General-purpose debug logger. * Requires double parentheses because of variable arguments of printf(). @@ -6932,9 +6934,6 @@ static void dissect_wbxml_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, const wbxml_decoding *override_content_map); -void -proto_register_wbxml(void); - /* Parse and display the WBXML string table */ static void show_wbxml_string_table (proto_tree *tree, tvbuff_t *tvb, guint32 str_tbl, |