Commit graph

976 commits

Author SHA1 Message Date
Anders Broman
a40f824e0e Make it easier to try GTK 3.6
svn path=/trunk/; revision=54986
2014-01-27 19:22:10 +00:00
Gerald Combs
bce9eaad75 Partially revert r54824.
svn path=/trunk/; revision=54825
2014-01-16 02:23:42 +00:00
Gerald Combs
d5b706be51 Allow the use of Win flex-bison and document how to do that.
svn path=/trunk/; revision=54824
2014-01-16 01:28:02 +00:00
Gerald Combs
bbc7ad3c4e cfile.c is in WIRESHARK_COMMON_SRC so there's no need to add it again.
svn path=/trunk/; revision=54675
2014-01-09 01:30:25 +00:00
Guy Harris
658e0b30e6 At least some of the files in PLATFORM_CAPTURE_SRC are needed by
programs that use {lib,win}pcap but that don't capture traffic, such as
rawshark; rename it to PLATFORM_PCAP_SRC, to match CMake.

svn path=/trunk/; revision=54671
2014-01-08 20:50:52 +00:00
Guy Harris
324a7c9043 Rename PLATFORM_SRC to PLATFORM_CAPTURE_SRC, to match the CMake name.
svn path=/trunk/; revision=54669
2014-01-08 20:22:13 +00:00
Michael Mann
bf284da2ee TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607)
This is a VERY PRELIMINARY version of tfshark.  It's an attempt to jumpstart FileShark and its architecture.  Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)

This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture.  And those layers will slowly be added in time (patches always welcome!).

svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
Guy Harris
e21fd7c0ce Add a "captype" file that just reports the type of a capture file, based
on what libwiretap thinks it is.

Update some comments to reflect the death of the hack used to include
(libwiretap) plugin support in programs not built with libwireshark.

svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
Guy Harris
0cc1545d05 Move most of the plugin code from epan to wsutil and remove all
knowledge of particular types of plugins.  Instead, let particular types
of plugins register with the common plugin code, giving a name and a
routine to recognize that type of plugin.

In particular applications, only process the relevant plugin types.

Add a Makefile.common to the codecs directory.

svn path=/trunk/; revision=53710
2013-12-02 08:30:29 +00:00
Jörg Mayer
244000000d - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

svn path=/trunk/; revision=53690
2013-12-01 10:05:16 +00:00
Gerald Combs
26325020a2 Try to get qmake to create wireshark-tap-register.c.
svn path=/trunk/; revision=53466
2013-11-21 02:05:36 +00:00
Guy Harris
db25270df8 Move the epan/filesystem.c routines to wsutil; they're not specific to
packet dissection, they're specific to the entire Wireshark suite of
programs.

svn path=/trunk/; revision=53377
2013-11-17 02:55:14 +00:00
Pascal Quantin
63ff652b8e Fix relative path now that u3 folder has been removed
svn path=/trunk/; revision=52898
2013-10-27 19:45:30 +00:00
Gerald Combs
69741d086b Remove U3 code and packaging.
svn path=/trunk/; revision=52896
2013-10-27 17:15:39 +00:00
Gerald Combs
e7202d159a If static analysis is enabled disable error checking when compiling the
Qt code. This should hopefully work around a builder issue.

svn path=/trunk/; revision=52661
2013-10-17 17:50:00 +00:00
Pascal Quantin
6390f33772 Update the User Guide for the upcoming 1.11.0 release
svn path=/trunk/; revision=52576
2013-10-12 23:48:43 +00:00
Gerald Combs
6a5afa8e95 Update to the latest Windows library tags. Add an "install_qt" target.
svn path=/trunk/; revision=52558
2013-10-12 01:02:34 +00:00
Gerald Combs
fcff2c96e6 QT_DIR → QT5_BASE_DIR. This matches the CMake environment.
svn path=/trunk/; revision=52557
2013-10-12 00:12:24 +00:00
Gerald Combs
383ed6465a Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.
svn path=/trunk/; revision=52556
2013-10-11 23:52:19 +00:00
Gerald Combs
59e24dfb1d "install-generated-files" depends on "doc". Set dependencies
accordingly.

svn path=/trunk/; revision=52530
2013-10-11 01:31:59 +00:00
Gerald Combs
c03546c8c6 qtshark.exe doesn't depend on tshark_OBJECTS.
svn path=/trunk/; revision=52529
2013-10-11 01:16:19 +00:00
Gerald Combs
c62f096ec7 Don't return an error if cleaning the Qt directory fails.
svn path=/trunk/; revision=52525
2013-10-11 00:29:21 +00:00
Chris Maynard
37a7e3382c Revert the changes made to resolve https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res).
#BACKPORT(1.10)


svn path=/trunk/; revision=52506
2013-10-10 19:48:37 +00:00
Jörg Mayer
c3d138dca5 As the Qt build will not use portaudio, we don't need to
put portaudio flags into config.pri

svn path=/trunk/; revision=52485
2013-10-10 07:13:36 +00:00
Gerald Combs
f54c08ed35 Add some QT_DIR checks.
svn path=/trunk/; revision=52459
2013-10-08 23:45:26 +00:00
Gerald Combs
b3c844fa64 Add an initial Qt configuration and makefile targets.
svn path=/trunk/; revision=52456
2013-10-08 23:03:56 +00:00
Gerald Combs
34e2a96d0b Define NOMINMAX for the entire Qt build.
svn path=/trunk/; revision=51955
2013-09-11 19:59:22 +00:00
Gerald Combs
2dab57f425 Switch to make-services.py. Fix some variable names and version tests.
svn path=/trunk/; revision=51189
2013-08-07 16:33:39 +00:00
Anders Broman
78afe3fa82 Add a routine to get application memory usage to epan.
svn path=/trunk/; revision=51023
2013-07-30 05:49:58 +00:00
Graham Bloice
71921ced57 clean target misses some build artefacts; capinfos.lib and editcap.lib
svn path=/trunk/; revision=50972
2013-07-28 13:57:12 +00:00
Anders Broman
61e0e4d88c Make it possible to use GetProcessMemoryInfo on Windows.
svn path=/trunk/; revision=50865
2013-07-24 15:54:55 +00:00
Gerald Combs
a692824160 GeoIP 1.5.1.
svn path=/trunk/; revision=50742
2013-07-20 01:01:55 +00:00
Jeff Morriss
54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Jeff Morriss
4dcc156cf3 Move the print modules into epan.
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +00:00
Chris Maynard
d602662b36 Add strnatcmp by Martin Pool for 'natural order' string comparisons, and make use of it in editcap and mergecap for listing encapsulation types. For example:
Before:
    user0 - USER 0
    user1 - USER 1
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9

After:
    user0 - USER 0
    user1 - USER 1
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15


svn path=/trunk/; revision=50482
2013-07-10 16:18:37 +00:00
Jeff Morriss
fd95d841b8 Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
./configure now accepts:
	--with-gtk2 :  enabled by default; exclusive of --with-gtk3
	--with-gtk3 : disabled by default; exclusive of --with-gtk2
	--with-qt   : disabled by default, can be specified with gtk
	--enable-wireshark : controls whether *any* GUI is built

If Qt is enabled then a new program is created: "wireshark-qt".  "wireshark"
remains the Gtk+ version.

svn path=/trunk/; revision=50147
2013-06-25 19:51:53 +00:00
Chris Maynard
ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Pascal Quantin
bc78191e31 Upgrade user manual
svn path=/trunk/; revision=49634
2013-05-30 20:13:56 +00:00
Chris Maynard
7224a27220 Correct the c-ares directory name in the clean_setup target.
#BACKPORT(1.10)

svn path=/trunk/; revision=49616
2013-05-29 15:41:57 +00:00
Chris Maynard
34fdcb7b64 Add dftest.exe to EXECUTABLES. For clean-local target, clean randpkt.exe, not randpkt.ext.
svn path=/trunk/; revision=49514
2013-05-22 17:46:17 +00:00
Gerald Combs
4b4542045c Install and uninstall our global profiles.
svn path=/trunk/; revision=49123
2013-05-01 22:06:49 +00:00
Gerald Combs
7613251d1c Switch to WinPcap 4.1.3.
svn path=/trunk/; revision=48207
2013-03-09 01:20:09 +00:00
Gerald Combs
ac364779f7 Switch to c-ares 1.9.1.
svn path=/trunk/; revision=48191
2013-03-08 16:51:21 +00:00
Pascal Quantin
c2862992b9 Revert part of r48021: those hunks are no more needed with r48170
svn path=/trunk/; revision=48171
2013-03-07 17:39:20 +00:00
Gerald Combs
29ceca1b26 From Balint:
[PATCH 1/2] Revert "Try to fix the "LNK4217: locally defined symbol"
warnings.

This reverts commit r48158.

[PATCH 2/2] Employ small hack in editcap to link with a few objects from
libwireshark properly


From me:

Add the ability to reset symbol exports via ws_symbol_export.h's include
guard and do so in capinfos.c and editcap.c. We include ws_symbol_export.h
in over 200 files so it didn't seem to make sense to remove its include
guard entirely.

svn path=/trunk/; revision=48170
2013-03-07 17:20:12 +00:00
Gerald Combs
7e8c551af0 Try to fix the "LNK4217: locally defined symbol" warnings.
svn path=/trunk/; revision=48158
2013-03-07 00:16:32 +00:00
Gerald Combs
5378455e7a Don't define WS_BUILD_DLL when building capinfos and editcap. In the case
of capinfos this breaks getopt because optind isn't properly imported.

svn path=/trunk/; revision=48072
2013-03-04 22:49:23 +00:00
Pascal Quantin
fc9156a8a0 Try to fix LNK4217 (locally defined symbol imported in function) and C4273 (inconsistent DLL linkage) warnings when compiling for Windows
svn path=/trunk/; revision=48021
2013-03-02 22:19:33 +00:00
Balint Reczey
1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Gerald Combs
e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00