diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-09-01 19:33:24 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-09-02 02:34:09 +0000 |
commit | a66a216820f877881217485388b86c73722b351d (patch) | |
tree | dee6c8bcafaebb596884bfb4906758454d3fd23b /epan/dissectors | |
parent | 1ef38667197289f585c7315beacb87179c21b1b6 (diff) |
Don't export structures used internally by dissectors for Export Objects.
They're not used anywhere other than inside the dissectors, so make them
private to the dissectors.
Change-Id: I9946713f34f95a8173fd7748055fd4aa2e870f70
Reviewed-on: https://code.wireshark.org/review/23357
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/Makefile.am | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-dcm.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-dcm.h | 38 | ||||
-rw-r--r-- | epan/dissectors/packet-http.c | 9 | ||||
-rw-r--r-- | epan/dissectors/packet-http.h | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-imf.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-imf.h | 9 | ||||
-rw-r--r-- | epan/dissectors/packet-tftp.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-tftp.h | 9 |
9 files changed, 35 insertions, 69 deletions
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index 51b38fcbff..c45cde67f5 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -1535,7 +1535,6 @@ DISSECTOR_INCLUDES = \ packet-dcerpc-tapi.h \ packet-dcom.h \ packet-dcom-dispatch.h \ - packet-dcm.h \ packet-diameter.h \ packet-diameter_3gpp.h \ packet-diffserv-mpls-common.h \ diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 156ae77e43..5c4c866b58 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -225,8 +225,6 @@ #include "packet-tcp.h" -#include "packet-dcm.h" - void proto_register_dcm(void); void proto_reg_handoff_dcm(void); @@ -390,6 +388,16 @@ static const value_string user_identify_type_vals[] = { { 0, NULL } }; +/* Used for DICOM Export Object feature */ +typedef struct _dicom_eo_t { + guint32 pkt_num; + gchar *hostname; + gchar *filename; + gchar *content_type; + guint32 payload_len; + guint8 *payload_data; +} dicom_eo_t; + static gboolean dcm_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) diff --git a/epan/dissectors/packet-dcm.h b/epan/dissectors/packet-dcm.h deleted file mode 100644 index bfadc9fe33..0000000000 --- a/epan/dissectors/packet-dcm.h +++ /dev/null @@ -1,38 +0,0 @@ -/* packet-dcm.h - * - * Routines for DICOM packet dissection - * Copyright 2009, David Aggeler <david_aggeler@hispeed.ch> - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef PACKET_DCM_H -#define PACKET_DCM_H - -/* Used for DICOM Export Object feature */ -typedef struct _dicom_eo_t { - guint32 pkt_num; - gchar *hostname; - gchar *filename; - gchar *content_type; - guint32 payload_len; - guint8 *payload_data; -} dicom_eo_t; - -#endif /* PACKET_DCM_H */ diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 84b3e91a73..ae788743f2 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -352,6 +352,15 @@ static dissector_table_t port_subdissector_table; static dissector_table_t media_type_subdissector_table; static heur_dissector_list_t heur_subdissector_list; +/* Used for HTTP Export Object feature */ +typedef struct _http_eo_t { + guint32 pkt_num; + gchar *hostname; + gchar *filename; + gchar *content_type; + guint32 payload_len; + const guint8 *payload_data; +} http_eo_t; static gboolean http_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) diff --git a/epan/dissectors/packet-http.h b/epan/dissectors/packet-http.h index dfa65cbbd0..a4aac74217 100644 --- a/epan/dissectors/packet-http.h +++ b/epan/dissectors/packet-http.h @@ -43,16 +43,6 @@ typedef struct _http_info_value_t { const gchar *request_uri; } http_info_value_t; -/* Used for HTTP Export Object feature */ -typedef struct _http_eo_t { - guint32 pkt_num; - gchar *hostname; - gchar *filename; - gchar *content_type; - guint32 payload_len; - const guint8 *payload_data; -} http_eo_t; - /** information about a request and response on a HTTP conversation. */ typedef struct _http_req_res_t { /** the running number on the conversation */ diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 91b6935b6e..d2867389d7 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -155,6 +155,14 @@ static dissector_handle_t imf_handle; static expert_field ei_imf_unknown_param = EI_INIT; +/* Used for IMF Export Object feature */ +typedef struct _imf_eo_t { + gchar *filename; + gchar *sender_data; + gchar *subject_data; + guint32 payload_len; + gchar *payload_data; +} imf_eo_t; static gboolean imf_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) diff --git a/epan/dissectors/packet-imf.h b/epan/dissectors/packet-imf.h index 7e1717ea7c..02017780b5 100644 --- a/epan/dissectors/packet-imf.h +++ b/epan/dissectors/packet-imf.h @@ -34,13 +34,4 @@ */ int imf_find_field_end(tvbuff_t *tvb, int offset, gint max_length, gboolean *last_field); -/* Used for IMF Export Object feature */ -typedef struct _imf_eo_t { - gchar *filename; - gchar *sender_data; - gchar *subject_data; - guint32 payload_len; - gchar *payload_data; -} imf_eo_t; - #endif /* __PACKET_IMF_H__ */ diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 9eae0df181..6770aa74d1 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -148,6 +148,14 @@ typedef struct eo_info_dynamic_t { } eo_info_dynamic_t; static GSList *s_dynamic_info_list = NULL; +/* Used for TFTP Export Object feature */ +typedef struct _tftp_eo_t { + guint32 pkt_num; + gchar *filename; + guint32 payload_len; + GSList *block_list; +} tftp_eo_t; + /* Tap function */ static gboolean tftp_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) diff --git a/epan/dissectors/packet-tftp.h b/epan/dissectors/packet-tftp.h index d8c78ad0f7..c5dd4681d4 100644 --- a/epan/dissectors/packet-tftp.h +++ b/epan/dissectors/packet-tftp.h @@ -30,13 +30,4 @@ typedef struct file_block_t { guint length; } file_block_t; -/* Used for TFTP Export Object feature */ -typedef struct _tftp_eo_t { - guint32 pkt_num; - gchar *filename; - guint32 payload_len; - GSList *block_list; -} tftp_eo_t; - - #endif /* __PACKET_TFTP_H__ */ |