summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2017-06-07netflow/cflow: fix hf conflictAlexis La Goutte1-1/+1
'cflow.pie.ntop.retransmitted_out_bytes' exists multiple times with NOT compatible types: FT_IPv6 and FT_UINT32 Change-Id: I9caed4c28a5e8322008b4cae4f625a681343a136 Reviewed-on: https://code.wireshark.org/review/21984 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> (cherry picked from commit ba86dc303da0d62650c0136967c18eba62cc8eaa) Reviewed-on: https://code.wireshark.org/review/21995 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-07ieee80211: Explain TSF in wlan_radio.timestamp blurbStig Bjørlykke1-4/+4
Also exchange 0xFFFFFFFFFFFFFFFF with G_MAXUINT64. Change-Id: Ie9ecca6268afc1788ce79015295b706350490476 Reviewed-on: https://code.wireshark.org/review/21990 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> (cherry picked from commit 067716557403254cd9c476a8340dd318d58efa49) Reviewed-on: https://code.wireshark.org/review/21992 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-07CQL: add an expert info when a list count is negativePascal Quantin1-17/+41
Bug: 13764 Change-Id: Ied78911c7089c9b7ca50d4df0e478cd4946af372 Reviewed-on: https://code.wireshark.org/review/21988 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Benoît Canet <benoit@scylladb.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 8e738bad90eb0ede94c56fb7709f0081564cd225) Reviewed-on: https://code.wireshark.org/review/21991
2017-06-05[Bssmap] Fix and improve dissectionIvan Nardi1-6/+4
See TS 48.008: * in "Perform Location Request" msg, "Cell Identifier" ie is optional, not mandatory (3.2.1.71) * in "Uplink Releae Command" msg, "Cause" ie is mandatory (3.2.1.62) * fixed and improved "Service Handover" ie dissection (3.2.2.75) Change-Id: I2194bf56ef21a2cccbd4f2ed7ff22565af04cddd Reviewed-on: https://code.wireshark.org/review/21957 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> (cherry picked from commit 795077b3ea95b1c2fb8f8cf5c6971da05a0c3ed2) Reviewed-on: https://code.wireshark.org/review/21960
2017-06-05Add a timeline view for packets, with the timing data used to generate the ↵Simon Barber3-26/+79
display taken from the timing analysis done in the wlan_radio dissector. QT only. The timeline background is light gray, white for packets displayed in the packetlist, and blue for the currently selected packet. Packets are coloured according to the colouring rules foreground colour. The timeline can be zoomed with controls on the toolbar. At higher zoom levels the duration (NAV) field is plotted as a horizontal line to the right of a packet. The height of a packet in the timeline is proportional to the RSSI. The bottom half of the packet is only shown if it matches the display filter. Todo: Auto detect TSF timing reference point (start/end of packet) Add a scrollbar Add a ruler showing time Improve handling of focus. Do not display NAV for packets with bad FCS. Show related packets graphically Different Y axis modes - bandwidth/channel use display - different transmitters per line - background color from coloring rules Live capture support Change-Id: Ic31fffb0d6854966361ade7abb5c0be50db9a247 Reviewed-on: https://code.wireshark.org/review/21956 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-05Allow bigger snapshot lengths for D-Bus captures.Guy Harris2-2/+2
Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except for D-Bus captures. Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for them, because that's the largest possible D-Bus message size. See https://bugs.freedesktop.org/show_bug.cgi?id=100220 for an example of the problems caused by limiting the snapshot length to 256KB for D-Bus. Have a snapshot length of 0 in a capture_file structure mean "there is no snapshot length for the file"; we don't need the has_snap field in that case, a value of 0 mean "no, we don't have a snapshot length". In dumpcap, start out with a pipe buffer size of 2KB, and grow it as necessary. When checking for a too-big packet from a pipe, check against the appropriate maximum - 128MB for DLT_DBUS, 256KB for everything else. Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20 Reviewed-on: https://code.wireshark.org/review/21952 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> (cherry picked from commit d0865fd619454a9ac06b1c7d287dc438aff50bb0) Reviewed-on: https://code.wireshark.org/review/21955
2017-06-05[TDS] Convert to using tcp_dissect_pdus.Michael Mann1-214/+72
Bring some modernity to this dissector and use tcp_dissect_pdus. Also an excuse to remove the conversation_set_dissector in the heuristic dissector which was generating some false positives because the heuristic isn't that strong. Bug: 12882 Change-Id: Ibb04fd4fbc819acd1dc96d6259b047c897ec2de6 Reviewed-on: https://code.wireshark.org/review/19125 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 17965f57f178aa7e4027f2d363658098e2f1abb3) Reviewed-on: https://code.wireshark.org/review/21954
2017-06-05Add DCE/RPC over TCP dissector to "force" DCE/RPC when heuristics failMichael Mann1-2/+19
Add a simple dissection function for DCE/RPC that just calls tcp_dissect_pdus and doesn't do any heuristics checks. This can be used to handle cases where TCP PDU is too small for DCE/RPC heuristics checks and user knows the data is DCE/RPC and can set it through Decode As. Bug: 6392 Change-Id: I9e4960282ea64d20499f7d5a330f48f30a092b30 Reviewed-on: https://code.wireshark.org/review/21951 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit aabb8fd5946110767479e2863ffe4fc40d63ac53) Reviewed-on: https://code.wireshark.org/review/21953
2017-06-04GSM A DTAP: fix detection of missing first mandatory elementPascal Quantin1-3/+4
Bug: 13760 Change-Id: I1c062420f96104a46e5d1478eb054f086f942b54 Reviewed-on: https://code.wireshark.org/review/21946 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> (cherry picked from commit 6d29f50d61de03f73a2a9336378b1c846ae65924) Reviewed-on: https://code.wireshark.org/review/21947
2017-06-04[SGsAP] Fix Release-Request msgIvan Nardi1-1/+1
"SGs Cause" is an optional ie, not a mandatory one. See TS 29.118 8.23.1 Change-Id: I74ad90d159e667fa41f8c099520ce5f662a4d85e Reviewed-on: https://code.wireshark.org/review/21939 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> (cherry picked from commit 88cf898c4409d4267ef11eb6676cca5c8b05c435) Reviewed-on: https://code.wireshark.org/review/21943
2017-06-04[Automatic update for 2017-06-04]Gerald Combs2-2/+192
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3a58a0486a2904fc98693d58255c58f6d9fe0bdb Reviewed-on: https://code.wireshark.org/review/21933 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-03RADIUS: Fix gda9363e202João Valverde1-1/+1
EVS value was incorrectly typed from the non-extended type space. Now it should display as unknown. Ping-Bug: 13745 Change-Id: I67cfa29d3edcd56e49c1f4eded117a26594f0a14 Reviewed-on: https://code.wireshark.org/review/21911 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit c508932a60dcc44904bf91474ac3aab049026ebe) Reviewed-on: https://code.wireshark.org/review/21913
2017-06-02netflow: use BASE_UNIT_STRING (units_seconds, units_microseconds)Alexis La Goutte1-23/+23
and fix also some typo Change-Id: I7892e715af56ebd1abb3fb36110200e2e992e9b1 Reviewed-on: https://code.wireshark.org/review/21901 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> (cherry picked from commit a27a308fcc84f3ea8745181c1c3f0b5def8c40ba) Reviewed-on: https://code.wireshark.org/review/21908
2017-06-02netflow: ntop information elements update, added all missingLorenzo Vannucci1-314/+4216
items exported by nProbe. Change-Id: I476c970d1abb7e1776da01bbdbf74e255387c917 Reviewed-on: https://code.wireshark.org/review/21825 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> 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> (cherry picked from commit b932b719ebe75d87e1009336f7795d55c129c838) Reviewed-on: https://code.wireshark.org/review/21907
2017-06-02Initialize master-2.4.Gerald Combs2-3/+3
Change-Id: If82fbf5eb269e4177d39477c08d6ab29b43a73c0 Reviewed-on: https://code.wireshark.org/review/21904 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-02Add ChaCha20-Poly1305 decryption support for TLS 1.2 and 1.3Peter Wu2-14/+55
Implements all seven AEAD_CHACHA20_POLY1305 cipher suites from RFC 7905 (for TLS 1.2) and the final missing one for TLS 1.3 (draft -20). New test captures (created using OpenSSL_1_1_0-pre6-2528-g042597b0a) also serve as tests for TLS 1.3 decryption support. Change-Id: Ice6d639c9c7b7bc23a6ff5fb4832d02694abd8c4 Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/21902 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 57b0527821b69dc8aa0786a3b5a425192795aff2) Reviewed-on: https://code.wireshark.org/review/21903
2017-06-02IEEE 802.15.4: add missing increments for Header IEsRobert Sauter1-1/+2
Add missing offset increment for Header IEs with length (missing from https://code.wireshark.org/review/21472). Add missing increment so that the overall header tree spans all elements. Change-Id: I91515a0b6b5fca8bcc95ea9e2cbc791bddf0500d Reviewed-on: https://code.wireshark.org/review/21890 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: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-02Rename packet-netgear.c -> packet-netgear-ensemble.cMichael Mann3-3/+3
This may not be the only Netgear protocol, so make a distinction. Change-Id: I68f460f44ac9345863468cfb407cec205a392d54 Reviewed-on: https://code.wireshark.org/review/21900 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Charlie Lenahan <clenahan@sonicbison.com> 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>
2017-06-02gsm_osmux: Use proper sizes for struct osmux_hdr fieldsPau Espin Pedrol1-15/+18
Change-Id: I93de7ffdbd3c43494bc6a5dd1f44f6f45d6b54f8 Reviewed-on: https://code.wireshark.org/review/21617 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-02packet-epl.c: Make dissector oss-fuzz friendlyAhmad Fatoum1-12/+29
oss-fuzz invokes the dissector without IP layer, so we can't assume the IP address to be available when dissecting POWERLINK/UDP packets. Same goes for the "Exported PDU" functionality. Bug: 13756 Change-Id: I038f0445ada3f764dcc72f7bce1d02cfa49791fb Reviewed-on: https://code.wireshark.org/review/21894 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: Michael Mann <mmann78@netscape.net>
2017-06-02uaudp: added "SuperFast Connect" parameter to connect message (removes ↵Nicolas Bertin1-0/+1
"Unknown" display) Change-Id: Ia686028e4a4472b18d362c010f802f351cd1b0ac Reviewed-on: https://code.wireshark.org/review/21899 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-02TCAP: fix SRT analysisPascal Quantin3-18/+44
When reviewing the code, the following issues were identified: - otid/dtid on 3 bytes were not stored - when receiving the first continue from dest, the TC_END hash entry was created with the source tid / address instead of destination ones - when receiving the first continue from src, the logic could prevent the creation of the hash entry Bug: 13739 Change-Id: If4ee70f0fa69f5ff74fdf75f3a741102baa0121a Reviewed-on: https://code.wireshark.org/review/21780 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-02ssl-utils: fix regression in decryption and Follow SSL StreamPeter Wu2-5/+6
Store SslPacketInfo under the same key as used by p_get_proto_data and pass this data to the Follow SSL tap. Change-Id: If9b97d0e0e2a82562abe6cb9e61986744680066d Fixes: v2.3.0rc0-3740-ge1f84f985e ("Fix Decode As for protocols that may use tunneling.") Reviewed-on: https://code.wireshark.org/review/21893 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-02packet-epl.c: Prefix EPL UAT files with epl_Ahmad Fatoum1-2/+2
Unlike preferences, UATs are stored in their own files, so prefexing file name with the protocol abbreviation makes sense to keep matters organized. Change-Id: Ic7918f509e38da38cdb86ad70917923547f9c112 Reviewed-on: https://code.wireshark.org/review/21888 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-02Add SUBOBJECT_INITIALIZER and use it.Guy Harris4-7/+4
Just as we have OD_ENTRY_INITIALIZER, add SUBOBJECT_INITIALIZER, and use it rather than memset(). Whether removing initializer warnings is a Good Thing is subject to debate; remove a comment that implies it's been deemed a Good Thing. Change-Id: Ife658d8bb1d4868789ca3b929aff6e4fccecb430 Reviewed-on: https://code.wireshark.org/review/21892 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-02packet-epl.c: Change CANopen Unicode_String to little endianAhmad Fatoum1-2/+2
CANopen DS301 defines "Unicode_String" as "ARRAY [ length ] OF UNSIGNED16" and states "For numerical data types the encoding is little endian style". Change-Id: I146449d7eaafe58b337b505682b14cd672f8ad76 Reviewed-on: https://code.wireshark.org/review/21891 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-02packet-epl.c: Fixup missing initializer warningsAhmad Fatoum3-12/+15
macOS Buildbot doesn't like {0} (probably because GNU C already provides {} exactly for the purpose of initializing all members to zero/NULL/0.0.. etc) Affected local type definitions now have a static intializer macro that uses the correct amount of zeroes and braces (similar to PTHREAD_MUTEX_INITIALIZER) Global type definitions have a memset to zero (Which isn't strictly correct, but as the platforms we support all have all-bits-zero-nulls and IEEE 754 floats, it should be good enough. A separate change will attempt to disable -Wmissing-field-initializers -Wmissing-braces globally and hopefully make these workarounds unnecessary. Change-Id: I30b0f679bbb8adb2dd7269c9f3bc19732e48212b Reviewed-on: https://code.wireshark.org/review/21887 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-02packet-rsl.c: add Encapsulating paging messages into a packet EP2192796 - ↵Piotr Tulpan1-0/+234
proprietor Huawei Adding dissection RSL message that corresponds to patent EP2192796 owned by Huawei. Change-Id: I9fe32370d9b1330f78ac96c1203b6fde3f7784cd Reviewed-on: https://code.wireshark.org/review/21788 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>
2017-06-02packet-ipp.c: Improve enum tag filteringMichael Mann1-10/+24
Change-Id: I41249c832b96c8942b78b17983a493faf802f355 Reviewed-on: https://code.wireshark.org/review/21886 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>
2017-06-02Fix Decode As for protocols that may use tunneling.Irene Ruengeler8-38/+139
Dissectors that rely on pinfo structure information may have the data overwritten if the data is tunneled. Address it by using proto data that is based on pinfo->curr_layer_num. Bug: 13746 Change-Id: I1c29f26a3c49f368876f0e96908705bc9c099ce1 Reviewed-on: https://code.wireshark.org/review/21559 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-02gsm_osmux: Add support to follow Osmux streams and show its statisticsPau Espin Pedrol3-110/+274
Change-Id: I5262b3b1ac5a6f5bc6ac932eedbb889847131d9c Reviewed-on: https://code.wireshark.org/review/21601 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-01fb-zero: Add support of Zero ProtocolAlexis La Goutte3-0/+614
Facebook uses a derivative of QUIC protocol (on top of TCP) for Android device The dissector was reverse engineered based off of QUIC dissector functionality Pcap avaliable https://github.com/ntop/nDPI/issues/300 Some information (not spec) can be found here: https://code.facebook.com/posts/608854979307125/building-zero-protocol-for-fast-secure-mobile-connections/ Change-Id: I4026bb992aa17a0c679379646b388a694f24a07f Reviewed-on: https://code.wireshark.org/review/18937 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> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-01thread: Fix division by zeroBjörn Ruytenberg1-1/+1
Perform sanity check on channel count. Channel count must be greater than zero to build energy measurements list from Energy List TLV [1]. Zero channel count results in a division by zero in dissect_thread_mc. Do not process Energy List TLV if zero. [1]: OpenThread implementation - https://github.com/openthread/openthread/blob/b89a9dfbc117a9c80e795700b67/include/openthread/commissioner.h#L158 Energy List TLV contains energy measurements. If no channels are present, no energy measurements can exist. Bug: 13747 Change-Id: I53a19dfbeae9ef0421c8c144ef3be4da28413ad3 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1979 Reviewed-on: https://code.wireshark.org/review/21878 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-01packet-epl.c: Enhance dissection by ObjectMappings and device profilesAhmad Fatoum3-297/+2505
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>
2017-06-01FP - Moved RLC info retrieval for E-DCH channelsDarien Spencer1-9/+9
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>
2017-06-01IEEE 802.15.4: add a missing offset increment in ↵Pascal Quantin1-0/+1
dissect_ieee802154_payload_mlme_sub_ie() Bug: 13751 Change-Id: I33d9d51ba36ddb2caeee25612b613bc799c76339 Reviewed-on: https://code.wireshark.org/review/21875 Reviewed-by: Rémy Léone <remy.leone@gmail.com> 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>
2017-06-01dfilter: fvt_cache use g_hash_table_new_full() API to prevent some memory leaksMax Dmitrichenko1-9/+9
Change-Id: I650c1eb1e98c7d2d2c9ec85bb6ec9b75667142a2 Reviewed-on: https://code.wireshark.org/review/21230 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-01[GTPv2] Add "name" to IEs with Generic names in some cases.AndersBroman1-3/+34
Bug: 13531 Change-Id: I81edc081a508ab1e56b279ec1183066c4334dc10 Reviewed-on: https://code.wireshark.org/review/21872 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>
2017-06-01prefs: Avoid empty elements in string lists.Stig Bjørlykke1-2/+4
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>
2017-06-01Add interval array data structure, with growable intervalsAhmad Fatoum4-0/+287
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>
2017-06-01Qt+prefs: Add a dark theme check and default colors.Gerald Combs2-11/+36
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>
2017-05-31packet-epl.c: Fix bounds error on malformed packetAhmad Fatoum1-10/+8
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>
2017-05-3180211 (prism): fix conflict for hf fieldAlexis La Goutte1-11/+3
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>
2017-05-31acn: fix conflict for hf fieldAlexis La Goutte1-11/+13
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>
2017-05-31UMTS FP: backout part of g899fd42Pascal Quantin1-19/+33
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>
2017-05-31Update a comment.Guy Harris1-3/+2
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>
2017-05-31Give more information in a comment.Guy Harris1-2/+7
Change-Id: I43efd124bc49bc3d1261bd690ce38c5debb94e45 Reviewed-on: https://code.wireshark.org/review/21852 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-30[GTP] Update cause values.AndersBroman1-2/+13
Change-Id: Ic9b0ccf045169de676b95c4b85a8d0e1e21e2cb4 Reviewed-on: https://code.wireshark.org/review/21826 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>
2017-05-30[Diameter 3GPP] Add subdissection of AVP 1679 AIR-FlagsAndersBroman1-0/+40
Change-Id: I783385b85cfb67d3b0d4affc82a6071e4de51062 Reviewed-on: https://code.wireshark.org/review/21824 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>
2017-05-30FP - Checks to avoid NULL dereferencingDarien Spencer1-38/+70
Making sure channel specific structs are not null Change-Id: I9f979db4e24bb7bd490cf29a5c68ef32d1b029db Reviewed-on: https://code.wireshark.org/review/21754 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>