aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-03-11Remove the last remnants of U3 support.Gerald Combs13-381/+28
Change-Id: Ide4c177e67a77c5f9495b3b4c0f817f40e6dde30 Reviewed-on: https://code.wireshark.org/review/14425 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-11Add IAX2 and Skinny calls to VoIP calls windowPascal Quantin1-2/+28
Bug: 12254 Change-Id: Ibaddfaf8018be673d8f2cf642b1127062d7d507d Reviewed-on: https://code.wireshark.org/review/14423 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>
2016-03-11OS X packaging: Remove some unused files.Gerald Combs4-1370/+0
Change-Id: Id01af6460828338bd3d0ac59e20000e93999ca7b Reviewed-on: https://code.wireshark.org/review/14424 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-11cmake: Copy docs to build datafile dir for NSIS packaging.João Valverde2-5/+23
Change-Id: Icc1f6dadc8bb082c4049cafc6a7e6c2d030ec85e Reviewed-on: https://code.wireshark.org/review/14409 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-11trmac: fix 'trmac.group_address' exists multiple times with NOT compatible ↵Alexis La Goutte1-2/+2
types: FT_ETHER and FT_UINT32 Change-Id: I5289022752513e84783a8c65ab8f2327a7023597 Reviewed-on: https://code.wireshark.org/review/14414 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-11SCSI: Fix conflict for hf fieldsAlexis La Goutte1-2/+2
'scsi.blockdescs.no_of_blocks' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'scsi.naa.vendor_specific' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT32 Change-Id: Iaa512c02b99f0a103bb5015e92d900dae2932843 Reviewed-on: https://code.wireshark.org/review/14418 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-11sigcomp: fix 'sigcomp.decompression_failure' exists multiple times with NOT ↵Alexis La Goutte1-1/+1
compatible types: FT_NONE and FT_UINT32 Change-Id: I45a1c26dd7f8822faeed62dd82b5ecdcca16be41 Reviewed-on: https://code.wireshark.org/review/14417 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-11sysex: fix 'sysex.digitech.parameter_data' exists multiple times with NOT ↵Alexis La Goutte1-1/+1
compatible types: FT_BYTES and FT_UINT8 Change-Id: I3692c6465f6d8e4ce6c9a0f6e4bb851b83713757 Reviewed-on: https://code.wireshark.org/review/14416 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-11[SGsAP] Wrong tag used for IE Erroneous message, dissect the failingAndersBroman1-3/+30
message too. Change-Id: I6d10d41366795e59396c238cf620c43a3d96217b Reviewed-on: https://code.wireshark.org/review/14420 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-11TDS: Fix conflict for hf fieldsAlexis La Goutte1-5/+5
'tds.done.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'tds.doneproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'tds.doneinproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'tds.envchange.newvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING 'tds.envchange.oldvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING Change-Id: I87d713aaa722d7ab9e8d19955f3820e9040446c1 Reviewed-on: https://code.wireshark.org/review/14415 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-11Rename a variable for clarity.Jeff Morriss1-4/+4
It's confusing to have 'pdus_tree' mean both the map of pdu_trees and the pdu trees themselves. Change-Id: Ie875798eb140b60a1309ddc0c0bf885b48c0407c Reviewed-on: https://code.wireshark.org/review/14413 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-03-10Fix NSIS installerJoão Valverde1-0/+5
Broken by gb7f6cf9. Change-Id: I21a91cf56c16b7ffdf72da7bf68a556feb6a6c17 Reviewed-on: https://code.wireshark.org/review/14408 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10Remove double check for null (CID 1158871)Jaap Keuter1-4/+1
Make full use of our proper implementation of this macro by giving it the pointer as is. Change-Id: I0bbe73d19cc3f578b94ea2d4d904d6fa87b20b48 Reviewed-on: https://code.wireshark.org/review/14391 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-10CIP: Improve info column informationD. Ulis3-125/+141
1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-103GPP NAS: fix dissection of GMM Identity Request, Response and ↵Pascal Quantin1-1/+1
Authentication and Ciphering Failure messages Bug: 12246 Change-Id: I0cad1c951c4939bde41c281cfc0cf5b4a08ea2a3 Reviewed-on: https://code.wireshark.org/review/14406 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-10GTPv2 conversation time responseglores1-0/+11
Change-Id: Ice7a08a47b091e4e47cd13b04b7dd7ed74a0f950 Reviewed-on: https://code.wireshark.org/review/14328 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>
2016-03-10Qt: Check for selected interface in filterEdited()Stig Bjørlykke1-2/+4
Add a check for selected filters in filterEdited() to avoid a out-of-bounds index into ui->interfaceTree->selectedItems(). Bug: 12241 Bug: 12245 Change-Id: Ie18fc34a17427dd5330a5a617051cbc061555e0c Reviewed-on: https://code.wireshark.org/review/14404 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-10Add doc/CMakeLists.txtJoão Valverde7-176/+205
Change-Id: I387e893dc5b8b38569f7189d078fdc1853ba012f Reviewed-on: https://code.wireshark.org/review/14269 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-03-10autotools: Don't use AM_PROG_CC_C_OJoão Valverde1-1/+0
Try to fix OSX build after commit g2728f56: configure.ac:76: error: AC_PROG_CC cannot be called after AM_PROG_CC_C_O aclocal-fallback/ax_prog_cc_for_build.m4:125: AX_PROG_CC_FOR_BUILD is expanded from... Automake manual indicates this macro as obsolescent. Change-Id: Ia110ad34d65cab91a55b9d57673356d5c4b3bfe3 Reviewed-on: https://code.wireshark.org/review/14403 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10Add the pass number to the fuzz failure report.Gerald Combs1-0/+1
When adjusting MAX_PASSES it'd be nice to know how many passes it normally takes to fail. Change-Id: I335c26a1e6847371706da880b83773d142797da9 Reviewed-on: https://code.wireshark.org/review/14389 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-10DNS: Fix handling of the server part of EDNS0 Cookie OptionRemi Gacogne1-0/+1
cur_offset was not incremented for the server part, causing a "Malformed packet" message. Change-Id: I21cb876e0d70b1de0cb2f76d37edec4c2ec7c788 Reviewed-on: https://code.wireshark.org/review/14402 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-10Add myself to AUTHORS.srcJoão Valverde2-1/+2
Change-Id: Iaac1e06cbdbe3bdca465283fb28770fe7fdc9b06 Reviewed-on: https://code.wireshark.org/review/14385 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10Use AX_PROG_CC_FOR_BUILD macro to identify compiler targeting the build host.Eric Anderson5-21/+144
(When cross-compiling, this is *not* the compiler used to build wireshark itself). Macro ax_prog_cc_for_build.m4 retrieved from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git Change-Id: I035059d9315e0081dcf1ffbafd9ce6d7ad46700c Reviewed-on: https://code.wireshark.org/review/4503 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Eric Anderson <andersoe@cs.cmu.edu> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-09Remove superfluous pointer checks (CID-280599, 280600 and 280601)Jaap Keuter1-18/+15
The preceding code takes every effort to make sure that the frac and end pointers are relevant pointers. Don't go back and check for NULL yet again. Change-Id: If805aee5a77a8c23eac7b074bd11d3743c5e1a3b Reviewed-on: https://code.wireshark.org/review/14398 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-09Use field info length instead of packet length for protocol hierarchy stats.Michael Mann1-7/+7
Bug: 1885 Change-Id: If2b68365880f3508ed82947a0d18e6c28d6e4db8 Reviewed-on: https://code.wireshark.org/review/14392 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-09Bluetooth: GATT: Pass data to GATT dissectorsMichal Labedzki1-8/+7
Now GATT dissectors need to have opcode to properly dissect attribute or return expert info if possible (wrong usage). Change-Id: Ife79bbf0682967a8bef8efadd8b242aa147315a7 Reviewed-on: https://code.wireshark.org/review/14314 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-03-09Bluetooth: GATT: Add a lot of attributes usage expert infosMichal Labedzki4-43/+2343
Bluetooth Specifications specify properties of every characteristics (read, write, indicate, notify, write without response, signed write etc.) Check it and add expert info about invalid usage if detected use of wrong opcode with the characteristic. Change-Id: I98ad8280b9ee65b4015a021e732ea748cc9e7a83 Reviewed-on: https://code.wireshark.org/review/14313 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-03-09Initialize write function pointers when copying a new wtap block option.Michael Mann1-0/+2
Issue found by Clang (Assigned value is garbage or undefined). Change-Id: I9a3ab41dd01becbd454af02f2567ea3a2beeba40 Reviewed-on: https://code.wireshark.org/review/14399 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08AUTHORS: Use LF line endings and remove BOMJoão Valverde2-7/+2
Change-Id: I03c582baa03238ac82916d8bf865a3bf25f04cd5 Reviewed-on: https://code.wireshark.org/review/14384 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08AUTHORS: Add <...> to git log email addressesJoão Valverde2-295/+295
Change-Id: I936e4a25833906cac75d4d5b7359b5629d14b33d Reviewed-on: https://code.wireshark.org/review/14382 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08AUTHORS: sort by nameAlexis La Goutte3-132/+133
Change-Id: I01980d1ab757decb7bb84649dbd41477978104c3 Reviewed-on: https://code.wireshark.org/review/14381 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08AUTHORS: update .mailmapAlexis La Goutte2-10/+13
Change-Id: Ic67b404457435c3c9d1bc54ca0c7809e71917945 Reviewed-on: https://code.wireshark.org/review/14380 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08AUTHORS: Update some e-mail address from AUTHORS.src for avoid duplicate entryAlexis La Goutte2-37/+25
Change-Id: I3ee91a0da1732f4a65c799a7b057272bf8b437f5 Reviewed-on: https://code.wireshark.org/review/14358 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08BGP: Fix detection of additional pathUli Heilmeier1-1/+1
When additional path index are in use there must be more remaining data bytes. Therefore we return only 1 when the len is greater 1. Bug has been reported by Garri. Bug: 12240 Change-Id: Ia24311dcedc450e4208df875bc254c9744dec5dd Reviewed-on: https://code.wireshark.org/review/14396 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-08Add packet-metamako.c to EditorConfig filePascal Quantin1-0/+3
Change-Id: I4f1a03c348e4b3e29164d90c0c1e2035eed6f2a1 Reviewed-on: https://code.wireshark.org/review/14395 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-08Added dissector for Metamako trailers.David Snowdon4-0/+250
Change-Id: Ib9dc712f58b9e579ad8ef027864db0a1b31ebf52 Reviewed-on: https://code.wireshark.org/review/14282 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>
2016-03-08generate_authors.pl: Use literal regex expressionJoão Valverde1-3/+1
Change-Id: I6828dc5f71930ce4121ab7ad24db5b0428cea7f3 Reviewed-on: https://code.wireshark.org/review/14383 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Add EditorConfig settings for most C filesJoão Valverde23-2/+821
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52 Reviewed-on: https://code.wireshark.org/review/14360 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Convert dissector modelines to EditorConfig fileJoão Valverde3-0/+2292
Change-Id: I467b6ca940d2f89346fde46b7348b00eab40092e Reviewed-on: https://code.wireshark.org/review/14353 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Start adding EditorConfig files.Gerald Combs4-0/+35
Add EditorConfig files where we currently have consistent indentation. This might let us get rid of our editor modeline footers at some point. Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce Reviewed-on: https://code.wireshark.org/review/12383 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07Qt: Remove unused version.h headerJoão Valverde1-2/+0
Change-Id: I3f9f38b2077077aca6106e22abe337bf724f33e7 Reviewed-on: https://code.wireshark.org/review/14379 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07dmp: Report unused bits in last byte for 7bit string.Stig Bjørlykke1-17/+33
The protocol spec states that unused bits in the last byte in a 7bit string shall be null. Change-Id: I6fa2e0af6462c87279c19e23a98bf624e46bc9c1 Reviewed-on: https://code.wireshark.org/review/14387 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>
2016-03-07Add conflict check filterAlexis La Goutte5-1/+71
Set ENABLE_CHECK_FILTER to 1 for get list of display filter with conflict... Ping-Bug:2402 Change-Id: I8d56b1573120d1a29d437aae1088be242e15e9a3 Reviewed-on: https://code.wireshark.org/review/13644 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-07generate_authors: Align git log email columnJoão Valverde2-320/+328
Change-Id: Ic08b23e80a982805f4b512a410a1a4414afc3a8c Reviewed-on: https://code.wireshark.org/review/14354 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07Update the Automake gen-authors target to match CMake.Gerald Combs1-1/+1
Broken in g32d60ac. Change-Id: Idf9ea0970c30c8eff8e21c3039fe47fd8a175a27 Reviewed-on: https://code.wireshark.org/review/14370 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07sshdump: minor changesDario Lombardo1-12/+10
Change-Id: I07bd2a95622187c6bacb3013998f93bfa07af87c Reviewed-on: https://code.wireshark.org/review/14338 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-07Run checkAPIs in the (epan/) wslua and crypt directories.Jeff Morriss2-5/+4
Don't try to run it (automake only) in dcerpc: there's no target for it there. Change-Id: Idaf1d3d3ac27e837f484520406e604c12c4b473f Reviewed-on: https://code.wireshark.org/review/14346 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-06Fix indentation.Guy Harris1-23/+23
Change-Id: I78fd1d8e91443fa878e6c4ae05839d8a49849830 Reviewed-on: https://code.wireshark.org/review/14367 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-06[Automatic update for 2016-03-06]Gerald Combs19-4034/+4375
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ibd8571b495bc8170a5f77f7461d86a9a02c8b0b4 Reviewed-on: https://code.wireshark.org/review/14364 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-06To see whether a string equals another string, just use strcmp().Guy Harris1-1/+1
The goal here is to see whether out_filename is "-" or not; there's no good reason to use strncmp() here. Fixes Coverity CID 1316605. Change-Id: I851eee869afed58ac091982b8d303b0eda276c2e Reviewed-on: https://code.wireshark.org/review/14361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 02:54:43 +0000