aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2016-03-01debian-setup: need libtool-bin for building.Alexis La Goutte1-1/+1
Change-Id: I761babced3eb49b8a8cea4996b7ccd6f748a6200 Reviewed-on: https://code.wireshark.org/review/13829 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-02-29fuzz-test: Add missing new lineJoão Valverde1-1/+1
Change-Id: I68f85cdbef24289cabb5e46905356c3cc1c39ad8 Reviewed-on: https://code.wireshark.org/review/14252 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-29PIDL: sync pidl with samba repoAurelien Aptel13-144/+365
Copy pidl from samba repo after all wireshark changes were applied. Change-Id: I0d3fb780c3f79b3b873304bab0655d98564dfc71 Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/13967 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-25pre-commit: Use uname -a instead.João Valverde1-2/+2
Not all shells support uname -o. Change-Id: Ia6f46f3580f6d7b421da672418dcbee38ad9e60b Reviewed-on: https://code.wireshark.org/review/14143 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-25pre-commit: Avoid launching python subprocesses.João Valverde4-53/+63
This makes Python required only for (portable) fnmatch(). Change the ignore script to work as a filter. Multi-platform improvements. Change-Id: I6ac757d48ba2ff965da5da3dc9c25047a0e37f92 Reviewed-on: https://code.wireshark.org/review/13693 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-23When installing RPMs for development, use dnf if the OS has it.Jeff Morriss1-2/+7
Also install the Qt5-devel packages (in addition to plain old "Qt"). Change-Id: I86f6a779dc9d0b359c69f0627106d1cce3120f83 Reviewed-on: https://code.wireshark.org/review/13916 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-02-19Add inet_pton/inet_ntop interface to libwsutilJoão Valverde1-0/+2
Change-Id: Ifc344ed33f2f7ca09a6912a5adb49dc35f07c81f Reviewed-on: https://code.wireshark.org/review/13881 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-02-13Just #include wsutil/inet_aton.hJoão Valverde1-0/+1
No need for platform-specific system header boilerplate. Change-Id: I5387a0005ddb0d7aab3c5b9f28d6282053c1b0fd Reviewed-on: https://code.wireshark.org/review/13865 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-02-11autotools: Add more silent build rulesJoão Valverde1-1/+1
Change-Id: I4abff8880d5b3ff439e6abc9cf3c2d17897501ea Reviewed-on: https://code.wireshark.org/review/13816 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-02-10debian-setup: bug fixDario Lombardo1-3/+3
Change-Id: I90cb9eafdef2d8f20d9c3ea0327b5cce06f2426b Reviewed-on: https://code.wireshark.org/review/13822 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-08tools: improve valgrind script.Dario Lombardo1-3/+13
Change-Id: Ifae62e6334b48002516dfff6d1c2f094445f423c Reviewed-on: https://code.wireshark.org/review/13820 Reviewed-by: Evan Huus <eapache@gmail.com>
2016-02-05fuzz-test: Move the ASan message outside our loops.Gerald Combs1-3/+7
Change-Id: I109a3e222358523de8f43c887bf7551e92fce135 Reviewed-on: https://code.wireshark.org/review/13714 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-04Fix asn2wrs warnings [-Wredundant-decls]João Valverde1-1/+4
Change-Id: Iced801f17c56618eaaf1bb7c85d68ecdebd633a1 Reviewed-on: https://code.wireshark.org/review/13705 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-04fuzz-test: Print the memory limit if ASan is enabled.Gerald Combs1-2/+5
Update the 'ulimit -v' FAQ URL while we're here. Change-Id: I0e1b007295bf609d7a585087b00c97eae01501c2 Reviewed-on: https://code.wireshark.org/review/13696 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-03No need for execute bit on setuid-root.pl.inJoão Valverde1-0/+0
Change-Id: I099fbd73b5a192375c8b99f0997c7074c97d0cb9 Reviewed-on: https://code.wireshark.org/review/13673 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-03lemon: Use automake rulesJoão Valverde1-4/+14
Change-Id: I5110e3781682e003cc4e60a592694dc9e8930456 Reviewed-on: https://code.wireshark.org/review/13641 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-02Add silent build rules for setuid-root.plJoão Valverde1-1/+4
Change-Id: Id99c8d545b8ae53cf4dac0ccf54226df07f596bd Reviewed-on: https://code.wireshark.org/review/13627 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-01pre-commit: ignore ASN.1 template filesPascal Quantin1-0/+1
They trigger false positives Change-Id: I0cc22e0600461475e67610ac7e9dc687822c87f2 Reviewed-on: https://code.wireshark.org/review/13639 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-31plugins: do not import symbols globallyPeter Wu1-1/+1
Clang's ASAN reported an ODR violation when plugins were loaded. Sure enough, symbols did actually get loaded twice: ==5898==ERROR: AddressSanitizer: odr-violation (0x7fffd95a35e0): [1] size=7 'version' plugins/mate/plugin.c:19:31 [2] size=6 'version' plugins/opcua/plugin.c:19:31 After this change, plugins cannot insert new symbols in the global namespace. Change-Id: Ib11f7263e9c586f8e7c1f8f5fb239b20d46ddd2f Reviewed-on: https://code.wireshark.org/review/13260 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-01-31lemon: fix leak.Dario Lombardo1-2/+6
Found by clang's ccc-analyzer. Change-Id: I04eaad73486a43a77c4f08cf519bbfe7d2d8c838 Reviewed-on: https://code.wireshark.org/review/13581 Petri-Dish: Dario Lombardo <lomato@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-01-29tools: improve debian-setup with optional packages.Dario Lombardo1-2/+20
Change-Id: Ie7480b0c5297039aadfa253fce84c66b0e217814 Reviewed-on: https://code.wireshark.org/review/13596 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-01-29lemon: Have Makefile.am handle warnings as errors correctlyJoão Valverde1-1/+1
Change-Id: If0d59eb109802a799c33e439e607178102678f7d Reviewed-on: https://code.wireshark.org/review/13580 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-01-28Add fnmatch support to git pre-commit hookJoão Valverde4-37/+125
Allows for wildcard pathname matching in ignore list. Change-Id: I52e47c72c69e16ff9aefadfde22d1bd682df9654 Reviewed-on: https://code.wireshark.org/review/13166 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-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris1-0/+1
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22lemon (tools): Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-22/+25
Change-Id: Ica08d9372fbe3809eb078e0285cba2a49cee6b8d Reviewed-on: https://code.wireshark.org/review/13331 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-12Fix another warning on 64-bit platforms.Guy Harris1-1/+1
Change-Id: I5cdf55cdaef048d9d564a5fca39027dae3b78bab Reviewed-on: https://code.wireshark.org/review/13242 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12Add the comment about the Wireshark changes github repo from the commitJoerg Mayer1-1/+2
messages to the README. Change-Id: Ia73807ca4c04ca0e9019ed22e5733bf378cdf327 Reviewed-on: https://code.wireshark.org/review/13241 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-01-12Lemon: resync with upstreamAlexis La Goutte3-286/+492
lemon: Thu Oct 29 13:48:15 2015 lempar: Tue Nov 10 14:51:22 2015 a copy of all Wireshark changes are available https://github.com/alagoutte/sqlite/tree/wireshark Change-Id: I51f8b40a7087362502f6ce2156820a9f107ddf15 Reviewed-on: https://code.wireshark.org/review/13033 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-01-10checkfiltername.pl: Don't print empty line on successful runJoão Valverde1-43/+43
Change-Id: I3915a5771786bc763747ed74fadede15353fdf40 Reviewed-on: https://code.wireshark.org/review/13165 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-09checkAPIs: remove false positive in shadow checkPeter Wu1-1/+1
" strlen (" would match the shadow regex due to backtracking. Disable backtracking with the "possessive quantifier". Change-Id: If5d307fd61f252c41ad6d9b6104d2add1dfa63ae Reviewed-on: https://code.wireshark.org/review/13157 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-09Add lempar to pre-commit ignore listAlexis La Goutte1-0/+1
Change-Id: I4ad9b1dadfdb51ad750cc61782eca69125989b55 Reviewed-on: https://code.wireshark.org/review/13144 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-07lemon: Fix warnings [-Wpedantic]João Valverde1-26/+31
Change-Id: I7b350b2c4de5f86de24c8f2309016f3de7af8516 Reviewed-on: https://code.wireshark.org/review/12959 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-06checkAPIs: Add "system" to possible shadow variable (on OS X)Alexis La Goutte1-0/+1
See I651e76c6d53b0 Change-Id: I8082f22da0d16655104ad8699f08abdaf916a941 Reviewed-on: https://code.wireshark.org/review/13078 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-05Add basic exclude facility to pre-commit hook checksJoão Valverde2-0/+19
Change-Id: If08fd1481e58f785fed90a7d8c24aa2a1e0f3df7 Reviewed-on: https://code.wireshark.org/review/12958 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-31lemon: Fix warnings [-Wcast-qual]João Valverde1-8/+8
Change-Id: I2b9efa50cf6385622601d2a80f4cc51691d080a1 Reviewed-on: https://code.wireshark.org/review/12960 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-20Add %ProgramW6432% to the list of search paths when looking for 7-Zip.Christian Tellefsen1-0/+1
This allows a 64bit 7-Zip installation to be located even though win-setup.ps1 is run by a 32-bit process. This applies to 64bit Windows (7, 10, Server 2008 R2, Server 2012). Tested on 2012. Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/aa384274%28v=vs.85%29.aspx Change-Id: I6f4f3226b25c890cd674bf4c4d9ea73ddfc8ece0 Reviewed-on: https://code.wireshark.org/review/12740 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-13Create a way to register "capture" dissectors.Michael Mann1-12/+0
Capture dissectors could be architected like dissection dissectors, with tables and subtables and possibly using tvbs to pass there data instead of raw byte arrays. This is a first step towards that by refactoring capture_info_packet() to work off of a "capture dissector table" Registering the capture dissection functions instead of calling them directly also clears up a bunch of dissector header files who sole purpose was providing the capture dissection function definition. Change-Id: I10e9b79e061f32d2572f009823601d4f048d37aa Reviewed-on: https://code.wireshark.org/review/12581 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-12Update USBPcap installer packagedPascal Quantin1-4/+4
NSIS script modified to: - check for KB 3033929 presence on Windows 7 / 2008R2 (as we sign drivers with a SHA2 certificate) - do not delete the installation folder if not empty Bug: 11766 Change-Id: I5c7b6378b0775bb75c1b9e58e503997176c12213 Reviewed-on: https://code.wireshark.org/review/12546 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>
2015-12-11new_create_dissector_handle -> create_dissector_handle for plugins.Michael Mann1-1/+1
Change-Id: I0d485b1337c669291ad58b6c096657ce2db353c8 Reviewed-on: https://code.wireshark.org/review/12516 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann1-40/+19
names that were generated from asn2wrs.py This includes: 1. new_create_dissector_handle -> create_dissector_handle 2. new_register_dissector -> register_dissector 3. new_register_ber_oid_dissector -> register_ber_oid_dissector 4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore. Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329 Reviewed-on: https://code.wireshark.org/review/12491 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09Skinny: packet-skinnyDiederik de Groot1-3/+5
Fix messages generated by 894X phones, which do not always include all fields Revert accidental change by using of an older packet-skinny.c.in file Change-Id: I4c6f0ef053579cbbd0c15e90b44dda6a6b173d0d Reviewed-on: https://code.wireshark.org/review/12478 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>
2015-12-07Spelling fixes for errors found by lintianBalint Reczey2-2/+2
Change-Id: I889283902875193f4d3f3fd59788f59f8d9bcc20 Reviewed-on: https://code.wireshark.org/review/11945 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-05Use noyywrap rather than defining our own yywrap functions.Guy Harris1-0/+2
Tweak lemonflex-tail.inc to fix an issue this reveals. It appears that, at least on the buildbots, the Visual Studio compiler no longer issues warnings for the code generated with %option noyywrap. Change-Id: Id64d56f1ae8a79d0336488a4a50518da1f511497 Reviewed-on: https://code.wireshark.org/review/12433 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-02eCMP Dissector - Extensible Control & Management ProtocolJames Lynch1-0/+1
Developed by Emerson Industrial Automation (Control Techniques Division) eCMP is a protocol for setting up and controlling the devices in a factory automation system. eCMP has about 30 commands; most are embedded into TCP/IP messages, but cyclic data messages use the UDP protocol. Bug: 10562 Change-Id: I9a421f39dfbdbc9e28d8f7cba72c22e270064641 Reviewed-on: https://code.wireshark.org/review/3157 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-29Support building the X11 dissector outside the source tree.Jeff Morriss2-40/+54
Use relative path names for the script names and mesa/xcbproto directories so different paths (from different users) don't cause deltas. Also, with help from Peter Wu and Graham, get generation of the X11 dissector working from cmake. Change-Id: I95cd2a0f973dcbc67f457ff94c28e46a666afb74 Reviewed-on: https://code.wireshark.org/review/12213 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: Peter Wu <peter@lekensteyn.nl>
2015-11-27Officially remove tvb_get_string and tvb_get_stringz.Michael Mann1-2/+0
Almost all replacements were done awhile ago, just put the final nail in the coffin. Change-Id: I0a708d886da5a500c2a1e2c9ee2736794bdb9411 Reviewed-on: https://code.wireshark.org/review/12206 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-25asn2wrs.py: always use relative pathsPeter Wu1-6/+10
Avoids absolute paths when using cmake and doing an in-tree build. Before (source directory is /tmp/wireshark): /*--- Included file: /tmp/wireshark/asn1/t38/packet-t38-exp.h ---*/ After: /*--- Included file: packet-t38-exp.h ---*/ Change-Id: Id5c98bff7b97447479e1a09751701f2f52132b20 Reviewed-on: https://code.wireshark.org/review/12118 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-23lemon (tools): Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-23/+33
Change-Id: I6be51833b4268dbfde5c78820004a4714779b0c5 Reviewed-on: https://code.wireshark.org/review/9515 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-22asn2wrs.py: fix path substitution when generating ASN.1 dissectors with ↵Pascal Quantin1-2/+2
CMake on Windows Change-Id: I48e7d48544274f27d276e7128f8d2a2727c0b9cd Reviewed-on: https://code.wireshark.org/review/12031 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-21Fix Windows hardening check (x64)Graham Bloice1-0/+9
Fix the x64 ones missed on commit f1efeb1eba8329 Change-Id: Iec432c81511c64145711052bb29f6484c6c1c5b1 Reviewed-on: https://code.wireshark.org/review/12020 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>