diff options
23 files changed, 69 insertions, 10 deletions
diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 2622d8eb45..55b28797a2 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -47,6 +47,8 @@ #define COMMUNICATION_PHASE_3 (0x3) #define COMMUNICATION_PHASE_4 (0x4) +void proto_register_sercosiii(void); +void proto_reg_handoff_sercosiii(void); /* Initialize the protocol and registered fields */ static gint proto_siii = -1; @@ -775,7 +777,7 @@ static const value_string siii_at_hotplug_status_error_text[]= -void dissect_siii_mst(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static void dissect_siii_mst(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_item *ti; proto_tree *subtree; @@ -801,7 +803,7 @@ void dissect_siii_mst(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) } -void dissect_siii_mdt_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static void dissect_siii_mdt_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_tree *subtree; proto_tree *subtree2; @@ -821,7 +823,7 @@ void dissect_siii_mdt_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_item(subtree, hf_siii_mdt_hp_info, tvb, 4, 4, ENC_NA); } -void dissect_siii_mdt_devctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static void dissect_siii_mdt_devctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_tree *subtree; proto_item *ti; @@ -834,7 +836,7 @@ void dissect_siii_mdt_devctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_tree_add_item(subtree, hf_siii_mdt_dev_control_top_control, tvb, 0, 2, ENC_LITTLE_ENDIAN); } -void dissect_siii_mdt_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint devno _U_) /* devno will be needed in later versions */ +static void dissect_siii_mdt_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint devno _U_) /* devno will be needed in later versions */ { proto_tree *subtree; proto_item *ti; @@ -930,7 +932,7 @@ static void dissect_siii_mdt_cp3_4(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_tree_add_text(tree, tvb, 0, 0, "Device Controls"); } -void dissect_siii_mdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void dissect_siii_mdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; proto_tree *subtree; @@ -984,7 +986,7 @@ void dissect_siii_mdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -void dissect_siii_at_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint devno _U_) /* devno will be used in later versions */ +static void dissect_siii_at_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint devno _U_) /* devno will be used in later versions */ { proto_tree *subtree; proto_item *ti; @@ -1000,7 +1002,7 @@ void dissect_siii_at_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_item(tree, hf_siii_at_svch_info, tvb, 2, 4, ENC_NA); } -void dissect_siii_at_devstat(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static void dissect_siii_at_devstat(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_tree *subtree; proto_item *ti; @@ -1018,7 +1020,7 @@ void dissect_siii_at_devstat(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_tree_add_item(subtree, hf_siii_at_dev_status_parameterization_level_active, tvb, 0, 2, ENC_LITTLE_ENDIAN); } -void dissect_siii_at_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) +static void dissect_siii_at_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_tree *subtree; proto_tree *subtree2; @@ -1122,7 +1124,7 @@ static void dissect_siii_at_cp3_4(tvbuff_t *tvb, packet_info *pinfo, proto_tree } -void dissect_siii_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static void dissect_siii_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; proto_tree *subtree; diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index dc7a06da9b..8af415f2a6 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -40,6 +40,11 @@ #include "packet-ber.h" #include "packet-ses.h" +void proto_register_ses(void); +void proto_reg_handoff_ses(void); + +void proto_register_clses(void); +void proto_reg_handoff_clses(void); /* ses header fields */ static int proto_ses = -1; diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 8e45b4b585..a94c1ec28b 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -61,6 +61,8 @@ #define SFLOW_UDP_PORTS "6343" +void proto_register_sflow(void); + static dissector_handle_t sflow_handle; /* diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 1e4109cc43..abf13ae5cc 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -44,6 +44,8 @@ */ #define SCTP_PORT_SGSAP 29118 +void proto_register_sgsap(void); +void proto_reg_handoff_sgsap(void); /* Global variables */ static dissector_handle_t gsm_a_dtap_handle; diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 57f3acf249..3e7b1f1491 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -43,6 +43,9 @@ #include <epan/sigcomp-udvm.h> #include <epan/sigcomp_state_hdlr.h> +void proto_register_sigcomp(void); +void proto_reg_handoff_sigcomp(void); + /* Initialize the protocol and registered fields */ static int proto_sigcomp = -1; static int proto_raw_sigcomp = -1; diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index c2376e7c18..5becafba56 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.c @@ -43,6 +43,8 @@ #define CA_SYSTEM_ID_MIKEY 0x9999 /* CA_system_ID corresponding to MIKEY ECM */ #define CA_SYSTEM_ID_MIKEY_PROTO "mikey" /* Protocol name to be used to "decode as" ECMs with CA_SYSTEM_ID_MIKEY */ +void proto_register_simulcrypt(void); + /* Tecm_interpretation links ca_system_id to ecmg port and protocol name for dissection of * ecm_datagram in ECM_Response message. * Currently size is 1 as only have MIKEY protocol but could add extra protocols diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index b6c74f7145..510e926648 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -65,6 +65,8 @@ #define TLS_PORT_SIP 5061 #define DEFAULT_SIP_PORT_RANGE "5060" +void proto_register_sip(void); + static dissector_handle_t sip_tcp_handle; static gint sip_tap = -1; diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c index 1692447069..9ddc3f8ede 100644 --- a/epan/dissectors/packet-sipfrag.c +++ b/epan/dissectors/packet-sipfrag.c @@ -32,6 +32,7 @@ * Doesn't do a detailed dissection of the lines of the message, just treat as text. */ +void proto_register_sipfrag(void); /* Initialize the protocol and registered fields. */ static int proto_sipfrag = -1; diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index acbb60ae4a..6991b398ae 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -47,6 +47,9 @@ #include "packet-ssl.h" #include "packet-skinny.h" +void proto_register_skinny(void); +void proto_reg_handoff_skinny(void); + #define TCP_PORT_SKINNY 2000 #define SSL_PORT_SKINNY 2443 /* IANA assigned to PowerClient Central Storage Facility */ diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c index 9fb9cb6af3..71b7503562 100644 --- a/epan/dissectors/packet-skype.c +++ b/epan/dissectors/packet-skype.c @@ -47,6 +47,9 @@ #include <epan/packet.h> #include <epan/conversation.h> +void proto_register_skype(void); +void proto_reg_handoff_skype(void); + /* Things we may want to remember for a whole conversation */ typedef struct _skype_udp_conv_info_t { guint32 global_src_ip; diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 4efe2616f7..8ad1f64d0e 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -35,6 +35,9 @@ #include <epan/packet.h> #include <epan/to_str.h> +void proto_register_slimp3(void); +void proto_reg_handoff_slimp3(void); + static int proto_slimp3 = -1; static int hf_slimp3_opcode = -1; static int hf_slimp3_control = -1; diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 5f4d61c34a..e52a7f69e4 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -40,6 +40,8 @@ #include <epan/addr_resolv.h> #include <epan/etypes.h> +void proto_register_sll(void); +void proto_reg_handoff_sll(void); /* * A DLT_LINUX_SLL fake link-layer header. */ diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index dd1b11e2af..065fc1af47 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -39,6 +39,8 @@ #include <epan/expert.h> /* General declarations */ +void proto_register_slow_protocols(void); +void proto_reg_handoff_slow_protocols(void); #define SLOW_PROTO_SUBTYPE 0 diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 4cc5201cae..f2cfa7f2b7 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -42,6 +42,9 @@ #include <epan/expert.h> #include "packet-tcp.h" +void proto_register_slsk(void); +void proto_reg_handoff_slsk(void); + /* Initialize the protocol and registered fields */ static int proto_slsk = -1; diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index ed071c9aa4..66841e5bfb 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -38,6 +38,9 @@ #include "packet-smb-browse.h" #include "packet-dcerpc.h" +void proto_register_smb_browse(void); +void proto_reg_handoff_smb_browse(void); + static int proto_smb_browse = -1; static int hf_command = -1; static int hf_update_count = -1; diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 9ef5441486..d09ad8bc29 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -33,6 +33,8 @@ #include "packet-windows-common.h" #include "packet-smb-common.h" +void proto_register_smb_logon(void); + static int proto_smb_logon = -1; static int hf_command = -1; static int hf_computer_name = -1; diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index cc3bafd905..cdf61dfb30 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -37,6 +37,9 @@ #include "packet-smb-browse.h" #include "packet-smb-pipe.h" +void proto_register_smb_mailslot(void); +void proto_reg_handoff_smb_mailslot(void); + static int proto_smb_msp = -1; static int hf_opcode = -1; static int hf_priority = -1; diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index ca044071b0..94689ac7ce 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -50,6 +50,11 @@ XXX Fixme : shouldn't show [malformed frame] for long packets #include "packet-dcerpc.h" #include <epan/reassemble.h> +void proto_register_pipe_lanman(void); +void proto_register_pipe_dcerpc(void); +void proto_register_smb_pipe(void); +void proto_reg_handoff_smb_pipe(void); + static int proto_smb_pipe = -1; static int hf_smb_pipe_function = -1; static int hf_smb_pipe_priority = -1; diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index c15d388851..e7cf127580 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -54,6 +54,9 @@ #include <wsutil/wsgcrypt.h> #endif /* HAVE_LIBGCRYPT */ +void proto_register_smb2(void); +void proto_reg_handoff_smb2(void); + static const char smb_header_label[] = "SMB2 Header"; static const char smb_transform_header_label[] = "SMB2 Transform Header"; diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index 3a904b2610..f73e2d0d29 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -38,6 +38,7 @@ * http://www.iana.org/assignments/websocket (last updated 2012-04-12) */ +void proto_register_websocket(void); void proto_reg_handoff_websocket(void); static dissector_handle_t text_lines_handle; @@ -131,7 +132,7 @@ static dissector_table_t port_subdissector_table; static heur_dissector_list_t heur_subdissector_list; #define MAX_UNMASKED_LEN (1024 * 64) -tvbuff_t * +static tvbuff_t * tvb_unmasked(tvbuff_t *tvb, const guint offset, guint payload_length, const guint8 *masking_key) { diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index 10b03df1c3..07b82a8a59 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -64,6 +64,9 @@ RWHOD(8) UNIX System Manager's Manual RWHOD(8) * */ +void proto_register_who(void); +void proto_reg_handoff_who(void); + static int proto_who = -1; static int hf_who_vers = -1; static int hf_who_type = -1; diff --git a/epan/dissectors/packet-wifi-display.c b/epan/dissectors/packet-wifi-display.c index 44aca0fcfb..5db8099bf8 100644 --- a/epan/dissectors/packet-wifi-display.c +++ b/epan/dissectors/packet-wifi-display.c @@ -30,6 +30,8 @@ #include "packet-ieee80211.h" +void proto_register_wifi_display(void); + static int proto_wifi_display = -1; static int hf_wfd_subelem_id = -1; diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index a04a1b6486..d1fec08794 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -30,6 +30,8 @@ #include "packet-ieee80211.h" +void proto_register_p2p(void); + enum { P2P_ATTR_STATUS = 0, P2P_ATTR_MINOR_REASON_CODE = 1, |