summaryrefslogtreecommitdiff
path: root/tools/indexcap.py
AgeCommit message (Collapse)AuthorFilesLines
2015-03-25indexcap.py: fix tmpdir handling, python 3 compatPeter Wu1-38/+43
Add Python 3 compatibility to indexcap.py and only create a tmpdir for actions that need it. Only remove tmpdir for the compare action and try to remove the temp dir even if an exception occurs. In list_protos_in_cap.sh, rename BIN_DIR to WS_BIN_PATH (matching test/config.sh) and allow it to be overridden from the environment. Tested with Python 2.6.6, 2.7.9, 3.2.6, 3.4.3 as follows (with tshark built using cmake and '-b /tmp/wsbuild/run'): tools/indexcap.py out pop-ssl.pcapng; tools/indexcap.py out pop-ssl.pcapng --list-all-proto; tools/indexcap.py out pop-ssl.pcapng --list-all-files; tools/indexcap.py out pop-ssl.pcapng --list-all-proto-files=ssl; rm out; Python 2.5.6 does not work (there is no multiprocessing module). The dict output in Python 3.4.3 is different (has the hash function changed?) Change-Id: I592d8c4458a20d5088d815c6dd1cf90c9d3df9d3 Reviewed-on: https://code.wireshark.org/review/7792 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21Fix indexcap toolsAlexis La Goutte1-1/+1
Change-Id: Ib77af11975873106b7db7ac1bcd12f4a0800b59e TypeError: extract_protos_from_file() takes exactly 6 arguments (7 given) Reviewed-on: https://code.wireshark.org/review/779 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-14Remove $Id$ and other Subversion leftovers from the tools.Jeff Morriss1-2/+0
There are a few things in here which could still use attention. Don't regenerate anything now. Change-Id: I283c224d3523212144707fca3d6265916cb11792 Reviewed-on: https://code.wireshark.org/review/205 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2012-07-31Add comments to point out that these 2 scripts do the same thing.Jeff Morriss1-4/+6
svn path=/trunk/; revision=44175
2012-06-28Update FSF address - part II.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=43538
2009-10-18Default to number of CPUs availableKovarththanan Rajaratnam1-1/+1
svn path=/trunk/; revision=30591
2009-10-11Remove temporary directory on shutdownKovarththanan Rajaratnam1-13/+8
svn path=/trunk/; revision=30504
2009-10-11Add an option to randomize file list orderKovarththanan Rajaratnam1-1/+8
svn path=/trunk/; revision=30503
2009-10-11Remember to create a temporary directory before dissectingKovarththanan Rajaratnam1-0/+1
svn path=/trunk/; revision=30486
2009-09-26Delete log files from test runs that were succesfulKovarththanan Rajaratnam1-0/+4
svn path=/trunk/; revision=30170
2009-09-26* Redirect stdout/stderr to temporary filesKovarththanan Rajaratnam1-9/+28
* Do file comparison on stdout/stderr output svn path=/trunk/; revision=30169
2009-09-26Start implementing 'compare against baseline'. When fully implemented we'll ↵Kovarththanan Rajaratnam1-11/+44
be able to compare any changes that we've made to the working directory against a clean/baseline version of tshark. svn path=/trunk/; revision=30168
2009-09-26Add support for running tshark (-d) on a set of files matching a certains ↵Kovarththanan Rajaratnam1-28/+77
protocols (--list-all-proto-files). The index file is used to search for the files matching the given protocol(s) svn path=/trunk/; revision=30167
2009-09-26Look for both tshark and tshark.exeKovarththanan Rajaratnam1-2/+10
svn path=/trunk/; revision=30166
2009-09-26Add option to dump all files containing a protocol (possibly a comma ↵Kovarththanan Rajaratnam1-14/+38
delimited list of protocols) svn path=/trunk/; revision=30160
2009-09-25Set the usual properties + executable:Stephen Fisher1-0/+0
Name: svn:executable + * Name: svn:keywords + Id Name: svn:eol-style + native svn path=/trunk/; revision=30157
2009-09-25Handle keyboard interrupts gracefullyKovarththanan Rajaratnam1-17/+24
svn path=/trunk/; revision=30156
2009-09-25* Cleanup printKovarththanan Rajaratnam1-17/+6
* Remove timeout (this wasn't correctly implemented) svn path=/trunk/; revision=30155
2009-09-25Use timeout to keep the file progress printing smoothKovarththanan Rajaratnam1-3/+9
svn path=/trunk/; revision=30153
2009-09-25Use apply_async and print out file progress in the parent processKovarththanan Rajaratnam1-9/+12
svn path=/trunk/; revision=30152
2009-09-25Refactoring: add find_capture_files()Kovarththanan Rajaratnam1-9/+12
svn path=/trunk/; revision=30150
2009-09-25Add option to dump all files in index fileKovarththanan Rajaratnam1-1/+15
svn path=/trunk/; revision=30149
2009-09-25Add option to dump all protocols in index fileKovarththanan Rajaratnam1-13/+25
svn path=/trunk/; revision=30148
2009-09-25* Handle some error path more gracefullyKovarththanan Rajaratnam1-9/+10
* Add more verbose output svn path=/trunk/; revision=30147
2009-09-25Use pickle to store the results into the index fileKovarththanan Rajaratnam1-8/+22
svn path=/trunk/; revision=30146
2009-09-25Add initial multiprocessing supportKovarththanan Rajaratnam1-22/+35
svn path=/trunk/; revision=30143
2009-09-24The beginning of a Python script/tool that indexes capture files. It ↵Kovarththanan Rajaratnam1-0/+89
currently extracts all protocols that appear in the given capture files. svn path=/trunk/; revision=30120
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-18 23:57:27 +0000