aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2016-01-13Qt: Update some keyboard shortcuts to match the GTK+ UI.Gerald Combs1-11/+11
As the QKeySequence documentation says, "On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control and Qt::ControlModifier correspond to the Command keys on the Macintosh keyboard, and references to "Meta", Qt::META, Qt::Meta and Qt::MetaModifier correspond to the Control keys. Developers on Mac OS X can use the same shortcut descriptions across all platforms, and their applications will automatically work as expected on Mac OS X." This also applies to Qt Creator on OS X. If you assign a shortcut to an action that contains the Control key, it will draw the ^ symbol in the UI but will save "Meta" in the .ui file instead of "Ctrl", in the manner of a well-meaning-but-not-helpful comedy sidekick. This happened for the actions listed below. Replace "Meta" in their shortcuts with "Ctrl". - Unmark all (Ctrl+Alt+M) - Next marked packet (Ctrl+Shift+N) - Previous marked packet (Ctrl+Shift+B) - Show packet times... (Ctrl+Alt+1 - Ctrl+Alt+8) This matches the GTK+ UI on Windows and Linux, and uses the Command key on OS X. If we really want to use the Control key everywhere we can override the action sequences in main_window.cpp. We might want to do this for the "mark" actions since Command+M is the standard key for "Minimize this window". Change-Id: I1537cee5bc27a32b505bace01c1de3703a18dd6a Reviewed-on: https://code.wireshark.org/review/13238 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-12Need to include <epan/prefs.h> to declare preference functions.Guy Harris1-0/+2
Change-Id: I5fbc9d25dde30ce8d14c80e765a3a8a630fec708 Reviewed-on: https://code.wireshark.org/review/13239 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix type: strlen returns a size_tEvan Huus1-1/+1
Change-Id: I5a3ea655c4a362bbacb72e8c7a19f3c96d22a0fc Reviewed-on: https://code.wireshark.org/review/13231 Reviewed-by: Evan Huus <eapache@gmail.com>
2016-01-12Refactor "Follow Stream" functionality on all GUI interfaces.Michael Mann25-2957/+721
Create a "registration" system for Follow functionality so most of the work can be abstracted into a dissector and GUI can just be responsible for "display". This also removes the global variables in follow.c to open up multithreading possibilities. TCP, UDP and HTTP all have the same "tap interface" for Follow functionality (passing a tvb with byte data to "follow"). SSL still has it's own behavior, so Follow structures have to take that into account. TShark through the Follow registration now has support for HTTP. The only thing possibly missing is dynamic menu generation to further reduce explicit knowledge of Follow "type" (and rely on registration) Bug: 11988 Change-Id: I559d9ee1312406ad0986d4dce9fa67ea2103b339 Reviewed-on: https://code.wireshark.org/review/13161 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-12Qt: Refactor testCaptureFileCloseStig Bjørlykke3-28/+39
Cleanup arguments and simplify code for button texts. Change-Id: Ie505650889212082e088a525f4b82e62b9177b0d Reviewed-on: https://code.wireshark.org/review/13180 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-12Fix indentation.Guy Harris1-1/+1
Change-Id: Icefabed4c9069bb3fe015739c805cd8fb2426ea5 Reviewed-on: https://code.wireshark.org/review/13213 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Move some definitions and declarations around.Guy Harris2-80/+0
This removes duplicates (including one incorrect duplicate), and also means we have only one chunk_type_values[] value_string. Change-Id: I4c3035b1cfb5c86cc7a5bf79feb9a5b0204b6dcc Reviewed-on: https://code.wireshark.org/review/13212 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Add some missing curly braces.Guy Harris1-1/+2
Change-Id: Ifcacd1fedd8c71d47ab618d036765b8195d4ccbb Reviewed-on: https://code.wireshark.org/review/13209 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Fix indentation.Guy Harris1-3/+3
Change-Id: I5b01865b33b65ee55718be680b6d17cdeee1a809 Reviewed-on: https://code.wireshark.org/review/13208 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-11Lua: Added reload_lua_pluginsStig Bjørlykke9-29/+62
This makes it possible to trigger reloading Lua plugins from within a Lua plugin. This can be used when having a plugin to update local plugins from a external source. Renamed reload() to reload_packets() to clarify what's reloaded, and added a alias (marked as obsoleted) from reload(). Change-Id: I4e529992af5f651613950329e73718dbda317d2e Reviewed-on: https://code.wireshark.org/review/13024 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-10Qt: Restore the filename in the status bar.Gerald Combs1-4/+12
Change isNull checks to isEmpty. This keeps us from pushing an empty field status and clobbering the file name in the status bar. Make sure we do the same for other statuses. Change-Id: I68ea669bdafc6e1177c1b8aaa07781464371de96 Reviewed-on: https://code.wireshark.org/review/13175 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-10Qt: Fix testCaptureFileClose without packetsStig Bjørlykke2-35/+25
In MainWindow::testCaptureFileClose() we must always stop a running capture if closing, even if not having any packets, because cf_close() will fail (assert) if still in progress. This fixes an issue (crash) when closing the application with a running capture without packets. This also fixes restarting current capture without packets, both with and without "Confirm unsaved capture files". Bug: 11981 Change-Id: Id0655fcc799682a4f45c855bc2e76386dffc35a5 Reviewed-on: https://code.wireshark.org/review/13121 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-10Add a comment about improvements for the OverlayScrollBar.Gerald Combs1-0/+4
Change-Id: I2953deaa29691a2d12cb158456a650202dfeec77 Reviewed-on: https://code.wireshark.org/review/13171 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-10Update the packet list documentation.Gerald Combs1-0/+4
Update images and describe related packets and the intelligent scrollbar. Suggest a way to make it easier to get a screenshot of related packets. Change-Id: I5bf27b0c53fb62f3e567765400141a374a465e4e Reviewed-on: https://code.wireshark.org/review/13159 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-10[Automatic update for 2016-01-10]Gerald Combs13-1011/+996
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I2087677da0b09293ff156e39acbdbab8486262f4 Reviewed-on: https://code.wireshark.org/review/13167 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-10GTK: fix infinite loop at startupPeter Wu1-3/+3
Add the tap timer after validating all preferences, otherwise a zero timeout will result in an infinite loop, visible by a splash screen that never goes away. Change-Id: I180a123ac2cc7774356e17f1f1d4dcaf38f252b4 Reviewed-on: https://code.wireshark.org/review/13156 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-10Qt: fix infinite loop when gui_recent_files_count_max is negativePeter Wu1-1/+1
Change-Id: I7cfddd865ebe0cd01230e19bf20fee7964c40324 Reviewed-on: https://code.wireshark.org/review/13155 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-09Qt: Save the default capture device name.Gerald Combs1-1/+10
Make sure we save the device name in capture.device. This should fix the default device selection in the welcome screen on Windows. Change-Id: I19337cf2813f3b5aba75228e855dad0a0f5e0f78 Reviewed-on: https://code.wireshark.org/review/13138 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-08Revert "Qt: Try to fix Main Welcome Interfaces List Scrollbar"Gerald Combs4-14/+11
Instead of calling InterfaceTree::reset (which clears our selection) when we resize, just pass our resize event to QTreeWidget. Additionally, select our default interface using setCurrentItem. This fixes behavior broken in gb152ca3. This reverts commit 7baac67149a68b66087c5d688dbeda2869485765. Bug: 11733 Change-Id: I58855de38561fcb6984273ae3910c0dfcda04e69 Reviewed-on: https://code.wireshark.org/review/13135 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-08Qt: Queue up redissection.Gerald Combs1-1/+1
Make the WiresharkApplication::packetDissectionChanged → MainWindow::redissectPackets connection queued rather than direct. redissectPackets eventually calls update_progress_dlg, which processes UI events. This should keep the profile dialog from destroying itself prematurely in a nested event loop when the user hits "OK". Bug: 11979 Change-Id: I7276e08c1911708c3aca5ff05ab6a40bfc336add Reviewed-on: https://code.wireshark.org/review/13134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-08Fix a lot of typos and misspellingsmoshekaplan1-2/+2
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-08Add a Busy status to SyntaxLineEdit.Gerald Combs8-50/+89
For CaptureFilterEdit it's possible to have an indeterminate state while we're waiting on name resolution. Add a Busy status to SyntaxLineEdit and set the text color to a mix of the normal foreground and background colors (gray on most platforms). Make the Busy state valid so that we don't have to wait on an annoyingly-long name resolution to start capturing. Update the global capture option filters using the main welcome capture filter when we start a capture instead of when we've finished checking the filter syntax. Connect the CaptureFilterEdit returnPressed signal no matter what so that we can start a capture by pressing return in the welcome screen CaptureFilterEdit. Add a fake resolution timeout to the CaptureFilterSyntaxWorker debug code to make testing the different states easier. Bug: 11950 Change-Id: I0cf01c0fbc0dd8065cdf5a91f1d6b224291b1ce6 Reviewed-on: https://code.wireshark.org/review/13110 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-08QT: add same warning as GTK when trying to save a decoded RTP stream that is ↵Pascal Quantin1-0/+10
not alaw/ulaw Change-Id: Ia11e58a20c879d1ca3ead8479f8082e204d92caf Reviewed-on: https://code.wireshark.org/review/13131 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-08Fix warnings for epan/prefs.c [-Wcast-qual]João Valverde1-2/+2
Change-Id: I86032d624ee37edc86a868eb2aaaffce81a8807b Reviewed-on: https://code.wireshark.org/review/12719 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-07Qt: Sort traffic table default protosStig Bjørlykke1-2/+2
When changing conversation types in Conversations and endpoint types in Endpoints the tabs will be arranged alphabetically, so ensure that the default protos also are alphabetically. Change-Id: Ib0e8ffb744f63867e93282b7a81b1c11b0ee3dc4 Reviewed-on: https://code.wireshark.org/review/13107 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-07Don't include much of anything if HAVE_LIBPCAP isn't defined.Guy Harris1-2/+4
We don't need it. Change-Id: Idca29cbd7208c388a1f5d4e2b0131f5cfddc7896 Reviewed-on: https://code.wireshark.org/review/13096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-07"#ifdef" out a definition not used if HAVE_LIBPCAP isn't defined.Guy Harris1-0/+2
Change-Id: Ifc0f89706c0633925c57d1fed3a56c7e531a3b39 Reviewed-on: https://code.wireshark.org/review/13095 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-07Qt: Add recent capture filter entries.Gerald Combs1-1/+17
Copy over and adapt missing logic from the GTK+ UI which adds recent capture filter entries when we start a capture. Change-Id: Ifcf8b719e53727b7c269d9890731d542d1759efc Ping-Bug: 11950 Reviewed-on: https://code.wireshark.org/review/13086 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-07Remove some unnecessary dependencies and cleanup some codeJoão Valverde7-75/+43
No need for the GTK dependency on dissectors/packet-ipv6.h. Add the stream_addr typedef in follow.h to make some code simpler. Change-Id: I1cf906f58734a90263141362f2da33a140f93533 Reviewed-on: https://code.wireshark.org/review/13063 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-07Get rid of unused #define.Guy Harris1-6/+0
Change-Id: I16abf022ea79f763b82a28f9dffccbf56630f14c Reviewed-on: https://code.wireshark.org/review/13087 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-06KISS the Follow TCP functionality.Michael Mann7-548/+204
[KISS - Keep It Simple, Stupid] Convert the Follow TCP functionality to use a tap from the TCP dissector that passes the tvb of the payload. This makes things A LOT simpler, but relies on the TCP dissector to make all decisions. The "tap" logic passes tvb data 1. Before calls to process_tcp_payload 2. Before hf_tcp_segment_data fields (that aren't retransmissions or otherwise handled) Follow up patches will be necessary to clean up all of the supporting "follow" functionality that is now useless. Bug: 6925 Bug: 9780 Change-Id: I4e7f5d453519be839de39a109bafa899b9987139 Reviewed-on: https://code.wireshark.org/review/13038 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-06Clean up more includes of wtap.h.Guy Harris2-3/+5
Change-Id: Ie53b64f7e5b39a50dffb62fc0b886da71e0a3bd2 Reviewed-on: https://code.wireshark.org/review/13066 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-05Qt: Disable configurable interface settings for extcapStig Bjørlykke1-18/+30
Disable promiscuous mode, snaplen, buffer size and monitor mode settings for extcap interfaces. Bug: 11865 Change-Id: I20c67815ece99b8e742e36c727f415931b87af1f Reviewed-on: https://code.wireshark.org/review/13023 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-05extcap: Add regular expression validation supportRoland Knall8-267/+503
Regular expressions follow the Qt Regex syntax, which is formulated after the Perl Regex syntax. A more detailed overview of the possible rules can be found at: http://doc.qt.io/qt-4.8/qregexp.html If a required option is present, even the double-click on the interface will first start the options dialog (Qt only) Required fields are marked bold and put first in the dialog. Additionally if validation failes (which it will if a required field is kept empty, but also if a non-required textfield is violating the defined regex), the label of the field is marked with red. Change-Id: If04a1146d0dfa778332ab2a39122c7a6ee1e93d2 Reviewed-on: https://code.wireshark.org/review/12914 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-05Qt: Show capture filter warningStig Bjørlykke1-1/+1
Change-Id: I080bcb25edcee0c38984cd1a7f7f36a7fd3ff36c Reviewed-on: https://code.wireshark.org/review/13055 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-05Qt: Don't check capture filter for user DLTsStig Bjørlykke4-17/+24
This makes it possible to use a capture filter on an interface with user DLTs (147-162). Bug: 11656 Ping-Bug: 11668 Change-Id: Ie9931b27e8dc8ea239e7e04e26d0ae1cacba50c9 Reviewed-on: https://code.wireshark.org/review/12996 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-04Remove unneeded "#if 0"ed out code.Guy Harris2-169/+16
If we ever need to look at the value of any field in the packet, we should do it the way we do in the RTP analysis code, rather than walking the entire protocol tree. Get rid of an unnecessary extra level of indirection for the filter string. Change-Id: Ie95c0171da79e7f24019a3f67396f6a533959881 Reviewed-on: https://code.wireshark.org/review/13046 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-04Don't walk the entire protocol tree to extract the value of one field.Guy Harris2-168/+46
Instead, prime the epan_dissect_t's tree to look for rtp.ssrc, and extract that value with proto_get_finfo_ptr_array(). Also, have the filter used to check whether the packet is a candidate for RTP analysis to check for RTPv2 (and add a check for IPv4 or IPv6 back to the Qt version), and get rid of an unnecessary extra level of indirection for that string. In the Qt version, if findStreams() set the error string, don't overwrite it with a "No streams found." indication, and fix error handling for the "filter didn't compile" case. Change-Id: I09d0ea37ccd4806d99e3b6394f2a8a376e974705 Reviewed-on: https://code.wireshark.org/review/13045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-04PPP: fix registration of CRTP (CNTCP) protocolPascal Quantin1-1/+2
Also protect against any badly registered protocol Bug: 11958 Change-Id: I0c03f50c2c5478a9524ad06e669510ffb5739b21 Reviewed-on: https://code.wireshark.org/review/13041 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-04cli: packets / bytes conversation statistics are swappedPascal Quantin1-2/+2
Bug: 11959 Change-Id: I594413b26bb33f38099046e26c1d20bba7f649fa Reviewed-on: https://code.wireshark.org/review/13042 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-04Bugfix Follow HTTP byte statsDavid Morsberger1-1/+1
Change-Id: I23806012fc4f7f3a791e380de0c364b5825f8951 Reviewed-on: https://code.wireshark.org/review/13037 Reviewed-by: David Morsberger <dave@morsberger.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-04Bugfix some issues with Follow HTTP Qt dialogMichael Mann1-5/+34
1. Populate packet number on follow HTTP handler. 2. Remove stream navigation (until its a little less buggy). This follows the convention of SSL which runs on top of a stream protocol (TCP), it's not a stream itself, which seems to be why its buggy. Change-Id: Idf21be2a00a8fde0fbf16f40ca8c36a2a44b8993 Reviewed-on: https://code.wireshark.org/review/13027 Reviewed-by: David Morsberger <dave@morsberger.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-04Rename ipv4_addr and ipv6_addr to indicate their full contents.Guy Harris3-11/+11
They're not just addresses, they also include a mask length for IPv4 and a prefix length for IPv6. Rename them appropriately. Rename the old ipv4_addr_and_mask() and ipv6_addr_and_mask() to reflect that 1) they fetch data from a tvbuff and 2) *don't* fetch the mask length or prefix length, those lengths are passed as arguments to indicate how many bytes worth of address to fetch. Change-Id: I4cad5a186ad7bfcb60022a91dbe8bc8479e6471f Reviewed-on: https://code.wireshark.org/review/13035 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-03[Automatic update for 2016-01-03]Gerald Combs13-4117/+4277
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia31206d914b7e024d71a88edd2c66ed8b3cbf4be Reviewed-on: https://code.wireshark.org/review/13028 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-03Pass SslPacketInfo structure directly to SSL tap instead of having listeners ↵Michael Mann3-7/+3
get it themselves anyway. Change-Id: I3817d12e473b67e26159e1562a08169e91f51d46 Reviewed-on: https://code.wireshark.org/review/13019 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-03Cleanup follow stream codeMichael Mann10-170/+47
Adding Follow HTTP Stream justified some refactoring and code removal. Change-Id: I9b7ace83f8517e880e78193bb97ac32e3fc91114 Reviewed-on: https://code.wireshark.org/review/13015 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-03Add HTTP Follow streamMichael Mann18-17/+530
This automatically detects and decompresses HTTP along a TCP stream through the use of taps. Bug: 3528 Change-Id: I8ab832d509700d0da8eabf3c3e514d8511c598d3 Reviewed-on: https://code.wireshark.org/review/13009 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-01Make color filters part of dissectionMichael Mann2-6/+0
Color filters can be seen as a function that takes a tree and display filters as input and a (possibly empty) coloring rule as output. This coloring rule is then added to the frame tree and used by the GUI for coloring the packets list. From an architectural POV, "coloring" is part of the UI component, but since it influences the tree, it is something for the dissection component. Bug: 5703 Bug: 6099 Change-Id: I73d132ec1dca7262bcb1b55c8481ca564c6161d1 Reviewed-on: https://code.wireshark.org/review/12507 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-01GTK: add a missing cast in dissector_tables_dlg.cPascal Quantin1-1/+1
Change-Id: I1f763a6046fc06b221742e70edd39055586e45d0 Reviewed-on: https://code.wireshark.org/review/12990 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-01No need for toolkit-dependent color initialization.Guy Harris11-56/+55
We're not allocating colors ourselves in GTK+ (and haven't been doing so since at least 1.12), and all color_t values are valid colors, so we don't need any toolkit-specific processing to fill in a color_t. While we're at it, catch read errors when reading color filter files. Change-Id: Ieb520d141cf15e371a31a01459d466c95ba2209b Reviewed-on: https://code.wireshark.org/review/12985 Reviewed-by: Guy Harris <guy@alum.mit.edu>