osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
43,789 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

117 Commits

Author SHA1 Message Date
Guy Harris f3792fdf6b Make the error message for "we didn't get the error message we expected" 
clearer - it's not as if we didn't expect to get an error message, we
just didn't expect to get *that particular* error message.

svn path=/trunk/; revision=46118
 2012-11-21 19:04:21 +00:00
Guy Harris 7714813e0e For invalid interfaces, just check for "The capture session could not be 
initiated", as we used to do.

svn path=/trunk/; revision=46117
 2012-11-21 19:01:16 +00:00
Guy Harris 6871a7bb1c We aren't using pcap_create()/pcap_activate() to open interfaces on 
Windows, as there isn't yet a WinPcap based on libpcap 1.0.0, so we
don't get PCAP_ERROR_NO_SUCH_DEVICE as a return value and thus don't
just report "No such device exists" for an invalid interface.

svn path=/trunk/; revision=46116
 2012-11-21 18:59:27 +00:00
Guy Harris fd62af338d If we're not on Windows, assume we don't have sufficient privileges to 
open any capture devices, so "-i invalid_interface" will fail with a "no
permission" error rather than a "no such device" error.

svn path=/trunk/; revision=46115
 2012-11-21 18:56:25 +00:00
Guy Harris 6a205fd224 Give a better failure message for the cases where a test failed not 
because of an incorrect exit status but because of the error message not
being what we expected.

Include the name of the program being tested in the capture
filter/interface options tests.

svn path=/trunk/; revision=46110
 2012-11-21 17:54:14 +00:00
Guy Harris 17d0007030 Handle an error message that includes single quotes. 
svn path=/trunk/; revision=46105
 2012-11-21 09:03:30 +00:00
Guy Harris 0e59a15714 Add dumpcap command-line option tests; run them before TShark tests, so 
that if dumpcap isn't working right, we don't try TShark tests, as
TShark tests that involve capturing probably won't work.

svn path=/trunk/; revision=46104
 2012-11-21 09:01:39 +00:00
Guy Harris d37123f4d5 Fix the error message to test for when testing "-i invalid_interface". 
svn path=/trunk/; revision=46103
 2012-11-21 07:06:57 +00:00
Guy Harris 323fabab95 Fix the capitalization of the error message printed if you specify an 
invalid interface index.

svn path=/trunk/; revision=46102
 2012-11-21 01:11:19 +00:00
Jeff Morriss f9fc9a2a20 I thought the test suite was run with capture permissions; that does not appear to be true. Fix the expected output for the "invalid interface" test (again). 
svn path=/trunk/; revision=46091
 2012-11-19 22:11:07 +00:00
Jeff Morriss e8e7ba68da r46083 added interface name matching which changed the error text when an interface can't be found. Update the test to check for the new wording. 
svn path=/trunk/; revision=46086
 2012-11-19 20:56:20 +00:00
Jeff Morriss 30cb074991 zbee.aps was renamed zbee_aps (in r43990). 
svn path=/trunk/; revision=44009
 2012-07-25 20:09:17 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address. 
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
 2012-06-28 22:56:06 +00:00
Gerald Combs 3e85a8f4a2 Add more manufacturer names. 
svn path=/trunk/; revision=42973
 2012-06-01 15:35:29 +00:00
Gerald Combs 22d347ae3e In recent versions of GLib (test with 2.32) g_log_default_handler 
helpfully ignores G_LOG_LEVEL_INFO and G_LOG_LEVEL_DEBUG messages by
default. If the console_log_level preference includes either of those
two levels set the G_MESSAGES_DEBUG environment variable so that those
messages are printed.

Add checks for various console log messages to the stdin capture suite.

Fixes bug 7265.

svn path=/trunk/; revision=42930
 2012-05-30 21:42:24 +00:00
Gerald Combs 805c4779fa Update INSTALL_DIR to match r42659. 
svn path=/trunk/; revision=42660
 2012-05-16 17:57:12 +00:00
Gerald Combs 6e009a575c Print the TShark version information during the prerequisite phase. 
svn path=/trunk/; revision=42029
 2012-04-12 01:48:44 +00:00
Gerald Combs 794b2ca691 Add a to-do list for more decryption tests. 
svn path=/trunk/; revision=41908
 2012-04-03 16:10:55 +00:00
Gerald Combs 4326f8de55 Add a test for Zigbee. Compress the 802.11 capture. Fix an error message. 
svn path=/trunk/; revision=41898
 2012-04-02 18:48:56 +00:00
Gerald Combs 95bd0745b9 Add a test for DTLS decryption. 
svn path=/trunk/; revision=41896
 2012-04-02 16:37:40 +00:00
Gerald Combs 4b421da47c Add a missing file. 
svn path=/trunk/; revision=41866
 2012-03-30 23:52:55 +00:00
Gerald Combs 5332cb82b2 Add a WPA PSK decryption test. 
svn path=/trunk/; revision=41865
 2012-03-30 23:51:48 +00:00
Gerald Combs f21274b7c2 Clobber our personal configuration directory on Windows. 
svn path=/trunk/; revision=41860
 2012-03-30 21:04:09 +00:00
Gerald Combs 22be69a190 More fixes for Windows. UATs need to be created in ../wireshark-gtk2 
and backslashes need to be escaped.

svn path=/trunk/; revision=41859
 2012-03-30 20:58:44 +00:00
Jeff Morriss c4678fb771 rsasnakeoil2 is a PCAP file; name it .pcap for consistency. Set SVN properties appropriately. 
svn path=/trunk/; revision=41858
 2012-03-30 19:57:48 +00:00
Gerald Combs 005e724d27 Fix the location of dhcp.pcap. 
svn path=/trunk/; revision=41857
 2012-03-30 18:19:35 +00:00
Gerald Combs 3a20e10615 Fix decryption test on Windows. 
svn path=/trunk/; revision=41856
 2012-03-30 18:13:41 +00:00
Gerald Combs 46e68bab2b Add a missing file. 
svn path=/trunk/; revision=41855
 2012-03-30 17:59:27 +00:00
Gerald Combs 1bf7a61ac0 Add a decryption test suite along with an SSL decryption test. Move our 
growing collection of capture files to a subdirectory.

svn path=/trunk/; revision=41852
 2012-03-30 17:51:54 +00:00
Gerald Combs e60c1286b2 Add a "fileformats" suite (copied from the I/O suite) to check file 
format conversion. So far we check nanosecond pcap, microsecond pcap-ng
and nanosecond pcap-ng against standard pcap.

Fix color output on OS X.

svn path=/trunk/; revision=41541
 2012-03-13 19:58:19 +00:00
Gerald Combs db240c2b5e Replace "-Q" with "WIRESHARK_QUIT_AFTER_CAPTURE" as discussed in bug 6256. 
svn path=/trunk/; revision=38784
 2011-08-29 21:16:29 +00:00
Michael Tüxen f98587d686 Undo the checking of command line interfaces. It might the a pipe... 
svn path=/trunk/; revision=38146
 2011-07-21 17:30:42 +00:00
Michael Tüxen 77022a66b0 Adopt test to new error handling. 
svn path=/trunk/; revision=38145
 2011-07-21 16:06:52 +00:00
Gerald Combs 53f69df361 Use the proper function name. 
svn path=/trunk/; revision=37982
 2011-07-11 22:41:53 +00:00
Gerald Combs 30fe3b47ea Re-enable Cygwin's error_start environment variable. 
svn path=/trunk/; revision=37860
 2011-07-01 21:38:56 +00:00
Gerald Combs 21a1c33639 Comment out the addtion of error_start to CYGWIN in case it's clobbering 
Jakub's change in r37857.

svn path=/trunk/; revision=37858
 2011-07-01 20:58:10 +00:00
Gerald Combs dd82c59ff9 Fix indentation. 
svn path=/trunk/; revision=37855
 2011-07-01 19:36:57 +00:00
Gerald Combs 8160523d80 Tell Cygwin to create a core file if we run into any issues. 
svn path=/trunk/; revision=37852
 2011-07-01 18:32:57 +00:00
Gerald Combs f04a525e79 Temporarily enable dumpcap debugging. 
svn path=/trunk/; revision=37844
 2011-06-30 17:41:46 +00:00
Gerald Combs 3cb77978f6 Remove tracing. 
svn path=/trunk/; revision=37838
 2011-06-30 00:24:05 +00:00
Gerald Combs 2d306873c9 Temporarily enable tracing for the stdin capture step. 
svn path=/trunk/; revision=37837
 2011-06-29 23:10:49 +00:00
Gerald Combs bb75faf9d3 Add more error output to try to see what's causing the current test failure 
on the XP buildbot. Use "capture_test_output_print" instead of "cat".

svn path=/trunk/; revision=37825
 2011-06-28 23:08:05 +00:00
Gerald Combs 710c5d67f7 Update suite-clopts.sh to match dumpcap's error output. Add a comment 
to dumpcap.c about keeping the errors synced.

svn path=/trunk/; revision=37805
 2011-06-27 16:09:49 +00:00
Gerald Combs 9c6dc650db Add a check for TShark's return status. 
svn path=/trunk/; revision=37774
 2011-06-23 19:22:21 +00:00
Gerald Combs d927e094eb Try adding the fifo step to Wireshark. Clean up the order of tests. 
svn path=/trunk/; revision=37485
 2011-05-31 18:34:24 +00:00
Gerald Combs c1b210c23c Add a "capture from stdin" test. 
svn path=/trunk/; revision=37416
 2011-05-26 20:23:38 +00:00
Gerald Combs f9fad8cd75 "tshark -D" writes to stderr now. 
svn path=/trunk/; revision=37092
 2011-05-12 17:49:15 +00:00
Guy Harris 0edb77e6f3 TShark now exits with a status of 1 for an invalid interface or capture 
filter; check for that, rather than for a status of 0.

svn path=/trunk/; revision=33397
 2010-07-01 04:01:13 +00:00
Guy Harris 7559d34b7b Clean up indentation. 
svn path=/trunk/; revision=33104
 2010-06-05 02:19:45 +00:00
Guy Harris 7ecae442c5 capture() can, in some cases, return FALSE when the capture succeeds; 
back out the change to check its return value until we fix that.

Also back out the test suite changes to look for an error exit for
invalid capture filters and interfaces.

svn path=/trunk/; revision=33029
 2010-06-01 03:37:51 +00:00