aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-03-28tools/generate_authors.pl: avoid duplicatesPeter Wu3-18/+9
Officially, the local part of an email address is case sensitive, but in practice this is ignored. Ensure that duplicate email addresses are not listed. While at it, detect duplicates using `grep -Po '<\K[^>]+' AUTHORS | tr '[:upper:]' '[:lower:]' | sort | uniq -cd` and resolve them. Change-Id: Ie1e853d6253758c8454d9583f0a11f317c8390cb Reviewed-on: https://code.wireshark.org/review/14659 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>
2016-03-27NAS EPS: upgrade dissector to v13.5.0Pascal Quantin1-13/+334
Change-Id: I04319c1ca0a6c166904a584f31088460ea35eb89 Reviewed-on: https://code.wireshark.org/review/14655 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-27If setting an address from a tvb and the address length is 0, the address ↵Michael Mann1-1/+4
should be NULL. Bug: 12295 Change-Id: I875308a16b11023a691d34057c7f8561a15aa598 Reviewed-on: https://code.wireshark.org/review/14649 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>
2016-03-27NGHTTP2: Update to 1.8.0Alexis La Goutte5-37/+596
Change-Id: Ic818b7df95c9812076303f613b0641b9e702b62e Reviewed-on: https://code.wireshark.org/review/14562 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>
2016-03-27Treat Gammu DCT3 trace files as having magic numbers.Guy Harris1-1/+2
Otherwise, they get treated as generic XML files. No, a standard XML tag, followed by <dump>, isn't a *perfect* magic number, but if you *really* want to read it as a generic XML file, you can do so from the UI. (This is just like TNEF files.) Change-Id: I7624023ecf87a21ef339222c89b3c9abd7acc727 Reviewed-on: https://code.wireshark.org/review/14656 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-27[Automatic update for 2016-03-27]Gerald Combs14-937/+1422
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I19f4ffca89acbd207cafe1f29f14aba293b068f4 Reviewed-on: https://code.wireshark.org/review/14650 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-27Add dissector table for negotiated WebSocket protocolGregor Jasny3-3/+20
This adds the possibility to filter on the negotiated WebSocket protocol from the upgrade response as well as on a specific TCP port Bug: 12298 Change-Id: I8e0b785cec0b8c71ec558b74ac07c81194268b38 Signed-off-by: Gregor Jasny <gjasny@googlemail.com> Reviewed-on: https://code.wireshark.org/review/14645 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-27Pull the invocation of the Lex scanner into common code.Guy Harris4-25/+9
Instead of text_import_setup() and text_import_cleanup() routines, and the actual scanner invocation being done in the dialog box, have a text_import() routine that does all the work. Change-Id: Ifd8a999618dbb411d613e6596484e4c2e013431d Reviewed-on: https://code.wireshark.org/review/14647 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-27Make failure_alert_box() be printf-like.Guy Harris6-9/+20
Have it be printf-like, and have vfailure_alert_box() be vprintf-like. Rename a few variables to make it clearer what pointers point to vprintf-like functions. Change-Id: I960e2138a18edcc742c450d68a0c6f7248f50c3f Reviewed-on: https://code.wireshark.org/review/14646 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-26Make sure conversation exists (CID-280536)Jaap Keuter1-0/+2
The code sets up a conversation, then proceeds getting it and using it. It must be there, so assert that it is before dereferencing it. Change-Id: I5384b9b773a5f4e86f649612ee4f4929a503c523 Reviewed-on: https://code.wireshark.org/review/14641 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: Anders Broman <a.broman58@gmail.com>
2016-03-26ethercat: Fix Control flow issues MISSING_BREAK (CID 1357204)Alexis La Goutte1-0/+1
Change-Id: I7efc9b4b44590e3408ba058d7aa02f843cbfeca4 Reviewed-on: https://code.wireshark.org/review/14642 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>
2016-03-26Improves MPTCP analysisMatthieu Coudron3-61/+466
Adds options that control depth of MPTCP analysis, notably: - if mptcp_relative_seq is enabled, can display relative MPTCP sequence numbers - if mapping analysis is allowed, can tell in which packets the DSS mappings covering this data was sent - if intersubflow checks are enabled, it can check for retransmissions over other subflows Change-Id: I82b934513c9f16affb60c066a1fbcca234ffc999 Reviewed-on: https://code.wireshark.org/review/12316 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>
2016-03-26bootp: Add support for iSNS (RFC4174) dissectionVictor Dodon3-1/+373
Change-Id: I2d1807e631991d4115ca33d351e85c36272c209b Reviewed-on: https://code.wireshark.org/review/14523 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>
2016-03-26ASTERIX: Add CAT025 dissectionAndrew Hoag1-1/+245
The CAT025 type of ASTERIX messages is "CNS/ATM Ground System Status Report". Change-Id: Icf39d595cef8663357a487b799bf32e738236757 Reviewed-on: https://code.wireshark.org/review/14590 Tested-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26PTP: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I277c0e6f0f257dfb84bfb778c221c519204907d4 Reviewed-on: https://code.wireshark.org/review/14643 Reviewed-by: Uli Heilmeier <openid@heilmeier.eu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26Fix compile errors when compiling w/o zlibDaniël van Eeden5-5/+5
Change-Id: I443cd0d4a143e456e11b5939891312a0501770a0 Reviewed-on: https://code.wireshark.org/review/14636 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: Michael Mann <mmann78@netscape.net>
2016-03-26MySQL: Fix query string in info columnDaniël van Eeden1-1/+1
Change-Id: I2d0aae95c41f527c4a1e0327bf6c3950204458e1 Reviewed-on: https://code.wireshark.org/review/14637 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26Make sure there's enough data in the header for a FMTP packet.Michael Mann1-2/+7
Bug: 12285 Change-Id: I103dff37b34f922ac5c3071c49b7dfe55b059717 Reviewed-on: https://code.wireshark.org/review/14634 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>
2016-03-26Fix typo in README.cmakeDaniël van Eeden1-1/+1
Change-Id: I2bbb589c5a0c5cbab9fd6f0623682e119bbfd46a Reviewed-on: https://code.wireshark.org/review/14635 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-26Push initial directory code up into CaptureFileDialog.Jeff Morriss3-87/+26
That way each (CaptureFileDialog) user doesn't have to (remember to) check the preference, etc., to figure out what directory to start in. Change-Id: Ifa60e1ef9dbd11689a3f72906997cf3ed8ce259c Reviewed-on: https://code.wireshark.org/review/14550 Petri-Dish: Jeff Morriss <jeff.morriss.ws@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-26Choose the appropriate initial directory for the Export Dissections window.Jeff Morriss1-2/+26
Bug: 12105 Change-Id: Ib2398e5213b2ef2501660d1bba13dca66f04bd55 Reviewed-on: https://code.wireshark.org/review/14549 Petri-Dish: Jeff Morriss <jeff.morriss.ws@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-26IEEE802.11: properly decode bss transition response packetsSven Schnelle1-2/+69
Old code didn't decode response specific fields, so all packets where shown as invalid. Bug: 12294 Change-Id: Id3bca825925ef3c20da1bb98dfb50961989fd585 Reviewed-on: https://code.wireshark.org/review/14529 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26gvsp: allow for header-only GVSP payload packetMoeller, Thies1-28/+46
if a packet is not successful ( after resend ) the data section has to be skipped GEV 2.0 spec [CR-203st]/[CR-204st] Bug: 12281 Change-Id: I9465000fb3e25f1e00f419cc7ccae29bd32a56b1 Reviewed-on: https://code.wireshark.org/review/14555 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>
2016-03-26Add json.member.keyJakub Zawadzki1-7/+5
Bug: 12287 Change-Id: I9aecf83ef6f166fc30c275d1e50e0268b1b59ad5 Reviewed-on: https://code.wireshark.org/review/14618 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>
2016-03-26Fix some copy/pasteos for writecap using doxygenMichael Mann1-3/+3
Change-Id: Ie5baadb7c19a56c2e1de524fcf8598d60dce18f8 Reviewed-on: https://code.wireshark.org/review/14632 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26Fix nmake build for new extcap and writecap binaries.Michael Mann3-8/+13
Change-Id: Ic7f370cfe5e2a3aad81c77baab066e95a249238f Reviewed-on: https://code.wireshark.org/review/14631 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-25QUIC: Add new tag found with version Q30Alexis La Goutte1-0/+13
* CSCT: Signed cert timestamp (RFC6962) of leaf cert Change-Id: I487090830ea8fa1d7597fbd7eef9e801f5e1fb65 Reviewed-on: https://code.wireshark.org/review/14626 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>
2016-03-25packet-nfs: enable nfs4.lock_owner4Benjamin Coddington1-4/+2
Change-Id: I32e718a8ef94b514fd2907651e2f9bd92d8119ef Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/14627 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>
2016-03-25CMake: Add a note about CMAKE_TRY_COMPILE_CONFIGURATION.Gerald Combs1-0/+5
Note that CMAKE_TRY_COMPILE_CONFIGURATION can noticeably affect the run time of MSBuild, which in turn affects try_compile, which we call many, many times. Change-Id: I041d00e647ab570ec14f7c78b1d1d6806ac31ce4 Reviewed-on: https://code.wireshark.org/review/14630 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-25Add a deprecation warning to config.nmake.Gerald Combs2-0/+31
Add a deprecation warning to config.nmake which can be disabled by setting YES_I_KNOW_ABOUT_THE_DEPRECATION. Note that it will become a warning at some point in the future. Make a list of files that will be removed or updated in Makefile.nmake. Change-Id: I50d68eb3dea1bf5baee1e8a90d007c06d3aa1fa3 Reviewed-on: https://code.wireshark.org/review/14591 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-25openSAFETY: Change verbosity on expert notesRoland Knall1-9/+16
Expert Infos can be a little overwhelming in large traces. This preference will allow any user to enable the PI_NOTE declared expert infos to be shown only when they are really necessary. Fix a bug with SCM UDID validity detection as well Change-Id: I2d197684157f1ea748bfbcc6fa2dfdb348722223 Reviewed-on: https://code.wireshark.org/review/14625 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-25Add MQTT over SSL port.Jakub Zawadzki1-1/+5
Change-Id: If44d33e739bc02425aea437e34ea8531b4223691 Reviewed-on: https://code.wireshark.org/review/14617 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>
2016-03-25Add new UPI values for GFPEdward Smith1-2/+5
Change-Id: I8cfad1cdbb3843fa65931d8a22beba1b6bdf57c8 Reviewed-on: https://code.wireshark.org/review/14620 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-25Remove .gitignore file in pidl folderJoão Valverde2-2/+1
Otherwise it will end up in the source distribution tarball. Change-Id: Ieeafd5dbaebe3930c3769bfcbce538da5d36b7d3 Reviewed-on: https://code.wireshark.org/review/14624 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25autotools: Reorder extra compiler warnings to come lastJoão Valverde2-103/+102
Also try to improve check hf description. Change-Id: I7a1e5997dfc7a97cc62e2f2f9cc7c5026468451e Reviewed-on: https://code.wireshark.org/review/14623 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25Remove -W from compiler warningsJoão Valverde2-3/+2
Change-Id: I6d1aeab4fd9dce9b7a9804ac9099d318a2b434d2 Reviewed-on: https://code.wireshark.org/review/14622 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25Improve configure script messageJoão Valverde2-16/+12
Change-Id: I4b05d20d22300e2c29982ca0b9724196f9335497 Reviewed-on: https://code.wireshark.org/review/14621 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25Add ax_lib_socket_nsl.m4 macroJoão Valverde7-150/+63
Add SOCKET_LIBS and NSL_LIBS to global LIBS variables on platforms where it is required. Make configure checks for getaddrinfo/gethostname unconditional, that is handled with #ifdefs if necessary. Change-Id: Ia874038454fb9cf3bdbf8e6fd829f319e331837e Reviewed-on: https://code.wireshark.org/review/14560 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-24First convert the string to a number, then convert it to network byte order.Guy Harris1-1/+2
That should squelch some warnings from the compiler on the OS X buildbot. Change-Id: I0da16469fb48e26677c5366d6fe290db2bf52a10 Reviewed-on: https://code.wireshark.org/review/14619 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24Put pcapio.c into a writecap library, and use it.Guy Harris19-15/+352
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e Reviewed-on: https://code.wireshark.org/review/14615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24PTP: Add mm TLV according to SMPTE ST 2059-2Uli Heilmeier1-0/+267
Add organization extension management message TLV according to SMPTE (Society of Motion Picture and Television Engineers) ST 2059-2 to Precision Time Protocol (PTP). Bug: 12264 Change-Id: I487ef2bacbccdb61c813d923830242f9526fd2cf Reviewed-on: https://code.wireshark.org/review/14559 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>
2016-03-24Add basic PIDL MakefileJoão Valverde51-3758/+167
Change-Id: I8f4c8e312df73b70f3cacd0df768375b46197ae6 Reviewed-on: https://code.wireshark.org/review/14507 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-24sshdump: use arg define.Dario Lombardo1-9/+1
Change-Id: I49ccfc3f616d2d6660c46d6a47d2409e25ad842a Reviewed-on: https://code.wireshark.org/review/14512 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-24ciscodump: fix OSX compilation error.Dario Lombardo1-4/+4
Change-Id: I65d0c5bc6178ef3c2a7e9d5cf8e81d985f9d555a Reviewed-on: https://code.wireshark.org/review/14613 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>
2016-03-24configure.ac: Fix missing quotesJoão Valverde1-6/+6
Change-Id: Ib2337bfb91be69bce85c3e69eaf3a4d91c5f3ed5 Reviewed-on: https://code.wireshark.org/review/14616 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-24CMake: Find asn2wrs.py once.Gerald Combs1-3/+3
Load LocatePythonModule and use it to find asn2wrs once instead of every time we cal the ASN2WRS function. This reduces the cmake run time by about 3 to 4 seconds here. Change-Id: I85f7dcca0b5891c9b4b23a76d017f8e504d6af60 Reviewed-on: https://code.wireshark.org/review/14614 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-24GTPv2: Fix length of Presence Reporting Area Identifier fieldUli Heilmeier1-5/+5
Specs (http://www.etsi.org/deliver/etsi_ts/129200_129299/129274/13.04.00_60/ts_129274v130400p.pdf , page 281 ) lists 3 Bytes for field Presence Reporting Area Identifier. Bug: 12284 Change-Id: I404c5133fa0975b5c9a245b8e4b952c7eb4d2818 Reviewed-on: https://code.wireshark.org/review/14608 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-24extcap: add ciscodump.Dario Lombardo12-24/+1119
Ciscodump is a new extcap that allows packet capture on Cisco routers (IOS 12.4 and later) through SSH. Change-Id: Ic9c5be01d3bd0112116f7fc9fa10e26c1552b007 Reviewed-on: https://code.wireshark.org/review/13886 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-03-24MySQL: Decoding of the header of compressed packetsDaniël van Eeden1-1/+68
If client and server have the flag set then compression starts after the greeting,login,ok. This comments makes it possible to decode packets which use the compressed protocol but don't have an compressed payload. Ping-Bug: 10342 Change-Id: I710f655c86feb9770556d1ffa69edd728e0374c3 Reviewed-on: https://code.wireshark.org/review/14603 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>
2016-03-24ethercat: Use tfs_ecat_fmmu_typereadStig Bjørlykke1-1/+1
Change-Id: I928fc0eeeac99156fb50a97b5497913ca6e67350 Reviewed-on: https://code.wireshark.org/review/14610 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>