summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt5
-rw-r--r--Makefile.common5
-rw-r--r--NEWS9
3 files changed, 8 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17097bb2ba..5a600d9dc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -814,6 +814,7 @@ endif()
set(SHARK_COMMON_SRC
${PLATFORM_PCAP_SRC}
capture-pcap-util.c
+ cfile.c
cfutils.c
clopts_common.c
frame_tvbuff.c
@@ -946,7 +947,6 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
proto_hier_stats.c
summary.c
ws80211_utils.c
- cfile.c
${SHARK_COMMON_CAPTURE_SRC}
${SHARK_COMMON_SRC}
${PLATFORM_UI_SRC}
@@ -1018,7 +1018,6 @@ if(BUILD_tshark)
capture_opts.c
tshark-tap-register.c
tshark.c
- cfile.c
${TSHARK_TAP_SRC}
${SHARK_COMMON_CAPTURE_SRC}
${SHARK_COMMON_SRC}
@@ -1040,7 +1039,6 @@ if(BUILD_tfshark)
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
)
set(tfshark_FILES
- cfile.c
tfshark.c
tshark-tap-register.c
${TSHARK_TAP_SRC}
@@ -1061,7 +1059,6 @@ if(BUILD_rawshark AND PCAP_FOUND)
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
)
set(rawshark_FILES
- cfile.c
${SHARK_COMMON_SRC}
rawshark.c
ui/util.c
diff --git a/Makefile.common b/Makefile.common
index 9c44211796..f47aa9389e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -45,6 +45,7 @@ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
SHARK_COMMON_SRC = \
$(PLATFORM_PCAP_SRC) \
capture-pcap-util.c \
+ cfile.c \
cfutils.c \
clopts_common.c \
frame_tvbuff.c \
@@ -90,7 +91,6 @@ WIRESHARK_COMMON_SRC = \
capture.c \
capture_info.c \
capture_opts.c \
- cfile.c \
color_filters.c \
file.c \
fileset.c \
@@ -122,20 +122,17 @@ WIRESHARK_COMMON_INCLUDES = \
tshark_SOURCES = \
$(SHARK_COMMON_SRC) \
$(SHARK_COMMON_CAPTURE_SRC) \
- cfile.c \
capture_opts.c \
tshark.c
# tfshark specifics
tfshark_SOURCES = \
$(SHARK_COMMON_SRC) \
- cfile.c \
tfshark.c
# rawshark specifics
rawshark_SOURCES = \
$(SHARK_COMMON_SRC) \
- cfile.c \
rawshark.c
# text2pcap specifics
diff --git a/NEWS b/NEWS
index 7381962222..38c3a5e176 100644
--- a/NEWS
+++ b/NEWS
@@ -31,8 +31,6 @@ What's New
+ Several SCTP dialogs have been added.
+ The statistics tree (the backend for many Statistics and
Telephony menu items) dialog has been added.
- + In Windows Installer (NSIS), it is possible to associate file with
- Wireshark Qt and select icons to be installed
The following features are new (or have been significantly updated)
since version 1.11.1:
@@ -76,6 +74,11 @@ What's New
they are Wireshark application specific filters and not dissector
filters.
+ Removed dissectors
+
+ * The ASN1 plugin has been removed as it's deemed obsolete.
+ * The GNM dissector has been removed as it was never used.
+
New Protocol Support
802.1AE Secure tag, ASTERIX, ATN, BT 3DS, CARP, Cisco MetaData, ELF
@@ -165,7 +168,7 @@ Frequently Asked Questions
A complete FAQ is available on the [21]Wireshark web site.
__________________________________________________________________
- Last updated 2013-12-31 15:25:28 CET
+ Last updated 2014-01-03 11:21:56 CET
References