Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I471c3d060ff69982e94c9046ca121bb0c15f0d74
Reviewed-on: https://code.wireshark.org/review/16212
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
|
|
Set our pointers and copy our data *after* we read our packet.
Bug: 12556
Change-Id: I5b373f94ad5b2fa2e6563142200a80912e717a96
Reviewed-on: https://code.wireshark.org/review/16211
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>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
|
|
Bug: 12568
Change-Id: Id2b89c2d133865771e21acf3ee224f57ac9d262b
Reviewed-on: https://code.wireshark.org/review/16203
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
Wireshark.pro is the qt project file used by qmake
which in turn was used by nmake
now that nmake is gone, the only reason to keep Wireshark.pro
was the update-tx script that syncs our translation files with Transifex
update-tx calls lupdate to create a list of texts to translate and
lrelease to convert such a list into a binary file
lupdate and lrelase can read file names from a project file or
get them on the command line
modify update-tx to pass the required file names on the command line
we can use wildcards so there's no need to change update-tx when a new
source file is added
remove Wireshark.pro from the release tarball as well
Change-Id: I7ff4ebc96f13b4ffc6fb1b2f4e045999fbfbed5e
Reviewed-on: https://code.wireshark.org/review/16151
Reviewed-by: Gerald Combs <gerald@wireshark.org>
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>
|
|
That makes failing to specify a format a compile-time error.
Change-Id: Iff0bda8be35b1e3acc97e4314657ceaff2b3d0be
Reviewed-on: https://code.wireshark.org/review/16218
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
For OS X, mention the use of CMake or autotools for building.
For Linux, mention autotools as well as CMake, and speak of Debian
derivatives other than Ubuntu.
Add a section for UN*Xes other than OS X and Linux.
Change-Id: I73bb7afe2d427333b10016aeb497ab32eee16d43
Reviewed-on: https://code.wireshark.org/review/16217
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: Ifc8b45d42d9dbf9560ec825e3ce1784534df7b3b
Reviewed-on: https://code.wireshark.org/review/16216
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I5778b08c52119b5be1ec482be9417b3c4ba8ed62
Reviewed-on: https://code.wireshark.org/review/16215
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I2a41d378187c1685afb701372cf3a8ec9c0aeb70
Reviewed-on: https://code.wireshark.org/review/16214
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: Id8b45715c753dc6006f7833e5f49bd8aabc15271
Reviewed-on: https://code.wireshark.org/review/16213
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Rename write_fields_proto_tree() to write_specified_fields(), and make
it static. Make write_fields_proto_tree() a wrapper around
write_specified_fields() that sets the format to FORMAT_CSV. Have
write_specified_fields() fail with an assertion if fields->format isn't
one of the known formats, to catch problems such as this in the future.
Don't fill in the "data" structure if we're not going to use it.
Change-Id: I11dbf448d72ca389f0e5fb8558a41b7eecf7c9a4
Reviewed-on: https://code.wireshark.org/review/16210
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
A recent patch introduced whitespace errors.. clean them out.
Change-Id: Id67bed40646d60dc6775e1e1f958a5a07a5f5f6d
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-on: https://code.wireshark.org/review/16205
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: Pascal Quantin <pascal.quantin@gmail.com>
|
|
Remove ui/qt/progress_overlay.png.
Change-Id: I2016c6aa5f77314add9870ba95d1c297d72a05c3
Reviewed-on: https://code.wireshark.org/review/16207
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Icf7774098986da29efdf76af1dcf217bced428e4
Reviewed-on: https://code.wireshark.org/review/16206
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
* LAPD can be configured in "Decode As" using port and protocol identifier.
* Add default sctp ppi (the number is not assigned by IANA).
Change-Id: Iaa4797e844f6480881605ad4e6b408d7d5f60cad
Reviewed-on: https://code.wireshark.org/review/16107
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
|
|
Rather than have a bitmask for each desired field, have a dissector
provide a list of structures that represent data that goes into
the PDU.
Change-Id: I125190cbaee489ebffb7d9f5d8bc6f3be2d06353
Reviewed-on: https://code.wireshark.org/review/16122
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
|
|
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>
|
|
-e fields filter addded to ek|json|pdml output.
Bug: 12529
Change-Id: I1f0f8772eefceb5b71927925ce0c34af483571b9
Reviewed-on: https://code.wireshark.org/review/16193
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>
|
|
Change-Id: I4f974351ab1f4781e140873f460d028f49640ca1
Reviewed-on: https://code.wireshark.org/review/16200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
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>
|
|
Change-Id: Idbbc1ad126e0b01952957a914bd9c16a990a9b9e
Reviewed-on: https://code.wireshark.org/review/16036
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
|
|
Change-Id: Idddbae0e969b525ddbe31f3b1ddbccaed232891a
Reviewed-on: https://code.wireshark.org/review/16197
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
|
|
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>
|
|
* Replace tab by 4-spaces
* Add modelines (for packet-dtn.c)
Change-Id: I668f20b4a021ef94a1bb0b26ac815495eb9920d9
Reviewed-on: https://code.wireshark.org/review/16165
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Ia90644c22896586e4a260a3bf11d1f3e50bd4c4b
Reviewed-on: https://code.wireshark.org/review/16134
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>
|
|
Change-Id: Ieffc5d6544f3bd121ff317ff598faaadb5f117ab
Reviewed-on: https://code.wireshark.org/review/16194
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>
|
|
Added NULL pointer check in print_escaped functions.
Requested by comment in change 16034.
Change-Id: Id172d772d9b5cb4bcd31fe8b42286f885ec5b968
Reviewed-on: https://code.wireshark.org/review/16188
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
|
|
Change-Id: I8cae4a8d2b57f961d16cb388befed2348a88badc
Reviewed-on: https://code.wireshark.org/review/16191
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
|
|
Change-Id: Ia5d75bab03bfc065651ea83c936aedffb1f69e9f
Reviewed-on: https://code.wireshark.org/review/16190
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Kacer <kacer.martin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
|
|
[-Wmissing-prototypes]
Change-Id: Ib10e919dd3f0bec92004c68bf73a3c7d37961f03
Reviewed-on: https://code.wireshark.org/review/16187
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>
|
|
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>
|
|
Change-Id: I185a1786365f185f18f3ec492a8ef165d61595ed
Reviewed-on: https://code.wireshark.org/review/16185
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
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>
|
|
Change-Id: I871f75394ba66967d7d7be203bd9e235575458e1
Reviewed-on: https://code.wireshark.org/review/16183
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>
|
|
Change-Id: I16b778064c1cd2bbf281fb5192bf35da252e99dd
Reviewed-on: https://code.wireshark.org/review/16179
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>
|
|
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>
|
|
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>
|