Commit Graph

62296 Commits

Author SHA1 Message Date
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
Jaap Keuter 01faf39794 Remove constant variable (CID-280372)
This copied and stripped code has this variable which does
not change. Remove this constant variable and the conditional
statements related.

Change-Id: I0741ef0ef8b8d1cbd52fc521bc6a91ad06c8b597
Reviewed-on: https://code.wireshark.org/review/14594
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-24 00:04:55 +00:00
Michael Cistera df8b5cbdc0 Detect spurious retransmissions when the full segment is retransmitted
The TCP dissector failed to recognize spurious retransmissions when the last ack
exactly equaled the retransmitted packet's sequence number plus the len. This is
standard TCP behavior so this feature was broken in most cases.

Bug: 12282
Change-Id: I90196cc79e786f92fd0d7be32816aad1d69d5718
Reviewed-on: https://code.wireshark.org/review/14592
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-03-24 00:04:03 +00:00
Pascal Quantin 5a166757ec 3GPP NAS: upgrade dissector to v13.5.0
Change-Id: I454a6a07efe599924edcfd2a5adeeabaf902995b
Reviewed-on: https://code.wireshark.org/review/14605
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-23 22:16:52 +00:00
Daniël van Eeden 0408f7c1a2 Update MySQL protocol URL
Change-Id: Ia50e06f8e9387ccb5e413f9a77fa811f092cb34a
Reviewed-on: https://code.wireshark.org/review/14602
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-23 21:48:17 +00:00
Guy Harris 77b26d6d71 That's not specific to OS X.
OS X's sed appears to be a *BSD sed, so the same problem might exist on
*BSD, or at least some *BSDs, and it might, in fact, be a problem with
everything except for GNU sed.

Change-Id: I267d9d7eb077c8ec39135bac7eff2c765af3efcf
Reviewed-on: https://code.wireshark.org/review/14601
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-23 20:12:41 +00:00
Joerg Mayer e8472e5660 Fix a problem that prevented checkins of all filenames containing the
character 'r' on MacOS with an active pre-commit hook.

Change-Id: If26fb22d5057794ec0de0def4055310b78a05f89
Reviewed-on: https://code.wireshark.org/review/14600
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-23 19:58:51 +00:00
Guy Harris aacab13591 Fix typo.
Change-Id: Ia7a94a855a2a7fe184232fea73874a607c4141b2
Reviewed-on: https://code.wireshark.org/review/14598
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-23 19:56:49 +00:00
Joerg Mayer bc3bd625e1 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 =
                               ^
1 error generated.

Change-Id: I7b215b9f2dafa04c6aae4a22fb6ae256f65e8585
Reviewed-on: https://code.wireshark.org/review/14597
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-23 19:50:19 +00:00
Joerg Mayer 222d30b340 Mikrotik has a protocol that they name Ethernet over IP (EoIP) which has
nothing to do with IP protocol 97 called EoIP. Instead it is a GRE encapsulation
with Ethertype 0x6400. It sets the GRE version to 1 but doesn't use a sequence
number (in violation of RFC2637). Welcome to the real world.

Change-Id: I3d916f8fc134ef14bcaf0b946a10f7170a9f6a75
Reviewed-on: https://code.wireshark.org/review/14596
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-23 19:45:29 +00:00
Gerald Combs e947d362f8 Override shortcuts in SyntaxLineEdit.
Add an ::event member function to SyntaxLineEdit that looks for
ShortcutOverride events and accepts them. This keeps them from being
interpreted as shortcuts in the main window.

Note that the current code accepts everything, and that we should probably
restrict this to AltGr only.

Bug: 12270
Change-Id: I01765ce2447d220a102d97fcbbe47579341ce075
Reviewed-on: https://code.wireshark.org/review/14570
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-23 18:07:23 +00:00
João Valverde aedc4af6c1 Use absolute path for test suite TEST_OUTDIR
Error out if it can't be created.

Change-Id: I1a087f0e0cc064be7a417b9a2e66cf3c940e02fa
Reviewed-on: https://code.wireshark.org/review/14565
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 15:15:22 +00:00
richardk 6a3a85f318 Added dissection of most of the ESC( EtherCAT slave controller) registers.
Change-Id: Idee70e6eaa926efb74cd4ff0bb529a601edbb67e
Reviewed-on: https://code.wireshark.org/review/13729
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-23 11:44:48 +00:00
Alexis La Goutte bf82500674 MySQL: Fix typo on CAPS_UNUSED #define
Change-Id: I4b4a5e6ca0b10068075767e6eec95c97d32034a1
Reviewed-on: https://code.wireshark.org/review/14561
Reviewed-by: Daniël van Eeden <wireshark@myname.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-23 11:44:04 +00:00
Jaap Keuter 040f5e5c1b Remove some dead code in copied code (CID-280297)
The copied function retained features from its parent,
which cannot be reached. Might as well remove them and
replace with proper assert.

Change-Id: I63838d6011420d6c4473b127da52e7f304376172
Reviewed-on: https://code.wireshark.org/review/14531
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-23 11:42:58 +00:00
Uli Heilmeier bbcb1aa3d8 WSUG: Change word in chapter VLAN resolving
As suggested by Graham Bloice.

Change-Id: Ic42e89e2b4ce98cbda827533d234ee1e3d03d32f
Reviewed-on: https://code.wireshark.org/review/14583
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-23 07:28:10 +00:00
João Valverde d30904567b Set missing manpages in configure.ac
Change-Id: I09cea974f1da7a37bf633fd8f5eae30382f18628
Reviewed-on: https://code.wireshark.org/review/14581
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 05:04:42 +00:00
Guy Harris 74cf25e910 Fix whitespace.
Change-Id: I9ec492c90e22813f6336130a875b9bca7179af6a
Reviewed-on: https://code.wireshark.org/review/14580
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-23 03:29:07 +00:00
Guy Harris 1543d34d6b Expand the LAT dissection.
Base it on the DEC specification, not on whatever the Linux DECNET
people managed to reverse-engineer.

Change-Id: I60586f52e35f9f61e4aed93f315bfaceebe68cce
Reviewed-on: https://code.wireshark.org/review/14579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-23 03:26:28 +00:00
João Valverde b4037729a0 Remove spurious file from g759fc8c
Change-Id: Ib33aacb85dc410732d1d36b8a24266c1cc0f248b
Reviewed-on: https://code.wireshark.org/review/14578
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:47:24 +00:00
João Valverde 759fc8cf70 Rename 'aclocal-fallback' directory to 'm4'
Change-Id: Icac1c43264b6c6fd426d3c5146863a491b48b4ff
Reviewed-on: https://code.wireshark.org/review/14569
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-23 02:33:56 +00:00
João Valverde c57b3777f8 Add pkg.m4 and remove aclocal-flags script
Add pkg-config 0.29.1 macros to our distribution. This makes the
aclocal-flags script obsolete, since we are already not using GLib
autoconf macros.

ACLOCAL_AMFLAGS need only be defined on the top-level Makefile.am.

Change-Id: Idd868dcfeb8f279517970d0f96d9d53e3a7e4d5c
Reviewed-on: https://code.wireshark.org/review/14568
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:33:43 +00:00
João Valverde 125989780b configure.ac: Remove --enable-usr-local
Let the compiler and linker handle the system default search path.

Generally give priority to /usr/local when doing "manual" searches.

Change-Id: I3bde7af1226305d94ddb4bc96cefe9ef91e26769
Reviewed-on: https://code.wireshark.org/review/14564
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:15:32 +00:00
João Valverde ed350dd350 Don't move config.guess and config.sub for autogen.sh
Libtoolize won't touch them if they exist (since 2.2.x at least).

Change-Id: I6bac9980523c27d1ee2f5a008d25a93a3ef5f175
Reviewed-on: https://code.wireshark.org/review/14567
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:10:08 +00:00
João Valverde b175e16d6e Remove unused autoconf macros
Change-Id: Ifb9ab1011373cbe6ac9d6a417f07af76171d87fe
Reviewed-on: https://code.wireshark.org/review/14577
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:08:41 +00:00
João Valverde 17371523e1 Clean autoconf macros whitespace
Change-Id: Ib57e9255991b63bb47c8e9821938d3b38a82d140
Reviewed-on: https://code.wireshark.org/review/14576
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:07:59 +00:00
João Valverde 3a9feb4118 EditorConfig: Add C++ to root file
Change-Id: I716bf59e401d7764692e524506756eb30ddb75f2
Reviewed-on: https://code.wireshark.org/review/14572
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:00:21 +00:00
João Valverde d93331e124 Update config.guess and config.sub to latest upstream version
Change-Id: I5cbeaf66af0627c27d5a1e38aa438c91cfa45250
Reviewed-on: https://code.wireshark.org/review/14566
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 01:04:38 +00:00
João Valverde b5c76bee39 configure.ac: Add missing quotes
Change-Id: Iecd2fa95104ac483a2babad1eaba8f9e9c4732c5
Reviewed-on: https://code.wireshark.org/review/13308
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 01:04:01 +00:00
João Valverde eb09239bae Make runlex.sh quieter
Change-Id: I5a20493d1cca57ecb2487c443e9c0e20120fd711
Reviewed-on: https://code.wireshark.org/review/14575
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 00:40:18 +00:00
João Valverde b8ab3afc4a Move extcap EditorConfig settings to source dir
To comply with the procedure in README.developer.

Change-Id: If68da7b5ff27c3b250200cd17c80a005d51c631d
Reviewed-on: https://code.wireshark.org/review/14573
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 00:24:52 +00:00
João Valverde 7a15af9dd3 Remove unnecessary make dependency in doc/Makefile.am
Change-Id: I3b8db4727d9674d4e573c5ccc739a3661ee14196
Reviewed-on: https://code.wireshark.org/review/14574
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 00:23:52 +00:00
João Valverde 1777f840cf Minor EditorConfig fixups
Change-Id: I16eb1ff8b71104300e88f4f307aaaaf6e276bc8e
Reviewed-on: https://code.wireshark.org/review/14571
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-22 23:52:11 +00:00
João Valverde 33850025ca Reorder some linker flags from most dependent to least dependent
Change-Id: I949a01cc6a8d56c4aac65b54f45e6ab6cc918d29
Reviewed-on: https://code.wireshark.org/review/14563
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-22 20:37:01 +00:00