commit f975c17 Author: Guy Harris Date: Tue Jun 27 18:34:30 2017 -0700 Don't worry about initializing auto aggregates with non-constant values. On UN*X, you can get C99-or-later compilers, and we request that in the autoconf script, so it's really a requirement. At least as I read https://msdn.microsoft.com/en-us/library/34h23df8%28v=vs.100%29.aspx Visual Studio 2010 (and earlier, going back to VS .NET 2003) supports the "Use of block-scope variables initialized with nonconstant expressions", with an example of an aggregate (array) initialization involving function calls, so it sounds as if it's available on Windows with any version of VS that we support. (If I've missed something, it'll presumably show up when something is built with MSVC, and we can update this at that point.) So the only thing to avoid is initializing global or static variables with a value that has to be evaluated at run time (the ability to do that is probably present in most environments, as I think C++ constructors for variables with static storage duration might have to be evaluated before main() is called, but I guess few C compilers bother to use it). Expand the example in the hopes of avoiding confusion between "static storage duration" (which something declared "static" has, but which anything declared with file scope, whether declared "static" or not, also has) and "static storage duration and internal linkage", which is what the "static" keyword specifies. Change-Id: I338eb0892e656c2ab59519e4bf76e1dfbec2fa7d Reviewed-on: https://code.wireshark.org/review/22434 Reviewed-by: Guy Harris (cherry picked from commit e0a9192ebceba1e7d010a75592b101e4b80b952a) Reviewed-on: https://code.wireshark.org/review/22435 commit 39b22b7 Author: Guy Harris Date: Tue Jun 27 14:35:20 2017 -0700 Fix the "don't initialize with non-constant variables" item. It only applies to variables with static storage duration, i.e. global and static variables. Expand the example of how to do it, to make it a bit clearer. Change-Id: Ie0c473a35a77351dd10d6c9df2c34a39f077fca4 Reviewed-on: https://code.wireshark.org/review/22430 Reviewed-by: Guy Harris (cherry picked from commit 7321df2a4532d6531eab75f99c5f158ffd90574b) Reviewed-on: https://code.wireshark.org/review/22431 commit d169cdf Author: Gerald Combs Date: Tue Jun 27 11:56:45 2017 -0700 WiX: More merge module fixups. Look for our merge module using find_path. This should be more reliable and doesn't assume our build and target platforms are the same. Change-Id: I95a4454a063af2f978550b8cf1f1624c4aeb5ebc Reviewed-on: https://code.wireshark.org/review/22426 Reviewed-by: Gerald Combs (cherry picked from commit 5997e8e1980ea9981e28a5abe73d1b8718d03041) Reviewed-on: https://code.wireshark.org/review/22427 commit 1d35614 Author: Gerald Combs Date: Tue Jun 27 10:26:39 2017 -0700 CMake: Fix the WiX search path. Look for WiX executables in $WIX/bin instead of $WIX. Change-Id: Id55eb8e73403d2beed55d64e9bdc6812308c359f Reviewed-on: https://code.wireshark.org/review/22423 Reviewed-by: Gerald Combs (cherry picked from commit a6652a27783b59d23dca3405b0399690f38f3402) Reviewed-on: https://code.wireshark.org/review/22425 commit cd63520 Author: Gerald Combs Date: Sat Jun 17 11:15:18 2017 -0700 WiX: Fixup merge module configuration. Set the merge module path based on our platform and version of Visual Studio. Change-Id: Ic866447f36d5264d61fc988f3f9d8b4d2e5c0827 Reviewed-on: https://code.wireshark.org/review/22192 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit c89f4c628c315e8f472653856a0776469c65f34e) Reviewed-on: https://code.wireshark.org/review/22424 commit 89431bc Author: Guy Harris Date: Mon Jun 26 21:03:01 2017 -0700 On UN*X, make sure we can find inflate() in libz. For example, on at least some versions of Fedora, if you have a 64-bit machine, have both the 32-bit and 64-bit versions of the run-time zlib package installed, and have only the *32-bit* version of the zlib development package installed, it'll find the header, and think it can use zlib, and will use it in subsequent tests, but it'll try and link 64-bit test programs with the 32-bit library, causing those tests to falsely fail. Hilarity ensues. Change-Id: Ic2536e8a652ef96e2a3923c1faa61f6c8c06bf58 Reviewed-on: https://code.wireshark.org/review/22417 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris (cherry picked from commit e61d2f624348329f8d73af55e6ff3e0e7ee012da) Reviewed-on: https://code.wireshark.org/review/22418 commit fc9a7df Author: Guy Harris Date: Mon Jun 26 18:48:01 2017 -0700 Don't check for inflatePrime() on Windows. On Windows, we build libz as part of the Wireshark build process, so we don't necessarily *have* a libz library to search or inflatePrime() at this point; the search fails on the buildbots, for example. So, on Windows, we just assume we have a new enough version of libz, so that it has inflatePrime(). Bug: 13850 Change-Id: Ied0909f4a591ff3312d83a2a2ed41e3cd12218e8 Reviewed-on: https://code.wireshark.org/review/22413 Petri-Dish: Guy Harris Reviewed-by: Guy Harris (cherry picked from commit 9a1d16b55324056e4d5031370b007097b76dc519) Reviewed-on: https://code.wireshark.org/review/22414 commit a3ff8f8 Author: Peter Wu Date: Mon Jun 26 00:34:41 2017 +0200 cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 8d214209e80c2cc86ad9624b31cc6365e10ed454) Reviewed-on: https://code.wireshark.org/review/22409 Reviewed-by: Peter Wu commit 48f6616 Author: Pascal Quantin Date: Mon Jun 26 16:05:00 2017 +0200 PDCP LTE: fix dissection of Polling bit for User plane Data PDU with 18 bits SN Change-Id: Id1167d2c6fa84fd5145d5f0313e39f53591a9add Reviewed-on: https://code.wireshark.org/review/22406 Reviewed-by: Pascal Quantin (cherry picked from commit 71a9ade669c51209132f61a0ded27e60c386af99) Reviewed-on: https://code.wireshark.org/review/22408 commit bc8e63b Author: Silvio Gissi Date: Sat Jun 24 17:13:54 2017 -0700 Fix Packet Lengths statistics count Packet statistics were not showing the packets above 5120 due to the last entry being reformatted and not parsed correctly. Since the last entry is "reformatted" for better user string, also "reformat" the last entry as it goes through "range processing". Bug: 13844 Change-Id: Id49b41c08111dcad1590e034159b81ead8636c4e Reviewed-on: https://code.wireshark.org/review/22382 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit aefd4e1844abbc8b10732be03991047617ebd650) Reviewed-on: https://code.wireshark.org/review/22403 commit fce9fc6 Author: Michael Mann Date: Sun Jun 25 17:16:26 2017 -0400 Sample deprecated filter -> Sample warning filter "Warning" is a more appropriate name because filter may not be as deterministic as user desires Bug: 13834 Change-Id: Ie34e37db8866dc409f25df227a4d34e7c11d0058 Reviewed-on: https://code.wireshark.org/review/22392 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 395775acce1ef9624fdf2030179683f37a27cd59) Reviewed-on: https://code.wireshark.org/review/22394 commit 344e2b7 Author: Silvio Gissi Date: Sat Jun 24 17:52:21 2017 -0700 Fix Y.1711 endianness ITU Y.1711 at https://www.itu.int/rec/T-REC-Y.1711-200402-I/en states that OAM payloads are big endian (section 5.3) as reported on bug. Bug: 8292 Change-Id: Id30e340eee5f5a5c96020cdd1770fa48adb5d169 Reviewed-on: https://code.wireshark.org/review/22383 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte (cherry picked from commit 80d3483f3463b8e5ed73f019dbf431656410f658) Reviewed-on: https://code.wireshark.org/review/22388 Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit a07d904 Author: Gerald Combs Date: Sun Jun 25 08:14:30 2017 +0000 [Automatic update for 2017-06-25] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie5891519ffda85c84dcda3b745e3abf64a3dfd21 Reviewed-on: https://code.wireshark.org/review/22385 Reviewed-by: Gerald Combs commit 8b7c70f Author: Sake Blok Date: Fri Jun 23 12:38:05 2017 -0400 tcp: add tcp.payload field Make the tcp segment data available on all tcp packets, regardless of reassembly of higher layer protocols. Change-Id: I1a5024e427e07b85bfc3a4aad5d0a401beb1049d Reviewed-on: https://code.wireshark.org/review/22374 Reviewed-by: Sake Blok Petri-Dish: Sake Blok Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser (cherry picked from commit 69bac0d15c94891398e65fda05fb5d7320eb2989) Reviewed-on: https://code.wireshark.org/review/22375 commit 32aa469 Author: Alexis La Goutte Date: Wed Jun 21 23:25:24 2017 +0200 OSPF: fix Opaque LSA Type 11 is considered as unknown it is define in RFC5250 (and RFC 2370) Ping-Bug: 13823 Change-Id: I84f166d48b39e76ab811a6c2d1c7b1d516e7f0f3 Reviewed-on: https://code.wireshark.org/review/22328 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin (cherry picked from commit 0727123773d36a9dd6000d82a2967f7ddaa61aca) Reviewed-on: https://code.wireshark.org/review/22370 commit c038937 Author: Martin Mathieson Date: Thu Jun 22 13:36:33 2017 +0100 Snort content matching fixes Cope with a space between colon and start of options value. When there are no constraining modifiers, let match for next content or pcre field start from beginning of payload again. Change-Id: Ie1267a0a38143cbe9f0444945f78708bbefaa270 Reviewed-on: https://code.wireshark.org/review/22365 Petri-Dish: Martin Mathieson Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson (cherry picked from commit 8a3e4650674a36fdfe7b38c60c8d83b4dfec0d11) Reviewed-on: https://code.wireshark.org/review/22369 Reviewed-by: Pascal Quantin commit e958a26 Author: Michael Mann Date: Thu Jun 22 17:02:35 2017 -0400 Properly find packet comments "field" for protocol hierarchy stats. That way it can be properly filtered out. This was broken when pkt_comments was switched to a pino and wasn't available in the protocol filters list. Change-Id: Ie3f2b4f25eeb11be57111c98be87e33e0849174b Reviewed-on: https://code.wireshark.org/review/22363 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 66c2f5b5f17c3873d0b9e6ea853ccf7bf8c7062d) Reviewed-on: https://code.wireshark.org/review/22364 commit 76b1d48 Author: Stig Bjørlykke Date: Thu Jun 22 10:48:34 2017 -0400 Qt: Restore multi custom column width and align Put custom column field settings in quotes in the recent file to support multi custom columns which contains space. Otherwise the space will be removed in prefs_get_string_list() and the field will not match when reading the recent file. Change-Id: Ic6e2b1e02d68970a4e11fbecbe55a7b10f8b10dd Reviewed-on: https://code.wireshark.org/review/22349 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 578f2a15bb7534b3aad315a92989b6e4d577e4c3) Reviewed-on: https://code.wireshark.org/review/22358 Reviewed-by: Stig Bjørlykke commit 9927004 Author: Gerald Combs Date: Wed Jun 21 10:45:29 2017 -0400 TCP: Make the header length display consistent with IPv4. Format tcp.hdr_len in the tree similar to ip.hdr_len. Add comments noting that they should be consistent. Change-Id: Ic64282d8386c8ed339811bc9c22b5962c707d292 Reviewed-on: https://code.wireshark.org/review/22314 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit b370c02a02cef0e26f327342e085fa45b4e06e3f) Reviewed-on: https://code.wireshark.org/review/22355 commit 9bc595f Author: Pascal Quantin Date: Thu Jun 22 16:02:40 2017 +0200 E.212: update list to Operational Bulletin No. 1126 (15.VI.2017) Change-Id: Ib91dc1fca0d39b53f5f55223405f473dfa816a84 Reviewed-on: https://code.wireshark.org/review/22350 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit cfb23d874345eede2860afa155b181a2e2e208c0) Reviewed-on: https://code.wireshark.org/review/22357 commit 27b6fe4 Author: Gerald Combs Date: Tue Jun 20 11:43:07 2017 -0400 Manuf: Konica Minolta updates. Correct a couple of entries related to Konica Minolta. Change-Id: I3acea1cf7ab1ad9be5d1b367a1015f5205b9e80b Reviewed-on: https://code.wireshark.org/review/22268 Reviewed-by: Anders Broman (cherry picked from commit c919c625025afdca318a1a3413b268d00ad1985c) Reviewed-on: https://code.wireshark.org/review/22356 Reviewed-by: Gerald Combs commit 8ddc581 Author: Stig Bjørlykke Date: Thu Jun 22 09:58:14 2017 -0400 wsutil: Back out profile_write_info_file Change-Id: I9253a4295aecb23ec5e87d0453249955ca1ea18a Reviewed-on: https://code.wireshark.org/review/22347 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit a4694da Author: Chris Bontje Date: Tue Jun 20 14:15:31 2017 -0600 packet-mbtcp - Fix retrieval of Holding/Input Register Format Preference Change-Id: I7a6a409df5c977db1898aec6a47ae3dd8427a00c Reviewed-on: https://code.wireshark.org/review/22286 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin (cherry picked from commit 130b514be216e8ccc42c6831f62ecb23e9b83917) Reviewed-on: https://code.wireshark.org/review/22351 commit 61d2f5e Author: Alexis La Goutte Date: Wed Jun 21 23:32:38 2017 +0200 OSPF: Opaque ID is not longer be zero With RFC7770 the Opaque ID for Router Information is not longer be zero Change-Id: I22f9917ac5b5b0261e36b1097765dab6ce216a46 Ping-Bug: 13823 Reviewed-on: https://code.wireshark.org/review/22329 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 123d170767f6e51ce6b216d633fb03a3cf311109) Reviewed-on: https://code.wireshark.org/review/22348 commit 632ae0d Author: Jiří Engelthaler Date: Thu Jun 22 13:33:54 2017 +0200 IEC104: Added checking of correct ApduLen in context of ASDU type Added displaying of raw data for unknown ASDU type Change-Id: I17e2ae048dbec61718610dd86d6878cdc0563ef0 Reviewed-on: https://code.wireshark.org/review/22341 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit d2ed7fcf9e0dca17f1a0181364910b9533dc7091) Reviewed-on: https://code.wireshark.org/review/22345 commit 472043e Author: Dirk Weise Date: Thu Jun 22 10:16:17 2017 +0200 Add notes about predefined strings not available to plugins The documention refers dissector authors to helpful predifined string structures that plugin authors unfortunately cannot use. Bug: 13828 Change-Id: I62cdfeb200c9b354aed44d40c80a0e8f9e8f910b Reviewed-on: https://code.wireshark.org/review/22339 Reviewed-by: Michael Mann (cherry picked from commit 9fe90b93ce9bbb802f45b93632a78f5261b3f717) Reviewed-on: https://code.wireshark.org/review/22342 commit ed558b5 Author: Pascal Quantin Date: Thu Jun 22 02:13:52 2017 +0200 MQ: put declaration before code Change-Id: I2b0d1a4795e3278a1702d51d4fd532a37a4eba19 Reviewed-on: https://code.wireshark.org/review/22332 Reviewed-by: Pascal Quantin (cherry picked from commit e46cb2defc559a530d11689d50f0adf47513e8e5) Reviewed-on: https://code.wireshark.org/review/22333 commit 1e7a921 Author: Silvio Gissi Date: Wed Jun 21 15:46:45 2017 -0400 Lua: Add "tonumber" method to NSTime Absolute and Relative time fields could not be converted to seconds without converting to string and parsing to number. Fixed conversion in generated code that was subject to precision loss Usage: f=Field.new("frame.delta_time") delta=f().value:tonumber() Change-Id: I6ef91c6238a6c2ed9adf6cae03f8913f0a09332e Reviewed-on: https://code.wireshark.org/review/22316 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris (cherry picked from commit 59add43eecfbed3bae5d75dabe6e875b5adefe1b) Reviewed-on: https://code.wireshark.org/review/22331 commit 192ba64 Author: Peter Wu Date: Wed Jun 21 15:51:35 2017 -0400 Qt: fix sorting of custom columns with multiple fields Fields like "dns.time || http.time || smb.time" were sorted by column number before. Recognize when all fields are numeric values and then try to sort by number and otherwise fallback to a value comparison. In theory sorting should now also be a bit faster for custom columns because the columnn type is looked up once. Change-Id: Id40d7cce8080d05823d74459fc493ec6ebf80956 Reported-by: Laura Chappell Reviewed-on: https://code.wireshark.org/review/22317 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 16f70b9bb1faf48d985e21fcfa92d1934c2b50f5) Reviewed-on: https://code.wireshark.org/review/22326 Reviewed-by: Stig Bjørlykke commit 7e124c9 Author: Stig Bjørlykke Date: Wed Jun 21 16:09:15 2017 -0400 wsutil: Check return from ws_write Change-Id: I73f65222dc23ebcb484f2598a12f43b284654420 Reviewed-on: https://code.wireshark.org/review/22321 Reviewed-by: Stig Bjørlykke (cherry picked from commit 6117ff496becee208336847a0cf460c15751ef6d) Reviewed-on: https://code.wireshark.org/review/22322 commit bd1dbaf Author: Stig Bjørlykke Date: Wed Jun 21 16:04:14 2017 -0400 wsutil: Ignore return from ws_write Change-Id: Idad4dd84538e3ccb7b258775704db8b6bd6c301e Reviewed-on: https://code.wireshark.org/review/22319 Reviewed-by: Stig Bjørlykke (cherry picked from commit 6e0bc30a95ae7759c45ce1f39360259570087b5d) Reviewed-on: https://code.wireshark.org/review/22320 commit 4138697 Author: Anders Date: Wed Jun 21 18:37:25 2017 +0200 [sipstat] Update the Response Codes table. Change-Id: Iae6e49963ea94ba8a174342e25d2ca5494001e28 Reviewed-on: https://code.wireshark.org/review/22310 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 536451a8dea2655a1d31006125cb283f49cfb859) Reviewed-on: https://code.wireshark.org/review/22318 commit 3178664 Author: Stig Bjørlykke Date: Wed Jun 21 10:43:21 2017 -0400 Qt: Write a list of profile files at startup This file will contain all personal config files which will be fetched from a profile. Change-Id: I430ca84ccefc17f0e21c8efb93a92602ab8d5661 Reviewed-on: https://code.wireshark.org/review/22303 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit a14ef98540af979f0dbc39c728f9fc31a687a16f) Reviewed-on: https://code.wireshark.org/review/22313 Reviewed-by: Stig Bjørlykke commit 7740d1d Author: Stig Bjørlykke Date: Wed Jun 21 10:48:22 2017 -0400 wsutil: Free files in reset_default_profile This plugs a memory leak. Change-Id: Ic989a89353d10de6f8f07df6a734d2b912facb7e Reviewed-on: https://code.wireshark.org/review/22305 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 99c3c6d9086a49bd88f8b99db641a4ba2b5d4c0a) Reviewed-on: https://code.wireshark.org/review/22312 Reviewed-by: Stig Bjørlykke commit 5503bc6 Author: Peter Wu Date: Wed Jun 21 10:58:28 2017 -0400 Qt: display newlines in capture file comments Due to the use of HTML, whitespace (including newline) are shown as single horizontal space. Add a special case for newlines. Bug: 13819 Change-Id: Iefa2af7d2948ed18a3b7f8f4ee8cb90100bf3460 Reviewed-on: https://code.wireshark.org/review/22306 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit b44ad2a0fa58e4a5acb4293d047993b3aea1f532) Reviewed-on: https://code.wireshark.org/review/22311 Reviewed-by: Peter Wu commit 6001fc1 Author: Vasil Velichkov Date: Tue Jun 20 21:30:42 2017 +0300 packet-xml: Add 3GPP, ETSI, GSMA and OMA media types Not all media types are IANA registered https://www.iana.org/assignments/media-types/media-types.xhtml http://www.gsma.com/newsroom/wp-content/uploads/IR.95-v2.0-3.docx http://www.openmobilealliance.org/release/XDM/V2_2_1-20170124-A/OMA-ERELD-XDM-V2_2_1-20170124-A.pdf Change-Id: I7e2e1ef5ddcff91f04655d84836e10b9bf20d765 Reviewed-on: https://code.wireshark.org/review/22273 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 3b7440996b2f3637656575ad121fa6edfa03cfcb) Reviewed-on: https://code.wireshark.org/review/22304 commit 9277e96 Author: Alexis La Goutte Date: Wed Jun 21 14:43:04 2017 +0200 ISIS LSP: fix wrong bitmask for SPVID Issue reported by Bo-Han Liao Bug: 13821 Change-Id: I74641bef723e747bfe5fa87e946b7f4f74b94bf6 Reviewed-on: https://code.wireshark.org/review/22299 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 855484fbd98c8c01f5a84902243389e07e32b6e9) Reviewed-on: https://code.wireshark.org/review/22300 commit c71a7c7 Author: Robert Sauter Date: Mon Jun 12 01:22:44 2017 +0200 IEEE 802.15.4: Fix double offset increment for Time Correction Header IE Regression by https://code.wireshark.org/review/21890/ Change-Id: Ieb90672dc2181f5951a8a4165e2676b7882282e5 Reviewed-on: https://code.wireshark.org/review/22087 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin (cherry picked from commit b8e660edc66d7f40545868a377b3385b4c9a54cb) Reviewed-on: https://code.wireshark.org/review/22298 commit 0ca55e7 Author: Roland Knall Date: Tue Jun 20 15:56:31 2017 -0400 Fix Toggle indicator for search Removing the toggle indicator. Search behaves now the same as it does for e.g. in SublimeText Change-Id: I4523001b536caa116bcb989f0850aa769c6220f8 Reviewed-on: https://code.wireshark.org/review/22280 Reviewed-by: Roland Knall (cherry picked from commit 6b9b4bd96833e31f659118b5e34f1393cb95b247) Reviewed-on: https://code.wireshark.org/review/22282 Reviewed-by: Michael Mann commit 5138182 Author: Roland Knall Date: Mon Jun 19 15:57:04 2017 +0200 SearchBar - Focus on shortcut instead of closing If the searchbar is already open focus on the bar and highlight existing test, instead of closing an already open bar Change-Id: I4f8ae2e903cb65c0ebca238f3bcc1c62b63b5c3b Reviewed-on: https://code.wireshark.org/review/22223 Reviewed-by: Roland Knall Petri-Dish: Roland Knall Reviewed-by: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit d83176ed2edffe59badd75d8ee98c77227fd357f) Reviewed-on: https://code.wireshark.org/review/22281 Reviewed-by: Michael Mann commit 4dbcea0 Author: Roland Knall Date: Tue Jun 20 16:10:42 2017 -0400 tcp: Change the wording to include (s) More than one packet could be meant by that Change-Id: Ie751a282c927608414673c2cd48b11dc5e6d5ea6 Reviewed-on: https://code.wireshark.org/review/22283 Reviewed-by: Roland Knall Petri-Dish: Roland Knall Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 050da447424223d39d1e494b8daab840a100d05e) Reviewed-on: https://code.wireshark.org/review/22295 commit e1d4ce4 Author: Peter Wu Date: Tue Jun 20 14:08:39 2017 -0400 Fix filter for "Next Packet in Conversation" The "Previous/Next Packet in Conversation" actions accidentally overwrites more specific filters (like TCP port matching) by less specific ones (like IP addresses). This resulted in strange behavior where packets from different TCP streams were selected. Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe Reported-by: Christian Landström Reviewed-on: https://code.wireshark.org/review/22274 Reviewed-by: Pascal Quantin Reviewed-by: Peter Wu (cherry picked from commit 4deb97f31f52ca9c88efbbf46cf3e580c85474f3) Reviewed-on: https://code.wireshark.org/review/22287 commit d0e9027 Author: Pascal Quantin Date: Tue Jun 20 21:00:59 2017 +0200 IP: ensure that fragment contains payload before adding it for reassembly Solves a UBSan runtime error null pointer passed as argument 1, which is declared to never be null. It can be reproduced with the pcap from bug 13603 Change-Id: I0d6fdddcccc892b3141855d59be372887afcaca5 Reviewed-on: https://code.wireshark.org/review/22272 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit e6883c15ac00942e3232213f087147e355f7494b) Reviewed-on: https://code.wireshark.org/review/22284 commit 06a002e Author: Stig Bjørlykke Date: Tue Jun 20 15:49:53 2017 -0400 Qt: Rename "Filter Expressions" to "Filter Buttons" Change-Id: I7adcb1d28d239bbc25d8a7a5969b34c6db84e022 Reviewed-on: https://code.wireshark.org/review/22277 Reviewed-by: Stig Bjørlykke (cherry picked from commit 75f9247c2cfec63caeb59039de972abc768e3a4b) Reviewed-on: https://code.wireshark.org/review/22279 commit 63943ab Author: Stig Bjørlykke Date: Tue Jun 20 15:12:48 2017 -0400 Qt: Create the user profiles dir at startup Ensure the user profiles directory is created at startup so that users can put downloaded profiles without creating the directory. Change-Id: Ib06bb3055daef8fd9e78d7887ce56f8fe50e48bf Reviewed-on: https://code.wireshark.org/review/22275 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 4f1053c5464de12b635a8cf4128b78d51f6f3deb) Reviewed-on: https://code.wireshark.org/review/22278 Reviewed-by: Stig Bjørlykke commit 1c212eb Author: Martin Mathieson Date: Sun Jun 18 22:01:04 2017 +0100 Misc snort fixes. - search for content fields taking into account length of last match - handle absolute path to file file inclusion not using $RULE_PATH - parse longer tokens (saw emerging-threats rule with enormous pcre) - content offset is relative to start of frame, *not* previous content match - show content modifiers 'rawbytes' and 'http_user_agent' Change-Id: I0a4e0b857c8049380ed6aa47e4a3d3649e84d4ad Reviewed-on: https://code.wireshark.org/review/22211 Petri-Dish: Martin Mathieson Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit d19c3a22b927db0dc83bcad9e024a8ed8f866671) Reviewed-on: https://code.wireshark.org/review/22269 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 5897c97 Author: Pascal Quantin Date: Tue Jun 20 02:49:07 2017 +0200 GTPv2: put dissection under GTPv2 protocol item Bug: 13813 Change-Id: Ic1582406896b2d4d3505ae1d3bb79cdbafa481da Reviewed-on: https://code.wireshark.org/review/22247 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 59670461b00414d504b2a9ed9e7bafeab65a7420) Reviewed-on: https://code.wireshark.org/review/22270 Reviewed-by: Pascal Quantin commit a879379 Author: Robert Sauter Date: Tue Jun 20 14:18:02 2017 +0200 IEEE 802.11: Use correct mask for 'SMK message' Change-Id: I2def75c999faec0cbb16fd87133f09544bff78c4 Reviewed-on: https://code.wireshark.org/review/22264 Reviewed-by: Michael Mann (cherry picked from commit 23e667169eefc450808e60ea515fc271122052de) Reviewed-on: https://code.wireshark.org/review/22266 commit 90e1f73 Author: Peter Wu Date: Mon Jun 19 16:28:10 2017 -0400 Qt: make Wireless Timeline a separate item Do not put the wireless timeline in the main view with splitters, it has a fixed size anyway and is not taken into account for layout and size calculations for the panes. Bug: 13776 Change-Id: I71da962950c3f1b215908674f4852afa76744343 Reviewed-on: https://code.wireshark.org/review/22242 Petri-Dish: Michael Mann Reviewed-by: Simon Barber Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 4d90f2e092802775e5e3e457768d1c1f4760a1f0) Reviewed-on: https://code.wireshark.org/review/22265 commit 832f62f Author: Jeff Morriss Date: Mon Jun 19 16:46:49 2017 -0400 Don't scroll back to the selected frame when we get name resolution updates. With live or large capture files and asynchronous name resolution this can cause serious scrolling issues as the name resolutions come in. Bug: 12074 Change-Id: I1a5cca410c0608927b32e9e7107885370caf14d7 Reviewed-on: https://code.wireshark.org/review/22245 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 4e46352657df1d66e8f2ade8c5e3d38ecae18530) Reviewed-on: https://code.wireshark.org/review/22262 Reviewed-by: Michael Mann commit e62d7ef Author: Pascal Quantin Date: Mon Jun 19 20:06:06 2017 +0200 PROFINET IO: define an arbitrary recursion depth limit Bug: 13811 Change-Id: I52bffd4a79dcdad9da23f33e1fc6a868472390bf Reviewed-on: https://code.wireshark.org/review/22232 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit fbfb87a2439dd18f2318586b8e5a2f6db410ba6a) Reviewed-on: https://code.wireshark.org/review/22254 Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit 7da750c Author: Stig Bjørlykke Date: Mon Jun 19 16:26:45 2017 -0400 Qt: Turn off auto scroll when going to a packet When going to a packet (first, last, next, prev and specific) during capture we must turn off auto scroll to let the packet be shown in the packet list. Change-Id: If1c615eb4d422c3b4c0418114064f7a4a0b75b35 Reviewed-on: https://code.wireshark.org/review/22244 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit be4dbf840b164ab9b788ee8c3a9466e2da1393d2) Reviewed-on: https://code.wireshark.org/review/22259 Reviewed-by: Stig Bjørlykke commit 1c4b185 Author: Pascal Quantin Date: Mon Jun 19 22:12:22 2017 +0200 AMQP: workaround some proto_tree_add_none_format() asserts Previously proto_tree_add_none_format() could be called with any type of field type, not FT_NONE only. Change-Id: I78976a168fc1bf606b72ad38d284bb0bd1794b03 Ping-Bug: 13780 Reviewed-on: https://code.wireshark.org/review/22243 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 2de483c0925a5a93cdaee168997f3f3c7949d2d4) Reviewed-on: https://code.wireshark.org/review/22257 commit c558379 Author: Pascal Quantin Date: Mon Jun 19 20:40:52 2017 +0200 MQ: check fragment length before trying to perform reassembly Bug: 13792 Change-Id: Id0c116655288c5a3347911281a932ae80250c24f Reviewed-on: https://code.wireshark.org/review/22233 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit bb58b3a2643ab81560d84b00be3a9b9e86f0393c) Reviewed-on: https://code.wireshark.org/review/22251 Reviewed-by: Michael Mann commit c3c2e84 Author: Pascal Quantin Date: Mon Jun 19 21:23:47 2017 +0200 AMQP: fix a stack overflow when offset goes back and forth Previous code assumed that list decoding was successful and that some bytes were consumed. Let's explicitly check this. Bug: 13780 Change-Id: I3546b093f309f2b8096f01bc9987ac5ad9e029eb Reviewed-on: https://code.wireshark.org/review/22235 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 246cbbc2ea6dd0a3a69a1aaa94db244a77565353) Reviewed-on: https://code.wireshark.org/review/22248 commit d9cbe24 Author: Guy Harris Date: Mon Jun 19 12:46:42 2017 -0700 Register for SFLOW_245_HEADER_FDDI. In 609ea4baa62a523434cdd8ff350d56d135d588ae (I459249b98741cc069495c84ad4c47c0aa6768096) I unintentionally removed the registration. Put it back. Change-Id: I4769fc10d74fe7358f9794b9697591c61324e883 Reviewed-on: https://code.wireshark.org/review/22239 Reviewed-by: Guy Harris (cherry picked from commit 051921854d8720123bd671af3ba3a123da2cfab3) Reviewed-on: https://code.wireshark.org/review/22240 commit 29c0bc8 Author: Pascal Quantin Date: Sun Jun 18 22:16:42 2017 +0200 DAAP: define an arbitrary recursion depth limit Bug: 13799 Change-Id: I611e3e888f91f78262e0d685e613a2bc221687c5 Reviewed-on: https://code.wireshark.org/review/22210 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin (cherry picked from commit 82fc557bed30b1aa69ca43a4291b64a9ce54c78a) Reviewed-on: https://code.wireshark.org/review/22229 commit 4378f2d Author: Stig Bjørlykke Date: Mon Jun 19 10:30:35 2017 -0400 Qt: Flush signals when disable protocols When opening the enabled protocols dialog from a protocol preferences menu we must flush app signals to ensure a redissect is done. Change-Id: I512b8f6959aabcc15ccffc67615583ee9c60ceec Reviewed-on: https://code.wireshark.org/review/22224 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke (cherry picked from commit 583c2504671e1671afd03e7638cf6c2957d2b020) Reviewed-on: https://code.wireshark.org/review/22228 commit 4715b44 Author: Guy Harris Date: Sun Jun 18 19:55:11 2017 -0700 Put the definition of BIT_SWAPPED_MAC_ADDRS in the file where it's used. In change 18a3b0659c209a2e0121eacd640b75e6c1c3b87d, I moved the table that uses it, but not the actual definition, from libpcap.c to pcap-common.c; they both should have been moved. Make it so. Change-Id: I266fce455df3848b873cdfadb12cecdbf9c8d4d3 Reviewed-on: https://code.wireshark.org/review/22216 Reviewed-by: Guy Harris (cherry picked from commit e9e1b4816278a131aa38dfc579ccd975fed2d7c7) Reviewed-on: https://code.wireshark.org/review/22217 commit 0012bf7 Author: Guy Harris Date: Sun Jun 18 18:58:48 2017 -0700 Register for WTAP_ENCAP_FDDI. In 609ea4baa62a523434cdd8ff350d56d135d588ae (I459249b98741cc069495c84ad4c47c0aa6768096) I unintentionally removed the registration. Put it back. Change-Id: I7cf216378e1610350949910091ee187ce150ca05 Reviewed-on: https://code.wireshark.org/review/22213 Reviewed-by: Guy Harris (cherry picked from commit 547b08b49527eb97ac2ab37fbbcb5a728869d2fd) Reviewed-on: https://code.wireshark.org/review/22214 commit 74bf217 Author: Michael Mann Date: Sat Jun 17 11:33:29 2017 -0400 OpenSafety: sanity check calculated length. Original sanity check was missed for fragmentation Bug: 13755 Change-Id: If9e24e01a119c869b02f198456776c8e6c6f2ad0 Reviewed-on: https://code.wireshark.org/review/22193 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall (cherry picked from commit 66c50585e5c10764d0b8a850fd49fa7012346560) Reviewed-on: https://code.wireshark.org/review/22208 Reviewed-by: Peter Wu commit c59d770 Author: Gerald Combs Date: Sun Jun 18 08:20:35 2017 +0000 [Automatic update for 2017-06-18] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Iabd301cc4cda3d645854111fa5638d4b55cc8953 Reviewed-on: https://code.wireshark.org/review/22204 Reviewed-by: Gerald Combs commit d2d630c Author: Guy Harris Date: Sat Jun 17 14:50:31 2017 -0700 Clean up whitespace. Change-Id: I67616d3ea6d325000c22c550c4d20c320b1c51db Reviewed-on: https://code.wireshark.org/review/22195 Reviewed-by: Guy Harris (cherry picked from commit 43700544312f33ca78199de6003f8c4328df2203) Reviewed-on: https://code.wireshark.org/review/22196 commit 0738978 Author: Michael Mann Date: Sat Jun 17 11:10:53 2017 -0400 Expose RTPS dissector for Lua. See https://ask.wireshark.org/questions/61824/how-to-get-a-reference-to-an-existing-heuristic-dissector-in-lua-in-order-to-wrap-rtps Change-Id: I926b974da8e2de35c64cc46cba7b38e71368fcdd Reviewed-on: https://code.wireshark.org/review/22137 Reviewed-by: Michael Mann (cherry picked from commit 57fece13e06b347ef14f106ec9ee19f2d13b0182) Reviewed-on: https://code.wireshark.org/review/22194 commit 230ebe0 Author: Peter Wu Date: Mon Jun 12 16:21:29 2017 +0200 Do not process UI events while reading from live capture For at least Qt, the main_window_update callback is not necessary to make the stop button work. When restarting a live capture during a flood (via Ctrl-R), this callback actually results in an infinite loop in MainWindow::captureStop since the capture state never changes from FILE_READ_IN_PROGRESS. Remove this callback to ensure that the problematic pipeActivated / sync_pipe_input_cb / capture_input_new_packets / main_window_update / ... / on_actionCaptureRestart_triggered / testCaptureFileClose / captureStop sequence is avoided. Even though captureStop invokes capture_stop, I guess that this does not change the state because the pipeActivated callback is already active. Bug: 10917 Change-Id: I6ca4fa946963928b7bc8a53ca14f9a9a3a35eaa7 Reviewed-on: https://code.wireshark.org/review/22097 Reviewed-by: Jaap Keuter Reviewed-by: Peter Wu (cherry picked from commit 553b1e0215ad5826906aafbe0e38c1e44cf9e1c3) Reviewed-on: https://code.wireshark.org/review/22191 commit 51c57ce Author: Peter Wu Date: Mon Jun 12 14:23:32 2017 +0200 Qt: fix hang on exiting Qt while loading capture file testCaptureFileClose can also be invoked while reading an existing capture file (the original comment only applied to GTK+, not Qt). When the user quits Wireshark while reading an offline pcap, this could result in a confusing "Unsaved packets" dialog. Fix this by checking the actual capture session state. After fixing this, the next issue is that cf_close trips on an assertion ("cf->state != FILE_READ_IN_PROGRESS"). To address this problem, do not close the capture file immediately, but signal to the reader (cf_read) that this should be done (similar to the quit logic in GTK+). Bug: 13563 Change-Id: I12d4b813557bf354199320df2ed8609070fdc58a Reviewed-on: https://code.wireshark.org/review/22096 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu (cherry picked from commit 800a856fb4784e31347e15a8ec825d2daeb62350) Reviewed-on: https://code.wireshark.org/review/22190 commit 6c7ed87 Author: Jaap Keuter Date: Sat Jun 17 08:44:08 2017 +0200 PIM: Add identification of Hello option 65004 Cisco uses propietary option 65004 to transmit RPF Proxy Vector information. Add the name of the option to the option identification. Change-Id: I5ee9e4d44d6326d8a457a8a4bbb24896e17216e8 Reviewed-on: https://code.wireshark.org/review/22186 Reviewed-by: Jaap Keuter Petri-Dish: Jaap Keuter Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit b2fa26ff7a270dc6a0f70c06cdc3e186f0c9d29f) Reviewed-on: https://code.wireshark.org/review/22189 commit b5711f1 Author: Guy Harris Date: Fri Jun 16 20:43:51 2017 -0700 Handle CMD over GRE. Bug: 13804 Change-Id: I0d96122a0c7f39315316e4da32c29977e147d3d6 Reviewed-on: https://code.wireshark.org/review/22183 Reviewed-by: Guy Harris (cherry picked from commit e2efa82811ee987dfe96929dd8383c45104dec0b) Reviewed-on: https://code.wireshark.org/review/22184 commit cd8f1f2 Author: Vasil Velichckov Date: Sat Jun 17 04:16:02 2017 +0300 gsm_sms: decode UCS2 as UTF-16 Some phones (Android and iOS smartphones) encode emoji characters as UTF-16 big endian and although the UTF-16 is not specified in the 3GPP 23.038 (GSM 03.38) it seems to be widely supported Bug: 13808 Change-Id: Ic4a600e42fb4b471223aaef1a661bd002835b519 Reviewed-on: https://code.wireshark.org/review/22181 Reviewed-by: Guy Harris (cherry picked from commit 85e2a54703da8adee8bf7aefc67f4851ee3b3f1d) Reviewed-on: https://code.wireshark.org/review/22182 commit 6b610cc Author: Guy Harris Date: Fri Jun 16 14:03:17 2017 -0700 Have two separate routines for wlantap dissection - OCTO and pre-OCTO. The two code paths don't share any code, so they might as well be in separate routines. That makes it even easier to read. Change-Id: I8ee335f4cac2aedc42216db7f9674e1a609d9347 Reviewed-on: https://code.wireshark.org/review/22179 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 8b99bb7fbf80f2fd3bfe53bbbfa14caec6319cbd) Reviewed-on: https://code.wireshark.org/review/22180 Reviewed-by: Guy Harris commit bcceb20 Author: Guy Harris Date: Fri Jun 16 13:31:10 2017 -0700 Further cleanup. Move some commented-out code where it belonged, and #if 0 it out instead. Have only *one* test for OCTO. Change-Id: I6e8803f936ebd88f1705b2185f034ec0b2bddb77 Reviewed-on: https://code.wireshark.org/review/22177 Reviewed-by: Guy Harris (cherry picked from commit 8ab033a2838ee94879910fd3ab9860122a72f151) Reviewed-on: https://code.wireshark.org/review/22178 commit fadd484 Author: Guy Harris Date: Fri Jun 16 12:53:44 2017 -0700 Clean up the 802.11 payload handling a bit. Two separate checks for OCTO, one right after the other, is a bit confusing. Change-Id: I702aa1809dc7271b69b5419dc850228fac516ed6 Reviewed-on: https://code.wireshark.org/review/22175 Reviewed-by: Guy Harris (cherry picked from commit d217b757cb1c627e53d9cffe47fa5f47c38045de) Reviewed-on: https://code.wireshark.org/review/22176 commit f6ad625 Author: Guy Harris Date: Fri Jun 16 11:40:22 2017 -0700 Fix SURROGATE_VALUE() to match what RFC 2781 says. While we're at it, note in the comment for get_utf_16_string() the "decoding UTF-16" algorithm in RFC 2781. Change-Id: I5d7dc5c09af0474c055796e49e0c7b94fa87d2ad Reviewed-on: https://code.wireshark.org/review/22171 Reviewed-by: Guy Harris (cherry picked from commit 435c68cd2b856a6be7d015e8703c6c83d9b8eb89) Reviewed-on: https://code.wireshark.org/review/22172 commit 25b6694 Author: Guy Harris Date: Fri Jun 16 01:54:42 2017 -0700 Rename FindOS_X_FRAMEWORKS.cmake for the new OS name. It's now FindMACOS_FRAMEWORKS.cmake. (But is it actually *used*? CMakeLists.txt does the check itself.) Change-Id: I6e972869b94da959dc7c9a3fccacfbd35e0e992c Reviewed-on: https://code.wireshark.org/review/22163 Reviewed-by: Guy Harris (cherry picked from commit a0dfbccdfca79da5ed9bc250d18bceedd3598276) Reviewed-on: https://code.wireshark.org/review/22164 commit 74858be Author: Guy Harris Date: Fri Jun 16 01:49:44 2017 -0700 Change some names to reflect Apple's new UNIX-for-Macs name. {OS_X,os_x} -> {MACOS,macos}. Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de Reviewed-on: https://code.wireshark.org/review/22161 Reviewed-by: Guy Harris (cherry picked from commit 5039d0e57635589208e1d969a57250746e422e06) Reviewed-on: https://code.wireshark.org/review/22162 commit 3e828e8 Author: Guy Harris Date: Fri Jun 16 00:57:54 2017 -0700 Rename a routine to match the OS name. It's now "macOS". While we're at it, note that the property list from which it fetches version information still calls it "Mac OS X". Change-Id: I438ef9dc65c2619d7378b0deb5efc84734a2ac6d Reviewed-on: https://code.wireshark.org/review/22159 Reviewed-by: Guy Harris (cherry picked from commit 63b91ad3119c64eb8fdaa67303fe37d71a01a1b0) Reviewed-on: https://code.wireshark.org/review/22160 commit d802138 Author: Michael Mann Date: Wed Jun 14 12:52:09 2017 -0400 packet-btrfcomm.c: Prevent over bit shift in get_le_multi_byte_value. https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2163 Bug: 13783 Change-Id: I92cefec86f9545345d00cf28e32ef7c05064417c Reviewed-on: https://code.wireshark.org/review/22141 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 552dab08a6ea1b47465d888c613c353f8697e918) Reviewed-on: https://code.wireshark.org/review/22152 Reviewed-by: Michael Mann commit 7f8d5f9 Author: Michael Mann Date: Wed Jun 14 19:55:05 2017 -0400 udpdump.c: Don't include epan headers. udpdump has local copies of the tag values from exported_pdu.h, so the dependency isn't needed. exported_pdu.h required tv_buff.h and packet_info.h, whose inclusion caused link errors on SPARC. Bug: 13801 Change-Id: Icbf7b59b8af0d3a0fc73599baad6932e76dc3462 Reviewed-on: https://code.wireshark.org/review/22131 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 828e1f07a82feb821c8169236fde18570ec01313) Reviewed-on: https://code.wireshark.org/review/22151 Reviewed-by: Michael Mann commit c6eeecf Author: Guy Harris Date: Thu Jun 15 02:14:25 2017 -0700 Make the short names for USB encspsulation types more regular. Have them all be "usb-XXX", where XXX indicates the type of header. Change-Id: I7f1bfea7e264b17c57f94c484d64d1cce91b9b78 Reviewed-on: https://code.wireshark.org/review/22147 Reviewed-by: Guy Harris (cherry picked from commit ee0dde474c20afb4c493441400926ad7924ca458) Reviewed-on: https://code.wireshark.org/review/22148 commit 6e694c6 Author: Guy Harris Date: Thu Jun 15 02:05:08 2017 -0700 Better names for various USB headers. Change-Id: Iec2126fa1b71d9923ef0fb9ca2a027f7752d71f3 Reviewed-on: https://code.wireshark.org/review/22144 Reviewed-by: Guy Harris (cherry picked from commit 6f8bc61c3323b959900f125234e7055018d62e4b) Reviewed-on: https://code.wireshark.org/review/22145 commit 3f3d229 Author: Jaap Keuter Date: Wed Jun 14 22:55:02 2017 +0200 Miscellaneous texual corrections and addition Correct some symbolic references in source file comments and add a note about the CMake configuration options. Change-Id: Idb670a2c798c2a52cdce142340ce8fc5a2022508 Reviewed-on: https://code.wireshark.org/review/22138 Reviewed-by: Michael Mann Reviewed-by: Anders Broman (cherry picked from commit 2a5cb8e32e31ed0fb64b97318dd38470886d9154) Reviewed-on: https://code.wireshark.org/review/22142 commit 588c1f5 Author: João Valverde Date: Wed Jun 14 21:01:11 2017 +0100 RADIUS: Fix dissection for non-default VSA lengths Ping-Bug: 13745 Change-Id: I1c9f69d0015ba9bea16d8300fbfd85abe110f829 Reviewed-on: https://code.wireshark.org/review/22136 Reviewed-by: João Valverde (cherry picked from commit 9ed4046e0f3e8872c3adec3f11376ee392834525) Reviewed-on: https://code.wireshark.org/review/22139 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit d7f1dc8 Author: Robert Sauter Date: Wed Jun 14 07:52:59 2017 +0200 IEEE 802.15.4: Fix IE/MIC handling of secured packets without payload Change-Id: Icdcb770723e3783013f525524c3fe745d5dd862d Reviewed-on: https://code.wireshark.org/review/22122 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit ae085f7338b356f249bbc639ce70412ece42a708) Reviewed-on: https://code.wireshark.org/review/22133 commit 75e2c7e Author: Michael Mann Date: Tue Jun 13 23:05:24 2017 -0400 WBXML: Fix some more potential infinite loops. tvb_get_guintvar can generate some unrealistic values so do some sanity checking on them. Bug: 13796 Change-Id: I2d5f7a48c2e982a419ea6ab3ac0000be3b6bcbc7 Reviewed-on: https://code.wireshark.org/review/22121 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 50fa2d95833ec2e2b0de3000eda7b290fc23eaeb) Reviewed-on: https://code.wireshark.org/review/22128 commit 9adc7af Author: Michael Mann Date: Tue Jun 13 20:37:11 2017 -0400 DOCSIS: Prevent infinite loop from unknown FCParm. concatlen was not updated if FCParm was unknown, leading to an infinite loop. Bug: 13797 Change-Id: I1b64d757a369183a711f01b0b5cd1ba7aa0787bc Reviewed-on: https://code.wireshark.org/review/22120 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 26a6881014c85c935f2794f6eeb852849137c20a) Reviewed-on: https://code.wireshark.org/review/22124 commit b0af8a5 Author: Anthony Coddington Date: Fri Jun 9 17:16:27 2017 +1200 Fix automatic name resolution not saved to NRB Clear DUMMY_ADDRESS_ENTRY when add_ipv4_name/add_ipv6_name. This flag is checked in ipv4_hash_table_resolved_to_list(). TODO: clean up these flags as they are confusing and DUMMY appears somewhat redundant. Change-Id: I81d40cc778cbe5c36314631d3fa0997cee409368 Bug: 13798 Reviewed-on: https://code.wireshark.org/review/22109 Reviewed-by: Michael Mann (cherry picked from commit f3267f17a3fc3c8ab138940653f2e968c5d27378) Reviewed-on: https://code.wireshark.org/review/22114 commit 5be6088 Author: Alexis La Goutte Date: Sun Jun 11 19:30:49 2017 +0000 address(.h): fix typo adresses => addresses Change-Id: Ibc787005bb7865da55d2d8257009bace1108f181 Reviewed-on: https://code.wireshark.org/review/22082 Reviewed-by: Michael Mann (cherry picked from commit d4e51deadb280b822532a268304fed0e03b31cac) Reviewed-on: https://code.wireshark.org/review/22099 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8f05fac Author: Alexis La Goutte Date: Thu Jun 8 10:03:27 2017 +0000 netflow: fix typo adresses => addresses Change-Id: I8578f86f75b1a7278ad71d8671ce4e2dbc4f0c82 Reviewed-on: https://code.wireshark.org/review/22081 Reviewed-by: Michael Mann (cherry picked from commit 0813fccb089ae6c9a910604f137fa8f99e66e142) Reviewed-on: https://code.wireshark.org/review/22100 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 2b2ecff Author: Pascal Quantin Date: Sat Jun 10 16:31:52 2017 +0200 Windows: increase minimum CMake version to 3.7 g9f0d22b introduced the use of GREATER_EQUAL operator. Let's update the minimum CMake version accordingly. Change-Id: Ibf619a24f5ee296b547fbc6ba46e13b8a1f3302c Reviewed-on: https://code.wireshark.org/review/22066 Petri-Dish: Pascal Quantin Reviewed-by: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin (cherry picked from commit 4edc611526fc2aa17a7f5e82ce0147d799d2c508) Reviewed-on: https://code.wireshark.org/review/22092 commit a1bda46 Author: Gerald Combs Date: Thu Jun 8 10:39:05 2017 -0700 NSIS: Add support for Visual Studio 2017. Also fixes a bug where vcredist was found in C:\Program Files\Wireshark Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9 Reviewed-on: https://code.wireshark.org/review/22044 Petri-Dish: Anders Broman Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 9f0d22bdd1e75178332756f9abb1ae4b45b0de0b) Reviewed-on: https://code.wireshark.org/review/22090 commit 79d7ef3 Author: Gerald Combs Date: Thu Jun 8 15:30:35 2017 -0700 CMake: Look for Python in more places. According to PEP 514, Python.org's Windows installer stores its installation path in HKEY_LOCAL_MACHINE\Software\Python\\\InstallPath where is the value of sys.winver. Newer versions of python add "-32" and "-64" to the version in order to allow side by side installations. Adjust LocatePythonExecutable accordingly. Change-Id: I8c7f8b4c31b37e7f687ce9909f97d62a779cfa91 Reviewed-on: https://code.wireshark.org/review/22048 Reviewed-by: Gerald Combs (cherry picked from commit 6a16f158c849c054bd1a4b71e0c497df48933797) Reviewed-on: https://code.wireshark.org/review/22089 Reviewed-by: Anders Broman commit c319989 Author: Anders Date: Fri Jun 9 16:02:21 2017 +0200 Simplify the search for HTMLHelp. Change updated as per https://gitlab.kitware.com/cmake/cmake/issues/16950#note_277462 Change-Id: I794e6cf7af3d1affa7ee5182374b6f22d9acdf33 Reviewed-on: https://code.wireshark.org/review/22051 Reviewed-by: Anders Broman Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 0dc32776d071fdf00754e349a0f9db20119df5df) Reviewed-on: https://code.wireshark.org/review/22093 commit e89e2f9 Author: Graham Bloice Date: Thu Jun 8 13:38:40 2017 +0100 CMake: Add local copy of FindHTMLHelp.cmake Add a local copy of FindHTMLHelp.cmake to search for hhc.exe that includes the 32 bit program files locations "Program Files (x86)" as this is where hhc.exe normally lives. Change-Id: Ic5917a0765786ac483a7d4ef457043319d0e8501 Reviewed-on: https://code.wireshark.org/review/22037 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice (cherry picked from commit fce2f2bb1f0e6cc2a07a26e0c35b994a3253131d) Reviewed-on: https://code.wireshark.org/review/22091 Reviewed-by: Anders Broman commit 6eec098 Author: Michael Mann Date: Sun Jun 11 15:20:44 2017 -0400 Ranap: improve heuristic algorithm Strength the heuristic cheking PDU-Type and Criticality field values too # Conflicts: # epan/dissectors/packet-ranap.c Change-Id: Id95603634a93033664bdbd169880e6b411cfbc11 Bug: 13791 Reviewed-on: https://code.wireshark.org/review/22076 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-on: https://code.wireshark.org/review/22080 Petri-Dish: Michael Mann commit c238d2f Author: Petr Sumbera Date: Sun Jun 11 15:32:12 2017 +0200 Fix airpdcap compilation on Sun Bug: 13786 Change-Id: Iaa3890610768605b5c579aaddc73124b9f85bdd9 Reviewed-on: https://code.wireshark.org/review/22074 Petri-Dish: Michael Mann Reviewed-by: Michael Mann (cherry picked from commit 2073457ab9ef817a2342e3c4dd858b88198020e4) Reviewed-on: https://code.wireshark.org/review/22075 commit 325895b Author: Robert Sauter Date: Sun Jun 11 12:37:14 2017 +0200 packet-spdy: Fix -Wunused-const-variable error when compiling without zlib Change-Id: Id471772488d3a0568f16f604585b3155a57e47b2 Reviewed-on: https://code.wireshark.org/review/22072 Reviewed-by: Anders Broman Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit 5617527ee3831a8012f076b67e2532eeb8b1da2d) Reviewed-on: https://code.wireshark.org/review/22073 commit ead3354 Author: Gerald Combs Date: Sun Jun 11 08:19:37 2017 +0000 [Automatic update for 2017-06-11] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I7fc53087dbb81293f8bd5f62e505f879896f668f Reviewed-on: https://code.wireshark.org/review/22068 Reviewed-by: Gerald Combs commit 3d5c9b3 Author: Guy Harris Date: Fri Jun 9 19:59:39 2017 -0700 Fix indentation. Change-Id: I9ea3947a4100d4d566c0d6815de5336214f9f581 Reviewed-on: https://code.wireshark.org/review/22062 Reviewed-by: Guy Harris (cherry picked from commit b01c85c17a0a1e78837aeab79b15054ab15c8483) Reviewed-on: https://code.wireshark.org/review/22063 commit baacfcf Author: Guy Harris Date: Fri Jun 9 18:43:00 2017 -0700 Put the non-filter part of epan/color_filters.h into wsutil/color.h. Places that only need color_t, such as certain preferences, don't need the color filter stuff. Change-Id: I88fc2858454d04e659b323a8bc28b21d362ca3fb Reviewed-on: https://code.wireshark.org/review/22060 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris (cherry picked from commit 0480a0be81dd5c561637c8d6351191c154f72970) Reviewed-on: https://code.wireshark.org/review/22061 commit 689a94b Author: Guy Harris Date: Fri Jun 9 17:48:46 2017 -0700 Fix weird comment. Change-Id: I4254b37b14631929681b5642dc44911019807cb1 Reviewed-on: https://code.wireshark.org/review/22058 Reviewed-by: Guy Harris (cherry picked from commit 25777d09866015d0cfef7265aefcc341321df110) Reviewed-on: https://code.wireshark.org/review/22059 commit 98ffd27 Author: Guy Harris Date: Fri Jun 9 15:38:05 2017 -0700 Just print the string color_filters_init() provides on an error. It gives all the necessary details; no need to mention the name of a routine the existence of which the user is probably unaware. Change-Id: I66d372bc6650c84fbbc6be438be695eff1048413 Reviewed-on: https://code.wireshark.org/review/22055 Reviewed-by: Guy Harris (cherry picked from commit 60da2c96ddddd222994e8d25a3825fb8d7fd7ae5) Reviewed-on: https://code.wireshark.org/review/22057 commit efb35a2 Author: Guy Harris Date: Fri Jun 9 15:04:32 2017 -0700 Handle filter open and read errors better. If the user's color filter file exists but can't be opened, fail and return a failure indication. If it doesn't exist, just try reading the global color filter file. If *that* exists but can't be opened, fail and return a failure indication; if it doesn't exist, don't treat that as an error. Change-Id: I5ebdc0eb1ada3cc190990be9228639304f32147e Reviewed-on: https://code.wireshark.org/review/22054 Reviewed-by: Guy Harris (cherry picked from commit ad4e81fcf869680b057651970fba38690e82c87d) Reviewed-on: https://code.wireshark.org/review/22056 commit cc4c80d Author: Guy Harris Date: Fri Jun 9 13:19:09 2017 -0700 Add URL for link specifying D-Bus maximum message length. Change-Id: I5797407a18fda674b2c9b2cc1c192c211c91c496 Reviewed-on: https://code.wireshark.org/review/22052 Reviewed-by: Guy Harris (cherry picked from commit ed7e9c77db9a4a7306abfc3935a84f49a9a96ee4) Reviewed-on: https://code.wireshark.org/review/22053 commit 2931ba8 Author: Simon Barber Date: Wed Jun 7 12:06:26 2017 -0700 ieee80211-radio: Fix calculation of frame start time With captures where TSF indicates the end of the frame the preamble was being counted twice in the calculation of the start. Change-Id: I3d042d8ea3bc46a833438cb3d2f75e3499a7711d Reviewed-on: https://code.wireshark.org/review/22020 Petri-Dish: Stig Bjørlykke Reviewed-by: Stig Bjørlykke (cherry picked from commit 33456f48ac9a3842e1eda8e179ae9d8bd4c33140) Reviewed-on: https://code.wireshark.org/review/22050 commit 2ea72fa Author: Pascal Quantin Date: Thu Jun 8 14:44:49 2017 +0200 IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin (cherry picked from commit 49a55b9666329971e2c17d69179c331160fa7b40) Reviewed-on: https://code.wireshark.org/review/22047 commit 61fa008 Author: Pascal Quantin Date: Thu Jun 8 22:16:36 2017 +0200 sharkd: fix a shadow warning when compiling on RHEL/CentOS 6.x Bug: 13424 Change-Id: I20e474180545d89599c346ad2c5994949d213cb0 Reviewed-on: https://code.wireshark.org/review/22045 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin (cherry picked from commit b347ce62c95c76b840fbb1740912718fde746176) Reviewed-on: https://code.wireshark.org/review/22046 commit bd59918 Author: Pavel Strnad Date: Thu Jun 8 15:23:53 2017 +0200 LTE RRC: fix filtering of q-RxLevMin parameter Ensure that filter as a different abbreviation depending on the technology used. Bug: 13481 Change-Id: I14782dffcf70bdb015fd705d2184ae8c42f232c5 Reviewed-on: https://code.wireshark.org/review/22039 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 3453a0b888a0e188c03012023a4e93d03764602c) Reviewed-on: https://code.wireshark.org/review/22041 commit a24bcc5 Author: linzhao115 Date: Wed Jun 7 19:52:53 2017 -0700 export-smb2-objects: Make sure tap be called for named pipe smb2_eo_tap is not called when smb2 packets are dissected as named pipe then exit. Basically, for the following code snippet, if (length) { int old_offset = offset; ... offset = dissect_file_data_smb2_pipe(...); if (offset != oldoffset) { /* managed to dissect pipe data */ return offset; ... dissect_file_data_smb2_pipe() always returns a different offset, thus it will never hit the smb2_eo_tap related code below that are needed for exporting smb2 objects. As a quick fix, call the tap related code before returning. Bug: 13214 Change-Id: I7a99177947c384f53424b209f7e5c1f9963b5da8 Reviewed-on: https://code.wireshark.org/review/22031 Reviewed-by: Jaap Keuter Petri-Dish: Jaap Keuter Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 411a5342c5d9f12651ed7c8d268597bdc3db9f4a) Reviewed-on: https://code.wireshark.org/review/22034 Reviewed-by: Michael Mann commit 4f4258e Author: Martin Kaiser Date: Wed Jun 7 23:26:33 2017 +0200 wsmp: read the message length as big endian We add the message length to the tree as big endian but we interpret it as little endian for our further calculations. This causes parsing errors. Use big endian for both cases. Bug: 13766 Change-Id: I4e6cdb7d4267be96ea78eb664e88c532a9a90b52 Reviewed-on: https://code.wireshark.org/review/22024 Petri-Dish: Martin Kaiser Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann (cherry picked from commit bd130766438546ab64f7540597a2e3b82cbf8a3c) Reviewed-on: https://code.wireshark.org/review/22028 commit d3bf38c Author: Gerald Combs Date: Wed Jun 7 18:07:16 2017 -0700 2.4.0rc1 → 2.4.0rc2. Change-Id: Ie37f6e639b7fc2a16459b37283af28beeff15d45 Reviewed-on: https://code.wireshark.org/review/22027 Reviewed-by: Gerald Combs