Traffic class values from IPHC headers were shown correctly in the IPHC
dissection, but not correctly inserted into the expanded IPv6 packet.
Problem was only visible on little-endian systems - the previous
code did work if big-endian.
Error was not present in HC1 decompression, but both IPHC and HC1
IPv6 construction code clarified by avoiding writing overlapping union
members.
Bug: 11971
Change-Id: I3515f18c892f1fc28ef7f8a0830a79d134e81f48
Reviewed-on: https://code.wireshark.org/review/13109
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>
in the functions that dissect specific messages, we can just return 0
add a return value to aeron_frame_stream_analysis_setup() and
pass it on to the callers to allow for a clean exit
Change-Id: Iab4dee38112e32ca36822abc49d27dfe9e4c9ef7
Reviewed-on: https://code.wireshark.org/review/13147
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>
The interface list is not sorted at all, leading to
a very chaotic list. This sorts it alphabetically, as
well as correct a type in extcap_init_interfaces.
Bug: 11998
Change-Id: Ib5381a1761e8f07f9ba7996b3e6276da063b3932
Reviewed-on: https://code.wireshark.org/review/13220
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Remove the file dependency on the xml file as this causes
build failures due to parallel building.
There is still an issue with the build of *.hhp if the corresponding
*.xml file is rebuilt.
Change-Id: I738c687be50daebcf93576be8a43dbb6475f4fc8
Reviewed-on: https://code.wireshark.org/review/13217
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Due to integer overflow (unsigned -1 + 1 = 0), a call to
dissector_add_uint_range would be stuck in an infinite loop, eventually
crashing due to out of memory.
Found when setting radius.alternate_port:-1, but could happen with any
dissector using similar ports_range constructs.
Change-Id: Ia234e94516446250e959e0f51d552bef704cddff
Reviewed-on: https://code.wireshark.org/review/13153
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>
OSC-1.1 requires OSC packets to be double SLIP encoded on a TCP stream
for framing, whereas OSC-1.0 frames packets via a int32 size prefix.
As only either OSC-1.0 or OSC-1.1 will ever be used on the same
connection, the tcp part of the OSC dissector should handle both.
'dissect_osc_tcp' now merely acts as a fork into one of both versions.
Changes:
* Reassembly for OSC-1.0 TCP is left untouched.
* Reassembly for OSC-1.1 TCP is implemented in second reassembly mode.
* OSC is no protocol per se, it's merely an encoding, renamed accordingly.
* Fix logical vs binary OR typo in MIDI pitch bend calculation.
Capture file:
* Mixed framing (OSC-1.0, OSC-1.1) OSC TCP pcap: Bug 11976
Change-Id: I5d26db023ef3ee659ae5a668b1665abef40b54c3
Reviewed-on: https://code.wireshark.org/review/13112
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>
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>
lemon: Thu Oct 29 13:48:15 2015
lempar: Tue Nov 10 14:51:22 2015
a copy of all Wireshark changes are available https://github.com/alagoutte/sqlite/tree/wireshark
Change-Id: I51f8b40a7087362502f6ce2156820a9f107ddf15
Reviewed-on: https://code.wireshark.org/review/13033
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>
Add some braces to make it clearer what some if clauses are. It also
makes it clearer what the right indentation for the last statement of
dissect_rtmac() is (if you don't have -Werror=misleading-indentation to
tell you).
Change-Id: I2c44c6de41e610de4c4b6b5025732483f4e33471
Reviewed-on: https://code.wireshark.org/review/13205
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It's not used by anything outside the TPKT dissector - and probably
*shouldn't* be used by anything outside the TPKT dissector.
Clean up some white space while we're at it.
Change-Id: I9bb9642a002fb9e8bd6c36d80d7653ef9af615d4
Reviewed-on: https://code.wireshark.org/review/13204
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Make most of them static; make the ones used in more than one file
public, and declare them in packet-ncp-int.h.
Change-Id: If3df3bda33239d1ad3145b10d375ed76d632d4a9
Reviewed-on: https://code.wireshark.org/review/13202
Reviewed-by: Guy Harris <guy@alum.mit.edu>
None of it is used outside packet-fcdns.c.
Then "#if 0" out an unused item from that file.
Change-Id: Ie9f966055ef6b839ec4325d966eaac424d9495be
Reviewed-on: https://code.wireshark.org/review/13200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Define it in a source file, and export it to other users. One instance
suffices (and suppresses "defined but not used" errors from
-Werror=unused-const-variable).
Change-Id: I8b8d624344ec08c777d1869ee2692d535f898f19
Reviewed-on: https://code.wireshark.org/review/13198
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If you have multiple present flags words, that makes it easier to see
which bits belong to which words.
Change-Id: Ib8168bf9ab540c3b11467e95d6ddfdd27a6ef317
Reviewed-on: https://code.wireshark.org/review/13193
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Change-Id: I9702a8afad787191b0c5bd8630ef2ec011cceb17
Reviewed-on: https://code.wireshark.org/review/13183
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: Michael Mann <mmann78@netscape.net>
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>
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>
in this case, we can simply abort the decompression,
the caller is already prepared to handle this
Change-Id: I2fb8132878ecd58d9370c49083aa7db959803cae
Reviewed-on: https://code.wireshark.org/review/13150
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>
in this case, it's enough to show an expert info and continue dissecting
Change-Id: Iac444dc838d6ba388de38b48bd3ccd38f90f7697
Reviewed-on: https://code.wireshark.org/review/13149
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
Change-Id: I3915a5771786bc763747ed74fadede15353fdf40
Reviewed-on: https://code.wireshark.org/review/13165
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
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>
unset accumulator variables after use so that successive uses are
not carried forward.
add MAIN_DEPENDENCY for chm generation so that it is correctly
rebuilt when the sources change.
Change-Id: I3b0c47a775f398346cc3a3bbd39d4fab2b0ec000
Reviewed-on: https://code.wireshark.org/review/13160
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This is a fix for bug 11989. This patch fixes the problem for the
GTK variant of Wireshark and matches the Qt bug reported by
bug 11810 and fixed by change 12306.
Bug: 11989
Change-Id: Ib9af8ba745394ebd31825003361ec637c45d75d6
Reviewed-on: https://code.wireshark.org/review/13152
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Update link to Gerrit.
Update Windows Git section with info on install options
and updated links.
Fix CMake section header level.
Change-Id: I24769534e07e79a0608201e103cb8f1b8625cf86
Reviewed-on: https://code.wireshark.org/review/13158
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
" strlen (" would match the shadow regex due to backtracking. Disable
backtracking with the "possessive quantifier".
Change-Id: If5d307fd61f252c41ad6d9b6104d2add1dfa63ae
Reviewed-on: https://code.wireshark.org/review/13157
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: Alexis La Goutte <alexis.lagoutte@gmail.com>