Commit Graph

49254 Commits

Author SHA1 Message Date
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
Anders Broman d8231f1222 Try to make the build bot happy.
svn path=/trunk/; revision=52505
2013-10-10 19:30:29 +00:00
Anders Broman d038be780b Flag the addresses used in the trace which has been resolved and only add those to the list used to create the NRB.
svn path=/trunk/; revision=52504
2013-10-10 19:17:48 +00:00
Evan Huus f29544f9df Add a call to tvb_ensure_bytes_exist before we allocate memory based on our
offset+size, prevents attempts to allocate outrageous memory, fixing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9260

svn path=/trunk/; revision=52503
2013-10-10 17:44:55 +00:00
Gerald Combs 7a1a387d51 Fixes for the utility-launcher script.
If we don't find Wireshark.app in WIRESHARK_APP_DIR or
/Applications/Wireshark.app, look for it using its bundle ID. Add a
description of this process to the Read Me First files. Look for
executables in the right subdirectory depending on our UI flavor.

Make sure we don't add GTK+-specific items to the app bundle if we're
using Qt.

svn path=/trunk/; revision=52502
2013-10-10 17:30:56 +00:00
Jörg Mayer 689618cd85 Build qtshark by default, use qt5 by default. To turn
off building qtshark do "cmake ... -DBUILD_qtshark=OFF ..."
or change your local copy of CMakeOptions.txt

Small update to README.cmake (when running nmake I recommend
using /X- to avoid some (viewing) corruptions.


svn path=/trunk/; revision=52501
2013-10-10 17:28:50 +00:00
Chris Maynard b80fad54e5 Fix a couple of typos.
svn path=/trunk/; revision=52500
2013-10-10 17:23:12 +00:00
Jörg Mayer 607e3297d3 Explain about setpath.bat
svn path=/trunk/; revision=52499
2013-10-10 17:16:21 +00:00
Jörg Mayer 7c25a38963 lib is required for linking, the dlls are in bin
And with this change, I'm finally able to run the executables in the
top builddir.

svn path=/trunk/; revision=52498
2013-10-10 17:13:02 +00:00
Evan Huus a50dee3286 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246
Fix memory leaks and bad memory accesses in c1222 dissector.

From me: use realloc in a handoff function since it may get called multiple
times, and we only need the latest.

svn path=/trunk/; revision=52497
2013-10-10 16:18:49 +00:00
Evan Huus 1370003bee From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9239

Add dissection of Asterix category 008.

svn path=/trunk/; revision=52496
2013-10-10 16:07:20 +00:00
Chris Maynard 59c91b3c52 Safer to compare return value of tvb_reported_length_remaining() > 0 than != 0.
Convert tabs to spaces.

svn path=/trunk/; revision=52495
2013-10-10 16:04:41 +00:00
Cal Turney 943356c9f4 "Expert Info (Error/Malformed) trying to fetch an unsigned integer with length 0" errors when an attempt is made to display the File Attributes within the FID subtree of SMB requests and responses. In addition, not all the options and masks were marked with PROTO_ITEM_SET_GENERATED(item) when appropriate to do so;
Fix1: The proto_tree_add_item() was changed to proto_tree_add_uint.
Fix2: "If (len==0) PROTO_ITEM_SET_GENERATED(item);" was added to dissect_nt_create_options_bits(), dissect_nt_share_access_bits(), dissect_smb_access_mask_bits(), dissect_nt_create_bits(), and dissect_file_ext_attr_bits().

svn path=/trunk/; revision=52494
2013-10-10 15:53:45 +00:00
Jeff Morriss bcf51e8131 Fix the core dump reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9258 :
After calling wtap_close(), set the wth to NULL so we don't try to close it
again later. (The core only happens when tshark isn't keeping up with dumpcap's
file rotation.)

Wireshark still has a problem but it's a different one.

svn path=/trunk/; revision=52493
2013-10-10 14:53:19 +00:00
Jörg Mayer 36e0adfcc1 Generate setpath.bat to set the paths necessary for running
the generated binaries inside the build dir.

svn path=/trunk/; revision=52492
2013-10-10 13:37:15 +00:00
Jörg Mayer 526f7cf367 The path approach can't work this way: Trying to set an environment
variable of our parent process isn't going to work. Plan B is to write
this stuff into a file and manually run it once.

Hard code the QT5 search path on Windows for now.

svn path=/trunk/; revision=52489
2013-10-10 09:10:53 +00:00
Balint Reczey 7af36bb2db Revert "Fix using fop from CMake"
This reverts commit r52484

svn path=/trunk/; revision=52488
2013-10-10 08:41:14 +00:00
Pascal Quantin a77e3754c9 Slightly change heuristics
svn path=/trunk/; revision=52487
2013-10-10 08:15:55 +00:00
Pascal Quantin ee0fc35c09 Add fragmentation support
svn path=/trunk/; revision=52486
2013-10-10 07:30:57 +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
Balint Reczey 6602789a48 Fix using fop from CMake
svn path=/trunk/; revision=52484
2013-10-10 05:02:50 +00:00
Guy Harris aa57e00210 Fix signed vs. unsigned comparison warnings.
svn path=/trunk/; revision=52483
2013-10-09 22:30:59 +00:00
Martin Mathieson 60d0a97524 Don't update DRX state when preference is turned off
svn path=/trunk/; revision=52482
2013-10-09 22:10:15 +00:00
Pascal Quantin f2f95a49c5 Update a comment
svn path=/trunk/; revision=52481
2013-10-09 21:59:41 +00:00
Anders Broman 61d0ac9dcf Change the default UDP port to 0.
svn path=/trunk/; revision=52480
2013-10-09 21:36:03 +00:00
Gerald Combs 6a8ceca13a Sometimes we need to @rpathify libraries from more than one directory.
Instead of trying to match libraries from $LIBPREFIX, exclude libraries
that aren't in well-known system paths and which haven't previously been
@rpathified.

svn path=/trunk/; revision=52479
2013-10-09 20:49:12 +00:00
Anders Broman 51d6f57fd7 Check if first char is printable.
svn path=/trunk/; revision=52478
2013-10-09 20:31:23 +00:00
Anders Broman f678c0fd49 Try to fix
packet-rtpproxy.c:217: warning: comparison between signed and unsigned

svn path=/trunk/; revision=52477
2013-10-09 20:30:18 +00:00
Anders Broman 6ca246c95d Make RTPProxy a newstyle dissector.
svn path=/trunk/; revision=52476
2013-10-09 20:14:12 +00:00
Anders Broman ca78b8f9dc g_list_prepend() is faster.
svn path=/trunk/; revision=52475
2013-10-09 20:12:08 +00:00
Michael Mann ba3e8e070a Make column "filter name" prefixed with _ws. to be the same as other "*shark application filters" created in r52462.
svn path=/trunk/; revision=52474
2013-10-09 19:43:02 +00:00