aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-10-10Move the QT_MACEXTRAS_LIB cmakedefine in cmakeconfig.h.in to theGuy Harris2-11/+15
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-10Use the right package name.Gerald Combs1-4/+4
svn path=/trunk/; revision=52521
2013-10-10Try to discover Qt similar to the way we discover Python.Gerald Combs1-2/+24
svn path=/trunk/; revision=52520
2013-10-10We use g_ascii_strtoll(), not strtoll(), so we no longer need to checkGuy Harris1-1/+0
for strtoll() (if we ever did check for it). svn path=/trunk/; revision=52519
2013-10-10Try to locate QtMacExtras.Gerald Combs2-0/+11
svn path=/trunk/; revision=52518
2013-10-10Fix other HAVE_LUA entry.Guy Harris1-1/+1
svn path=/trunk/; revision=52517
2013-10-10Fix a few things - untested until current build finishes.Jörg Mayer1-7/+4
svn path=/trunk/; revision=52516
2013-10-10Don't check for pcap_version(); we don't use it.Guy Harris2-91/+74
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-10Check for bpf_image(), just as the autoconf script does.Guy Harris2-0/+4
svn path=/trunk/; revision=52514
2013-10-10Add Airpcap detection, use it by default on win32Jörg Mayer3-14/+84
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-10Don't close the Capture Options window if there was an error in what wasJeff Morriss1-1/+2
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-10Just describe HAVE_LUA as "Define to use Lua"; it's not tied to aGuy Harris1-1/+1
version, and this matches cmakeconfig.h.in. svn path=/trunk/; revision=52511
2013-10-10Fix an infinite loop detected during fuzz testingPascal Quantin1-11/+41
svn path=/trunk/; revision=52510
2013-10-10HAVE_LUA is for Lua, not some particular version thereof.Guy Harris1-3/+3
Reorder to match config.h.in (which is autogenerated). svn path=/trunk/; revision=52509
2013-10-10Get rid of apparently-undefined and apparently-unused #defines.Guy Harris1-9/+0
svn path=/trunk/; revision=52508
2013-10-10Revert the changes made to resolve ↵Chris Maynard4-85/+7
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-10Try to make the build bot happy.Anders Broman1-1/+1
svn path=/trunk/; revision=52505
2013-10-10Flag the addresses used in the trace which has been resolved and only add ↵Anders Broman4-41/+48
those to the list used to create the NRB. svn path=/trunk/; revision=52504
2013-10-10Add a call to tvb_ensure_bytes_exist before we allocate memory based on ourEvan Huus2-7/+9
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-10Fixes for the utility-launcher script.Gerald Combs4-13/+68
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-10Build qtshark by default, use qt5 by default. To turnJörg Mayer2-3/+3
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-10Fix a couple of typos.Chris Maynard1-2/+2
svn path=/trunk/; revision=52500
2013-10-10Explain about setpath.batJörg Mayer1-1/+3
svn path=/trunk/; revision=52499
2013-10-10lib is required for linking, the dlls are in binJörg Mayer1-0/+2
And with this change, I'm finally able to run the executables in the top builddir. svn path=/trunk/; revision=52498
2013-10-10From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246Evan Huus4-39/+60
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-10From Marko Hrastovec viaEvan Huus1-1/+300
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9239 Add dissection of Asterix category 008. svn path=/trunk/; revision=52496
2013-10-10Safer to compare return value of tvb_reported_length_remaining() > 0 than != 0.Chris Maynard1-30/+30
Convert tabs to spaces. svn path=/trunk/; revision=52495
2013-10-10"Expert Info (Error/Malformed) trying to fetch an unsigned integer with ↵Cal Turney1-4/+11
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-10Fix the core dump reported in ↵Jeff Morriss1-0/+1
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-10Generate setpath.bat to set the paths necessary for runningJörg Mayer2-1/+33
the generated binaries inside the build dir. svn path=/trunk/; revision=52492
2013-10-10The path approach can't work this way: Trying to set an environmentJörg Mayer1-21/+5
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-10Revert "Fix using fop from CMake"Balint Reczey2-6/+2
This reverts commit r52484 svn path=/trunk/; revision=52488
2013-10-10Slightly change heuristicsPascal Quantin1-6/+11
svn path=/trunk/; revision=52487
2013-10-10Add fragmentation supportPascal Quantin1-236/+349
svn path=/trunk/; revision=52486
2013-10-10As the Qt build will not use portaudio, we don't need toJörg Mayer1-3/+2
put portaudio flags into config.pri svn path=/trunk/; revision=52485
2013-10-10Fix using fop from CMakeBalint Reczey2-2/+6
svn path=/trunk/; revision=52484
2013-10-09Fix signed vs. unsigned comparison warnings.Guy Harris1-4/+4
svn path=/trunk/; revision=52483
2013-10-09Don't update DRX state when preference is turned offMartin Mathieson1-77/+90
svn path=/trunk/; revision=52482
2013-10-09Update a commentPascal Quantin1-1/+1
svn path=/trunk/; revision=52481
2013-10-09Change the default UDP port to 0.Anders Broman1-2/+3
svn path=/trunk/; revision=52480
2013-10-09Sometimes we need to @rpathify libraries from more than one directory.Gerald Combs1-6/+23
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-09Check if first char is printable.Anders Broman1-0/+6
svn path=/trunk/; revision=52478
2013-10-09Try to fixAnders Broman1-4/+4
packet-rtpproxy.c:217: warning: comparison between signed and unsigned svn path=/trunk/; revision=52477
2013-10-09Make RTPProxy a newstyle dissector.Anders Broman1-6/+17
svn path=/trunk/; revision=52476
2013-10-09g_list_prepend() is faster.Anders Broman1-1/+1
svn path=/trunk/; revision=52475
2013-10-09Make column "filter name" prefixed with _ws. to be the same as other "*shark ↵Michael Mann4-5/+5
application filters" created in r52462. svn path=/trunk/; revision=52474
2013-10-09When we display an error message in the interface list make sure it'sGerald Combs1-2/+6
word-wrapped. svn path=/trunk/; revision=52473
2013-10-090xffffffffffff doesn't necessarily fit in an int, so useGuy Harris1-3/+3
G_GINT64_CONSTANT(). Make it unsigned while we're at it. Clean up indentation. svn path=/trunk/; revision=52472
2013-10-09Add some license headers after emailing the respective authors to confirm.Evan Huus5-1/+99
svn path=/trunk/; revision=52471
2013-10-09Slight simplification, inline a function only ever called once.Evan Huus2-18/+13
svn path=/trunk/; revision=52470