A Proto may be only be registered with a heuristic dissector once,
because we check this in heur_dissector_add().
Change-Id: I524fa832b647d557f13aedcb870f7789058d2180
Reviewed-on: https://code.wireshark.org/review/14436
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>
recv() can return negative value or 0 in "error cases".
There is need to check it. This also solved empty interfaces
list if there is unauthenticated device.
Bug: 12080
Change-Id: If6cd0e0933b64e9ac9bbb66b3b8138f7177451d1
Reviewed-on: https://code.wireshark.org/review/14316
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Change-Id: I5c7529bc630ad7312011b04ce101ba3608041d35
Reviewed-on: https://code.wireshark.org/review/14435
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>
Things like [Reassembled TCP segments] can add superfluous leaves so just walking down the tree from current location, so walk up the tree as well.
Bug: 1734
Change-Id: I91af554b59e1a6867dba9189ba37db5e396d892a
Reviewed-on: https://code.wireshark.org/review/14393
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Try to avoid the following call graph:
ProtoTree::expandAll
...
ProtoTree::expand
...
QTreeView::resizeColumnToContents
QTreeView::resizeColumnToContents calls sizeHintForColumn, which
iterates over a number of items (default 1000). Calling it from
ProtoTree::expand can lead to excessive wheel-spinning.
Add a single-shot timer for resizeColumnToContents. This is similar to
what QTreeView does internally when columns are resized.
Bug: 12228
Change-Id: I7b50c1486b3a25817efae58efbb8c9e961dbdab0
Reviewed-on: https://code.wireshark.org/review/14411
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
'scsi.blockdescs.no_of_blocks' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'scsi.naa.vendor_specific' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT32
Change-Id: Iaa512c02b99f0a103bb5015e92d900dae2932843
Reviewed-on: https://code.wireshark.org/review/14418
Reviewed-by: Anders Broman <a.broman58@gmail.com>
'tds.done.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'tds.doneproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'tds.doneinproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'tds.envchange.newvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
'tds.envchange.oldvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
Change-Id: I87d713aaa722d7ab9e8d19955f3820e9040446c1
Reviewed-on: https://code.wireshark.org/review/14415
Reviewed-by: Anders Broman <a.broman58@gmail.com>
It's confusing to have 'pdus_tree' mean both the map of pdu_trees and the pdu
trees themselves.
Change-Id: Ie875798eb140b60a1309ddc0c0bf885b48c0407c
Reviewed-on: https://code.wireshark.org/review/14413
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Broken by gb7f6cf9.
Change-Id: I21a91cf56c16b7ffdf72da7bf68a556feb6a6c17
Reviewed-on: https://code.wireshark.org/review/14408
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>
Make full use of our proper implementation of this macro by
giving it the pointer as is.
Change-Id: I0bbe73d19cc3f578b94ea2d4d904d6fa87b20b48
Reviewed-on: https://code.wireshark.org/review/14391
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column.
2. Don't display Class/Symbol name in the Info column when it's inside a MSP.
3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points.
4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity".
5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP.
6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item.
Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785
Reviewed-on: https://code.wireshark.org/review/14325
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: D. Ulis <daulis0@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Add a check for selected filters in filterEdited() to avoid a
out-of-bounds index into ui->interfaceTree->selectedItems().
Bug: 12241
Bug: 12245
Change-Id: Ie18fc34a17427dd5330a5a617051cbc061555e0c
Reviewed-on: https://code.wireshark.org/review/14404
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Try to fix OSX build after commit g2728f56:
configure.ac:76: error: AC_PROG_CC cannot be called after AM_PROG_CC_C_O
aclocal-fallback/ax_prog_cc_for_build.m4:125: AX_PROG_CC_FOR_BUILD is expanded from...
Automake manual indicates this macro as obsolescent.
Change-Id: Ia110ad34d65cab91a55b9d57673356d5c4b3bfe3
Reviewed-on: https://code.wireshark.org/review/14403
Reviewed-by: João Valverde <j@v6e.pt>
When adjusting MAX_PASSES it'd be nice to know how many passes it
normally takes to fail.
Change-Id: I335c26a1e6847371706da880b83773d142797da9
Reviewed-on: https://code.wireshark.org/review/14389
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
cur_offset was not incremented for the server part, causing a
"Malformed packet" message.
Change-Id: I21cb876e0d70b1de0cb2f76d37edec4c2ec7c788
Reviewed-on: https://code.wireshark.org/review/14402
Reviewed-by: Michael Mann <mmann78@netscape.net>
(When cross-compiling, this is *not* the compiler used to build wireshark itself).
Macro ax_prog_cc_for_build.m4 retrieved from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git
Change-Id: I035059d9315e0081dcf1ffbafd9ce6d7ad46700c
Reviewed-on: https://code.wireshark.org/review/4503
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Eric Anderson <andersoe@cs.cmu.edu>
Reviewed-by: João Valverde <j@v6e.pt>
The preceding code takes every effort to make sure that the
frac and end pointers are relevant pointers. Don't go back and
check for NULL yet again.
Change-Id: If805aee5a77a8c23eac7b074bd11d3743c5e1a3b
Reviewed-on: https://code.wireshark.org/review/14398
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Bug: 1885
Change-Id: If2b68365880f3508ed82947a0d18e6c28d6e4db8
Reviewed-on: https://code.wireshark.org/review/14392
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Now GATT dissectors need to have opcode to properly dissect attribute
or return expert info if possible (wrong usage).
Change-Id: Ife79bbf0682967a8bef8efadd8b242aa147315a7
Reviewed-on: https://code.wireshark.org/review/14314
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Bluetooth Specifications specify properties of every characteristics
(read, write, indicate, notify, write without response, signed write etc.)
Check it and add expert info about invalid usage if detected use of wrong
opcode with the characteristic.
Change-Id: I98ad8280b9ee65b4015a021e732ea748cc9e7a83
Reviewed-on: https://code.wireshark.org/review/14313
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Issue found by Clang (Assigned value is garbage or undefined).
Change-Id: I9a3ab41dd01becbd454af02f2567ea3a2beeba40
Reviewed-on: https://code.wireshark.org/review/14399
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
When additional path index are in use there must be more remaining data bytes.
Therefore we return only 1 when the len is greater 1.
Bug has been reported by Garri.
Bug: 12240
Change-Id: Ia24311dcedc450e4208df875bc254c9744dec5dd
Reviewed-on: https://code.wireshark.org/review/14396
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Add EditorConfig files where we currently have consistent indentation.
This might let us get rid of our editor modeline footers at some point.
Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce
Reviewed-on: https://code.wireshark.org/review/12383
Reviewed-by: João Valverde <j@v6e.pt>
Stig Bjørlykke