summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-07-03ieee802154: fix a bug preventing Payload Terminate IE dissectionmaster-2.4Yasuyuki Tanaka1-1/+1
Bug: 13867 Change-Id: Ib251b8646ddf428f0aa053dd91b613c027145d20 Reviewed-on: https://code.wireshark.org/review/22499 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> (cherry picked from commit 2c58ed569ed0c096d5640fd0da5825bcfef04aeb) Reviewed-on: https://code.wireshark.org/review/22502
2017-07-01iface_lists: select interfaces via command line (option -i)Peter Wu1-4/+6
The "wireshark -i lo" option somehow did not mark interfaces as selected. It turns out that the "-i" option populates the "ifaces" array during option parsing, but we must also set the "selected" property in the "all_ifaces" array in function "scan_local_interfaces". Bug: 13865 Fixes: v2.3.0rc0-2812-g40a5fb567a ("Restore interface selection after interface refresh") Change-Id: Iacfeaf14efe2696f37f0e021259c59fb677de435 Reviewed-on: https://code.wireshark.org/review/22478 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> (cherry picked from commit ec1a5b15455c2c0bd5535d5257b2513804140747) Reviewed-on: https://code.wireshark.org/review/22490 Petri-Dish: Michael Mann <mmann78@netscape.net>
2017-06-30btle: Improve reassembly when missing packetsStig Bjørlykke1-18/+32
Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 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> (cherry picked from commit e335636303eb7a63637f8bec89184cc20ceef8f9) Reviewed-on: https://code.wireshark.org/review/22486
2017-06-30btle: Support reassembly in both directionsStig Bjørlykke1-6/+40
Create one connection_info_tree for each direction to support reassembly in both directions simultaneously. Change-Id: If83e8705412062b07f3fa47a73f42db8c7895e78 Reviewed-on: https://code.wireshark.org/review/22476 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 95e09a60bbc0bc07cea9c8d12c28912845113407) Reviewed-on: https://code.wireshark.org/review/22485 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30extcap: another round of memory leak fixesPeter Wu1-4/+14
Fix assorted memory leaks. Note that _tool_for_ifname is cleaned up at exit by extcap_cleanup, but lacked key/value destructors, so add them. After this, ASAN reports no more extcap memleaks. Change-Id: Ie5f4b1e2453a0beb52d617670202973839ca1416 Reviewed-on: https://code.wireshark.org/review/22466 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 1c7e393af3dd5561f6a54dc93546cfd3e7af2286) Reviewed-on: https://code.wireshark.org/review/22471
2017-06-30dumpcap: fix minor memory leak at begin of capturePeter Wu1-0/+2
While "os_info_str" is freed after the loop, "cpu_info_str" was leaked. Change-Id: Ia4069403c0a5dd5cc6bd7ed61726c1bfa9736b19 Reviewed-on: https://code.wireshark.org/review/22465 Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 247446539704aee99f64e73a77e5e88a40ae885a) Reviewed-on: https://code.wireshark.org/review/22468
2017-06-30dumpcap: fix buffer overflow on packets larger than 2048 bytesPeter Wu1-6/+20
When the current capture buffer is too small, it must be increased before attempting to read the next data packet. Fix developed by Mikael Kanstrup (and Guy), I added comments such that the next reader does not have to guess whether "incl_len" is accidentally used for reading from the buffer (it is not). Change-Id: I980bd21ac79601a34d57ffc99a34bfb54c297ac0 Fixes: v2.5.0rc0-28-gd0865fd619 ("Allow bigger snapshot lengths for D-Bus captures.") Bug: 13852 Reviewed-on: https://code.wireshark.org/review/22464 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 8f8a0f72b442efe66c7ee26417a92508a1546289) Reviewed-on: https://code.wireshark.org/review/22467 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-29btle: Reorder elements in Packet Header and Data HeaderStig Bjørlykke1-10/+10
This shows the elements in a little-endian fashion and aligns with other element trees using bitmask. Change-Id: I8e16eaee9944c2b56bc9fe18f31a983047aca121 Reviewed-on: https://code.wireshark.org/review/22453 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> (cherry picked from commit dbcf160c38ca1ea7c4b2fc938d35c3e81758a895) Reviewed-on: https://code.wireshark.org/review/22459 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-29Qt: fix alloc-dealloc-mismatch while adding named pipePeter Wu3-34/+30
ManageInterfacesDialog::on_addPipe_clicked uses g_new0 to create an "interface_t" instance, but InterfaceTreeCacheModel uses qDeleteAll which results in ASAN reporting "alloc-dealloc-mismatch (malloc vs operator delete)". To fix this, remove the dynamic allocation and make InterfaceTreeCacheModel store the instance internally. Change-Id: I9426dfc88d0a54a889bbbc9cf336c0a6af76920e Reviewed-on: https://code.wireshark.org/review/22410 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> (cherry picked from commit 6bc0ba845100acb3c721e4f945bafeb1bed6c942) Reviewed-on: https://code.wireshark.org/review/22445 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-282.4.0rc2 → 2.4.0rc3.Gerald Combs2-7/+7
Change-Id: I7a76b96edc76ef0daf099c6bcaeb9b25d9cc5a75 Reviewed-on: https://code.wireshark.org/review/22449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-28Build 2.4.0rc2.Gerald Combs5-54946/+1107
Change-Id: Iaaa89c4eb9026217934073298689e08aa224c6aa Reviewed-on: https://code.wireshark.org/review/22444 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-28Don't worry about initializing auto aggregates with non-constant values.Guy Harris1-9/+16
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 <guy@alum.mit.edu> (cherry picked from commit e0a9192ebceba1e7d010a75592b101e4b80b952a) Reviewed-on: https://code.wireshark.org/review/22435
2017-06-27Fix the "don't initialize with non-constant variables" item.Guy Harris1-4/+20
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 <guy@alum.mit.edu> (cherry picked from commit 7321df2a4532d6531eab75f99c5f158ffd90574b) Reviewed-on: https://code.wireshark.org/review/22431
2017-06-27WiX: More merge module fixups.Gerald Combs1-7/+13
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 <gerald@wireshark.org> (cherry picked from commit 5997e8e1980ea9981e28a5abe73d1b8718d03041) Reviewed-on: https://code.wireshark.org/review/22427
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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-28 17:16:14 +0000