summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-04Allocate the pipe capture data buffer upfront.Guy Harris1-33/+32
We were allocating it every time we called cap_pipe_dispatch() (or, prior to I0256daae8478f1100fdde96a16a404465ec200b3, in capture_loop_dispatch()) and freeing it before the routine in question returned. However, we were treating that buffer as if it persisted from call to call, which worked *only* if freeing and re-allocating the buffer meant that we'd get back the same buffer with its previous contents intact. That is *not* guaranteed to work. Instead, allocate the buffer when we open the capture pipe, and free it when we close the capture pipe. Change-Id: Ic785b1f47b71b55aba426db3b1e868186c265263 Reviewed-on: https://code.wireshark.org/review/21948 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit b58e23846e4f21318efebca138f9aa3b0e26792d) Reviewed-on: https://code.wireshark.org/review/21949
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 Combs11-3457/+3773
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-04Allocate a buffer in cap_pipe_dispatch(), not in capture_loop_dispatch().Guy Harris1-7/+15
The buffer is only used when reading from a pipe; no need to allocate it when capturing from a pcap_t. Doing it in cap_pipe_dispatch() makes it clearer when the buffer exists and when it doesn't. Change-Id: I0256daae8478f1100fdde96a16a404465ec200b3 Reviewed-on: https://code.wireshark.org/review/21930 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit b70a2370c14d647b122eedfe7f9f3d6ba79595c4) Reviewed-on: https://code.wireshark.org/review/21931
2017-06-04Bugfix GTK Decode AsMichael Mann1-1/+1
Current layer number needs to be unconditionally saved after v2.3.0rc0-3740-ge1f84f985e, which increased the number of dissectors that use current layer number to determine Decode As value. Change-Id: Ib82370af94ea00613a337890369e228cffa1ed81 Reviewed-on: https://code.wireshark.org/review/21928 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 0c166f947e9c0f92f3c9bd56fe3db59589511b60) Reviewed-on: https://code.wireshark.org/review/21929
2017-06-03capture-pcap-util.c: fix a typoPascal Quantin1-1/+1
Change-Id: I674d02be665afc331e266725c0a0cbc0a33d9403 Reviewed-on: https://code.wireshark.org/review/21926 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 2ba951b984253135ba4dced906dd56a9d487ea65) Reviewed-on: https://code.wireshark.org/review/21927
2017-06-03Don't keep the pcap/pcapng link-layer header type as interface data.Guy Harris9-27/+12
Either 1) it can be determined from the libwiretap encapsulation type, in which case it's redundant information or 2) there *is* no pcap/pcapng link-layer header type for that encapsulation type, in which case you need to check for the attempt to determine it failing and handle that failure appropriately. Change-Id: Ie9557b513365c1fc8c6df74b9c8239e29aad46bc Reviewed-on: https://code.wireshark.org/review/21924 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 30c86f8b34233b1cf262c14660d32388bc7362d9) Reviewed-on: https://code.wireshark.org/review/21925
2017-06-03Get rid of #if 0'd out include.Guy Harris1-4/+0
Change-Id: I0d996b03303572538d250ed8f27b04a0e93cf261 Reviewed-on: https://code.wireshark.org/review/21921 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 69ed5d5841605c63cbe017a2a0006f4085b8bb23) Reviewed-on: https://code.wireshark.org/review/21922
2017-06-03Fix typo.Guy Harris1-1/+1
Change-Id: If4ac286fed29635ec085f9671c77abf6ed22766d Reviewed-on: https://code.wireshark.org/review/21919 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit eaecf02aed0dc326bee363a0e9b9284d1c3d8d40) Reviewed-on: https://code.wireshark.org/review/21920
2017-06-03If has_snaplen isn't set, don't set the snapshot length with ↵Guy Harris2-10/+35
pcap_create()/pcap_activate(). Just let libpcap pick the snapshot length; that way, for link-layer types that need a really large snapshot length, such as D-Bus (which requires 128MB for the largest messages), it can pick that, but can otherwise pick something that doesn't require as much memory, e.g. 256KB. For pcap_open_live() and pcap_open(), which don't have a way of saying "give me what's appropriate", pick 256KB. Change-Id: Idef5694f7dfa85eaf3a61d6ca7a17d263c417431 Reviewed-on: https://code.wireshark.org/review/21917 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 2814e3c9cd4d9393231a746b4ef1bb1e6b7d95c9) Reviewed-on: https://code.wireshark.org/review/21918
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-03Pass the file type, not the frame type, to cfile_dump_open_failure_message().Guy Harris1-4/+5
Change-Id: I3c5e73d4e13106891001dfccd1568148a06329b4 Reviewed-on: https://code.wireshark.org/review/21909 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit ae409ed545efd297d69378a6a612bfe2baa8c924) Reviewed-on: https://code.wireshark.org/review/21910
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-02Fixup the Windows library directory.Gerald Combs1-1/+1
Change-Id: I73649c7a51fb0a66cc4003426d23411b441d482a Reviewed-on: https://code.wireshark.org/review/21906 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-02Initialize master-2.4.Gerald Combs21-31/+38
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 Wu8-17/+149
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-02Qt: Add version check for setTextInteractionFlagsStig Bjørlykke1-0/+2
This property was introduced in Qt 5.1. Change-Id: I3446886d65fbeaf011a69071b605b044e5205b60 Reviewed-on: https://code.wireshark.org/review/21895 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-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 Goutte4-0/+615
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-01Add a new feature to the release notes.Stig Bjørlykke1-0/+1
Change-Id: I99dafc515ac70f7ed037c30936aceddd695d3525 Reviewed-on: https://code.wireshark.org/review/21871 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-01Qt: Enable unhiding all interfaces.Stig Bjørlykke1-1/+3
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>
2017-06-01Qt+prefs: Add a dark theme check and default colors.Gerald Combs3-11/+40
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-06-01cmake: Add -Wshorten-64-to-32 for C++ when using Qt >= 5.9Stig Bjørlykke1-2/+9
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>
2017-06-01Qt: Disable -Wframe-larger-than= for ui_main_window.hStig Bjørlykke2-0/+14
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>
2017-05-31debian: remove imagemagick and demote xdg-utils depsPeter Wu1-3/+4
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>
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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-03 08:00:36 +0000