6 years agoIf CODE_SIGN_IDENTITY is set use it to sign the app bundle and the
Gerald Combs [Tue, 15 Oct 2013 23:03:48 +0000 (23:03 -0000)]
If CODE_SIGN_IDENTITY is set use it to sign the app bundle and the
installer package. Add commented-out code to sign the .dmg as well in
case Apple supports that in the future.

svn path=/trunk/; revision=52633

6 years agoAdjust parenthesis to make gcc happy.
Gerald Combs [Tue, 15 Oct 2013 21:31:32 +0000 (21:31 -0000)]
Adjust parenthesis to make gcc happy.

svn path=/trunk/; revision=52632

6 years agoDon't try heuristic dissectors on second pass if no match was found in the first...
Anders Broman [Tue, 15 Oct 2013 21:28:04 +0000 (21:28 -0000)]
Don't try heuristic dissectors on second pass if no match was found in the first one.

svn path=/trunk/; revision=52631

6 years agoFix ABI check error for libwireshark
Balint Reczey [Tue, 15 Oct 2013 20:14:47 +0000 (20:14 -0000)]
Fix ABI check error for libwireshark

svn path=/trunk/; revision=52630

6 years ago1.11.0 → 1.11.1.
Gerald Combs [Tue, 15 Oct 2013 19:21:04 +0000 (19:21 -0000)]
1.11.0 → 1.11.1.

svn path=/trunk/; revision=52629

6 years agoTry building 1.11.0.
Gerald Combs [Tue, 15 Oct 2013 18:40:00 +0000 (18:40 -0000)]
Try building 1.11.0.

svn path=/trunk/; revision=52628

6 years agoFrom Ed Beroset via
Chris Maynard [Tue, 15 Oct 2013 18:27:35 +0000 (18:27 -0000)]
From Ed Beroset via

Add tshark -G column-formats report and document the missing ftypes, heuristic-decodes and plugins reports.

From me: Sort the reports.  Add modelines to epan/column.c.  Minor whitespace changes.

svn path=/trunk/; revision=52627

6 years agog_slist_prepend() should be faster than g_slist_append() use it where the order shoul...
Anders Broman [Tue, 15 Oct 2013 18:21:03 +0000 (18:21 -0000)]
g_slist_prepend() should be faster than g_slist_append() use it where the order shouldn't matter.

svn path=/trunk/; revision=52626

6 years agoMicro-optimize print_columns(): replace g_snprintf() & g_strlcat() with memcpy().
Jakub Zawadzki [Tue, 15 Oct 2013 18:20:59 +0000 (18:20 -0000)]
Micro-optimize print_columns(): replace g_snprintf() & g_strlcat() with memcpy().

svn path=/trunk/; revision=52625

6 years agoTry to optimize heuristics slightly.
Anders Broman [Tue, 15 Oct 2013 18:19:57 +0000 (18:19 -0000)]
Try to optimize heuristics slightly.

svn path=/trunk/; revision=52624

6 years agoReorder all of the bitmask trees according to its endianess from highest to lowest...
Cal Turney [Tue, 15 Oct 2013 16:41:29 +0000 (16:41 -0000)]
Reorder all of the bitmask trees according to its endianess from highest to lowest order bit.
These consist of the following bitmask fields:
[packet-smb.c] 'Create Flags', 'Access Mask', 'File Attributes', 'Share Access', 'Create Options',
               'Security Flags', 'Optional Support'(in TreeConnect AndX responses), and "Quota Flags"
[packet-smb2.c] 'Flags', 'Session Flags', 'Security mode', and 'Interface Capabilities'.

[packet-smb.c] Made the tfs_file_attribute_xxx true_false_string values less verbose and more compact.

[packet-smb2.c] Changed all references to "RMDA" to RDMA".

[packet_smb.c] In dissect_qfi_SMB_FILE_NETWORK_OPEN_INFO() (GetInfo response) changed "Unknown Field"
               to "Reserved" (See capture 'DMtrace2.cap' frame 20023).

svn path=/trunk/; revision=52623

6 years agoAdd another cast.
Gerald Combs [Tue, 15 Oct 2013 16:40:19 +0000 (16:40 -0000)]
Add another cast.

svn path=/trunk/; revision=52622

6 years agoAdd casts to fix some shortening errors.
Gerald Combs [Tue, 15 Oct 2013 16:29:38 +0000 (16:29 -0000)]
Add casts to fix some shortening errors.

svn path=/trunk/; revision=52621

6 years agoAdd some missing parenthesis. Make sure we set our font in the right place.
Gerald Combs [Tue, 15 Oct 2013 15:22:03 +0000 (15:22 -0000)]
Add some missing parenthesis. Make sure we set our font in the right place.

Make the ColorUtils::fromColorT() convenience function a little more
convenient. Use it.

svn path=/trunk/; revision=52620

6 years agolimit the values written to phdr.(cap)len to guint32, not to guint16
Martin Kaiser [Tue, 15 Oct 2013 15:15:59 +0000 (15:15 -0000)]
limit the values written to phdr.(cap)len to guint32, not to guint16

We read a two-byte length field and add a constant number of header
bytes to this length, so we could in theory be larger than guint16.

svn path=/trunk/; revision=52619

6 years agocode review of parse_s1_W_stats()
Martin Kaiser [Tue, 15 Oct 2013 15:11:40 +0000 (15:11 -0000)]
code review of parse_s1_W_stats()

   range check for array index
   don't assign the result of pntohs() to a gint16
   range check for the values stored in phdr.(cap)len

svn path=/trunk/; revision=52618

6 years agoDon't do canaries in blocks of guint32, it appears to cause alignment issues
Evan Huus [Tue, 15 Oct 2013 13:15:38 +0000 (13:15 -0000)]
Don't do canaries in blocks of guint32, it appears to cause alignment issues
when running tests on Solaris. Revert back to byte-at-a-time, but do fewer bytes
to avoid a performance hit.

svn path=/trunk/; revision=52617

6 years agoCheck the length *before* accessing the array, and cap the
Evan Huus [Tue, 15 Oct 2013 13:05:31 +0000 (13:05 -0000)]
Check the length *before* accessing the array, and cap the
length-retrieved-from-packet at the size of the array we have.


svn path=/trunk/; revision=52616

6 years agoFix a length check in the OID code, we add an extra byte if is_first, not the
Evan Huus [Tue, 15 Oct 2013 12:34:45 +0000 (12:34 -0000)]
Fix a length check in the OID code, we add an extra byte if is_first, not the
other way around. Also add an assert so it blows up if we get it wrong, rather
than leading to uninitialized memory.

Fixes the last errors I can find in

svn path=/trunk/; revision=52615

6 years agoFactor out common parts of ABI checks to UseABICheck.cmake
Balint Reczey [Tue, 15 Oct 2013 07:30:05 +0000 (07:30 -0000)]
Factor out common parts of ABI checks to UseABICheck.cmake

svn path=/trunk/; revision=52614

6 years agoFix Coverity CID 1106801: Missing break in switch.
Chris Maynard [Tue, 15 Oct 2013 03:38:09 +0000 (03:38 -0000)]
Fix Coverity CID 1106801: Missing break in switch.

svn path=/trunk/; revision=52613

6 years agoMake sure we have a valid capture file pointer in win32_export_file().
Gerald Combs [Tue, 15 Oct 2013 01:10:52 +0000 (01:10 -0000)]
Make sure we have a valid capture file pointer in win32_export_file().
Fixes bug 9271.

svn path=/trunk/; revision=52612

6 years agoFill in the help links. Make sure they do something when they're clicked.
Gerald Combs [Tue, 15 Oct 2013 00:48:34 +0000 (00:48 -0000)]
Fill in the help links. Make sure they do something when they're clicked.

Try to make the task list width match its contents.

svn path=/trunk/; revision=52611

6 years agoRemove some commented code.
Gerald Combs [Tue, 15 Oct 2013 00:17:23 +0000 (00:17 -0000)]
Remove some commented code.

svn path=/trunk/; revision=52610

6 years agoFix the bitcoin dissector to be able to dissect recent version of the protocol. ...
Michael Mann [Tue, 15 Oct 2013 00:05:45 +0000 (00:05 -0000)]
Fix the bitcoin dissector to be able to dissect recent version of the protocol.  Bug 8844 (

  - All messages now have a checksum (and not only version and verack).
  - In the version message: user agent added as a string preceded by a varint length.
  - Port in an address is in little endian and not big endian.
  - In the version message the receiving and emitting address where inverted.

From Eric Masson

svn path=/trunk/; revision=52609

6 years agoReverting as requested by Jakub, eventhoug I don't think this prticular entry is...
Anders Broman [Mon, 14 Oct 2013 21:50:37 +0000 (21:50 -0000)]
Reverting as requested by Jakub, eventhoug I don't think this prticular entry is useful as it's duplicated in the tree and almost certanly never vissible.

svn path=/trunk/; revision=52608

6 years agoLet Qt lay out and size elements in FollowStreamDialog. Make it
Gerald Combs [Mon, 14 Oct 2013 21:17:38 +0000 (21:17 -0000)]
Let Qt lay out and size elements in FollowStreamDialog. Make it
resizable. Get rid of the group box -- the OS X and Windows HIGs
discourage its use and I'm not sure if it fits the GNOME HIG in this
case either. Make the stream contents monospace. Set the cursor to the
beginning of the text when we follow a stream.

Continue the War On Unnecessary Dialogs. Move "Find"ing from a pop-up
window to the main Follow dialog. Wrap back to the beginning as needed.

Add a "Cancel" button. Make sure it and the escape key work as expected.

svn path=/trunk/; revision=52607

6 years agoReplace XXX with explanation based on discussion with Jakub on -dev.
Evan Huus [Mon, 14 Oct 2013 20:35:56 +0000 (20:35 -0000)]
Replace XXX with explanation based on discussion with Jakub on -dev.

svn path=/trunk/; revision=52606

6 years agoSlightly clarify the wmem release note entry.
Evan Huus [Mon, 14 Oct 2013 20:29:23 +0000 (20:29 -0000)]
Slightly clarify the wmem release note entry.

svn path=/trunk/; revision=52605

6 years ago Adding to col info is probably useless as next dissector will overwrite it.
Anders Broman [Mon, 14 Oct 2013 18:18:16 +0000 (18:18 -0000)]
 Adding to col info is probably useless as next dissector will overwrite it.

svn path=/trunk/; revision=52604

6 years agoTry to pptimize heuristics slightly.
Anders Broman [Mon, 14 Oct 2013 18:16:11 +0000 (18:16 -0000)]
Try to pptimize heuristics slightly.

svn path=/trunk/; revision=52603

6 years agoAdd dissection of NCM/MBIM data traffic based on data interface class protocol code
Pascal Quantin [Mon, 14 Oct 2013 17:55:43 +0000 (17:55 -0000)]
Add dissection of NCM/MBIM data traffic based on data interface class protocol code

svn path=/trunk/; revision=52602

6 years agoLook for QtWidgets in the right directory.
Gerald Combs [Mon, 14 Oct 2013 17:23:58 +0000 (17:23 -0000)]
Look for QtWidgets in the right directory.

svn path=/trunk/; revision=52601

6 years agoPacketList and ProtoTree need access to MainWindow at initialization
Gerald Combs [Mon, 14 Oct 2013 16:54:41 +0000 (16:54 -0000)]
PacketList and ProtoTree need access to MainWindow at initialization
time in order to fill in their respective context menus. R52386 broke
that. Fix it and add comments about handling reparenting. Fixes bug

svn path=/trunk/; revision=52600

6 years agodo some range checks when reading vwr files
Martin Kaiser [Mon, 14 Oct 2013 15:03:28 +0000 (15:03 -0000)]
do some range checks when reading vwr files
don't assign the output of pntoh24() to a gint16

unfortunately, vwr detection does not work reliably and many pdf files
are recognized as vwr - this commit should prevent wireshark from
crashing when it tries to load the USB 2.0 spec as pdf ;-)

svn path=/trunk/; revision=52599

6 years agoMake pkgconfig work - sort of:
Jörg Mayer [Mon, 14 Oct 2013 14:53:36 +0000 (14:53 -0000)]
Make pkgconfig work - sort of:
- fix a typo
- Add the library dirs and not just the libraries.
  This would help if the paths that are now returned
  were actually correct.

svn path=/trunk/; revision=52598

6 years agoAs reported by Didier Gautheron on -dev (
Pascal Quantin [Mon, 14 Oct 2013 08:36:38 +0000 (08:36 -0000)]
As reported by Didier Gautheron on -dev ( :
Since r49923, TCP flags are no more displayed in info column when tree is NULL

svn path=/trunk/; revision=52597

6 years agoTLS server key exchange misses sig and hash algorithm for TLS 1.2. Bug 9208 (https...
Michael Mann [Mon, 14 Oct 2013 03:07:32 +0000 (03:07 -0000)]
TLS server key exchange misses sig and hash algorithm for TLS 1.2.  Bug 9208 (

1. Fix ECDH server key exchange for TLS 1.2
2. Fix RSA server key exchange for TLS 1.2

From Hauke Mehrtens

svn path=/trunk/; revision=52596

6 years agoDTLS server key exchange misses sig and hash algorithm for TLS 1.2. Bug 9208 (https...
Michael Mann [Mon, 14 Oct 2013 02:34:06 +0000 (02:34 -0000)]
DTLS server key exchange misses sig and hash algorithm for TLS 1.2.  Bug 9208 (

1. Fix ECDH server key exchange for DTLS 1.2
2. Fix RSA server key exchange for DTLS 1.2

From Hauke Mehrtens

svn path=/trunk/; revision=52595

6 years agoDRX: start to show state prior to and after current PDU.
Martin Mathieson [Sun, 13 Oct 2013 22:00:09 +0000 (22:00 -0000)]
DRX: start to show state prior to and after current PDU.

svn path=/trunk/; revision=52594

6 years agoAs requested by Zoltán Lajos Kis, split the openflow dissector int one file per proto...
Anders Broman [Sun, 13 Oct 2013 21:25:19 +0000 (21:25 -0000)]
As requested by Zoltán Lajos Kis, split the openflow dissector int one file per protocol version.

svn path=/trunk/; revision=52593

6 years agoSMB2 SRT can be very inaccurate in the presence of retransmissions: Retransmitted...
Cal Turney [Sun, 13 Oct 2013 20:19:30 +0000 (20:19 -0000)]
SMB2 SRT can be very inaccurate in the presence of retransmissions:   Retransmitted responses not only add additional (bogus) transactions but also the latency associated with them. This can greatly inflate the maximum and average SRT stats especially in the case of retransmissions triggered by the expiry of the rexmit timer (RTOs). Only calculating SRT for the first response received accomplishes this goal without requiring the TCP pref "Do not call subdissectors for error packets" to be set.

svn path=/trunk/; revision=52592

6 years agowhitespace fixes; mostly: remove trailing blanks
Bill Meier [Sun, 13 Oct 2013 19:56:52 +0000 (19:56 -0000)]
whitespace fixes; mostly: remove trailing blanks

svn path=/trunk/; revision=52591

6 years agoMinor whitespace changes
Bill Meier [Sun, 13 Oct 2013 19:14:33 +0000 (19:14 -0000)]
Minor whitespace changes

svn path=/trunk/; revision=52590

6 years agoDon't clobber PKG_CONFIG_PATH.
Gerald Combs [Sun, 13 Oct 2013 18:59:23 +0000 (18:59 -0000)]
Don't clobber PKG_CONFIG_PATH.

svn path=/trunk/; revision=52589

6 years agoMinor whitespace, formatting & etc changes.
Bill Meier [Sun, 13 Oct 2013 18:14:59 +0000 (18:14 -0000)]
Minor whitespace, formatting & etc changes.

svn path=/trunk/; revision=52588

6 years agoWhen printing PDML, don't assume that all values with bitmasks are represented
Evan Huus [Sun, 13 Oct 2013 16:10:43 +0000 (16:10 -0000)]
When printing PDML, don't assume that all values with bitmasks are represented
as guint32 internally - they may be signed and/or 64-bit.

svn path=/trunk/; revision=52587

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-10-13]
Gerald Combs [Sun, 13 Oct 2013 14:03:40 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-10-13]

svn path=/trunk/; revision=52584

6 years agoSubsume README.binarytrees into wmem doxygen. The README was out of date
Evan Huus [Sun, 13 Oct 2013 13:13:24 +0000 (13:13 -0000)]
Subsume README.binarytrees into wmem doxygen. The README was out of date
anyways, since Michael made key operations non-destructive in r44380.

svn path=/trunk/; revision=52583

6 years agoopenSAFETY: Dissection for second crc as well as plausability check. Bug 9261 (https...
Michael Mann [Sun, 13 Oct 2013 12:25:01 +0000 (12:25 -0000)]
openSAFETY: Dissection for second crc as well as plausability check.  Bug 9261 (

From Roland Knall

svn path=/trunk/; revision=52582

6 years agoSet CMake to use Python when building the tap register files.
Graham Bloice [Sun, 13 Oct 2013 09:47:32 +0000 (09:47 -0000)]
Set CMake to use Python when building the tap register files.

svn path=/trunk/; revision=52581

6 years agoAdd CMake properties to targets so that they are logically organised when using a...
Graham Bloice [Sun, 13 Oct 2013 09:21:55 +0000 (09:21 -0000)]
Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.

svn path=/trunk/; revision=52580

6 years agoFix dissection of Home Provider CID and fix a typo error
Pascal Quantin [Sun, 13 Oct 2013 08:47:05 +0000 (08:47 -0000)]
Fix dissection of Home Provider CID and fix a typo error

svn path=/trunk/; revision=52579

6 years agoSo a while back Jeff added some code to check that the offset+length passed to
Evan Huus [Sun, 13 Oct 2013 04:54:14 +0000 (04:54 -0000)]
So a while back Jeff added some code to check that the offset+length passed to
proto_tree_add_item was valid *before* we short-circuited based on a NULL tree.
This was good in that it removed a common source of really-long-loop bugs. It
was less good in that it cost us about 8% in speed when doing a tree-less
dissection, but we decided the tradeoff was worth it.

After Anders' recent mail to -dev about performance, I started thinking about
how to optimize this. It occurred to me that the vast majority of the logic
involved in the check was dealing with the length value - fetching the actual
length if it was a counted string, calculating the length if it was -1, adding
the length to the offset in a way that was free from overflows, etc.

All of this is (theoretically) unnecessary - simply checking the offset without
worrying about the length will still catch the very-long-loops, since it is the
offset that increases in each iteration, not the length.

All that to justify:
- implement tvb_ensure_offset_exists which throws an exception if the offset is
  not within the tvb
- use it instead of all the complicated other logic in the pre-short-circuit
  step of proto_tree_add_item and friends

This gives us back about 3/4 of the performance we lost in the original patch.
We're still ~2% slower than without any check, but this is the best I can think
of right now.

svn path=/trunk/; revision=52578

6 years agoOrder our conditionals to take advantage of the fact that we know tvb->length <=
Evan Huus [Sun, 13 Oct 2013 00:13:20 +0000 (00:13 -0000)]
Order our conditionals to take advantage of the fact that we know tvb->length <=
tvb->reported_length. Small performance win on the hot path, and a bit easier to

svn path=/trunk/; revision=52577

6 years agoUpdate the User Guide for the upcoming 1.11.0 release
Pascal Quantin [Sat, 12 Oct 2013 23:48:43 +0000 (23:48 -0000)]
Update the User Guide for the upcoming 1.11.0 release

svn path=/trunk/; revision=52576

6 years agoTweak/simplify some tvbuff length check functions slightly. In my benchmarks of
Evan Huus [Sat, 12 Oct 2013 23:41:55 +0000 (23:41 -0000)]
Tweak/simplify some tvbuff length check functions slightly. In my benchmarks of
dissecting without tree, they are costly because they now happen for every
proto_tree_add_item call even if tree is NULL.

svn path=/trunk/; revision=52575

6 years agoRemove some things that I added while not understanding the real
Jörg Mayer [Sat, 12 Oct 2013 22:08:03 +0000 (22:08 -0000)]
Remove some things that I added while not understanding the real
"Long" since solved by copying the solution from Makefile.nmake.

Small update to the status of cmake builds on windows

svn path=/trunk/; revision=52574

6 years agoRedo r52569 in a way that doesn't break the GUI. Add a mem_pool member to
Evan Huus [Sat, 12 Oct 2013 21:01:17 +0000 (21:01 -0000)]
Redo r52569 in a way that doesn't break the GUI. Add a mem_pool member to
tree_data and reference it directly when allocating/freeing tree items. This
lets us keep multiple around when we need them, and still lets us use
wmem_free_all for a major speedup. It also, coincidentally, lets us get rid of
the annoying fi_tmp hack that was needed before, since that element gets swept
up in the free_all with everything else.

Keep one pool cached to avoid creating/destroying a pool for each packet,
another minor performance win.

The various changes in approach seem to balance out pretty much exactly, this
still gives ~11% over pre-52569.

svn path=/trunk/; revision=52573

6 years agoRevert r52569, it breaks the GUI since that sometimes has multiple trees active
Evan Huus [Sat, 12 Oct 2013 18:14:19 +0000 (18:14 -0000)]
Revert r52569, it breaks the GUI since that sometimes has multiple trees active
at once.

svn path=/trunk/; revision=52572

6 years agoIf the offset is out of bounds, have tvb_length_remaining() and tvb_reported_length_r...
Chris Maynard [Sat, 12 Oct 2013 18:13:26 +0000 (18:13 -0000)]
If the offset is out of bounds, have tvb_length_remaining() and tvb_reported_length_remaining() return 0 instead of -1.  This should provide a better long-term fix for bugs/problems such as seen in  In the long-run, if we like this behavior, we can change the return value to a guint as well.  Let's let it simmer for awhile first ...

svn path=/trunk/; revision=52571

6 years agoDon't assume that tvb_length_remaining() or tvb_reported_length_remaining() always...
Chris Maynard [Sat, 12 Oct 2013 18:03:34 +0000 (18:03 -0000)]
Don't assume that tvb_length_remaining() or tvb_reported_length_remaining() always return a value >= 0.  Part of fix for


svn path=/trunk/; revision=52570

6 years agoUse wmem_free_all on the tree pool rather than freeing each node, label and
Evan Huus [Sat, 12 Oct 2013 17:57:51 +0000 (17:57 -0000)]
Use wmem_free_all on the tree pool rather than freeing each node, label and
field_info separately. We still have to walk the tree in order to free certain
fvalues, but that's not a big deal. Another ~11% speed-up running "tshark -nVr"
on a large capture.

svn path=/trunk/; revision=52569

6 years agoUse a wmem block allocator to allocate field_infos, proto_nodes and item_labels.
Evan Huus [Sat, 12 Oct 2013 17:32:41 +0000 (17:32 -0000)]
Use a wmem block allocator to allocate field_infos, proto_nodes and item_labels.
Even without making use of free_all (which should be possible) this still
results in ~8% speedup running "tshark -nVr" on a large file in my tests.

svn path=/trunk/; revision=52568

6 years agoUpdate User Guide for 1.11 preparation
Pascal Quantin [Sat, 12 Oct 2013 14:29:40 +0000 (14:29 -0000)]
Update User Guide for 1.11 preparation

svn path=/trunk/; revision=52567

6 years agoFrom Todd Newton via :
Pascal Quantin [Sat, 12 Oct 2013 14:05:32 +0000 (14:05 -0000)]
From Todd Newton via :
Fix dissection of PTP Management messages

svn path=/trunk/; revision=52566

6 years agoWe can't use proto_tree_add_uint_* for FT_TIME fields, use proto_tree_add_time_*
Evan Huus [Sat, 12 Oct 2013 13:14:30 +0000 (13:14 -0000)]
We can't use proto_tree_add_uint_* for FT_TIME fields, use proto_tree_add_time_*
instead. Fixes another one of the issues that shows up in

svn path=/trunk/; revision=52565

6 years agoBased on help and suggestions from Johannes Berg, fix Radiotap Header decode the
Evan Huus [Sat, 12 Oct 2013 12:53:35 +0000 (12:53 -0000)]
Based on help and suggestions from Johannes Berg, fix Radiotap Header decode the
right way.

Fixes without

svn path=/trunk/; revision=52564

6 years agoFrom RobiOneKenobi via
Evan Huus [Sat, 12 Oct 2013 12:38:56 +0000 (12:38 -0000)]
From RobiOneKenobi via

Add a new strutil function format_text_chr that replaces unprintable characters
with a single passed-in char (eg a '.' or a '-') instead of a C-style escape.
This is useful for displaying binary data that frequently but not always
contains text; otherwise the number of C escape codes makes it unreadable.

svn path=/trunk/; revision=52563

6 years agoHave pixbuf_to_widget() use a guint8 * to match
Gerald Combs [Sat, 12 Oct 2013 03:44:20 +0000 (03:44 -0000)]
Have pixbuf_to_widget() use a guint8 * to match

svn path=/trunk/; revision=52562

6 years agoAnother Solaris Studio C++ fix.
Gerald Combs [Sat, 12 Oct 2013 03:00:04 +0000 (03:00 -0000)]
Another Solaris Studio C++ fix.

svn path=/trunk/; revision=52561

6 years agoFree the actual struct, not the typedef thereof, because the typedef is actually
Evan Huus [Sat, 12 Oct 2013 02:41:44 +0000 (02:41 -0000)]
Free the actual struct, not the typedef thereof, because the typedef is actually
a typedef of a *pointer* to the struct, not the struct itself, which are
different sizes.

This doesn't show up under valgrind because the length isn't checked in that
case, everything gets subsumed in valgrind's malloc/free hooks.


svn path=/trunk/; revision=52560

6 years agoSolaris Studio C++ won't let us pass the address of main() to
Gerald Combs [Sat, 12 Oct 2013 02:29:17 +0000 (02:29 -0000)]
Solaris Studio C++ won't let us pass the address of main() to
init_progfile_dir(). Try using QCoreApplication::applicationFilePath()

svn path=/trunk/; revision=52559

6 years agoUpdate to the latest Windows library tags. Add an "install_qt" target.
Gerald Combs [Sat, 12 Oct 2013 01:02:34 +0000 (01:02 -0000)]
Update to the latest Windows library tags. Add an "install_qt" target.

svn path=/trunk/; revision=52558

6 years agoQT_DIR → QT5_BASE_DIR. This matches the CMake environment.
Gerald Combs [Sat, 12 Oct 2013 00:12:24 +0000 (00:12 -0000)]
QT_DIR → QT5_BASE_DIR. This matches the CMake environment.

svn path=/trunk/; revision=52557

6 years agoLook for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.
Gerald Combs [Fri, 11 Oct 2013 23:52:19 +0000 (23:52 -0000)]
Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.

svn path=/trunk/; revision=52556

6 years agoWith Gerald's patch we should no longer require GTK includes for QT-Only builds
Jörg Mayer [Fri, 11 Oct 2013 23:03:18 +0000 (23:03 -0000)]
With Gerald's patch we should no longer require GTK includes for QT-Only builds

svn path=/trunk/; revision=52555

6 years agoOne more HAVE_LIBPCAP.
Gerald Combs [Fri, 11 Oct 2013 21:42:49 +0000 (21:42 -0000)]

svn path=/trunk/; revision=52554

6 years agocf_start_tail() is (now) just a wrapper around cf_open(). Get rid of it and just...
Jeff Morriss [Fri, 11 Oct 2013 21:29:12 +0000 (21:29 -0000)]
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

6 years agoTry to fix Qt compilation when libpcap is disabled.
Gerald Combs [Fri, 11 Oct 2013 21:26:26 +0000 (21:26 -0000)]
Try to fix Qt compilation when libpcap is disabled.

svn path=/trunk/; revision=52552

6 years agoFix some formatting.
Jeff Morriss [Fri, 11 Oct 2013 20:48:13 +0000 (20:48 -0000)]
Fix some formatting.

svn path=/trunk/; revision=52551

6 years agoReplace a question in a comment with a better explanation (that answers the question).
Jeff Morriss [Fri, 11 Oct 2013 20:29:11 +0000 (20:29 -0000)]
Replace a question in a comment with a better explanation (that answers the question).

svn path=/trunk/; revision=52550

6 years agoFix :
Jeff Morriss [Fri, 11 Oct 2013 19:55:34 +0000 (19:55 -0000)]
Fix :

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

6 years agoBuild with Qt by default.
Gerald Combs [Fri, 11 Oct 2013 18:42:34 +0000 (18:42 -0000)]
Build with Qt by default.

svn path=/trunk/; revision=52548

6 years agoMore ui/util.h includes.
Gerald Combs [Fri, 11 Oct 2013 17:58:12 +0000 (17:58 -0000)]
More ui/util.h includes.

svn path=/trunk/; revision=52545

6 years agoInclude ui/util.h.
Gerald Combs [Fri, 11 Oct 2013 17:47:43 +0000 (17:47 -0000)]
Include ui/util.h.

svn path=/trunk/; revision=52544

6 years agoThere's no need to include prefs.h twice.
Jeff Morriss [Fri, 11 Oct 2013 17:43:07 +0000 (17:43 -0000)]
There's no need to include prefs.h twice.

svn path=/trunk/; revision=52543

6 years agoRemove GTK+ and global cfile dependencies from file_dlg_win32.c.
Gerald Combs [Fri, 11 Oct 2013 17:20:50 +0000 (17:20 -0000)]
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

6 years agoThe env variable is QT5_BASE_DIR, as documented in README.cmake
Jörg Mayer [Fri, 11 Oct 2013 11:43:37 +0000 (11:43 -0000)]
The env variable is QT5_BASE_DIR, as documented in README.cmake
Make documentation and implementatoin consistent

svn path=/trunk/; revision=52541

6 years agoThe path for the Qt5 installation now needs to be set as a
Jörg Mayer [Fri, 11 Oct 2013 11:25:40 +0000 (11:25 -0000)]
The path for the Qt5 installation now needs to be set as a
windows environment variable.

svn path=/trunk/; revision=52540

6 years agoqtshark and wireshark(gtk2) now actually find their libs.
Jörg Mayer [Fri, 11 Oct 2013 11:11:41 +0000 (11:11 -0000)]
qtshark and wireshark(gtk2) now actually find their libs.

svn path=/trunk/; revision=52539

6 years agoNow the GUI programs (wireshark/gtk2 and qtshark) compile and link
Jörg Mayer [Fri, 11 Oct 2013 10:32:11 +0000 (10:32 -0000)]
Now the GUI programs (wireshark/gtk2 and qtshark) compile and link

svn path=/trunk/; revision=52538

6 years agoFix another fuzz failure
Pascal Quantin [Fri, 11 Oct 2013 10:32:05 +0000 (10:32 -0000)]
Fix another fuzz failure

svn path=/trunk/; revision=52537

6 years agoWe don't need to check for lauxlib.h.
Guy Harris [Fri, 11 Oct 2013 07:53:17 +0000 (07:53 -0000)]
We don't need to check for lauxlib.h.

svn path=/trunk/; revision=52536

6 years agoMake airpcap detection work
Jörg Mayer [Fri, 11 Oct 2013 07:38:45 +0000 (07:38 -0000)]
Make airpcap detection work

svn path=/trunk/; revision=52535

6 years agoCheck for sa_len in struct sockaddr.
Guy Harris [Fri, 11 Oct 2013 06:53:29 +0000 (06:53 -0000)]
Check for sa_len in struct sockaddr.

svn path=/trunk/; revision=52534

6 years agoWe don't check for lauxlib.h or lualib.h, and we don't need to - we just
Guy Harris [Fri, 11 Oct 2013 06:48:45 +0000 (06:48 -0000)]
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

svn path=/trunk/; revision=52533

6 years agoFix check for inflatePrime in zlib (ZLIB_LIBRARIES isn't set at that
Guy Harris [Fri, 11 Oct 2013 06:10:32 +0000 (06:10 -0000)]
Fix check for inflatePrime in zlib (ZLIB_LIBRARIES isn't set at that
point, you want ZLIB_LIBRARY).

svn path=/trunk/; revision=52532

6 years agoDestroy dissector tables on shutdown and use epan scoped memory of handles.
Evan Huus [Fri, 11 Oct 2013 01:33:40 +0000 (01:33 -0000)]
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

6 years ago"install-generated-files" depends on "doc". Set dependencies
Gerald Combs [Fri, 11 Oct 2013 01:31:59 +0000 (01:31 -0000)]
"install-generated-files" depends on "doc". Set dependencies

svn path=/trunk/; revision=52530