summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-27CMake: Fix the WiX search path.Gerald Combs1-3/+9
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 <gerald@wireshark.org> (cherry picked from commit a6652a27783b59d23dca3405b0399690f38f3402) Reviewed-on: https://code.wireshark.org/review/22425
2017-06-27WiX: Fixup merge module configuration.Gerald Combs2-5/+15
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 <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit c89f4c628c315e8f472653856a0776469c65f34e) Reviewed-on: https://code.wireshark.org/review/22424
2017-06-27On UN*X, make sure we can find inflate() in libz.Guy Harris2-1/+37
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 <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 e61d2f624348329f8d73af55e6ff3e0e7ee012da) Reviewed-on: https://code.wireshark.org/review/22418
2017-06-27Don't check for inflatePrime() on Windows.Guy Harris1-5/+19
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 <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 9a1d16b55324056e4d5031370b007097b76dc519) Reviewed-on: https://code.wireshark.org/review/22414
2017-06-26cmake: fix SET_FEATURE_INFO deprecation warningPeter Wu1-10/+42
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 <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 8d214209e80c2cc86ad9624b31cc6365e10ed454) Reviewed-on: https://code.wireshark.org/review/22409 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-26PDCP LTE: fix dissection of Polling bit for User plane Data PDU with 18 bits SNPascal Quantin1-4/+14
Change-Id: Id1167d2c6fa84fd5145d5f0313e39f53591a9add Reviewed-on: https://code.wireshark.org/review/22406 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 71a9ade669c51209132f61a0ded27e60c386af99) Reviewed-on: https://code.wireshark.org/review/22408
2017-06-26Fix Packet Lengths statistics countSilvio Gissi1-1/+6
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 <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> (cherry picked from commit aefd4e1844abbc8b10732be03991047617ebd650) Reviewed-on: https://code.wireshark.org/review/22403
2017-06-25Sample deprecated filter -> Sample warning filterMichael Mann2-2/+2
"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 <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 395775acce1ef9624fdf2030179683f37a27cd59) Reviewed-on: https://code.wireshark.org/review/22394
2017-06-25Fix Y.1711 endiannessSilvio Gissi1-3/+3
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 <mmann78@netscape.net> 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> (cherry picked from commit 80d3483f3463b8e5ed73f019dbf431656410f658) Reviewed-on: https://code.wireshark.org/review/22388 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25[Automatic update for 2017-06-25]Gerald Combs13-1831/+2293
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie5891519ffda85c84dcda3b745e3abf64a3dfd21 Reviewed-on: https://code.wireshark.org/review/22385 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-23tcp: add tcp.payload fieldSake Blok1-0/+11
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 <sake@euronet.nl> Petri-Dish: Sake Blok <sake@euronet.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> (cherry picked from commit 69bac0d15c94891398e65fda05fb5d7320eb2989) Reviewed-on: https://code.wireshark.org/review/22375
2017-06-23OSPF: fix Opaque LSA Type 11 is considered as unknownAlexis La Goutte1-0/+1
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 <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: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 0727123773d36a9dd6000d82a2967f7ddaa61aca) Reviewed-on: https://code.wireshark.org/review/22370
2017-06-23Snort content matching fixesMartin Mathieson2-8/+19
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 <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> (cherry picked from commit 8a3e4650674a36fdfe7b38c60c8d83b4dfec0d11) Reviewed-on: https://code.wireshark.org/review/22369 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-22Properly find packet comments "field" for protocol hierarchy stats.Michael Mann1-1/+1
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 <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 66c2f5b5f17c3873d0b9e6ea853ccf7bf8c7062d) Reviewed-on: https://code.wireshark.org/review/22364
2017-06-22Qt: Restore multi custom column width and alignStig Bjørlykke2-4/+2
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 <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 578f2a15bb7534b3aad315a92989b6e4d577e4c3) Reviewed-on: https://code.wireshark.org/review/22358 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-22TCP: Make the header length display consistent with IPv4.Gerald Combs2-2/+5
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 <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> (cherry picked from commit b370c02a02cef0e26f327342e085fa45b4e06e3f) Reviewed-on: https://code.wireshark.org/review/22355
2017-06-22E.212: update list to Operational Bulletin No. 1126 (15.VI.2017)Pascal Quantin1-6/+29
Change-Id: Ib91dc1fca0d39b53f5f55223405f473dfa816a84 Reviewed-on: https://code.wireshark.org/review/22350 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: Anders Broman <a.broman58@gmail.com> (cherry picked from commit cfb23d874345eede2860afa155b181a2e2e208c0) Reviewed-on: https://code.wireshark.org/review/22357
2017-06-22Manuf: Konica Minolta updates.Gerald Combs1-2/+1
Correct a couple of entries related to Konica Minolta. Change-Id: I3acea1cf7ab1ad9be5d1b367a1015f5205b9e80b Reviewed-on: https://code.wireshark.org/review/22268 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit c919c625025afdca318a1a3413b268d00ad1985c) Reviewed-on: https://code.wireshark.org/review/22356 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-22wsutil: Back out profile_write_info_fileStig Bjørlykke3-40/+0
Change-Id: I9253a4295aecb23ec5e87d0453249955ca1ea18a Reviewed-on: https://code.wireshark.org/review/22347 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-22packet-mbtcp - Fix retrieval of Holding/Input Register Format PreferenceChris Bontje1-1/+1
Change-Id: I7a6a409df5c977db1898aec6a47ae3dd8427a00c Reviewed-on: https://code.wireshark.org/review/22286 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 130b514be216e8ccc42c6831f62ecb23e9b83917) Reviewed-on: https://code.wireshark.org/review/22351
2017-06-22OSPF: Opaque ID is not longer be zeroAlexis La Goutte1-15/+0
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 <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 123d170767f6e51ce6b216d633fb03a3cf311109) Reviewed-on: https://code.wireshark.org/review/22348
2017-06-22IEC104: Added checking of correct ApduLen in context of ASDU typeJiří Engelthaler1-0/+19
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 <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 d2ed7fcf9e0dca17f1a0181364910b9533dc7091) Reviewed-on: https://code.wireshark.org/review/22345
2017-06-22Add notes about predefined strings not available to pluginsDirk Weise1-1/+7
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 <mmann78@netscape.net> (cherry picked from commit 9fe90b93ce9bbb802f45b93632a78f5261b3f717) Reviewed-on: https://code.wireshark.org/review/22342
2017-06-22MQ: put declaration before codePascal Quantin1-1/+2
Change-Id: I2b0d1a4795e3278a1702d51d4fd532a37a4eba19 Reviewed-on: https://code.wireshark.org/review/22332 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit e46cb2defc559a530d11689d50f0adf47513e8e5) Reviewed-on: https://code.wireshark.org/review/22333
2017-06-21Lua: Add "tonumber" method to NSTimeSilvio Gissi3-7/+22
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 <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 59add43eecfbed3bae5d75dabe6e875b5adefe1b) Reviewed-on: https://code.wireshark.org/review/22331
2017-06-21Qt: fix sorting of custom columns with multiple fieldsPeter Wu2-14/+37
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 <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 16f70b9bb1faf48d985e21fcfa92d1934c2b50f5) Reviewed-on: https://code.wireshark.org/review/22326 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-21wsutil: Check return from ws_writeStig Bjørlykke1-2/+3
Change-Id: I73f65222dc23ebcb484f2598a12f43b284654420 Reviewed-on: https://code.wireshark.org/review/22321 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 6117ff496becee208336847a0cf460c15751ef6d) Reviewed-on: https://code.wireshark.org/review/22322
2017-06-21wsutil: Ignore return from ws_writeStig Bjørlykke1-2/+2
Change-Id: Idad4dd84538e3ccb7b258775704db8b6bd6c301e Reviewed-on: https://code.wireshark.org/review/22319 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 6e0bc30a95ae7759c45ce1f39360259570087b5d) Reviewed-on: https://code.wireshark.org/review/22320
2017-06-21[sipstat] Update the Response Codes table.Anders1-2/+21
Change-Id: Iae6e49963ea94ba8a174342e25d2ca5494001e28 Reviewed-on: https://code.wireshark.org/review/22310 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> (cherry picked from commit 536451a8dea2655a1d31006125cb283f49cfb859) Reviewed-on: https://code.wireshark.org/review/22318
2017-06-21Qt: Write a list of profile files at startupStig Bjørlykke3-0/+40
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 <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 a14ef98540af979f0dbc39c728f9fc31a687a16f) Reviewed-on: https://code.wireshark.org/review/22313 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-21wsutil: Free files in reset_default_profileStig Bjørlykke1-0/+1
This plugs a memory leak. Change-Id: Ic989a89353d10de6f8f07df6a734d2b912facb7e Reviewed-on: https://code.wireshark.org/review/22305 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 99c3c6d9086a49bd88f8b99db641a4ba2b5d4c0a) Reviewed-on: https://code.wireshark.org/review/22312 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-21Qt: display newlines in capture file commentsPeter Wu1-2/+2
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 <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit b44ad2a0fa58e4a5acb4293d047993b3aea1f532) Reviewed-on: https://code.wireshark.org/review/22311 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-21packet-xml: Add 3GPP, ETSI, GSMA and OMA media typesVasil Velichkov1-0/+59
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 <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 3b7440996b2f3637656575ad121fa6edfa03cfcb) Reviewed-on: https://code.wireshark.org/review/22304
2017-06-21ISIS LSP: fix wrong bitmask for SPVIDAlexis La Goutte1-1/+1
Issue reported by Bo-Han Liao Bug: 13821 Change-Id: I74641bef723e747bfe5fa87e946b7f4f74b94bf6 Reviewed-on: https://code.wireshark.org/review/22299 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 855484fbd98c8c01f5a84902243389e07e32b6e9) Reviewed-on: https://code.wireshark.org/review/22300
2017-06-21IEEE 802.15.4: Fix double offset increment for Time Correction Header IERobert Sauter1-10/+6
Regression by https://code.wireshark.org/review/21890/ Change-Id: Ieb90672dc2181f5951a8a4165e2676b7882282e5 Reviewed-on: https://code.wireshark.org/review/22087 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit b8e660edc66d7f40545868a377b3385b4c9a54cb) Reviewed-on: https://code.wireshark.org/review/22298
2017-06-21Fix Toggle indicator for searchRoland Knall1-3/+0
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 <rknall@gmail.com> (cherry picked from commit 6b9b4bd96833e31f659118b5e34f1393cb95b247) Reviewed-on: https://code.wireshark.org/review/22282 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-21SearchBar - Focus on shortcut instead of closingRoland Knall2-3/+4
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 <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: 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 d83176ed2edffe59badd75d8ee98c77227fd357f) Reviewed-on: https://code.wireshark.org/review/22281 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-21tcp: Change the wording to include (s)Roland Knall1-1/+1
More than one packet could be meant by that Change-Id: Ie751a282c927608414673c2cd48b11dc5e6d5ea6 Reviewed-on: https://code.wireshark.org/review/22283 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 050da447424223d39d1e494b8daab840a100d05e) Reviewed-on: https://code.wireshark.org/review/22295
2017-06-20Fix filter for "Next Packet in Conversation"Peter Wu5-76/+32
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 <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit 4deb97f31f52ca9c88efbbf46cf3e580c85474f3) Reviewed-on: https://code.wireshark.org/review/22287
2017-06-20IP: ensure that fragment contains payload before adding it for reassemblyPascal Quantin1-0/+1
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 <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit e6883c15ac00942e3232213f087147e355f7494b) Reviewed-on: https://code.wireshark.org/review/22284
2017-06-20Qt: Rename "Filter Expressions" to "Filter Buttons"Stig Bjørlykke1-1/+1
Change-Id: I7adcb1d28d239bbc25d8a7a5969b34c6db84e022 Reviewed-on: https://code.wireshark.org/review/22277 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 75f9247c2cfec63caeb59039de972abc768e3a4b) Reviewed-on: https://code.wireshark.org/review/22279
2017-06-20Qt: Create the user profiles dir at startupStig Bjørlykke3-25/+54
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 <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 4f1053c5464de12b635a8cf4128b78d51f6f3deb) Reviewed-on: https://code.wireshark.org/review/22278 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-20Misc snort fixes.Martin Mathieson3-7/+60
- 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 <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit d19c3a22b927db0dc83bcad9e024a8ed8f866671) Reviewed-on: https://code.wireshark.org/review/22269 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-20GTPv2: put dissection under GTPv2 protocol itemPascal Quantin1-7/+5
Bug: 13813 Change-Id: Ic1582406896b2d4d3505ae1d3bb79cdbafa481da Reviewed-on: https://code.wireshark.org/review/22247 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 59670461b00414d504b2a9ed9e7bafeab65a7420) Reviewed-on: https://code.wireshark.org/review/22270 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-20IEEE 802.11: Use correct mask for 'SMK message'Robert Sauter1-1/+1
Change-Id: I2def75c999faec0cbb16fd87133f09544bff78c4 Reviewed-on: https://code.wireshark.org/review/22264 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 23e667169eefc450808e60ea515fc271122052de) Reviewed-on: https://code.wireshark.org/review/22266
2017-06-20Qt: make Wireless Timeline a separate itemPeter Wu6-18/+29
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 <mmann78@netscape.net> Reviewed-by: Simon Barber <simon.barber@meraki.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 4d90f2e092802775e5e3e457768d1c1f4760a1f0) Reviewed-on: https://code.wireshark.org/review/22265
2017-06-20Don't scroll back to the selected frame when we get name resolution updates.Jeff Morriss2-4/+12
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 <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 4e46352657df1d66e8f2ade8c5e3d38ecae18530) Reviewed-on: https://code.wireshark.org/review/22262 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-20PROFINET IO: define an arbitrary recursion depth limitPascal Quantin1-3/+12
Bug: 13811 Change-Id: I52bffd4a79dcdad9da23f33e1fc6a868472390bf Reviewed-on: https://code.wireshark.org/review/22232 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit fbfb87a2439dd18f2318586b8e5a2f6db410ba6a) Reviewed-on: https://code.wireshark.org/review/22254 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-20Qt: Turn off auto scroll when going to a packetStig Bjørlykke2-1/+17
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 <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 be4dbf840b164ab9b788ee8c3a9466e2da1393d2) Reviewed-on: https://code.wireshark.org/review/22259 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-20AMQP: workaround some proto_tree_add_none_format() assertsPascal Quantin1-14/+14
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 <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 2de483c0925a5a93cdaee168997f3f3c7949d2d4) Reviewed-on: https://code.wireshark.org/review/22257
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-23 19:49:48 +0000