Commit Graph

62317 Commits

Author SHA1 Message Date
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
Guy Harris 46be2049f3 More "FT_BOOLEAN is 64-bit" fixes.
Bug: 12276
Change-Id: I705b79073856cfb49c05d83014a3b9f50d2e30cf
Reviewed-on: https://code.wireshark.org/review/14556
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-22 18:08:08 +00:00
Uli Heilmeier 67a137a3bf WSUG: Add documentation for vlan id resolving
Ping-Bug: 11209
Change-Id: Ife36b7ad02d22e2fa53eedc8d49a81ff8c578844
Reviewed-on: https://code.wireshark.org/review/14554
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-22 15:51:44 +00:00
Michael Mann 0db6f9d91b Add $(EXTCAP_COMMON_SRC:.c=.obj) to tshark_OBJECTS
Change-Id: I5d3b33248ff849d4056fb671b546c314abd63c19
Reviewed-on: https://code.wireshark.org/review/14551
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-22 13:13:11 +00:00
Pascal Quantin d20c69c3ef ISO 7816: fix filters for Fi and Di fields
They use proto_tree_add_uint_format() function to build an interpreted value, so they should not apply the byte bitmask

Change-Id: I29f70f567d41a8a44a34f3f0bc477fbc04b11b29
Reviewed-on: https://code.wireshark.org/review/14553
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-03-22 11:52:18 +00:00
Gerald Combs c362dc7a52 Fix randpkt and reordercap.
Copy over recent wiretap plugin changes from mergecap, otherwise
randpkt and reordercap will crash.

Change-Id: I70111ded3d9a5c4380b964b2c5b626599eebc327
Reviewed-on: https://code.wireshark.org/review/14546
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-22 03:19:10 +00:00
João Valverde 51984de040 Remove more missed ADNS code
Fixup for 7a1d3f67ac.

Change-Id: Idb8d68a3cc114545f24738cead4968804d831346
Reviewed-on: https://code.wireshark.org/review/14548
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>
2016-03-22 02:16:02 +00:00
Gerald Combs bb48c859c9 Qt: Normalize timerEvents
Make our timerEvent code more consistent. Make sure we use timer IDs and
that we call our base class timerEvent everywhere.

Change-Id: Ib67daa459a8a2f9b67487c3952b7b35c7f162f7e
Reviewed-on: https://code.wireshark.org/review/14480
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-21 22:10:21 +00:00
João Valverde df23ccb7d7 AUTHORS: More column alignment improvements
Change-Id: I29d08ca213df44c1d6d437135c45a3d6e45efa7d
Reviewed-on: https://code.wireshark.org/review/14386
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21 21:34:07 +00:00
João Valverde 7a1d3f67ac Remove ADNS support
Relevant mailing list message:

  https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html

Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2
Reviewed-on: https://code.wireshark.org/review/14519
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21 19:32:00 +00:00
João Valverde 52dd4fb633 Fix building without extcap enabled
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap.

Some documentation fixes too.

Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99
Reviewed-on: https://code.wireshark.org/review/14522
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-21 17:10:21 +00:00
Michael Mann 69d348c12a Bugfix "typo" from I9b04837f93
Change-Id: Iafc67ced1af0fbb27545acb0e1569b8b8ccd9451
Reviewed-on: https://code.wireshark.org/review/14544
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-21 13:52:31 +00:00
D. Ulis 4a35488e0e ENIP: Add request/response arrows for related packets
Change-Id: I0fbaa0569be3aafa85156cea6b7f5220c2d5e118
Reviewed-on: https://code.wireshark.org/review/14542
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 20:52:32 +00:00
Guy Harris 88926c3b61 URL for the document in question.
Change-Id: Id92c484099bdcd71c0ff194abeefda4bab8dcd6e
Reviewed-on: https://code.wireshark.org/review/14543
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-20 20:40:39 +00:00
Daniël van Eeden 6cb36fed68 Add missing auth switch values to value_string
Change-Id: Ie602d76dfd2366294f2599f6c4d8634d37c6531c
Reviewed-on: https://code.wireshark.org/review/14535
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 18:22:28 +00:00
Daniël van Eeden 5c1e224b0d Add CLIENT_DEPRECATE_EOF flag
This is used in MySQL 5.7
https://dev.mysql.com/doc/internals/en/capability-flags.html#flag-CLIENT_DEPRECATE_EOF

Change-Id: I8e00c966628233181e7145d8ed80d51f2acd9517
Reviewed-on: https://code.wireshark.org/review/14536
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 18:22:06 +00:00
Daniël van Eeden 93a3041bf5 Fix response ok packet with no session tracking info but flag set
Change-Id: I901ebc2128c92ef758b6b400cc8d86488a2115cb
Reviewed-on: https://code.wireshark.org/review/14537
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-20 18:20:23 +00:00
Michael Mann 1e60d63c8c Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.

There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.

Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 17:38:03 +00:00
Adam Schwalm 2b2fc64447 Fix incorrect table being used to store Session Tickets
A regression was introduced at f4580ac9ed where an additional
hash table was introduced to store TLS Session Tickets separately
from Session IDs. However, the New Session Ticket dissector was
still storing the the Session Ticket in the ID table, causing lookups
to fail.

Change-Id: Iff49202f50afb8cb6ef62c774f6155682b8e48a6
Reviewed-on: https://code.wireshark.org/review/14499
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-20 16:57:41 +00:00
Juanjo Martin b5bd3dfe6a RTPS: Added new filters rtps.guidPrefix.src and rtps.guidPrefix.dst
As well as in the rest of network protocols, in RTPS we have senders
and receivers of data. The atomic unit is not the host address (IP)
or the host address and port (UDP) but the guidPrefix. The guidPrefix
represents a single DomainParticipant, that very likely will be an
application. I have added filters to be able to differentiate from
source of information and destination of information. Before, the
only filter available was rtps.guidPrefix

Change-Id: I810d8b043796119c6e381bdbcb6061e0525ea272
Reviewed-on: https://code.wireshark.org/review/14466
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-20 16:56:51 +00:00
Gerald Combs c581db2440 [Automatic update for 2016-03-20]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I1c1b5c902782d9250eab3341ff56e09f79c4c0e3
Reviewed-on: https://code.wireshark.org/review/14532
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-20 15:09:47 +00:00
Michael Mann 4cdc9eeba5 PKTC must be stricter with its Kerberos application choices.
The PKTC dissector calls the Kerberos dissector assuming certain application values.  Because different application values can have different "private" data, corruption can occur.
Ensure the Kerberos application values match the preceding comments by checking the ber identifier before calling the Kerberos dissector.

Bug: 12206
Change-Id: I9b04837f93a56681cae3816278315cf01da17544
Reviewed-on: https://code.wireshark.org/review/14520
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-20 14:03:57 +00:00
Graham Bloice 92db934c7c Fix CMake target FOLDER properties
Add FOLDER properties to targets to clean up the presentation
in Visual Studio.

Change-Id: I35a175175db055443572c58a069879061fdcf0a3
Reviewed-on: https://code.wireshark.org/review/14528
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-20 14:03:12 +00:00
Michael Mann 9bcac48403 Manually add protocol dependencies derived from find_dissector.
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector.  Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector.
"data" dissector was not considered to be a dependency.

Change-Id: I15d0d77301306587ef8e7af5876e74231816890d
Reviewed-on: https://code.wireshark.org/review/14509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 12:48:48 +00:00
Michael Mann 6da50e2fde Start work on API to generate protocol dependency tree.
Dissector and heuristic tables now setup protocol dependencies.
"Manual" dependencies in separate patch.

Ping-Bug: 1402
Change-Id: I8da1239306de8676dcb05f8807914376816fc44f
Reviewed-on: https://code.wireshark.org/review/14447
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 12:48:31 +00:00
Daniël van Eeden bb74293fa7 Fix compiling with CTDEBUG=1
Change-Id: Idf36ebd7ceb3f87ceb6a68774f5b2810f8cf7b58
Reviewed-on: https://code.wireshark.org/review/14527
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-20 00:58:47 +00:00
Jaap Keuter d4194585ba Remove unused header field.
Removing setting up and decoding for a header field which
never can be used anyway.

Change-Id: Ieed7810dd654df944a5bd16a7b84d3367bf9fa14
Reviewed-on: https://code.wireshark.org/review/14524
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-19 23:09:01 +00:00
Michael Mann 68c84a7e66 Make sure first byte in ACAP packet is printable.
Saves some false positives for protocols using port 674.

Bug: 12265
Change-Id: I7cb8aa9318639db0822b05b8c5b6f6563d8d4afc
Reviewed-on: https://code.wireshark.org/review/14521
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-19 11:42:47 +00:00
Gerald Combs a183726370 DocBook: Don't require xmllint.
Remove dependencies on xmllint. We don't write DocBook by hand any more
and we haven't used it in a long time in the CMake builds.

Change-Id: Ic07f03b00c4554c058eece0462b0925d565b6da1
Reviewed-on: https://code.wireshark.org/review/14506
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-18 23:26:51 +00:00
Martin Kaiser bf1c8b5617 6lowpan: proto_tree_add_item() can be used directly for an FT_UINT64
Change-Id: I3f43fc9b0951822dd2ec3aba85af993e20c549d3
Reviewed-on: https://code.wireshark.org/review/14515
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-18 22:04:18 +00:00