Fixes this failure:
tshark: lapi.c:175: lua_settop: Assertion `(-(idx+1) <= (L->top - (func + 1))) && "invalid new top"' failed.
Found using LUA 5.2 compiled with -DLUA_USE_APICHECK. Note that the
value returned by luaopen_bit does not affect the size of the stack
after using lua_call; if there are excess return values, then these will
be dropped after calling lua_call. See http://www.lua.org/pil/26.2.html
I also verified that the stack is still empty after calling all
wslua_reg_module functions.
Change-Id: Ia72635277ca4d8077e47a5c472391a78fe6d311e
Reviewed-on: https://code.wireshark.org/review/10664
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
When updating the RTP streams list, the data associated with the current
selection becomes invalid when the old list is cleared.
gtk_list_store_clear somehow triggers the selection callback which
attempts to access the invalid memory.
Avoid this by disabling selectability while clearing the list.
Bug: 10016
Change-Id: Id5126ec5ffa41fa6a65339f4453546223124ed67
Reviewed-on: https://code.wireshark.org/review/10690
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: Peter Wu <peter@lekensteyn.nl>
Neighborhood Watch Protocol (NWP) is an XIA protocol for resolving network
addresses to link-layer addresses. Hosts on a LAN send NWP Announcement
packets with their host identifiers (HIDs), and neighbors in the LAN respond
with NWP Neighbor List packets containing their HIDs and associated link-layer
addresses.
Bug: 11492
Change-Id: Ib1e801474b1aa72f5dd3d8303eeec36b96ee0a99
Reviewed-on: https://code.wireshark.org/review/10316
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>
Internal formatting: remove extra spacing from 'hf_register_info' array
(as suggested during review), plus indentation changes. Do the same
for expert info array.
External formatting: Minor cleanups.
Change-Id: I4d8db4891824e75d413b0eb53ebcc2e7b128c0bb
Reviewed-on: https://code.wireshark.org/review/10683
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: Anders Broman <a.broman58@gmail.com>
Otherwise we will end up calling cf_cb_file_rescan_started and cf_cb_file_rescan_finished callbacks while no capture file is available
Bug: 11552
Change-Id: Ib6fd7b13ce1b083d5f5b4e05d80152112c1451f6
Reviewed-on: https://code.wireshark.org/review/10692
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: Gerald Combs <gerald@wireshark.org>
Add DIRTY_CORBA_IDL_DISSECTOR_SRC back to our various makefiles and move
packet-cosnaming.c back to it.
Change-Id: I2f0427ad47bf0e2f166577608da7f5feaf848a48
Reviewed-on: https://code.wireshark.org/review/10691
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Otherwise a call to proto_tree_add_uint_format_value will trigger an assert
Bug: 11550
Change-Id: Ic30b07a424cd94b861cee8999b91154ceeb72469
Reviewed-on: https://code.wireshark.org/review/10689
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: Michael Mann <mmann78@netscape.net>
I am tired to go menu to refresh interfaces.
Shortcut make our live easier.
Change-Id: Ic2a478d7857b8138897088f0a6610df7988b1be9
Reviewed-on: https://code.wireshark.org/review/10520
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
v1.99.1rc0-717-ga2c2f87 removed pinfo->private_data assignment, but left
the comment in place. Since v1.99.1rc0-761-g6d207fe, the member is
removed completely, so let's drop the comment.
Change-Id: Ib36b6b979abda786202867ea1e6ef0d11487f61c
Reviewed-on: https://code.wireshark.org/review/10684
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Also fix usage of 'Decode As' window when no file is opened (broken by gf189cb8)
Change-Id: I06ff83394cf31763cecfbbedd99ce7438488872a
Reviewed-on: https://code.wireshark.org/review/10665
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>
hopefully, this will make my further patches easier to review
Change-Id: If9fe4aa03c08dd38eccae3d4a0accdcbb5d62111
Reviewed-on: https://code.wireshark.org/review/10681
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
The tests only allowed a single character suite selection, which
prevented suite 10 from being run on its own.
Modified test.sh to now require a newline in addition to the input
so that a 2 digit number can be entered.
Also fixed test display to remove illusion that an individual step
could be run. Only whole suites can be run.
Change-Id: I4dee0ec6a8e1f34fa443a6a0a3f2d52a73146e54
Reviewed-on: https://code.wireshark.org/review/10676
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
It looks like "items" could have contributed to fields/data being at an incorrect level off of a tree.
Change-Id: I93616ef8b6b364c578f989882045dee42cb6d3c3
Reviewed-on: https://code.wireshark.org/review/8558
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Remove size limitation of 23 addresses to Type 0. Add validity checks to Type 0 and Type 2.
Add address count vs segments left check to RPL.
Use hf_ipv6_routing_* for shared routing header fields and hf_ipv6_routing_<type>_* for the rest.
Change-Id: I98796504a0f7643476c4c3550586b5da2cf70f6d
Reviewed-on: https://code.wireshark.org/review/10470
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This replaces a question (recently remarked upon on -users) with a link to
someplace where we already have documentation on the subject.
Change-Id: I6c5cf2b0f674c129aaa017da0ca44176c5be665f
Reviewed-on: https://code.wireshark.org/review/10677
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
According to checkAPI.
Change-Id: Iddad6253fc4711ed7870eccadb91d94e5fecd24d
Reviewed-on: https://code.wireshark.org/review/10672
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>
Change-Id: I739262c0d6b8bd961cc75a18e7bdbb794806e2b7
Reviewed-on: https://code.wireshark.org/review/10668
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>
Debian packages used to build with parallel build enabled when
debian/rules used autotools but with switching to CMake the
parallel build failed sometimes. Now the CMake based build
system seems to be working for parallel builds, too, thus
it seems to be safe to enable parallel building of .debs again.
Change-Id: I79003bf6c4b74640f24d907b763a5cc3da595e68
Reviewed-on: https://code.wireshark.org/review/10657
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
There is only one meaning for the flags parameter, namely axis
orientation (x or y). Replace the bitmap by a bool instead.
Clang 3.7.0 reported this warning:
ui/gtk/tcp_graph.c:1652:29: warning: shifting a negative signed value is undefined [-Wshift-negative-value]
g->y_axis->flags &= ~AXIS_ORIENTATION;
~^~~~~~~~~~~~~~~~
ui/gtk/tcp_graph.c:140:28: note: expanded from macro 'AXIS_ORIENTATION'
#define AXIS_ORIENTATION 1 << 0
^
1 warning generated.
This (~1 << 0) happened to work because nothing is actually shifted.
Change-Id: I406235148b7826649d35647f5d0702cd72a925a5
Reviewed-on: https://code.wireshark.org/review/10658
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: Martin Mathieson <martin.r.mathieson@googlemail.com>
Add the "Internals" menu under the View menu instead of at the top level
for now at least. Add the Dissector Tables dialog there.
Change-Id: Ieb23b0015591bac196e4ef94e3443832288333f9
Reviewed-on: https://code.wireshark.org/review/10654
Reviewed-by: Gerald Combs <gerald@wireshark.org>
From See src/net/quic/quic_protocol.h
Change-Id: I5fbc037186491dc8555f7f41b3e43d7d6a628f88
Reviewed-on: https://code.wireshark.org/review/10647
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>
'hf_ipv6_opt_length' is being used both for extension header length
and option length.
Change-Id: I012e4d43abdf57997a24ab6f2d2c93d121f9f123
Reviewed-on: https://code.wireshark.org/review/10478
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>
Fixes two issues:
- Null IPv6 Fragment extension headers confuse Wireshark, because the 'offlg'
variable gets reset
- Dissection doesn't stop when reassembly is enabled and it is the first
fragment followed by more IPv6 extension headers
Bug: 8362
Change-Id: Ibe229a63d7a6ab8523ddfcae30e58d19cc2ce2bd
Reviewed-on: https://code.wireshark.org/review/10482
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>
Fix some (mostly spurious) checkapi warnings by renaming the
offending variables.
Change-Id: I7a43ac89f5ed35053a6526fa838fbad67669a49a
Reviewed-on: https://code.wireshark.org/review/10655
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Change-Id: I686eadc865ae38433c3795450aeca8582a74d2c8
Reviewed-on: https://code.wireshark.org/review/10535
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Some menu items always need to be enabled or disabled when we call
setMenusForSelectedTreeRow. Do so.
Add some NULL checks.
Change-Id: I5de3df2ceb1dfe19e1cea548b0299004fbea2ec7
Reviewed-on: https://code.wireshark.org/review/10651
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Make it clear that the shortcuts are for the main window. Add and update
a few tooltips.
Change-Id: I9ee082a9ede95f4b727fb652437f9ed16c9ef2bf
Reviewed-on: https://code.wireshark.org/review/10650
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Change-Id: Ieb88e2632401cbf50c4ae51768a64df64d54a45d
Reviewed-on: https://code.wireshark.org/review/10497
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This simplifies some of the logic required for field formatting.
Change-Id: I2f9a612b18e3e4ca01311683d9cf61cbad9950f4
Reviewed-on: https://code.wireshark.org/review/10649
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Ie67892caec2cddee591631045233f8a3f1cc0bc6
Reviewed-on: https://code.wireshark.org/review/10648
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
On Windows, add a hardening-check target which checks for DYNAMICBASE
and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1.
For a Visual Studio solution, run the check by calling:
msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj
using the config as appropriate for your build.
Otherwise if we find the Debian/Fedora hardening-check script add a
target which runs it for each of our executables.
Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96
Reviewed-on: https://code.wireshark.org/review/10641
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Using memcpy with overlapping buffers is not safe; use memmove instead
Bug: 11549
Change-Id: I8e15eb0af38d325a5e67e8748008126ac5994588
Reviewed-on: https://code.wireshark.org/review/10652
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
When SSL packet contains multiple encrypted contents the WS shows only the
last record due the wrong indexing of the structure where the decrypted
contents are stored. Should use tvb_raw_offset(tvb)+offset instead of
offset as I think was intended.
Added the same fix for DTLS.
Bug: 11523
Change-Id: I0a977a0e6ebe7c45e526fa5152b8614463abd4fa
Reviewed-on: https://code.wireshark.org/review/10528
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Peter Wu