diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | echld/echld-int.h | 2 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/Makefile.common | 2 | ||||
| -rw-r--r-- | epan/disabled_protos.c (renamed from disabled_protos.c) | 0 | ||||
| -rw-r--r-- | epan/disabled_protos.h (renamed from disabled_protos.h) | 15 | ||||
| -rw-r--r-- | rawshark.c | 2 | ||||
| -rw-r--r-- | tshark.c | 2 | ||||
| -rw-r--r-- | ui/gtk/main.c | 2 | ||||
| -rw-r--r-- | ui/gtk/proto_dlg.c | 2 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/wireshark_application.cpp | 2 |
13 files changed, 19 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9acf063bde..b8c8ede595 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -652,7 +652,6 @@ set(WIRESHARK_COMMON_SRC cfile.c cfutils.c clopts_common.c - disabled_protos.c frame_tvbuff.c print.c ps.c diff --git a/Makefile.common b/Makefile.common index 6d189d0921..6f89e69667 100644 --- a/Makefile.common +++ b/Makefile.common @@ -50,7 +50,6 @@ SHARK_COMMON_SRC = \ cfile.c \ cfutils.c \ clopts_common.c \ - disabled_protos.c \ frame_tvbuff.c \ print.c \ ps.c \ @@ -67,7 +66,6 @@ SHARK_COMMON_INCLUDES = \ clopts_common.h \ cmdarg_err.h \ color.h \ - disabled_protos.h \ file.h \ fileset.h \ frame_tvbuff.h \ diff --git a/echld/echld-int.h b/echld/echld-int.h index 0c9b58d0a1..ca14f6ba38 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -73,7 +73,7 @@ #include "epan/funnel.h" #include "epan/prefs.h" #include "epan/timestamp.h" -#include "disabled_protos.h" +#include "epan/disabled_protos.h" #include "echld.h" #ifdef __cplusplus diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 1e3678ba6c..871f5e5a84 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1430,6 +1430,7 @@ set(LIBWIRESHARK_FILES crc16-tvb.c crc32-tvb.c crc8-tvb.c + disabled_protos.c dissector_filters.c emem.c epan.c diff --git a/epan/Makefile.common b/epan/Makefile.common index 3b93b38073..49eca048dd 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -43,6 +43,7 @@ LIBWIRESHARK_SRC = \ crc16-tvb.c \ crc32-tvb.c \ crc8-tvb.c \ + disabled_protos.c \ dissector_filters.c \ emem.c \ epan.c \ @@ -169,6 +170,7 @@ LIBWIRESHARK_INCLUDES = \ crc32-tvb.h \ crc8-tvb.h \ diam_dict.h \ + disabled_protos.h \ dissector_filters.h \ dtd.h \ dtd_parse.h \ diff --git a/disabled_protos.c b/epan/disabled_protos.c index 56b2622692..56b2622692 100644 --- a/disabled_protos.c +++ b/epan/disabled_protos.c diff --git a/disabled_protos.h b/epan/disabled_protos.h index 8fbf9ad6b0..dfe17e9d98 100644 --- a/disabled_protos.h +++ b/epan/disabled_protos.h @@ -47,15 +47,17 @@ typedef struct { * or "*read_errno_return" is set to the error if we got an error reading * the file. */ -void read_disabled_protos_list(char **gpath_return, int *gopen_errno_return, - int *gread_errno_return, - char **path_return, int *open_errno_return, - int *read_errno_return); +WS_DLL_PUBLIC void +read_disabled_protos_list(char **gpath_return, int *gopen_errno_return, + int *gread_errno_return, + char **path_return, int *open_errno_return, + int *read_errno_return); /* * Disable protocols as per the stored configuration */ -void set_disabled_protos_list(void); +WS_DLL_PUBLIC void +set_disabled_protos_list(void); /* * Write out a list of disabled protocols. @@ -65,7 +67,8 @@ void set_disabled_protos_list(void); * the file we tried to read - it should be freed by our caller - * and "*errno_return" is set to the error. */ -void save_disabled_protos_list(char **pref_path_return, int *errno_return); +WS_DLL_PUBLIC void +save_disabled_protos_list(char **pref_path_return, int *errno_return); #ifdef __cplusplus } diff --git a/rawshark.c b/rawshark.c index 670b9addba..1fe5f31d23 100644 --- a/rawshark.c +++ b/rawshark.c @@ -74,7 +74,7 @@ #include <epan/packet.h> #include "file.h" #include "frame_tvbuff.h" -#include "disabled_protos.h" +#include <epan/disabled_protos.h> #include <epan/prefs.h> #include <epan/column.h> #include "print.h" @@ -65,7 +65,7 @@ #include <epan/packet.h> #include "file.h" #include "frame_tvbuff.h" -#include "disabled_protos.h" +#include <epan/disabled_protos.h> #include <epan/prefs.h> #include <epan/column.h> #include "print.h" diff --git a/ui/gtk/main.c b/ui/gtk/main.c index ae5e03b82c..30395d9c9c 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -85,13 +85,13 @@ #include <epan/stat_cmd_args.h> #include <epan/uat.h> #include <epan/column.h> +#include <epan/disabled_protos.h> /* general (not GTK specific) */ #include "../file.h" #include "../frame_tvbuff.h" #include "../summary.h" #include "../filters.h" -#include "../disabled_protos.h" #include "../color.h" #include "../color_filters.h" #include "../print.h" diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c index f8db18a62f..983893f3ca 100644 --- a/ui/gtk/proto_dlg.c +++ b/ui/gtk/proto_dlg.c @@ -34,9 +34,9 @@ #include <epan/prefs.h> #include <epan/filesystem.h> +#include <epan/disabled_protos.h> #include "ui/util.h" -#include "../disabled_protos.h" #include "ui/simple_dialog.h" diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 56df2fc9b9..28033ecc71 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -63,11 +63,11 @@ #include <epan/stat_cmd_args.h> #include <epan/uat.h> #include <epan/column.h> +#include <epan/disabled_protos.h> /* general (not Qt specific) */ #include "file.h" #include "summary.h" -#include "disabled_protos.h" #include "color.h" #include "color_filters.h" #include "print.h" diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index 740aad0606..76c6c6d8c3 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -25,6 +25,7 @@ #include <epan/filesystem.h> #include <epan/timestamp.h> +#include <epan/disabled_protos.h> #include "ui/recent.h" #include "ui/simple_dialog.h" @@ -33,7 +34,6 @@ #include "capture.h" #include "color_filters.h" -#include "disabled_protos.h" #include "filters.h" #include "log.h" #include "recent_file_status.h" |