osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
49284 commits 26 branches 0 tags 795 MiB
Commit graph

49284 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jörg Mayer
c01ab40cde With Gerald's patch we should no longer require GTK includes for QT-Only builds 
(untested).

svn path=/trunk/; revision=52555
 2013-10-11 23:03:18 +00:00
Gerald Combs
90b20ab830 One more HAVE_LIBPCAP. 
svn path=/trunk/; revision=52554
 2013-10-11 21:42:49 +00:00
Jeff Morriss
aae1de7f9e cf_start_tail() is (now) just a wrapper around cf_open(). Get rid of it and just call cf_open(). 
svn path=/trunk/; revision=52553
 2013-10-11 21:29:12 +00:00
Gerald Combs
564ca2d5e9 Try to fix Qt compilation when libpcap is disabled. 
svn path=/trunk/; revision=52552
 2013-10-11 21:26:26 +00:00
Jeff Morriss
2dcfce371b Fix some formatting. 
svn path=/trunk/; revision=52551
 2013-10-11 20:48:13 +00:00
Jeff Morriss
15b539fcbc Replace a question in a comment with a better explanation (that answers the question). 
svn path=/trunk/; revision=52550
 2013-10-11 20:29:11 +00:00
Jeff Morriss
d06d2fde90 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8943 : 
List Windows Server 2012 (and a couple of Home Server versions) as supported OS.

While at it, remove the list of the various "NT-based" Windows versions from
a couple of other places (this effectively removes statements that we still
support NT4.0 and 2000).

svn path=/trunk/; revision=52549
 2013-10-11 19:55:34 +00:00
Gerald Combs
d643779b9b Build with Qt by default. 
svn path=/trunk/; revision=52548
 2013-10-11 18:42:34 +00:00
Gerald Combs
a631772243 More ui/util.h includes. 
svn path=/trunk/; revision=52545
 2013-10-11 17:58:12 +00:00
Gerald Combs
3623167b81 Include ui/util.h. 
svn path=/trunk/; revision=52544
 2013-10-11 17:47:43 +00:00
Jeff Morriss
6262bb3f4d There's no need to include prefs.h twice. 
svn path=/trunk/; revision=52543
 2013-10-11 17:43:07 +00:00
Gerald Combs
259768dc1a Remove GTK+ and global cfile dependencies from file_dlg_win32.c. 
Move the declaration of set_last_open_dir() to ui/util.h. It still
has separate GTK+ and Qt implemenations. We might want to move it to
ui/util.c at some point. Remove a lot of unnecessary GTK+ includes.
Remove most of the references to the global cfile while we're at it.

svn path=/trunk/; revision=52542
 2013-10-11 17:20:50 +00:00
Jörg Mayer
ee5397d832 The env variable is QT5_BASE_DIR, as documented in README.cmake 
Make documentation and implementatoin consistent

svn path=/trunk/; revision=52541
 2013-10-11 11:43:37 +00:00
Jörg Mayer
f0e92efd24 The path for the Qt5 installation now needs to be set as a 
windows environment variable.

svn path=/trunk/; revision=52540
 2013-10-11 11:25:40 +00:00
Jörg Mayer
f5fd46fe6d qtshark and wireshark(gtk2) now actually find their libs. 
svn path=/trunk/; revision=52539
 2013-10-11 11:11:41 +00:00
Jörg Mayer
28282a991d Now the GUI programs (wireshark/gtk2 and qtshark) compile and link 
svn path=/trunk/; revision=52538
 2013-10-11 10:32:11 +00:00
Pascal Quantin
a37a217653 Fix another fuzz failure 
svn path=/trunk/; revision=52537
 2013-10-11 10:32:05 +00:00
Guy Harris
a183a4fb62 We don't need to check for lauxlib.h. 
svn path=/trunk/; revision=52536
 2013-10-11 07:53:17 +00:00
Jörg Mayer
8719cebf38 Make airpcap detection work 
svn path=/trunk/; revision=52535
 2013-10-11 07:38:45 +00:00
Guy Harris
5db6b8ae20 Check for sa_len in struct sockaddr. 
svn path=/trunk/; revision=52534
 2013-10-11 06:53:29 +00:00
Guy Harris
3179493814 We don't check for lauxlib.h or lualib.h, and we don't need to - we just 
check whether we have Lua or not.  Get rid of the cmakedefines for those
two headers.  (The autoconf script should perhaps do the check
differently.)

svn path=/trunk/; revision=52533
 2013-10-11 06:48:45 +00:00
Guy Harris
059423c27a Fix check for inflatePrime in zlib (ZLIB_LIBRARIES isn't set at that 
point, you want ZLIB_LIBRARY).

svn path=/trunk/; revision=52532
 2013-10-11 06:10:32 +00:00
Evan Huus
75ccff5744 Destroy dissector tables on shutdown and use epan scoped memory of handles. 
Cleans up another 600KB of "still accessible" memory.

svn path=/trunk/; revision=52531
 2013-10-11 01:33:40 +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
Evan Huus
abd75d1baf Free all the heuristict dissector lists and their entries on shutdown, another 
few KB of "still reachable" data down.

svn path=/trunk/; revision=52528
 2013-10-11 01:11:21 +00:00
Jeff Morriss
545455db1c Fix compilation when we don't HAVE_LIBGCRYPT 
svn path=/trunk/; revision=52527
 2013-10-11 00:42:02 +00:00
Jeff Morriss
64cc800644 Don't assume people have subversion--I just copied my home directory to a new 
machine and it would have been nice if this script and installed subversion
for me.

Install perl-podlators too (for pod2man).  Need to check if that's the package
name to use on SuSE too...

svn path=/trunk/; revision=52526
 2013-10-11 00:31:01 +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
Guy Harris
2ee9b16466 Note that dladdr() isn't being found on OS X, even though it's 
available.

svn path=/trunk/; revision=52524
 2013-10-11 00:05:08 +00:00
Evan Huus
2ed259ccbc When TCP options are truncated, we only add the truncated length to the tree, 
not the whole length. Fixes an invalid access with the capture from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263

svn path=/trunk/; revision=52523
 2013-10-10 23:59:57 +00:00
Guy Harris
e5336d281b Move the QT_MACEXTRAS_LIB cmakedefine in cmakeconfig.h.in to the 
equivalent location in config.h.in, to simplify comparing the two files.

Add some tests from the autoconf script to CMake:

	check for setresgid() and setresuid();

	check for struct stat having an st_flags member.

Get rid of INTTYPES_H_DEFINES_FORMATS; we don't appear to check for it,
and we don't use it (we're using GLib's formatting functions, which have
their own way of handling 64-bit integers).

Get rid of STDC_HEADERS; it's in autoconf because autoconf was
originally developed back when you couldn't rely in ANSI C and has never
been removed, and something we're using for other purposes checks for
it, not because we explicitly test for it, but we don't test it in the
code, and CMake doesn't even check for it.

svn path=/trunk/; revision=52522
 2013-10-10 23:54:53 +00:00
Gerald Combs
2f067f20dd Use the right package name. 
svn path=/trunk/; revision=52521
 2013-10-10 23:52:29 +00:00
Gerald Combs
06a3d1175c Try to discover Qt similar to the way we discover Python. 
svn path=/trunk/; revision=52520
 2013-10-10 23:45:16 +00:00
Guy Harris
878186be3d We use g_ascii_strtoll(), not strtoll(), so we no longer need to check 
for strtoll() (if we ever did check for it).

svn path=/trunk/; revision=52519
 2013-10-10 23:33:21 +00:00
Gerald Combs
564797a2e7 Try to locate QtMacExtras. 
svn path=/trunk/; revision=52518
 2013-10-10 23:11:19 +00:00
Guy Harris
2accaae68a Fix other HAVE_LUA entry. 
svn path=/trunk/; revision=52517
 2013-10-10 22:56:48 +00:00
Jörg Mayer
59e052e7c8 Fix a few things - untested until current build finishes. 
svn path=/trunk/; revision=52516
 2013-10-10 22:19:45 +00:00
Guy Harris
baf34b0beb Don't check for pcap_version(); we don't use it. 
Sort the #cmakedefines in cmakeconfig.h.in to more closely match the
order in config.h.in, to make it easier to make sure CMake and autofoo
are doing the same checks.  Remove some #cmakedefines that don't
correspond to check that are being done either by CMake or autofoo.

svn path=/trunk/; revision=52515
 2013-10-10 21:02:50 +00:00
Guy Harris
260a3af9b7 Check for bpf_image(), just as the autoconf script does. 
svn path=/trunk/; revision=52514
 2013-10-10 20:36:11 +00:00
Jörg Mayer
2a59ee58b8 Add Airpcap detection, use it by default on win32 
QT5 compile working - NOT. It's almost working, except
that I *still* need to get GTK detection working on Win :-(


svn path=/trunk/; revision=52513
 2013-10-10 20:35:32 +00:00
Jeff Morriss
561a0713d1 Don't close the Capture Options window if there was an error in what was 
selected (and we're not going to start capturing).  That way the user can fix
whatever was wrong without having to re-open the dialog.

svn path=/trunk/; revision=52512
 2013-10-10 20:23:59 +00:00
Guy Harris
36fe610b11 Just describe HAVE_LUA as "Define to use Lua"; it's not tied to a 
version, and this matches cmakeconfig.h.in.

svn path=/trunk/; revision=52511
 2013-10-10 20:20:45 +00:00
Pascal Quantin
dea61da3f6 Fix an infinite loop detected during fuzz testing 
svn path=/trunk/; revision=52510
 2013-10-10 20:19:27 +00:00
Guy Harris
ce17930dae HAVE_LUA is for Lua, not some particular version thereof. 
Reorder to match config.h.in (which is autogenerated).

svn path=/trunk/; revision=52509
 2013-10-10 20:14:12 +00:00
Guy Harris
aeec217e18 Get rid of apparently-undefined and apparently-unused #defines. 
svn path=/trunk/; revision=52508
 2013-10-10 20:10:18 +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