osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
56,274 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

1016 Commits

Author SHA1 Message Date
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
Chris Maynard 2bd7b33a0e Copy over any mibs that might be in the site directory. 
svn path=/trunk/; revision=46987
 2013-01-07 19:44:33 +00:00
Bill Meier e3b03c9c25 Remove redundant SUBSYSTEM link option from link commands. 
[ $(guiflags) or $(conflags) specified as part of the link options
  includes the SUBSYSTEM option ].

svn path=/trunk/; revision=46831
 2012-12-28 21:21:34 +00:00
Michael Tüxen 6c1435408e This should get it building on Windows. 
svn path=/trunk/; revision=46676
 2012-12-21 15:03:35 +00:00
Michael Tüxen 4c08d75359 Try to get text2pcap building on Windows. 
svn path=/trunk/; revision=46675
 2012-12-21 14:59:41 +00:00
Michael Tüxen 0461a705c0 text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see). 
svn path=/trunk/; revision=46600
 2012-12-18 22:56:06 +00:00
Michael Mann a37f60e4f6 Bug 3528 - When following an HTTP tcp stream decode gzip data automatically (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528) 
includes patch from bug (with actual functionality) + changes to makefiles to make it compile/link on Windows

svn path=/trunk/; revision=46530
 2012-12-13 19:59:57 +00:00
Pascal Quantin 96f889dfd6 Update the User's Guide to 1.9 
svn path=/trunk/; revision=46503
 2012-12-11 22:23:44 +00:00
Pascal Quantin 843864684c Update the User's Guide to 1.8 
svn path=/trunk/; revision=46463
 2012-12-07 22:40:04 +00:00
Anders Broman 64c46ea482 Make it easier to switch between GTK2 and GTK3. 
svn path=/trunk/; revision=46082
 2012-11-19 19:29:36 +00:00
Gerald Combs b924cfed2b The U3 and PortableApps packaging processes depend on simple 
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.

svn path=/trunk/; revision=45659
 2012-10-19 17:47:34 +00:00
Gerald Combs 20fa5a8774 Add PROGRAM_NAME and INSTALL_DIR to ui\qt\config.pri. Currently unused. 
svn path=/trunk/; revision=45561
 2012-10-15 16:07:07 +00:00
Anders Broman 46484ff0f7 Start making the program name "wireshark" configurable. 
svn path=/trunk/; revision=45558
 2012-10-15 15:31:20 +00:00
Anders Broman 1f867e7901 Include setup.ini in the tarball. 
Copy setup.ini to etc/gtk-3.0

svn path=/trunk/; revision=45497
 2012-10-12 12:36:22 +00:00
Chris Maynard 005175c9c4 Revert 45116. Developer's probably don't want the user-guide.chm that they get from the setup step as it's not going to be up-to-date. 
svn path=/trunk/; revision=45121
 2012-09-25 03:23:23 +00:00
Chris Maynard 410fdcd065 We're downloading the user-guide as part of the setup, so we might as well copy it to the install directory. If someone has built a more up-to-date version of the user-guide in the docbook directory, then it will just overwrite this one, but for most developers, I don't think they're building their own, so at least this way they'll still have a local copy of the user-guide. If optional is the preferred default, then we can change config.nmake and just comment out UG_DIR and mark as "optional" instead of "recommended". 
svn path=/trunk/; revision=45116
 2012-09-25 01:03:21 +00:00
Martin Mathieson 95cbbe48d4 Fix mispelling of reordercap.exe target. 
svn path=/trunk/; revision=45093
 2012-09-24 10:53:06 +00:00
Martin Mathieson 60fb63783a From Jim Young, bug 7745. 
Add Makefile support for reordercap.

svn path=/trunk/; revision=45090
 2012-09-24 10:23:20 +00:00
Gerald Combs 4a57360291 Use guilibsdll and htmlhelp.lib in the Qt build. 
svn path=/trunk/; revision=44996
 2012-09-19 00:47:31 +00:00
Jeff Morriss d8a0279ea0 From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 : 
Add VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO to the config.h on
Windows (actually Chris' patch included VERSION_BUILD and VERSION_EXTRA but
I've left those out to match what we have on *NIX now).

svn path=/trunk/; revision=44988
 2012-09-18 21:52:00 +00:00
Anders Broman 055736b655 Compile and install schemas if GTK3 is used, nsis needs update too 
svn path=/trunk/; revision=44923
 2012-09-16 09:55:44 +00:00
Gerald Combs 1b1a1e6a3e Remove our local copy of WinPcap and download it from 
wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip
files ending in .zip. PortableApps and U3 packaging changes are untested.

svn path=/trunk/; revision=44888
 2012-09-13 21:28:28 +00:00
Anders Broman 353823a2df Minor tweek for GTK3 
svn path=/trunk/; revision=44887
 2012-09-13 05:29:53 +00:00
Gerald Combs f2789cbb34 Copy over the C runtime DLLs if MSVCR_DLL is defined. 
svn path=/trunk/; revision=44544
 2012-08-16 19:37:01 +00:00
Gerald Combs f414b3cae3 Revert parts of r43978 and r43976 so that we can catch updates in 
subdirectories.

svn path=/trunk/; revision=44014
 2012-07-25 21:08:44 +00:00
Gerald Combs b10b774bc6 Make sure xcopy can figure things out on its own. 
svn path=/trunk/; revision=43979
 2012-07-25 00:47:11 +00:00
Gerald Combs 6d0149175a Make sure wireshark.exe and tshark.exe don't depend on pseudotargets. 
svn path=/trunk/; revision=43978
 2012-07-25 00:37:29 +00:00
Gerald Combs f25ae3613a Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy 
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
files in wireshark-gt2 unnecessarily.

svn path=/trunk/; revision=43976
 2012-07-24 23:59:42 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) 
svn path=/trunk/; revision=43844
 2012-07-20 01:21:27 +00:00
Gerald Combs bdea70585d Use win32_open_file in qtshark on Windows. 
svn path=/trunk/; revision=43677
 2012-07-12 00:04:53 +00:00
Jeff Morriss 9e1359e2fa Revert 43481: linking dftest against libui was not the problem. 
svn path=/trunk/; revision=43488
 2012-06-25 22:21:58 +00:00
Anders Broman e6e6d6217b From Tony Trinh: 
Update Lua from 5.1 to 5.2

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400

svn path=/trunk/; revision=43482
 2012-06-25 20:42:07 +00:00
Jeff Morriss 8eeebf73e0 Move get_args_as_string from ui/util.c into wsutil (maybe not to the best 
module, but...).

This makes dftest no longer dependent on libui, so stop linking against it.

svn path=/trunk/; revision=43481
 2012-06-25 20:38:45 +00:00
Guy Harris 204ea39c5d Move a bunch of common code in the file chooser dialog loops into a 
routine to run a file chooser dialog.

On Windows, add to that code to resolve shell links ("shortcuts"),
adopted from the Sylpheed mail reader.  (That code requires a pile of
OLE stuff, so link with the OLE library.)

Make it a bit easier to configure ui/gtk/capture_file_dlg.c to use GTK+
dialogs on Windows, but continue to default to using the Win32 dialogs,
at least for now.

svn path=/trunk/; revision=43439
 2012-06-21 22:21:02 +00:00
Gerald Combs 1785ed1ee0 Try to fix tarball compilation on Windows. 
svn path=/trunk/; revision=43428
 2012-06-21 17:35:59 +00:00
Jörg Mayer 41232f172e Remove HAVE_WIRELESS_TOOLBAR from the other build systems. 
svn path=/trunk/; revision=43419
 2012-06-20 19:11:55 +00:00
Anders Broman 227eb36c83 Start to have an generic wireless toolbar. Sligtly modified patch from 
Pontus Fuchs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973

svn path=/trunk/; revision=43354
 2012-06-19 12:42:06 +00:00
Bill Meier db25589d90 Add a comment as to .bsc files seemingly not usable with VS2010. 
svn path=/trunk/; revision=43232
 2012-06-13 16:18:38 +00:00
Bill Meier a519001f02 wireshark.bsc dependencies: fix a typo; add 2 which are missing. 
svn path=/trunk/; revision=43229
 2012-06-13 14:42:30 +00:00
Gerald Combs e63f70cfc2 Add the GeoIP DLL. 
svn path=/trunk/; revision=43128
 2012-06-05 23:43:02 +00:00
Gerald Combs 95e53ff7ab Pass WTAP_VERSION to Qt. (WTAP_VERSION should probably match the GNU 
toolchain version but that's a separate issue.)

svn path=/trunk/; revision=43124
 2012-06-05 18:37:32 +00:00
Anders Broman 7b43b3de0f Make it possible to build with GTK3 on Windows 
svn path=/trunk/; revision=43083
 2012-06-04 20:42:09 +00:00
Guy Harris 2b1f885ce9 No more GIOP plugins, no more GIOP plugin directory. 
svn path=/trunk/; revision=42980
 2012-06-01 17:10:09 +00:00
Pascal Quantin c8b19701bf Clean GeoIP-1.4.8-*-win??ws folder with setup target 
svn path=/trunk/; revision=42938
 2012-05-31 08:08:44 +00:00
Gerald Combs 3ea4fe2c4a Back out previous change. 
svn path=/trunk/; revision=42907
 2012-05-30 00:11:11 +00:00
Gerald Combs 18ac3d94ee Extract into the right directory. 
svn path=/trunk/; revision=42906
 2012-05-30 00:04:03 +00:00
Gerald Combs 43670460ff Use GeoIP 1.4.8 which includes a DLL instead of a static library. 
svn path=/trunk/; revision=42905
 2012-05-29 23:31:00 +00:00
Gerald Combs 992587c3bf Try using an OBS-derived Gtk2 bundle, second try. 
svn path=/trunk/; revision=42623
 2012-05-14 17:54:47 +00:00
Anders Broman 2c996e9c18 Make it possible to download the GTK3 package 
svn path=/trunk/; revision=42174
 2012-04-21 08:45:52 +00:00
Gerald Combs 733834afdb Switch back to the gtk.org version of the GTK+ bundle since its Cairo 
doesn't crash.

svn path=/trunk/; revision=42171
 2012-04-20 23:41:36 +00:00
pascal c06cea707c Clean gnutls-2.12.18-*-win??ws folder with setup target 
svn path=/trunk/; revision=42170
 2012-04-20 19:56:17 +00:00
Gerald Combs d8389b5429 Switch to our custom GTK+ bundles derived from openSUSE Build Service 
packages. Sort and normalize our DLL lists. Add several new required DLLs.

svn path=/trunk/; revision=42143
 2012-04-19 18:31:11 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building 
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
 2012-04-04 20:46:49 +00:00
Gerald Combs e19fa8063e Give qmake a VERSION it will accept. 
svn path=/trunk/; revision=41762
 2012-03-25 21:27:49 +00:00
Gerald Combs 6f5273e81e Fix the Qt build for Win64. 
svn path=/trunk/; revision=41761
 2012-03-25 19:01:58 +00:00
Gerald Combs 98080036b6 Capitalize "Wireshark" in various package names. 
svn path=/trunk/; revision=41621
 2012-03-16 17:36:40 +00:00
Bill Meier 78f602dc9b CVARSDLL hasn't been used (is undefined) for a while.... 
(This commit should have been part of SVNB #41180).

svn path=/trunk/; revision=41254
 2012-03-01 02:53:38 +00:00
Bill Meier 767ec314a0 Update clean_setup list of win32-libs to be deleted. 
svn path=/trunk/; revision=41252
 2012-03-01 02:43:07 +00:00
Guy Harris 2ae289a62e Build the TShark taps into a static libcliui library in the ui/cli 
directory, and link TShark with that; let's see if this fixes the
Windows buildbots.

svn path=/trunk/; revision=41070
 2012-02-19 19:01:01 +00:00
Guy Harris 530c8c5390 Create a libui (static) library in the ui directory, which contains the 
object files from all the source files in the ui directory (but not in
its subdirectories), and link the programs that need it with them.

This cleans things up a little bit, and may also fix the Windows build.

svn path=/trunk/; revision=41061
 2012-02-18 23:55:41 +00:00
Guy Harris 67186dfc6e Rename the (static) library built from stuff in ui/gtk to "libgtkui" in 
automake/autoconf and nmake builds, to match the name in CMake builds.

(Forgot Makefile.nmake.)

svn path=/trunk/; revision=41059
 2012-02-18 20:24:54 +00:00