aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-03-23Rename 'aclocal-fallback' directory to 'm4'João Valverde11-10/+50
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-23Add pkg.m4 and remove aclocal-flags scriptJoão Valverde9-172/+278
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-23configure.ac: Remove --enable-usr-localJoão Valverde2-61/+2
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-23Don't move config.guess and config.sub for autogen.shJoão Valverde1-11/+0
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-23Remove unused autoconf macrosJoão Valverde4-406/+0
Change-Id: Ifb9ab1011373cbe6ac9d6a417f07af76171d87fe Reviewed-on: https://code.wireshark.org/review/14577 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Clean autoconf macros whitespaceJoão Valverde3-5/+2
Change-Id: Ib57e9255991b63bb47c8e9821938d3b38a82d140 Reviewed-on: https://code.wireshark.org/review/14576 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23EditorConfig: Add C++ to root fileJoão Valverde3-12/+2
Change-Id: I716bf59e401d7764692e524506756eb30ddb75f2 Reviewed-on: https://code.wireshark.org/review/14572 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Update config.guess and config.sub to latest upstream versionJoão Valverde2-241/+159
Change-Id: I5cbeaf66af0627c27d5a1e38aa438c91cfa45250 Reviewed-on: https://code.wireshark.org/review/14566 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23configure.ac: Add missing quotesJoão Valverde1-1/+1
Change-Id: Iecd2fa95104ac483a2babad1eaba8f9e9c4732c5 Reviewed-on: https://code.wireshark.org/review/13308 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Make runlex.sh quieterJoão Valverde1-6/+6
Change-Id: I5a20493d1cca57ecb2487c443e9c0e20120fd711 Reviewed-on: https://code.wireshark.org/review/14575 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Move extcap EditorConfig settings to source dirJoão Valverde3-4/+10
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-23Remove unnecessary make dependency in doc/Makefile.amJoão Valverde1-10/+8
Change-Id: I3b8db4727d9674d4e573c5ccc739a3661ee14196 Reviewed-on: https://code.wireshark.org/review/14574 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-22Minor EditorConfig fixupsJoão Valverde1-5/+5
Change-Id: I16eb1ff8b71104300e88f4f307aaaaf6e276bc8e Reviewed-on: https://code.wireshark.org/review/14571 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-22Reorder some linker flags from most dependent to least dependentJoão Valverde1-4/+3
Change-Id: I949a01cc6a8d56c4aac65b54f45e6ab6cc918d29 Reviewed-on: https://code.wireshark.org/review/14563 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-22More "FT_BOOLEAN is 64-bit" fixes.Guy Harris1-1/+1
Bug: 12276 Change-Id: I705b79073856cfb49c05d83014a3b9f50d2e30cf Reviewed-on: https://code.wireshark.org/review/14556 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-22WSUG: Add documentation for vlan id resolvingUli Heilmeier2-0/+21
Ping-Bug: 11209 Change-Id: Ife36b7ad02d22e2fa53eedc8d49a81ff8c578844 Reviewed-on: https://code.wireshark.org/review/14554 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-22Add $(EXTCAP_COMMON_SRC:.c=.obj) to tshark_OBJECTSMichael Mann1-1/+1
Change-Id: I5d3b33248ff849d4056fb671b546c314abd63c19 Reviewed-on: https://code.wireshark.org/review/14551 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-22ISO 7816: fix filters for Fi and Di fieldsPascal Quantin1-2/+2
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-22Fix randpkt and reordercap.Gerald Combs2-0/+101
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-22Remove more missed ADNS codeJoão Valverde1-60/+0
Fixup for 7a1d3f67ac83e12645a91b5329b6e8163954f77e. 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-21Qt: Normalize timerEventsGerald Combs4-14/+20
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-21AUTHORS: More column alignment improvementsJoão Valverde3-309/+314
Change-Id: I29d08ca213df44c1d6d437135c45a3d6e45efa7d Reviewed-on: https://code.wireshark.org/review/14386 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21Remove ADNS supportJoão Valverde22-583/+26
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-21Fix building without extcap enabledJoão Valverde23-119/+170
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-21Bugfix "typo" from I9b04837f93Michael Mann4-48/+70
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-20ENIP: Add request/response arrows for related packetsD. Ulis1-2/+2
Change-Id: I0fbaa0569be3aafa85156cea6b7f5220c2d5e118 Reviewed-on: https://code.wireshark.org/review/14542 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20URL for the document in question.Guy Harris1-0/+1
Change-Id: Id92c484099bdcd71c0ff194abeefda4bab8dcd6e Reviewed-on: https://code.wireshark.org/review/14543 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-20Add missing auth switch values to value_stringDaniël van Eeden1-0/+2
Change-Id: Ie602d76dfd2366294f2599f6c4d8634d37c6531c Reviewed-on: https://code.wireshark.org/review/14535 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20Add CLIENT_DEPRECATE_EOF flagDaniël van Eeden1-0/+8
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-20Fix response ok packet with no session tracking info but flag setDaniël van Eeden1-22/+24
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-20Create call_data_dissector() to call data dissector.Michael Mann285-1576/+615
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-20Fix incorrect table being used to store Session TicketsAdam Schwalm2-2/+2
A regression was introduced at f4580ac9edc8b5351 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-20RTPS: Added new filters rtps.guidPrefix.src and rtps.guidPrefix.dstJuanjo Martin1-37/+45
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[Automatic update for 2016-03-20]Gerald Combs13-196/+424
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-20PKTC must be stricter with its Kerberos application choices.Michael Mann1-2/+19
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-20Fix CMake target FOLDER propertiesGraham Bloice2-2/+3
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-20Manually add protocol dependencies derived from find_dissector.Michael Mann358-823/+849
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-20Start work on API to generate protocol dependency tree.Michael Mann3-1/+154
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-20Fix compiling with CTDEBUG=1Daniël van Eeden1-7/+7
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-19Remove unused header field.Jaap Keuter1-22/+0
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-19Make sure first byte in ACAP packet is printable.Michael Mann1-0/+11
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-18DocBook: Don't require xmllint.Gerald Combs11-173/+8
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-186lowpan: proto_tree_add_item() can be used directly for an FT_UINT64Martin Kaiser1-5/+4
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-18cmake: Remove extcap from include directoriesJoão Valverde1-1/+0
Change-Id: Ia521aaa6ace14df5a6c02e0dd1c8336df41ac180 Reviewed-on: https://code.wireshark.org/review/14517 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-186lowpan: remove a ton of if (tree) checksMartin Kaiser1-172/+109
Change-Id: Idff3eda741e62bfe5b00f30760bcc8af0e8e5df5 Reviewed-on: https://code.wireshark.org/review/14514 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-03-18iso14443: fix the dissection of ATQAMartin Kaiser1-11/+36
the two bytes are sent LSB first all fields are defined relative to the entire 16bit value Change-Id: Iaea2b98fcb1f57224fbbd1c4c58473a7f810055d Reviewed-on: https://code.wireshark.org/review/14513 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-03-18IEEE 802.1Q/VLAN: Resolve ID to a describing nameUli Heilmeier5-2/+230
A vlans file in the personal preference directory add an option to resolve VLAN IDs to a describing name. Format of vlan file is 123\tName of VLAN To enable the resolving the preference nameres.vlan_name must be set to TRUE. Bug: 11209 Change-Id: I3f00b4897aace89c03c57b68b6c4b6c8b7d4685a Reviewed-on: https://code.wireshark.org/review/14471 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-18Qt: Use single-dash option for Qt4 compatibilityJoão Valverde1-6/+6
Change-Id: Ib8a52eca74ac63704a31b4b48da936abb6a6331b Reviewed-on: https://code.wireshark.org/review/14511 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-18INAP (ASN1): fix indent (use 2 spaces) and modelines infoAlexis La Goutte2-259/+277
Change-Id: I45b48c1e89ff68b1d990cd7cff9dd180cf4a1f7f Reviewed-on: https://code.wireshark.org/review/14505 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-18Clamp down on address data structure usage and AT_NONE semanticsJoão Valverde1-7/+7
Catch errors like bug 12205 with an assertion. Change-Id: I17381c92dfb22912e53eb20f6436adfa15d67e71 Reviewed-on: https://code.wireshark.org/review/14251 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>