CMake on macOS creates a convenience wrapper (run/wireshark) that runs
run/Wireshark.app/Contents/MacOS/Wireshark. Have it run the executable
using "exec" instead of opening the bundle using "open" so that
Wireshark runs in the foreground.
Change-Id: I295ce0681da75678e5e01781e9c8fb58e2236fc9
Reviewed-on: https://code.wireshark.org/review/16196
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Not all versions of sed support "\n" as meaning "newline" in the
replacement string of an s command. POSIX requires tr to support "\n"
in the replacement string, however, so use % as meaning "newline" in the
sed script, and translate it to a newline using tr.
Change-Id: Icdbc0b55787340953dfc90ea82e0421b4e77a896
Reviewed-on: https://code.wireshark.org/review/16199
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Change-Id: Ia2ee723227e1b331eeec0f0463654f35a4c9f37b
Reviewed-on: https://code.wireshark.org/review/14508
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
It's not safe to assume that the overlay scroll bar range is equal(ish)
to the number of packets. Adjust our arithmetic accordingly.
Change-Id: Ic8cc8a746bdd2bdc6771794303e95a810bc3d1d2
Reviewed-on: https://code.wireshark.org/review/16186
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Cast a pointer to a QWidget * so that compilation and pref selection
works for Qt4. Add an assert and some comments.
Change-Id: Ide89b698220a9af7b7252488f0770ff35081432e
Reviewed-on: https://code.wireshark.org/review/16195
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: Michael Mann <mmann78@netscape.net>
Change-Id: I6cf0a95525334d5a7561a477093b892a3f821b98
Reviewed-on: https://code.wireshark.org/review/16189
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>
Fill in advanced and module tree item text when requested.
Create ModulePreferencesScrollAreas only when we need to show them.
Change-Id: I5aa7d5dba8f5d20de088de3a9d1ee9d58e779269
Reviewed-on: https://code.wireshark.org/review/16181
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>
In OSPF v2 the N/P bit in NSSA LSA type 7 messages has to be
interpreted as P-bit (RFC 3101) instead of N-bit. This change
makes it so.
Bug: 12555
Change-Id: I1d4a8978ca42d0472d5967528e72cbfada87b799
Reviewed-on: https://code.wireshark.org/review/16174
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Other code looks at the global structure, so there won't be other
structures; just fill in the global structure directly.
Change-Id: I4dc87b79168c5a7c9ab1f085aa2d78cc6d2c9019
Reviewed-on: https://code.wireshark.org/review/16184
Reviewed-by: Guy Harris <guy@alum.mit.edu>
And make the commandline_info structure global, so all the places that
look at quit_after_cap can get at it.
Change-Id: I006329cf8842c655cca36f024570855d1b16e107
Reviewed-on: https://code.wireshark.org/review/16182
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Really, all the GUI-related options should be pulled out, so they're not
cluttering up dumpcap and tshark.
Change-Id: I0276dee2be48bae3498a819d8c0c2747fe1352e7
Reviewed-on: https://code.wireshark.org/review/16180
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The whole point of using mktemp is to get a temporary directory outside
the source tree. Commit v2.1.0rc0-1027-ge01f8fb tried to fix the
invocation for *BSD (including OS X), but by adding a template it
dropped the implicit --tmpdir option for GNU mktemp on Linux..
Use the GNU mktemp invocation and if it fails (for example, because a
template is expected for BSD/OS X), provide a template.
Change-Id: I77bbc7dc2045e4fa756e102afa080860b0857713
Reviewed-on: https://code.wireshark.org/review/16178
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
global_capture_opts is already defined by ui/commandline.c which is also
linked with wireshark-qt.cpp. Remove the duplicate definition to avoid a
build failure with the gold linker.
Fixes regression from v2.1.1rc0-192-g9b5b444.
Change-Id: I4484e2769bf270dee1ec0378fd9c925e01eaf390
Reviewed-on: https://code.wireshark.org/review/16175
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Add a callable target such that dissectors can be generated without the
AUTOGEN_dcerpc option.
Modelled after the pidl CMakeLists.txt file and target. This approach
has the advantage over the previous implementation such that the clean
target does not remove the packet-dcerpc-X.c files.
Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f
Reviewed-on: https://code.wireshark.org/review/15989
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
- 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>
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>
Gerald Combs