aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-v5ef.c2
-rw-r--r--epan/dissectors/packet-vcdu.c3
-rw-r--r--epan/dissectors/packet-vicp.c3
-rw-r--r--epan/dissectors/packet-vines.c20
-rw-r--r--epan/dissectors/packet-vmlab.c3
-rw-r--r--epan/dissectors/packet-vnc.c2
-rw-r--r--epan/dissectors/packet-zbee-zcl-general.c11
-rw-r--r--epan/dissectors/packet-zbee-zcl-ha.c9
-rw-r--r--epan/dissectors/packet-zbee-zcl-meas-sensing.c7
-rw-r--r--epan/dissectors/packet-zbee-zcl-se.c2
-rw-r--r--epan/dissectors/packet-zbee-zcl.c2
-rw-r--r--epan/dissectors/packet-zbee-zdp-management.c18
-rw-r--r--epan/dissectors/packet-zbee-zdp.h2
-rw-r--r--epan/dissectors/packet-zebra.c4
-rw-r--r--epan/dissectors/packet-zep.c1
-rw-r--r--epan/dissectors/packet-ziop.c3
-rw-r--r--epan/dissectors/packet-zrtp.c3
17 files changed, 79 insertions, 16 deletions
diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c
index 458ba9789a..2771a22765 100644
--- a/epan/dissectors/packet-v5ef.c
+++ b/epan/dissectors/packet-v5ef.c
@@ -41,6 +41,8 @@
#include <epan/xdlc.h>
#include <epan/crc16-tvb.h>
+void proto_register_v5ef(void);
+
static int proto_v5ef = -1;
static int hf_v5ef_direction = -1;
static int hf_v5ef_address = -1;
diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c
index b9d642a66f..ec6bf6efca 100644
--- a/epan/dissectors/packet-vcdu.c
+++ b/epan/dissectors/packet-vcdu.c
@@ -32,6 +32,9 @@
#include <epan/wmem/wmem.h>
#include <epan/uat.h>
+void proto_register_vcdu(void);
+void proto_reg_handoff_vcdu(void);
+
/* Initialize the protocol and registered fields */
static int proto_vcdu = -1;
diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c
index 2fe44ed9f8..c2742268e8 100644
--- a/epan/dissectors/packet-vicp.c
+++ b/epan/dissectors/packet-vicp.c
@@ -42,6 +42,9 @@ static gint ett_vicp = -1;
#define VICP_PORT 1861
+void proto_register_vicp(void);
+void proto_reg_handoff_vicp(void);
+
static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti;
diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c
index 6587a2d72d..2b3970960b 100644
--- a/epan/dissectors/packet-vines.c
+++ b/epan/dissectors/packet-vines.c
@@ -95,6 +95,26 @@
#include <epan/llcsaps.h>
#include <epan/to_str.h>
+void proto_register_vines_frp(void);
+void proto_reg_handoff_vines_frp(void);
+void proto_register_vines_llc(void);
+void proto_reg_handoff_vines_llc(void);
+void proto_register_vines_ip(void);
+void proto_reg_handoff_vines_ip(void);
+void proto_register_vines_echo(void);
+void proto_reg_handoff_vines_echo(void);
+void proto_register_vines_ipc(void);
+void proto_reg_handoff_vines_ipc(void);
+void proto_register_vines_spp(void);
+void proto_reg_handoff_vines_spp(void);
+void proto_register_vines_arp(void);
+void proto_reg_handoff_vines_arp(void);
+void proto_register_vines_rtp(void);
+void proto_reg_handoff_vines_rtp(void);
+void proto_register_vines_icp(void);
+void proto_reg_handoff_vines_icp(void);
+
+
#define UDP_PORT_VINES 573
static int proto_vines_frp = -1;
diff --git a/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c
index 37fca5a8c3..ac18fc7e83 100644
--- a/epan/dissectors/packet-vmlab.c
+++ b/epan/dissectors/packet-vmlab.c
@@ -48,6 +48,9 @@
#include <epan/packet.h>
#include <epan/etypes.h>
+void proto_register_vmlab(void);
+void proto_reg_handoff_vmlab(void);
+
static dissector_handle_t ethertype_handle;
static int proto_vmlab = -1;
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index 1b5fffa388..25083f4037 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -54,6 +54,8 @@
#include "packet-x11.h" /* This contains the extern for the X11 value_string_ext
* "x11_keysym_vals_source_ext" that VNC uses. */
+void proto_register_vnc(void);
+
typedef enum {
VNC_SECURITY_TYPE_INVALID = 0,
VNC_SECURITY_TYPE_NONE = 1,
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index 6f3f65ff43..62c68c5d8d 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -95,6 +95,17 @@
/*************************/
/* Command Dissector Helpers */
+void proto_register_zbee_zcl_basic(void);
+void proto_reg_handoff_zbee_zcl_basic(void);
+void proto_register_zbee_zcl_identify(void);
+void proto_reg_handoff_zbee_zcl_identify(void);
+void proto_register_zbee_zcl_on_off(void);
+void proto_register_zbee_zcl_part(void);
+void proto_reg_handoff_zbee_zcl_part(void);
+void proto_register_zbee_zcl_pwr_prof(void);
+void proto_reg_handoff_zbee_zcl_pwr_prof(void);
+void proto_register_zbee_zcl_appl_ctrl(void);
+void proto_reg_handoff_zbee_zcl_appl_ctrl(void);
/* Private functions prototype */
static void dissect_zcl_basic_attr_id (proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id);
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c
index 44f8e2e9c6..fb627a608a 100644
--- a/epan/dissectors/packet-zbee-zcl-ha.c
+++ b/epan/dissectors/packet-zbee-zcl-ha.c
@@ -107,6 +107,15 @@
/* Function Declarations */
/*************************/
+void proto_register_zbee_zcl_appl_idt(void);
+void proto_reg_handoff_zbee_zcl_appl_idt(void);
+void proto_register_zbee_zcl_met_idt(void);
+void proto_reg_handoff_zbee_zcl_met_idt(void);
+void proto_register_zbee_zcl_appl_evtalt(void);
+void proto_reg_handoff_zbee_zcl_appl_evtalt(void);
+void proto_register_zbee_zcl_appl_stats(void);
+void proto_reg_handoff_zbee_zcl_appl_stats(void);
+
/* Command Dissector Helpers */
/* Private functions prototype */
diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
index e349bfe34d..3715a49002 100644
--- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c
+++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
@@ -77,6 +77,13 @@
/*************************/
/* Function Declarations */
/*************************/
+void proto_register_zbee_zcl_illum_meas(void);
+void proto_reg_handoff_zbee_zcl_illum_meas(void);
+void proto_reg_handoff_zbee_zcl_temp_meas(void);
+void proto_register_zbee_zcl_press_meas(void);
+void proto_reg_handoff_zbee_zcl_press_meas(void);
+void proto_register_zbee_zcl_relhum_meas(void);
+void proto_reg_handoff_zbee_zcl_relhum_meas(void);
/* Command Dissector Helpers */
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c
index 3e470ed651..3d12e441f8 100644
--- a/epan/dissectors/packet-zbee-zcl-se.c
+++ b/epan/dissectors/packet-zbee-zcl-se.c
@@ -78,6 +78,8 @@
/*************************/
/* Function Declarations */
/*************************/
+void proto_register_zbee_zcl_msg(void);
+void proto_reg_handoff_zbee_zcl_msg(void);
/* Command Dissector Helpers */
static void dissect_zcl_msg_display (tvbuff_t *tvb, proto_tree *tree, guint *offset);
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index 4c9af24d29..0943df6fe8 100644
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -42,6 +42,8 @@
* Function Declarations *
*************************
*/
+void proto_register_zbee_zcl(void);
+void proto_reg_handoff_zbee_zcl(void);
/* Command Dissector Helpers */
static void dissect_zcl_read_attr (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint *offset);
diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c
index 3e9a2ae0ed..764f3c05be 100644
--- a/epan/dissectors/packet-zbee-zdp-management.c
+++ b/epan/dissectors/packet-zbee-zdp-management.c
@@ -52,7 +52,7 @@
* void
*---------------------------------------------------------------
*/
-void
+static void
zdp_parse_nwk_desc(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint8 version)
{
proto_item *ti = NULL;
@@ -120,7 +120,7 @@ zdp_parse_nwk_desc(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint8 versio
* void
*---------------------------------------------------------------
*/
-void
+static void
zdp_parse_neighbor_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint8 version)
{
proto_item *ti = NULL;
@@ -260,20 +260,6 @@ zdp_parse_routing_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset)
*offset += len;
} /* zdp_parse_routing_table_entry */
-/*FUNCTION:------------------------------------------------------
- * NAME
- * zdp_parse_bind_table_entry
- * DESCRIPTION
- * Parses and displays a single binding table entry.
- * PARAMETERS
- * tvbuff_t *tvb - pointer to buffer containing raw packet.
- * packet_into *pinfo - pointer to packet information fields
- * proto_tree *tree - pointer to data tree Wireshark uses to display packet.
- * RETURNS
- * void
- *---------------------------------------------------------------
- */
-extern void zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint8 version);
/**************************************
* MANAGEMENT REQUESTS
diff --git a/epan/dissectors/packet-zbee-zdp.h b/epan/dissectors/packet-zbee-zdp.h
index 0e060ef7fc..fa022bef2c 100644
--- a/epan/dissectors/packet-zbee-zdp.h
+++ b/epan/dissectors/packet-zbee-zdp.h
@@ -375,4 +375,6 @@ extern void dissect_zbee_zdp_rsp_mgmt_permit_join (tvbuff_t *tvb, packet_info
extern void dissect_zbee_zdp_rsp_mgmt_cache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
extern void dissect_zbee_zdp_rsp_mgmt_nwkupdate (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint8 version);
+
#endif /* PACKET_ZBEE_ZDP_H */
diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c
index 50f6701c02..e4d059615b 100644
--- a/epan/dissectors/packet-zebra.c
+++ b/epan/dissectors/packet-zebra.c
@@ -32,6 +32,10 @@
#include <glib.h>
#include <epan/packet.h>
+/* Function declarations */
+void proto_reg_handoff_zebra(void);
+void proto_register_zebra(void);
+
static int proto_zebra = -1;
static int hf_zebra_len = -1;
static int hf_zebra_command = -1;
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index 737dd98bc6..fe258cc5f2 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -62,6 +62,7 @@
/* Function declarations */
void proto_reg_handoff_zep(void);
+void proto_register_zep(void);
/* Initialize protocol and registered fields. */
static int proto_zep = -1;
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c
index a3895d7de0..6a0ae1a81f 100644
--- a/epan/dissectors/packet-ziop.c
+++ b/epan/dissectors/packet-ziop.c
@@ -46,6 +46,9 @@
#define DEBUG 0
+void proto_reg_handoff_ziop(void);
+void proto_register_ziop(void);
+
/*
* ------------------------------------------------------------------------------------------+
* Data/Variables/Structs
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c
index e9a8a0a8db..890e9227c2 100644
--- a/epan/dissectors/packet-zrtp.c
+++ b/epan/dissectors/packet-zrtp.c
@@ -37,6 +37,9 @@
#include "packet-rtp.h"
#include "packet-rtcp.h"
+void proto_reg_handoff_zrtp(void);
+void proto_register_zrtp(void);
+
/*
RTP header
*/