summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-17PIM: Add identification of Hello option 65004Jaap Keuter1-0/+3
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 <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit b2fa26ff7a270dc6a0f70c06cdc3e186f0c9d29f) Reviewed-on: https://code.wireshark.org/review/22189
2017-06-17Handle CMD over GRE.Guy Harris2-4/+47
Bug: 13804 Change-Id: I0d96122a0c7f39315316e4da32c29977e147d3d6 Reviewed-on: https://code.wireshark.org/review/22183 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit e2efa82811ee987dfe96929dd8383c45104dec0b) Reviewed-on: https://code.wireshark.org/review/22184
2017-06-17gsm_sms: decode UCS2 as UTF-16Vasil Velichckov1-4/+12
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 <guy@alum.mit.edu> (cherry picked from commit 85e2a54703da8adee8bf7aefc67f4851ee3b3f1d) Reviewed-on: https://code.wireshark.org/review/22182
2017-06-16Have two separate routines for wlantap dissection - OCTO and pre-OCTO.Guy Harris1-868/+904
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 <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 8b99bb7fbf80f2fd3bfe53bbbfa14caec6319cbd) Reviewed-on: https://code.wireshark.org/review/22180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16Further cleanup.Guy Harris1-50/+24
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 <guy@alum.mit.edu> (cherry picked from commit 8ab033a2838ee94879910fd3ab9860122a72f151) Reviewed-on: https://code.wireshark.org/review/22178
2017-06-16Clean up the 802.11 payload handling a bit.Guy Harris1-6/+10
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 <guy@alum.mit.edu> (cherry picked from commit d217b757cb1c627e53d9cffe47fa5f47c38045de) Reviewed-on: https://code.wireshark.org/review/22176
2017-06-16Fix SURROGATE_VALUE() to match what RFC 2781 says.Guy Harris2-1/+3
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 <guy@alum.mit.edu> (cherry picked from commit 435c68cd2b856a6be7d015e8703c6c83d9b8eb89) Reviewed-on: https://code.wireshark.org/review/22172
2017-06-16Rename FindOS_X_FRAMEWORKS.cmake for the new OS name.Guy Harris1-0/+0
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 <guy@alum.mit.edu> (cherry picked from commit a0dfbccdfca79da5ed9bc250d18bceedd3598276) Reviewed-on: https://code.wireshark.org/review/22164
2017-06-16Change some names to reflect Apple's new UNIX-for-Macs name.Guy Harris9-24/+24
{OS_X,os_x} -> {MACOS,macos}. Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de Reviewed-on: https://code.wireshark.org/review/22161 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 5039d0e57635589208e1d969a57250746e422e06) Reviewed-on: https://code.wireshark.org/review/22162
2017-06-16Rename a routine to match the OS name.Guy Harris1-2/+5
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 <guy@alum.mit.edu> (cherry picked from commit 63b91ad3119c64eb8fdaa67303fe37d71a01a1b0) Reviewed-on: https://code.wireshark.org/review/22160
2017-06-15packet-btrfcomm.c: Prevent over bit shift in get_le_multi_byte_value.Michael Mann1-1/+1
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 <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 552dab08a6ea1b47465d888c613c353f8697e918) Reviewed-on: https://code.wireshark.org/review/22152 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-15udpdump.c: Don't include epan headers.Michael Mann1-3/+0
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 <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 828e1f07a82feb821c8169236fde18570ec01313) Reviewed-on: https://code.wireshark.org/review/22151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-15Make the short names for USB encspsulation types more regular.Guy Harris1-2/+2
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 <guy@alum.mit.edu> (cherry picked from commit ee0dde474c20afb4c493441400926ad7924ca458) Reviewed-on: https://code.wireshark.org/review/22148
2017-06-15Better names for various USB headers.Guy Harris1-2/+2
Change-Id: Iec2126fa1b71d9923ef0fb9ca2a027f7752d71f3 Reviewed-on: https://code.wireshark.org/review/22144 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 6f8bc61c3323b959900f125234e7055018d62e4b) Reviewed-on: https://code.wireshark.org/review/22145
2017-06-15Miscellaneous texual corrections and additionJaap Keuter3-3/+8
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 <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 2a5cb8e32e31ed0fb64b97318dd38470886d9154) Reviewed-on: https://code.wireshark.org/review/22142
2017-06-15RADIUS: Fix dissection for non-default VSA lengthsJoão Valverde1-7/+11
Ping-Bug: 13745 Change-Id: I1c9f69d0015ba9bea16d8300fbfd85abe110f829 Reviewed-on: https://code.wireshark.org/review/22136 Reviewed-by: João Valverde <j@v6e.pt> (cherry picked from commit 9ed4046e0f3e8872c3adec3f11376ee392834525) Reviewed-on: https://code.wireshark.org/review/22139 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-14IEEE 802.15.4: Fix IE/MIC handling of secured packets without payloadRobert Sauter1-7/+6
Change-Id: Icdcb770723e3783013f525524c3fe745d5dd862d Reviewed-on: https://code.wireshark.org/review/22122 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 ae085f7338b356f249bbc639ce70412ece42a708) Reviewed-on: https://code.wireshark.org/review/22133
2017-06-14WBXML: Fix some more potential infinite loops.Michael Mann1-5/+11
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 <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 50fa2d95833ec2e2b0de3000eda7b290fc23eaeb) Reviewed-on: https://code.wireshark.org/review/22128
2017-06-14DOCSIS: Prevent infinite loop from unknown FCParm.Michael Mann1-0/+4
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 <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 26a6881014c85c935f2794f6eeb852849137c20a) Reviewed-on: https://code.wireshark.org/review/22124
2017-06-13Fix automatic name resolution not saved to NRBAnthony Coddington1-0/+4
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 <mmann78@netscape.net> (cherry picked from commit f3267f17a3fc3c8ab138940653f2e968c5d27378) Reviewed-on: https://code.wireshark.org/review/22114
2017-06-12address(.h): fix typo adresses => addressesAlexis La Goutte1-2/+2
Change-Id: Ibc787005bb7865da55d2d8257009bace1108f181 Reviewed-on: https://code.wireshark.org/review/22082 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit d4e51deadb280b822532a268304fed0e03b31cac) Reviewed-on: https://code.wireshark.org/review/22099 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-12netflow: fix typo adresses => addressesAlexis La Goutte1-1/+1
Change-Id: I8578f86f75b1a7278ad71d8671ce4e2dbc4f0c82 Reviewed-on: https://code.wireshark.org/review/22081 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 0813fccb089ae6c9a910604f137fa8f99e66e142) Reviewed-on: https://code.wireshark.org/review/22100 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-12Windows: increase minimum CMake version to 3.7Pascal Quantin1-4/+2
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 <pascal.quantin@gmail.com> Reviewed-by: 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 4edc611526fc2aa17a7f5e82ce0147d799d2c508) Reviewed-on: https://code.wireshark.org/review/22092
2017-06-12NSIS: Add support for Visual Studio 2017.Gerald Combs1-6/+24
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 <a.broman58@gmail.com> 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 9f0d22bdd1e75178332756f9abb1ae4b45b0de0b) Reviewed-on: https://code.wireshark.org/review/22090
2017-06-12CMake: Look for Python in more places.Gerald Combs1-4/+7
According to PEP 514, Python.org's Windows installer stores its installation path in HKEY_LOCAL_MACHINE\Software\Python\<Company>\<Tag>\InstallPath where <Tag> 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 <gerald@wireshark.org> (cherry picked from commit 6a16f158c849c054bd1a4b71e0c497df48933797) Reviewed-on: https://code.wireshark.org/review/22089 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-12Simplify the search for HTMLHelp.Anders1-22/+14
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 <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 0dc32776d071fdf00754e349a0f9db20119df5df) Reviewed-on: https://code.wireshark.org/review/22093
2017-06-12CMake: Add local copy of FindHTMLHelp.cmakeGraham Bloice1-0/+59
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 <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> (cherry picked from commit fce2f2bb1f0e6cc2a07a26e0c35b994a3253131d) Reviewed-on: https://code.wireshark.org/review/22091 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-11Ranap: improve heuristic algorithmMichael Mann2-6/+34
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 <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> Reviewed-on: https://code.wireshark.org/review/22080 Petri-Dish: Michael Mann <mmann78@netscape.net>
2017-06-11Fix airpdcap compilation on SunPetr Sumbera1-0/+4
Bug: 13786 Change-Id: Iaa3890610768605b5c579aaddc73124b9f85bdd9 Reviewed-on: https://code.wireshark.org/review/22074 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 2073457ab9ef817a2342e3c4dd858b88198020e4) Reviewed-on: https://code.wireshark.org/review/22075
2017-06-11packet-spdy: Fix -Wunused-const-variable error when compiling without zlibRobert Sauter1-1/+1
Change-Id: Id471772488d3a0568f16f604585b3155a57e47b2 Reviewed-on: https://code.wireshark.org/review/22072 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 5617527ee3831a8012f076b67e2532eeb8b1da2d) Reviewed-on: https://code.wireshark.org/review/22073
2017-06-11[Automatic update for 2017-06-11]Gerald Combs31-3783/+4352
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I7fc53087dbb81293f8bd5f62e505f879896f668f Reviewed-on: https://code.wireshark.org/review/22068 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-10Fix indentation.Guy Harris1-5/+5
Change-Id: I9ea3947a4100d4d566c0d6815de5336214f9f581 Reviewed-on: https://code.wireshark.org/review/22062 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit b01c85c17a0a1e78837aeab79b15054ab15c8483) Reviewed-on: https://code.wireshark.org/review/22063
2017-06-10Put the non-filter part of epan/color_filters.h into wsutil/color.h.Guy Harris5-19/+68
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 <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 0480a0be81dd5c561637c8d6351191c154f72970) Reviewed-on: https://code.wireshark.org/review/22061
2017-06-10Fix weird comment.Guy Harris1-1/+2
Change-Id: I4254b37b14631929681b5642dc44911019807cb1 Reviewed-on: https://code.wireshark.org/review/22058 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 25777d09866015d0cfef7265aefcc341321df110) Reviewed-on: https://code.wireshark.org/review/22059
2017-06-09Just print the string color_filters_init() provides on an error.Guy Harris2-2/+2
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 <guy@alum.mit.edu> (cherry picked from commit 60da2c96ddddd222994e8d25a3825fb8d7fd7ae5) Reviewed-on: https://code.wireshark.org/review/22057
2017-06-09Handle filter open and read errors better.Guy Harris1-70/+67
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 <guy@alum.mit.edu> (cherry picked from commit ad4e81fcf869680b057651970fba38690e82c87d) Reviewed-on: https://code.wireshark.org/review/22056
2017-06-09Add URL for link specifying D-Bus maximum message length.Guy Harris1-1/+6
Change-Id: I5797407a18fda674b2c9b2cc1c192c211c91c496 Reviewed-on: https://code.wireshark.org/review/22052 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit ed7e9c77db9a4a7306abfc3935a84f49a9a96ee4) Reviewed-on: https://code.wireshark.org/review/22053
2017-06-09ieee80211-radio: Fix calculation of frame start timeSimon Barber1-1/+1
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 <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 33456f48ac9a3842e1eda8e179ae9d8bd4c33140) Reviewed-on: https://code.wireshark.org/review/22050
2017-06-08IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IEPascal Quantin1-22/+35
Bug: 13778 Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f Reviewed-on: https://code.wireshark.org/review/22038 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 49a55b9666329971e2c17d69179c331160fa7b40) Reviewed-on: https://code.wireshark.org/review/22047
2017-06-08sharkd: fix a shadow warning when compiling on RHEL/CentOS 6.xPascal Quantin1-5/+5
Bug: 13424 Change-Id: I20e474180545d89599c346ad2c5994949d213cb0 Reviewed-on: https://code.wireshark.org/review/22045 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit b347ce62c95c76b840fbb1740912718fde746176) Reviewed-on: https://code.wireshark.org/review/22046
2017-06-08LTE RRC: fix filtering of q-RxLevMin parameterPavel Strnad2-3/+18
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 <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 3453a0b888a0e188c03012023a4e93d03764602c) Reviewed-on: https://code.wireshark.org/review/22041
2017-06-08export-smb2-objects: Make sure tap be called for named pipelinzhao1151-6/+8
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 <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 411a5342c5d9f12651ed7c8d268597bdc3db9f4a) Reviewed-on: https://code.wireshark.org/review/22034 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-08wsmp: read the message length as big endianMartin Kaiser1-1/+1
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 <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit bd130766438546ab64f7540597a2e3b82cbf8a3c) Reviewed-on: https://code.wireshark.org/review/22028
2017-06-082.4.0rc1 → 2.4.0rc2.Gerald Combs1-7/+7
Change-Id: Ie37f6e639b7fc2a16459b37283af28beeff15d45 Reviewed-on: https://code.wireshark.org/review/22027 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-07Build 2.4.0rc1.Gerald Combs4-4410/+52634
Change-Id: Ie4f06fa0487bdb50cd922d11c4dcd62f89da19ba Reviewed-on: https://code.wireshark.org/review/22026 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-07ieee80211-radio: Fix description of packet start and end time fieldsSimon Barber1-2/+2
Change-Id: I8b0acaa689c468b6da553d47a15a9d47fe9d45a6 Reviewed-on: https://code.wireshark.org/review/22021 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 23a2f56b0fcfb72c183f0ace8f30e25400036408) Reviewed-on: https://code.wireshark.org/review/22022
2017-06-07WiX: Switch to Visual Studio 2015.Gerald Combs2-4/+4
The Windows builders now use Visual Studio 2015. Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1 Reviewed-on: https://code.wireshark.org/review/22018 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-07epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-0/+4
Change-Id: Id5dde66c6473cd7ba3c7cc981d7b86f564f7ca9f Reviewed-on: https://code.wireshark.org/review/22004 Reviewed-by: Ahmad Fatoum <ahmad@a3f.at> 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 8aa84c630e258654db4ca99b4eb6c1a1ac3bc8bd) Reviewed-on: https://code.wireshark.org/review/22014
2017-06-07epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+4
Change-Id: Id8e5c3622f5186fcab530b9d329a0ff1d42bd6f3 Reviewed-on: https://code.wireshark.org/review/22002 Reviewed-by: Ahmad Fatoum <ahmad@a3f.at> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 831828878d998cdf12fbba66f5b8cabdfadac7a1) Reviewed-on: https://code.wireshark.org/review/22012
2017-06-07RANAP: prevent heuristic dissector from adding info to tree or triggering ↵Pascal Quantin2-15/+33
exception Bug: 13770 Change-Id: I6ba5dfb5098ea1a4d4d1e2d740382326c7d58f8c Reviewed-on: https://code.wireshark.org/review/22006 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Ivan Nardi <nardi.ivan@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit e82fa761d671fd4e1c6cdeccd57473fb18982e87) Reviewed-on: https://code.wireshark.org/review/22009
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-29 02:22:58 +0000