Commit Graph

62329 Commits

Author SHA1 Message Date
Gregor Jasny aab206c4e9 Add dissector table for negotiated WebSocket protocol
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-27 14:07:26 +00:00
Guy Harris dd6a74894f Pull the invocation of the Lex scanner into common code.
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-27 02:21:19 +00:00
Guy Harris f0ada20a91 Make failure_alert_box() be printf-like.
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-27 02:06:28 +00:00
Jaap Keuter 445a57bdc3 Make sure conversation exists (CID-280536)
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-26 22:21:26 +00:00
Alexis La Goutte 9dd085d3d6 ethercat: Fix Control flow issues MISSING_BREAK (CID 1357204)
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-26 22:19:10 +00:00
Matthieu Coudron 6bef7ffc89 Improves MPTCP analysis
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-26 19:15:25 +00:00
Victor Dodon c480652da9 bootp: Add support for iSNS (RFC4174) dissection
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-26 19:05:07 +00:00
Andrew Hoag 7b3bfb80d8 ASTERIX: Add CAT025 dissection
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-26 18:59:28 +00:00
Alexis La Goutte d2f96c6019 PTP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
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-26 18:57:19 +00:00
Daniël van Eeden a0b1354583 Fix compile errors when compiling w/o zlib
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-26 16:19:34 +00:00
Daniël van Eeden 320090ce23 MySQL: Fix query string in info column
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-26 13:08:59 +00:00
Michael Mann 59ab27b9c2 Make sure there's enough data in the header for a FMTP packet.
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-26 10:10:56 +00:00
Daniël van Eeden af7cb01bb2 Fix typo in README.cmake
Change-Id: I2bbb589c5a0c5cbab9fd6f0623682e119bbfd46a
Reviewed-on: https://code.wireshark.org/review/14635
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-26 10:08:17 +00:00
Jeff Morriss 11324a7257 Push initial directory code up into CaptureFileDialog.
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-26 01:44:07 +00:00
Jeff Morriss 928b570a34 Choose the appropriate initial directory for the Export Dissections window.
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-26 01:43:37 +00:00
Sven Schnelle 139aa61588 IEEE802.11: properly decode bss transition response packets
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-26 01:04:58 +00:00
Moeller, Thies 9153e98341 gvsp: allow for header-only GVSP payload packet
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-26 01:00:38 +00:00
Jakub Zawadzki bf959e5ad5 Add json.member.key
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-26 00:54:44 +00:00
Michael Mann b457fe5f03 Fix some copy/pasteos for writecap using doxygen
Change-Id: Ie5baadb7c19a56c2e1de524fcf8598d60dce18f8
Reviewed-on: https://code.wireshark.org/review/14632
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26 00:51:14 +00:00
Michael Mann 2b8f409324 Fix nmake build for new extcap and writecap binaries.
Change-Id: Ic7f370cfe5e2a3aad81c77baab066e95a249238f
Reviewed-on: https://code.wireshark.org/review/14631
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-26 00:51:04 +00:00
Alexis La Goutte f7e0a8cc38 QUIC: Add new tag found with version Q30
* 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-25 23:34:27 +00:00
Benjamin Coddington d3b86727e9 packet-nfs: enable nfs4.lock_owner4
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-25 23:31:36 +00:00
Gerald Combs 731c383f5f CMake: Add a note about CMAKE_TRY_COMPILE_CONFIGURATION.
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-25 18:39:40 +00:00
Gerald Combs b48fc66cbc Add a deprecation warning to config.nmake.
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-25 15:53:38 +00:00
Roland Knall 162df2509c openSAFETY: Change verbosity on expert notes
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-25 08:45:10 +00:00
Jakub Zawadzki 5eda884267 Add MQTT over SSL port.
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-25 06:12:03 +00:00
Edward Smith 98ccc699a7 Add new UPI values for GFP
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-25 03:32:48 +00:00
João Valverde 6bce7a0760 Remove .gitignore file in pidl folder
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-25 03:28:52 +00:00
João Valverde 0035e9d9dd autotools: Reorder extra compiler warnings to come last
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-25 00:49:30 +00:00
João Valverde 4440da9cae Remove -W from compiler warnings
Change-Id: I6d1aeab4fd9dce9b7a9804ac9099d318a2b434d2
Reviewed-on: https://code.wireshark.org/review/14622
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25 00:32:56 +00:00
João Valverde b561db6d6d Improve configure script message
Change-Id: I4b05d20d22300e2c29982ca0b9724196f9335497
Reviewed-on: https://code.wireshark.org/review/14621
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25 00:23:58 +00:00
João Valverde a1ed731413 Add ax_lib_socket_nsl.m4 macro
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-25 00:16:19 +00:00
Guy Harris b0db6a01a8 First convert the string to a number, then convert it to network byte order.
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-24 21:20:00 +00:00
Guy Harris a4aa8930bb Put pcapio.c into a writecap library, and use it.
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e
Reviewed-on: https://code.wireshark.org/review/14615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 20:49:37 +00:00
Uli Heilmeier 67bd2cc511 PTP: Add mm TLV according to SMPTE ST 2059-2
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-24 20:31:47 +00:00
João Valverde ac477e9b5d Add basic PIDL Makefile
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-24 20:30:22 +00:00
Dario Lombardo 5861c12d1b sshdump: use arg define.
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-24 20:15:26 +00:00
Dario Lombardo cb08496418 ciscodump: fix OSX compilation error.
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-24 20:10:18 +00:00
João Valverde 67a5c29474 configure.ac: Fix missing quotes
Change-Id: Ib2337bfb91be69bce85c3e69eaf3a4d91c5f3ed5
Reviewed-on: https://code.wireshark.org/review/14616
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-24 20:08:32 +00:00
Gerald Combs 1e41221f31 CMake: Find asn2wrs.py once.
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-24 18:41:39 +00:00
Uli Heilmeier 3992f5a8de GTPv2: Fix length of Presence Reporting Area Identifier field
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-24 12:34:00 +00:00
Dario Lombardo a6921c79ab extcap: add ciscodump.
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-24 12:07:28 +00:00
Daniël van Eeden 2e98866171 MySQL: Decoding of the header of compressed packets
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-24 11:39:31 +00:00
Stig Bjørlykke 07fb53b063 ethercat: Use tfs_ecat_fmmu_typeread
Change-Id: I928fc0eeeac99156fb50a97b5497913ca6e67350
Reviewed-on: https://code.wireshark.org/review/14610
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-24 11:02:30 +00:00
Stig Bjørlykke 781291d089 Revert "Fix compile error by removing an unused variable: git/plugins/ethercat/packet-ethercat-datagram.c:513:32: error: unused variable 'tfs_ecat_fmmu_typeread' [-Werror,-Wunused-const-variable] static const true_false_string tfs_ecat_fmmu_typeread = "
This reverts commit bc3bd625e1.

Change-Id: Iaf1e6fe51c20811761d18e86dc8b2c8402a2c89a
Reviewed-on: https://code.wireshark.org/review/14609
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-03-24 11:01:25 +00:00
Lucas Simopoulos 37bb735c6f Add support in order to dissect the GTPv2 IE "Presence Reporting Area Information"
Change-Id: Ibe25fd95a5020b1663c096b5e35a04587821d71e
Reviewed-on: https://code.wireshark.org/review/14604
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-24 08:40:55 +00:00
Alexis La Goutte fc690a6781 Update .mailmap
Change-Id: Ie6b9c0fabc31187a81bc3b41001fd558f69e062f
Reviewed-on: https://code.wireshark.org/review/14500
Reviewed-by: Daniël van Eeden <wireshark@myname.nl>
Reviewed-by: Matthieu Coudron <matthieu.coudron@lip6.fr>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-24 06:38:59 +00:00
Guy Harris 172b74d734 Portably remove CRs from Python output.
The GNU sed manual says the only C-style backslash escapes that can be
used in regular expressions in portable sed scripts are \n and \\.

The Single UNIX Specification says that \r is one of the C-style
backslash escapes that can be used in tr, so use tr -d instead.

Change-Id: I40d97ee9b89dfce3d67f062ec8839d3aba998ff3
Reviewed-on: https://code.wireshark.org/review/14606
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 01:09:03 +00:00
João Valverde c1692d989e Add files by folder to distribution tarball (EXTRA_DIST)
This takes away much of the pain (and merge conflicts) of micro-managing every
sub-folder file.

Change-Id: I7d7bb1173511ec9312ca4a97c6a59a26b0b194f4
Reviewed-on: https://code.wireshark.org/review/14595
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-24 01:04:36 +00:00
Stefan Völkel 56d48b5880 rtp_player: fix build with gtk < 2.22.0
RTP stream structs have been consolidated (see
I2b3f8f2051394a6a98a5c7bc49c117f07161d031), but gtk versions
< 2.22.0 seem to have been forgotten.

Bug: 12277
Change-Id: Iab2d2d0eab52ad0586581abe4df9f97d451ad454
Reviewed-on: https://code.wireshark.org/review/14588
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-03-24 00:20:52 +00:00