Commit Graph

63460 Commits

Author SHA1 Message Date
Gerald Combs b0b2540fba Qt: Clean up capture file callbacks.
Mark some callbacks GTK+ only as appropriate. Change a debug message to
an assert since we handle all callbacks.

Change-Id: I4266f0d7134d19a9c0432354ea36de67501275b4
Reviewed-on: https://code.wireshark.org/review/16171
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-06-27 20:09:33 +00:00
Martin Kacer d8ddf84693 Fixed tshark pdml output.
Corrected if no protocol filter (-j) specified.

Change-Id: Id20dd255642951633efa935dbb1363e7b9aa9be0
Reviewed-on: https://code.wireshark.org/review/16164
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27 19:12:21 +00:00
Jeff Morriss d90e6e74da There's no need to check the return from g_array_index().
g_array_index() returns an index into an array: we're sure to find
something at that index (whether that something is in bounds is
a-whole-nother question).

This fixes CIDs 1362829 and 1362890/1362830.  There were other CIDs like
this but they've already been fixed.

Change-Id: I94af0931b9adf3abd3bedc969e399cda98bbdd07
Reviewed-on: https://code.wireshark.org/review/16168
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27 15:23:56 +00:00
Michael Mann 2ab4155794 tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_string
Also some other tricks to remove unnecessary tvb_get_string_enc calls.

Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914
Reviewed-on: https://code.wireshark.org/review/16158
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-27 15:20:06 +00:00
D. Ulis 8c37621ca7 CIP: Cleanup info column for MSP packets
1. Skip printing class name in info column when it was an MSP, since it's implied.
2. Don't print response status for embedded messages in info column for MSP. It makes the line too long.
3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed.

Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd
Reviewed-on: https://code.wireshark.org/review/16162
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27 12:34:32 +00:00
Jeff Morriss 58ccf8e6b6 endpoint dialog: fix compilation when we don't HAVE_GEOIP.
Also fix some indentation and white space.
Remove a break-after-return.

Bug: 12562
Change-Id: I912ccdac62aceaabcffec8f7739da56cc6036abf
Reviewed-on: https://code.wireshark.org/review/16159
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-27 11:40:47 +00:00
Alexis La Goutte 010f5bba63 LTP: fix indent
replace space by tab

Change-Id: I52d5fefbf795fe6ee2dbdeda087c49280ba47503
Reviewed-on: https://code.wireshark.org/review/16166
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-27 07:05:48 +00:00
Bruno Verstuyft af26f31a63 DOCSIS: Fix unknown TLVs in UCD type29 caused parsing errors + bugfixes
Change-Id: I9ab56ded7ebf9f087afceed979e451e369eaf1d6
Reviewed-on: https://code.wireshark.org/review/15967
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-27 07:01:21 +00:00
Joerg Mayer 03adf58691 Remove author comments and some accompanying useless code comments
This only removes author's names that appear in the AUTHORS* files.
In those cases where a group of people get mentioned, this patch does
not remove any in case at least one name is not found in AUTHORS*

Change-Id: I2259dbda3d4a1250bdc103f3fc5be93df5482489
Reviewed-on: https://code.wireshark.org/review/16154
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: Anders Broman <a.broman58@gmail.com>
2016-06-27 06:58:33 +00:00
João Valverde ff9e62a30b autotools: Qt 5.7 requires C++11
Change-Id: Icad622a052a84862ace98a7000f10ccf677f54a5
Reviewed-on: https://code.wireshark.org/review/16138
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-27 06:56:51 +00:00
Thomas Wiens fbb23e27dd s7comm: Sinumerik NC file transfer
Added decoding of up-/downloading files from/to a Sinumerik NC CNC control
machine.

Change-Id: If7939e56e972fc2b8feb12150c4184a880b0cdae
Reviewed-on: https://code.wireshark.org/review/16129
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: Anders Broman <a.broman58@gmail.com>
2016-06-27 06:54:32 +00:00
Alexis La Goutte 76ae2d9721 AUTHORS: fix duplicate / wrong name entry
Change-Id: I1e2bb98d1e78af193f449c75109eabc92f934c11
Reviewed-on: https://code.wireshark.org/review/16149
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: David Zoller <zollerd@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-27 06:53:11 +00:00
Martin Kacer 148d5860a1 json: corrected json output format.
Some pcaps caused invalid json and ek files.

Bug: 11754
Change-Id: Id4c4d744b4d07fe4e8b6423688be1bb10a803844
Reviewed-on: https://code.wireshark.org/review/16152
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27 05:36:32 +00:00
Gerald Combs 619659599a CMake: Qt 5.7 requires C++ 11.
Add -std=c++11 to CMAKE_CXX_FLAGS if we have Qt >= 5.7.0 and we're
compiling with g++ or clang++.

Change-Id: Id4ce5921ce5c475e9eb9cc67f94c3b3a895924a1
Reviewed-on: https://code.wireshark.org/review/16135
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: João Valverde <j@v6e.pt>
2016-06-27 04:27:56 +00:00
Ashish Shukla a4711f80c6 radiotap: Fix for the VHT 20MHz MCS 9 data rate not displayed
MCS 9 at 20 MHz is valid for 3 and 6 spatial streams.
Changed the rate table to include rate (mbps) for VHT 20MHz MCS 9.

Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Bug: 12558
Change-Id: Ia16ae545a5ac1779131e24e1f54a5659390cd321
Reviewed-on: https://code.wireshark.org/review/16146
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27 02:14:53 +00:00
Alexis La Goutte 28048a9793 circuit(.h): fix indent (and add modelines)
Change-Id: I71bb0a8eaf9f5bd34395a4182e4158abaca4ace2
Reviewed-on: https://code.wireshark.org/review/16144
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-27 01:20:56 +00:00
Alexis La Goutte 4f2c3ad787 Fix typo on AUTHORS.src (about @)
Change-Id: Ie4ba5b6ca9cdcf0a90c4b7604b0b4ff89690f3d9
Reviewed-on: https://code.wireshark.org/review/16148
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-27 01:16:00 +00:00
Guy Harris ea4d01d90e The "coding" subfield of the VHT field is a bitmask.
Treat it as such.  Fetch it once, regardless of whether we have any
non-zero NSS values or not, and use the per-user NSS value to decide
whether a particular bit in the bitmask is valid and worth displaying.

Make the four coding fields bitfields, with the appropriate bit.

Change-Id: I506b35afa9d07da8d800da5c304d5d0aadd87c54
Reviewed-on: https://code.wireshark.org/review/16155
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27 00:38:22 +00:00
Guy Harris 497159f372 Check for an invalid 11ac MCS/bandwidth/NSS combination.
A few of the combinations are marked as "Not valid" in 802.11ac-2013.

Ping-Bug: 12558
Change-Id: I18b78ebb84ab32a6fc53c6d634ef07ae87fb4866
Reviewed-on: https://code.wireshark.org/review/16153
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-26 20:45:22 +00:00
Joerg Mayer b84637b4f6 Decode partial virtual bitmap in TIM IE
- Add yet another filter name for an association id element
- Minor (consistency) cleanups in the vicinity of the new hf element.

Bug: 12545
Change-Id: Ic8e7580e7de7572e1b449ae03494b25567d86ea3
Reviewed-on: https://code.wireshark.org/review/16150
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-26 17:14:28 +00:00
Gerald Combs e702da6e8a [Automatic update for 2016-06-26]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Id5cc1bbd3d7f899e48ae9c2de48613ef0366cc29
Reviewed-on: https://code.wireshark.org/review/16142
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-26 15:10:03 +00:00
Gerald Combs 5e8649bd59 Qt: Don't use QStyleOptionViewItemV4.
It was deprecated in Qt 5.7. Just use QStyleOptionViewItem.

Change-Id: I890305a11393940e21bdc68d90ca6602ade16769
Reviewed-on: https://code.wireshark.org/review/16137
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: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:23:59 +00:00
Gerald Combs 4addfc67b4 Add an RA_INTERFACES register action.
Add RA_INTERFACES between RA_PREFERENCES and RA_CONFIGURATION. Wireshark
was spending a suspiciously long time loading module preferences here.
(Now we just need to find out why that section of the code is slow.)

Change-Id: Iecbe55e8e10c8844bcb151a13e383cb13a3f6eb1
Reviewed-on: https://code.wireshark.org/review/16133
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:22:46 +00:00
Gerald Combs 60cdee9e30 Qt: Handle unhandled filter actions.
Handle FilterAction::ActionColorize and ::ActionFind. Remove
::ActionConversation since it was unused. Assert when we encounter a
missing FilterAction, similar to what we do in other parts of the code.

Bug: 12363
Change-Id: I5c1ecd488e5bdb9700a80fc70ec7c047311054b6
Reviewed-on: https://code.wireshark.org/review/16131
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: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:10:51 +00:00
Gerald Combs 291762d0af Qt: Try to fix un-maximize behavior on OS X.
On OS X, create dialogs with valid parents so that we don't trigger
QTBUG-46701. Document QDialog's "on top", maximize, and minimize
behaviors.

Bug: 12544
Change-Id: I32c0ef01dba3f7132e5fd0cd61f9feb654b92009
Reviewed-on: https://code.wireshark.org/review/16127
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: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:09:58 +00:00
Gerald Combs 974a530f8e Qt: Conversation and Endpoint dialog performance tweaks.
Generate column text dynamically. This keeps us from having to iterate
over our tree items each time we receive updates.

Set the uniformRowHeights property.

Stop automatically resizing columns after 200 items.

Fixup name resolution behavior. Disable the checkbox if host name
resolution is disabled.

Change-Id: Ib2fef604d6ee9e39a8b1edd72d58d0cb02d3bb64
Reviewed-on: https://code.wireshark.org/review/16110
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: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:08:57 +00:00
Dario Lombardo 01e22809ff circuit: rename shadow variable
Change-Id: I67e2c80e89af9526ba4b482933d64cab93b9490a
Reviewed-on: https://code.wireshark.org/review/16105
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:05:51 +00:00
Dario Lombardo 12efbd6b40 app_mem_usage: rename shadow variable
Change-Id: I0db888633118beeabfe4bb8fa6da419d0827c7c1
Reviewed-on: https://code.wireshark.org/review/16106
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:04:09 +00:00
Dario Lombardo f8500f39e2 conversation: rename shadow variable
Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911
Reviewed-on: https://code.wireshark.org/review/16104
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:03:14 +00:00
Dario Lombardo 46fc6f5d39 ex-opt: rename shadow variable
Change-Id: Iba19920e58ffb7f1a88c2a75964c518f0479c66f
Reviewed-on: https://code.wireshark.org/review/16103
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:02:45 +00:00
Dario Lombardo 916958ca82 filter: rename shadow var
Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545
Reviewed-on: https://code.wireshark.org/review/16102
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:02:09 +00:00
Dario Lombardo bfb6f62e36 srt: rename shadow variable
Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0
Reviewed-on: https://code.wireshark.org/review/16101
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:01:22 +00:00
Dario Lombardo b845e29d97 stats_tree: rename shadow variable
Change-Id: I5b3272cc4df728c70d6b0370b0d8a6d3482a0c6c
Reviewed-on: https://code.wireshark.org/review/16100
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 06:00:43 +00:00
Dario Lombardo 581d44f4ad h248: rename shadow variable.
Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443
Reviewed-on: https://code.wireshark.org/review/16099
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26 05:59:21 +00:00
Gerald Combs b47aca5fd1 Minor UI locale updates.
Qt: Call setlocale before commandline_early_options so that we get
proper "-v" output, similar to the GTK+ UI.

GTK+: Call setlocale once at startup.

Bug: 11960
Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08
Reviewed-on: https://code.wireshark.org/review/16132
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: João Valverde <j@v6e.pt>
2016-06-25 15:56:34 +00:00
Roland Knall 79836fa23a wsutil: Move Win32 helper routines from capchild
Move error handling and argument quoting routines from
capchild to wsutil, as those methods will be used by
extcap_spawn as well.

Change-Id: I2c4515fefd5aecad317fcdaefa721734288f792c
Reviewed-on: https://code.wireshark.org/review/16123
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-25 15:06:27 +00:00
Gerald Combs fe6856684b Qt: Fix "-l" behavior.
gbcae998 didn't completely fix the missing "-l" behavior.

Bug: 12311
Change-Id: Iee3c844013ac137e94848aaafca7aeb3de43e080
Reviewed-on: https://code.wireshark.org/review/16128
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-06-24 21:23:11 +00:00
Gerald Combs cc007e5908 Qt: Keep the syntax line edit cursor active.
Ignore focusOutEvents when the syntax line edit completer is active.
This keeps it from hiding its cursor.

Bug: 12520
Change-Id: I8e25b92c097e039e26e2381c5209be1e27a6a7cd
Reviewed-on: https://code.wireshark.org/review/16126
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-24 21:21:36 +00:00
Alexis La Goutte 4adf695a74 print(.c): fix indent
Change-Id: Ie7c55fb432b29abe689eed1968cfa30bd8e88e33
Reviewed-on: https://code.wireshark.org/review/16124
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-06-24 16:42:57 +00:00
Dario Lombardo 1df9918d5c tfshark: remove unused variable
Change-Id: I30ab3e4e044de12b18b7b7213a605df7096d1c54
Reviewed-on: https://code.wireshark.org/review/16108
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-24 14:16:13 +00:00
Guy Harris 71a57dc85b Indicate how this should be done.
Assuming that it could, if registered as an "eth.trailer" heuristic
dissector, get the length of the entire frame, that is.

Change-Id: I1ac26feeb10bb8ba357089a80f4b768f580bb51d
Reviewed-on: https://code.wireshark.org/review/16121
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-24 01:51:55 +00:00
Guy Harris a5e9e7e7ae Fix "disable this protocol by default".
Allow a dissector to mark its protocol as "disabled by default", which
means that the "enable all protocols" routine won't enable it.  This is
necessary in order to allow the disabling of protocols not to be
unintentionally changed due to profile changes; see bug 9826.

Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f
Ping-Bug: 9826
Reviewed-on: https://code.wireshark.org/review/16109
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23 19:45:51 +00:00
Pascal Quantin dd5f3c96c3 LTE RRC: fix display of info column when receiving a BR SIB
Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0
Reviewed-on: https://code.wireshark.org/review/16098
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-06-23 15:29:09 +00:00
Benjamin Coddington 45db2fbe1e packet-nfs: add extent decoding for SCSI layouts
Decode extents sent within the response to a LAYOUTGET operation on
SCSI layout types.

Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-on: https://code.wireshark.org/review/16097
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23 14:20:28 +00:00
dz-msfc 738b3e895f NASA provided LTP and DTN updates
Change-Id: I49769271a41b6a7b23c6bc1d4beaadbe8819198d
Reviewed-on: https://code.wireshark.org/review/14310
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23 14:19:17 +00:00
Jens Kilian edac72eb7d Increase MAX_DISSECTOR_ADDR_TYPE.
With the recent changes causing some address types to be registered
by their proper dissectors, I ran into the MAX_DISSECTOR_ADDR_TYPE
limit in a new dissector I'm currently writing.

Change-Id: I72f521266af9190e8ad198ace4d6608b6b4d2dee
Reviewed-on: https://code.wireshark.org/review/16091
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23 10:45:17 +00:00
Dario Lombardo 982359c098 bthci: add missing break (CID 1362832)
Change-Id: I705cb17d7c6d615361d29f00ba840a94dc835ff0
Reviewed-on: https://code.wireshark.org/review/16090
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-06-23 09:49:56 +00:00
Guy Harris a51b6a60b1 Fix some of the brokenness in the PRP redundancy control trailer dissector.
IF YOU ARE DOING A HEURISTIC CHECK TO DETERMINE WHETHER THE PACKET
YOU'RE LOOKING AT IS ONE YOU SHOULD DISSECT, EVEN IN A DISSECTOR
THAT'S NOT REGISTERED AS A HEURISTIC DISSECTOR, DO NOT LOOK AT PACKET
BYTES UNLESS YOU HAVE ALREADY DETERMINED THAT THEY ARE AVAILABLE IN THE
CAPTURE.

THERE ARE NO EXCEPTIONS TO THIS RULE.

Bug: 9826
Change-Id: I2327a92ee760003bc10489263c0c53acdf2094e9
Reviewed-on: https://code.wireshark.org/review/16092
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23 09:33:59 +00:00
Guy Harris 6b0923a640 No pcap, no live capture, so no auto_scroll_live.
Change-Id: Ic1993916cdb78c946bb291fa59f7cdc25e9cef2d
Reviewed-on: https://code.wireshark.org/review/16088
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23 08:00:34 +00:00
Dario Lombardo 2c8056acdf Qt: quit the UI if WIRESHARK_QUIT_AFTER_CAPTURE is set (offline mode too).
This change is useful to use the offline mode in tests (like fuzzing)
that require the software to quit after the processing of a sample.

Change-Id: I311c642edecf4012dc518c2bf8bca66c97aa1b02
Reviewed-on: https://code.wireshark.org/review/16038
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23 07:58:29 +00:00