Cyclic PDOs are setup either by ObjectMappings in the asynchronous SDOs,
or by serialized ObjectMappings in device profile files.
We now keep track of ObjectMappings transmitted via SDOs or read from
XDC files and use those to correctly partition the PDO's payloads.
Additionally types and descriptions for Object Directory entries extracted
from the EDS and XDD profiles are used to select the correct Wireshark type
and a string representation for those partitoned PDOs. Other places where
indices and subindices are also enriched by this information.
EDS support leverages GKeyFile and is available unconditionally, XDD/XDC
parsing support depends on the availabilty of libxml2. A patch for
inclusion of the latter as optional dependency was submitted
as Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783
Electronic Data Sheet (EDS) is the CANopen standard for device profiles,
POWERLINK being based on CANopen, is occasionly used with EDS profiles.
XML Device Description (XDD) is the Ethernet POWERLINK standard for
device profiles. XDC have the same structure but contain actualValues
fields which can contain default ObjectMappings.
XML Device Descriptions can be 25k+ lines with much duplication,
so wmem_iarray_t is leveraged for saving space as well as faster lookups.
A side-effect of now organizing the capture in conversations is that
POWERLINK over UDP packets are now assigned proper destination and source
node IDs, which are displayed in the column view. The Referenced bug where
packets where erronously flagged as duplicates because the address wasn't
considered is also fixed as a result.
Bug: 13604
Bug: 13749
Change-Id: Ic33ff0be8f2eae7c24fe5877ad9258d1e550c227
Reviewed-on: https://code.wireshark.org/review/21112
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Dissection method was receiving the RLC INFO struct as a paramter instead
of using p_get_proto_data like other channels' dissection methods.
Change-Id: Iaf44f71552526dcdf29b8a583b1d79012e2b24e3
Reviewed-on: https://code.wireshark.org/review/21874
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>
When parsing a comma-separated string list from file we should not
add an empty element if this list is empty. Otherwise we would
get an empty string in when writing the file back.
Change-Id: Iea5a33d20991f8c5daed6811beb8ec97b8b1dbe3
Reviewed-on: https://code.wireshark.org/review/21870
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
A sorted array keyed by intervals
You keep inserting items, then sort the array.
sorting also compacts items that compare equal into one and adjusts
the interval accordingly. find uses binary search to find the item
This is particularly useful, if you got many similar items,
e.g. ObjectMapping subindices in the XDD. XDDs can be upward of
25k lines long with much duplication (253 subindices having the same
content).
Interval Trees wouldn't work, because they didn't allow expanding
existing intervals. Using an array instead of a tree, additionally offers
a possible performance advantage, but it's not that critical here,
as finding should only happen in the async frames
There's room for optimization in the creation process of the array,
but it doesn't matter much, as they aren't created frequently.
Finding speed is what matters for the use case of parsing EDS
and XDD files
Change-Id: Iaaddc90059f0e49b456774a111d8d42452b90cf9
Reviewed-on: https://code.wireshark.org/review/21111
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 having hidden interfaces it was not possible to unhide all
in the "Manage Interfaces" dialog because prefs.capture_devices_hide
was not updated when not having any hidden interfaces.
This bug was introduced in g6eee29bf.
Change-Id: If94c2e592eea60e6f1ef1ce2107ff9b2b27c3176
Reviewed-on: https://code.wireshark.org/review/21869
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Add prefs_set_gui_theme_is_dark and call it in the WiresharkApplication
constructor. Add a set of dark syntax color defaults.
We could alternatively add a preference for the syntax foreground color,
but that would imply adding a preference for the background color as
well.
Bug: 11131
Bug: 13738
Change-Id: Iefe135ed04e63372ed434c5b9759647c9f4046e3
Reviewed-on: https://code.wireshark.org/review/21827
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>
The warnings has been fixed in Qt 5.9.
Change-Id: I7cc71612e601517b7d7117c3cf2711ec983593a6
Reviewed-on: https://code.wireshark.org/review/21861
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The generated Ui_MainWindow::setupUi() can grow larger than our configured
limit, so turn off -Wframe-larger-than= for ui_main_window.h.
Change-Id: I550ff30ebe566b711c63f7a9d0276e5b06244407
Reviewed-on: https://code.wireshark.org/review/21866
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
imagemagick was needed since v1.11.1-rc1-140-g02a8e72b43, but
unnecessary since v2.1.0rc0-491-g18a54fcaa4, remove it.
xdg-utils is needed for xdg-open (opening websites) at runtime in GTK+,
but not for Qt nor during the build, remove it or mark it as optional.
Change-Id: I6fc4d5fb61ea8b5cf79526d92ef8c108bc9d11a3
Reviewed-on: https://code.wireshark.org/review/21765
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
dissect_epl_payload is called with len retrieved from the packet payload,
so we've to ensure there are indeed at least len bytes remaining in the tvbuff.
Counting the remaining bytes has to start from the _current_ offset, not from
the start of the buffer.
Change-Id: I6f4a94e8503cde6c5eaadc43f560c15ef8c1c375
Reviewed-on: https://code.wireshark.org/review/21829
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: Roland Knall <rknall@gmail.com>
Remove hf_ieee80211_prism_did_sig_rate.
Change-Id: Id75deae2c074ecbb771e33c4a6f3855cb2ba9d9f
Reviewed-on: https://code.wireshark.org/review/21848
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Turn hf_magic_reply_invalid_type in an expert info.
Change-Id: I6eeb5590e3d620ebb5afe46eae36cba6784033a4
Reviewed-on: https://code.wireshark.org/review/21847
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 last lintian issue
Change-Id: I672b347a8b0fc495b6e010ef987c0ff238eb8d1e
Reviewed-on: https://code.wireshark.org/review/18622
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>
The delay for p_add_proto_data() calls was not required and introduced several
bugs (when the function returns before private info is attached).
Change-Id: Id3a668e6776308b2ea758940e4260bfcbddc236a
Reviewed-on: https://code.wireshark.org/review/21859
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>
Change-Id: I1fbc11dc433363b659ddba9a77e52ffd4e3968d7
Reviewed-on: https://code.wireshark.org/review/21850
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: If57183bcea978b766fc53f691a35c4ddf98ca2dd
Reviewed-on: https://code.wireshark.org/review/21849
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>
The radius erx disctionary has been renamed to unisphere.
Change-Id: I3d8a4b9d8f6a5340f3a92274816e66bdaa55ffd3
Reviewed-on: https://code.wireshark.org/review/21858
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
This picks up
commit a5ad82aecc194f5f55153c351a62af9bb1c222a0
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat Dec 7 23:24:20 2013 +0000
Fully sync ERX/Unisphere with Juniper's dictionaries
as well as picking up the copyright notice.
Change-Id: Ia6a694ccd94ad05caf25bea4dec9b467a4f99157
Reviewed-on: https://code.wireshark.org/review/21855
Reviewed-by: Guy Harris <guy@alum.mit.edu>
We now support dotted number values in the oid field.
Note that the attribute flags internal, array, concat, and virtual
aren't documented in the FreeRADIUS dictionary man page.
Change-Id: Iaf27845f75a93f2d006708224757ea48d8023cb1
Reviewed-on: https://code.wireshark.org/review/21853
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice, cleans up white space, puts the type and
the properties of attributes in separate fields.
Change-Id: I1a813a784498ed3217c7fc9bfcd9c1162ceffebb
Reviewed-on: https://code.wireshark.org/review/21851
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice and a commented-out attribute.
Change-Id: I0325164eb3875557f7ce9a81cf697a99a0f5de93
Reviewed-on: https://code.wireshark.org/review/21846
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice and a value.
Change-Id: I99957b97cf905b9d13024f70b76e875756e71609
Reviewed-on: https://code.wireshark.org/review/21845
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up a copyright notice, a comment, and some attributes.
Change-Id: I299a4f1225eb6be23410c396a4f5a00affd64523
Reviewed-on: https://code.wireshark.org/review/21844
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice and an additional attribute.
Change-Id: Ieebed5ceae7a10bf393245d9fcf82310df6c42d9
Reviewed-on: https://code.wireshark.org/review/21843
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice, a comment, and an attribute.
Change-Id: I9b0c536646860f0d4e6e7f59967db22d592fc1c4
Reviewed-on: https://code.wireshark.org/review/21842
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice, a comment, and an additional attribute.
Change-Id: Ie65dcb039c725a63d1a9b6976814c182e10c74cb
Reviewed-on: https://code.wireshark.org/review/21841
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up copyright notice and some additional attributes, along with
BEGIN-VENDOR and END-VENDOR.
Change-Id: Ifa0112a0bfc56f5977bffd6a32b12d1c1a089529
Reviewed-on: https://code.wireshark.org/review/21840
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice and some more attributes.
Change-Id: I594d8f72913fce3836db1935a3689d60a5a3f2ba
Reviewed-on: https://code.wireshark.org/review/21839
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice and some additional attributes.
Change-Id: I4a942512f62d91d98dcbf4ccba65ff97b6a729c9
Reviewed-on: https://code.wireshark.org/review/21838
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice and adds some attributes and values.
Change-Id: If24d00ceb23002aea2c24c16a7b38fd77df9401a
Reviewed-on: https://code.wireshark.org/review/21837
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Picks up the copyright notice and new attributes and values, and renames
a few values to remove "-HW".
Change-Id: Iccf3938f54fab8b234ee49b509fdcc8a3cfba670
Reviewed-on: https://code.wireshark.org/review/21836
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It moves an attribute.
Change-Id: I9f3c88f174b9520b16d3f2c68abe278ef695d403
Reviewed-on: https://code.wireshark.org/review/21835
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Give a URL for the Extreme Networks documentation listing these
attributes, replacing our earlier citation; the newer version says
attribute 213 is Extreme-VM-Name, as is the case in the FreeRADIUS
version, not Extreme-CLI-Profile, as was the case in our version.
Change-Id: Iddd69c2ef4d3a5d55f16c20f3899eebdea217a2a
Reviewed-on: https://code.wireshark.org/review/21833
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This file is mainly for supporting older names for certain attributes
and values; all the attributes and values here should be defined by
other files, so we really shouldn't be including this file.
Change-Id: I2e5391f0ed14d42e97434b77794e8ba643850608
Reviewed-on: https://code.wireshark.org/review/21832
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up the copyright notice and some additional attributes/values, and
mark some attributes as no longer being Wireshark additions. Change
some names to match the FreeRADIUS names.
Mark some URLs as dead links, and try to supply replacements; use the
Wayback Machine for others.
Preserve our fixes and enhancements.
Change-Id: I000cf05682506ed0db9b0fff856998479ee0dfa4
Reviewed-on: https://code.wireshark.org/review/21831
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up their copyright notice and additions.
Replace links used as references.
Our version is now their version with some additional comments and
different links (replacing broken links with non-broken ones).
Change-Id: I785d14f537abd96cd7baa3438191e1371e34ebc0
Reviewed-on: https://code.wireshark.org/review/21828
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Ahmad Fatoum