aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2018-03-28lemon: Sync with latest trunk.Anders2-175/+319
Change-Id: Iab0d64f675b482eee97b300d419ffa1e8090632e Reviewed-on: https://code.wireshark.org/review/26676 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-28lemon: Sync with upstream, Jun 28, 2017Anders2-26/+39
Change-Id: I4c6dbd018302fdf176e955e0e5e735a7aee22b10 Reviewed-on: https://code.wireshark.org/review/26669 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-28lemon: Align struct s_options with upstream.Anders1-60/+57
Change-Id: I87ce8123a625a643a7c3d9e426f5ce103a670f2a Reviewed-on: https://code.wireshark.org/review/26666 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-27lemon: Trivial changes to make it easier to compare with upstream.Anders1-19/+41
Change-Id: I1bfac3d39a50b3d2093c66a77280b355e678d427 Reviewed-on: https://code.wireshark.org/review/26664 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26CMake: Add an rpm-package target.Gerald Combs1-1/+3
Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20html2text: Wrap at 72 characters.Gerald Combs1-1/+1
Change-Id: Id8c9d74b71cabce6bbfb25fd857f71c4b2a4e8ea Reviewed-on: https://code.wireshark.org/review/26556 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-16Windows: use c-ares 1.14.0Pascal Quantin1-4/+4
Change-Id: Iefe3caf1856fd322c657a31d1eefe9a645a13070 Reviewed-on: https://code.wireshark.org/review/26495 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-13Remove popcount in favor of ws_count_ones.Gerald Combs2-27/+3
Remove our popcount implementation in favor of ws_count_ones, which is our other popcount implementation. This required updating and running process-x11-xcb.pl. Change-Id: I8634c55242113b338c5b0173837c35f98b148b4f Reviewed-on: https://code.wireshark.org/review/26454 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-11F5ETHTRAILER: Initial cleanup from submissionMichael Mann1-3/+0
The dissector had been a plugin since at least 1.3 (based on comments in the dissector). Not all of the most current APIs were used for functionality and there was some cruft left over. Also disable F5ETHTRAILER by default since it doesn't have a discriminating heuristic. Change-Id: I8c977167a906eafd6fbb663d2fe6c44f080f2209 Reviewed-on: https://code.wireshark.org/review/26428 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-11Adapt to current WS code base to make it compile and run without warnings or ↵Joerg Mayer1-0/+3
errors Change-Id: I135df8b0e49346e32a19620d52cd1a9a44b4ac08 Reviewed-on: https://code.wireshark.org/review/26426 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-03-09licensecheck: handle multiple licenses.Dario Lombardo1-1/+13
Change-Id: I1df4406e4bfcdcea99dc1c1446f1863c0a4522a0 Reviewed-on: https://code.wireshark.org/review/26386 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09Add MaxMindDB 1.3.2 library to WindowsPascal Quantin1-4/+5
Change-Id: I328b6a05cc356be59ac63e80eae55a832bf76a47 Reviewed-on: https://code.wireshark.org/review/26347 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-09spdx: more licenses converted.Dario Lombardo9-139/+9
Change-Id: I8f6693108c43959e54911d35b4fbf730c59add60 Reviewed-on: https://code.wireshark.org/review/26361 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09spdx: more licenses converted.Dario Lombardo5-85/+5
Change-Id: Ia1650bc02511f7bd47fb90be91b623177f05bcbd Reviewed-on: https://code.wireshark.org/review/26337 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07spdx: more licenses converted.Dario Lombardo40-528/+40
Change-Id: I3861061ec261e63b23621799e020e811ed78a343 Reviewed-on: https://code.wireshark.org/review/26333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07licensecheck: add BSD licenses.Dario Lombardo1-0/+8
Change-Id: I764d03e4dc6d8925e656f37c98ece3da1fb1f001 Reviewed-on: https://code.wireshark.org/review/26335 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07More licenses converted to SPDX.Dario Lombardo33-429/+33
Change-Id: Id4f987dcdacf06622d70263f4659a4400e30dc39 Reviewed-on: https://code.wireshark.org/review/26332 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs7-65/+46
MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02Fuzz-test: Handle ABRT.Gerald Combs1-1/+16
Trap ABRT and try to pass it on to our runners. Change-Id: I6e5a9fd63822c9bc84e116b3574abc4ccca448f5 Reviewed-on: https://code.wireshark.org/review/26227 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-28L16_mono: Add L16 monaural codec plugin as functional exampleJaap Keuter1-7/+21
This codec plugin serves a dual purpose. First it is to add L16 codec suppport to Wireshark. Second it is an illustration of a basic codec plugin module. Change-Id: I64394dab3257ae49dece0257b16cd969503918e2 Reviewed-on: https://code.wireshark.org/review/26131 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-24Rename airpdcap to dot11decrypt.Gerald Combs1-10/+10
Our 802.11 decryption code isn't tied to any specific product. Change the file and API names to dot11decrypt. Change-Id: I14fd951be3ae9b656a4e1959067fc0bdcc681ee2 Reviewed-on: https://code.wireshark.org/review/26058 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-21tools: add git to optional pkgs in debian-setup script.Dario Lombardo1-1/+2
Change-Id: I2931ee2bee9a719596318615d2cba7973e30e082 Reviewed-on: https://code.wireshark.org/review/25921 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-20fuzzshark: don't fuzz udplite.Jakub Zawadzki1-1/+2
Don't fuzz IP->udplite protocol. It's using most of UDP code, but cause udplite calls also udp dissectors it duplicates work of UDP fuzzer. This should also decrease IP corpus size, cause in IP corpus ~7.6% (9 165 out of 119 780) is udplite ip.proto Change-Id: I1d3bde6dd34f76696a34b1c728ce36f3c802e6c9 Link: https://github.com/google/oss-fuzz/issues/1087 Reviewed-on: https://code.wireshark.org/review/25950 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-02-17Don't have CLEAN_FILES variables for the "clean" source files.Guy Harris1-5/+1
Except for the one directory that (currently) has "not yet clean" files, epan/dissectors, we don't need a separate variable to keep track of the "clean" source files. In the cases where not all files were in CLEAN_FILES, put them into the variable used to enable -Werror or its equivalent. Change-Id: Ic4119861c1d9e381adfe31e9977e1ac71d623f5b Reviewed-on: https://code.wireshark.org/review/25830 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-15fuzzshark: disable reassembly for few protocolsYour Name1-4/+30
Reassembly (or in general being stateful) doesn't help when fuzzing, even if wireshark will crash oss-fuzz will try to reproduce the crash with just single sample. Single sample will not reproduce the crash, so being stateful makes wireshark 'buggy target'. I hope change will also make IP corpus a little bit smaller. Change-Id: I01ba8177a653d220c4cfe8a56a5836c96010c6fe Reviewed-on: https://code.wireshark.org/review/25799 Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-02-13Asciidoctor macro fixups.Gerald Combs1-1/+1
Fix a few errors in the Asciidoctor macros. Use the new macro names in the release notes and gen-bugnote. Change-Id: I2ca672949c59ca3da8a6b963cb5bd9abd66c348d Reviewed-on: https://code.wireshark.org/review/25774 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-13more SPDX convertions.Dario Lombardo1-13/+1
Change-Id: I6b8404c28b31a81767a3b64ffe9ba96156c4c217 Reviewed-on: https://code.wireshark.org/review/25757 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-13tools: fix zlib check in licensecheck.pl.Dario Lombardo1-1/+1
Change-Id: I0b1708c6e4530115698d050e41b691af2a948578 Reviewed-on: https://code.wireshark.org/review/25766 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-02-13tools: remove extra spaces from licensecheck.pl.Dario Lombardo1-3/+0
Change-Id: Iab25373f047cc084efaf751cb9a3cfbf62fd1f7a Reviewed-on: https://code.wireshark.org/review/25767 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-02-12html2text: Prefix lists with a bullet.Gerald Combs1-2/+5
Prefix lists with a bullet symbol (U+2022) instead on an asterisk. Skip the <head> tag while we're here so that we don't print the title twice. Change-Id: I1dfad1fc70aa05319e14c55b663dd2183ab87d79 Reviewed-on: https://code.wireshark.org/review/25762 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-12Remove Lynx.Gerald Combs3-5/+8
Use tools/html2text.py to convert HTML to text. Remove some now-obsolete documentation. Change-Id: Ib21a1ab10c789182da5fcc68e98917a00f2fa650 Reviewed-on: https://code.wireshark.org/review/25733 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-12fuzzshark: disable protocol in fuzzer if it's used by other fuzzer.Jakub Zawadzki2-7/+43
Change-Id: I4dcc38b2ac9711660c8cf27cbbabd879c2eee930 Link: https://github.com/google/oss-fuzz/issues/1087 Reviewed-on: https://code.wireshark.org/review/25738 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-11Switch from AsciiDoc to Asciidoctor.Gerald Combs3-56/+2
Switch the markup text processor for files in the docbook directory from AsciiDoc to Asciidoctor. Asciidoctor has several useful features (such as direct PDF output) and is actively developed. It's written in Ruby but that dependency can be sidestepped with AsciidoctorJ, a self-contained bundle that only depends on the JRE. The current toolchain targets require Python, AsciiDoc, DocBook XML, DocBook XSL, Java, FOP, xsltproc, lynx, and the HTMLHelp compiler: HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL Chunked HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL PDF: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → FOP HTMLHelp: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → HHC This change removes the AsciiDoc and FOP requirements and adds either AsciidoctorJ or Asciidoctor + Ruby: HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL Chunked HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL PDF: Asciidoctor HTMLHelp: Asciidoctor → DocBook XML → xsltproc + DocBook XSL → HHC Ideally we could generate all of these using AsciidoctorJ, Java, and lynx. Unfortunately we're not there yet. The release notes depend on several macros (ws-buglink, ws-salink, cve-idlink, sort-and-group). Add Asciidoctor (Ruby) equivalents. Remove the BUILD_xxx_GUIDES CMake options and add various output targets automatically. This means that you have to build the various documentation targets explicitly. Change-Id: I31930677a656b99b1c6839bb6c33a13db951eb9a Reviewed-on: https://code.wireshark.org/review/25668 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09caputils/tools: more SPDX convertions.Dario Lombardo5-65/+5
Change-Id: I44a8d1848f768acf4c3b31a68c845264c74e4bba Reviewed-on: https://code.wireshark.org/review/25709 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-09tools: fix BSD license name in licensecheck.pl.Dario Lombardo1-1/+1
Change-Id: I401efcbb4f8f9eec5ef38f3788e979a3752c4a7f Reviewed-on: https://code.wireshark.org/review/25714 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-09html2text: Skip some tags and add references.Gerald Combs1-1/+37
Skip the contents of <style> and <script> tags. Add URL footnotes similar to `lynx -dump`. Change-Id: I721bdfabeacc000d604aa8475f13be1d797ad0fb Reviewed-on: https://code.wireshark.org/review/25697 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-09Generalize wtap_pkthdr into a structure for packet and non-packet records.Guy Harris1-9/+9
Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo1-1/+1
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08tools: remove garbage from licensecheck.pl.Dario Lombardo1-1/+0
Change-Id: I9a0e00c9e033618ee2ced94dadf1a98640e0d914 Reviewed-on: https://code.wireshark.org/review/25684 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-02-08tools: add new SPDX GPL format to licensecheck.pl.Dario Lombardo1-2/+7
Change-Id: Ie148f8a660027df8194bd3890a108c0639a18823 Reviewed-on: https://code.wireshark.org/review/25680 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08tools: remake the indentation of licencecheck.pl.Dario Lombardo1-547/+549
Change-Id: Ib1b320e5b99e8842df61fd3dc584b6df4fc461f8 Reviewed-on: https://code.wireshark.org/review/25639 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07tools: Add SPDX MIT to licensecheck.pl.Gerald Combs1-0/+4
Add a check for "SPDX-License-Identifier: MIT". Change-Id: Id69c87e7d8d7fd3904a02f9fb410bae8e9d99d10 Reviewed-on: https://code.wireshark.org/review/25669 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-07tools: add files from wsutil and caputils to checklicense whitelist.Dario Lombardo1-0/+9
Change-Id: I35b6df8fbb31c209e7e79d5c002568d5194f3485 Reviewed-on: https://code.wireshark.org/review/25641 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07tools: add licenses to licensecheck.pl.Dario Lombardo1-0/+14
Include the following licenses in licensecheck.pl 1. LGPL-2.0-or-later 2. Zlib 3. BSD-3-Clause Change-Id: I65f0ca1f957ee072ed595ab56d20ec200bd7047e Reviewed-on: https://code.wireshark.org/review/25638 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-02fuzzshark: use SPDX identifier.Dario Lombardo1-14/+1
Change-Id: I9c786b8bbb96a4bfa1560536c3929b844aa8afb7 Reviewed-on: https://code.wireshark.org/review/25562 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01oss-fuzzshark: try to fix oss-fuzz assert fails.Jakub Zawadzki1-5/+10
Change-Id: Ic4ff70dfc55b2694f761cdadcac1962242fca753 Reviewed-on: https://code.wireshark.org/review/25551 Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-02-01oss-fuzzshark: test code to debug some oss-fuzz assert fails.Jakub Zawadzki1-0/+5
Change-Id: I5dbe899ca8a4f9107d62667ca107a4d3a48fe51b Reviewed-on: https://code.wireshark.org/review/25545 Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-27valgrind-wireshark.sh: fix typo in usageMartin Mathieson1-1/+1
Change-Id: If9210c6f71d4e258a489d254482cf5543b818e11 Reviewed-on: https://code.wireshark.org/review/25491 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-26Added the Proconx CAN-ETH protocol dissectorLazar Sumar1-0/+1
Change-Id: I306341c7cddf8facb4a9ca62254a465a1da22174 Reviewed-on: https://code.wireshark.org/review/25423 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-21Qt: Translate files in subdirectories.Gerald Combs1-5/+19
Make sure we pass ui/qt/*/*.{cpp,h} to lupdate. Make update-tx a bash script and make sure it passes ShellCheck. Add a -n flag, which disables pushing back to Transifex. Change-Id: Ia7d6564bbdbf69285f1f9b88cde09e37da4f916c Reviewed-on: https://code.wireshark.org/review/25382 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 22:30:59 +0000