Commit graph

300 commits

Author SHA1 Message Date
Alexis La Goutte
cd558218f7 test suite: fix indent (use tabs) and add modelines
Change-Id: I648d02d41f92c7fd176ce194eee20a2d19643fe0
Reviewed-on: https://code.wireshark.org/review/5985
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:27:48 +00:00
Michael Mann
6d207fe5f4 Remove private_data member from packet_info structure.
Dissectors should pass data directly to their subdissectors through the data parameter (of new-style dissectors). This avoids unintentional "trampling" from other dissectors trying to "share" private_data member.

Change-Id: I2efef5c8dfeef64588ba3ac6e695b469238c6468
Reviewed-on: https://code.wireshark.org/review/5487
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-01 14:05:44 +00:00
Gerald Combs
c55d69780b Try to speed up ping-dependent capture tests.
Ping four times a second for ~60 seconds. Save the subprocess PID so that
we can kill it when we're done with each test instead of waiting for it
to finish.

Change-Id: I64f889c700e8a6fa1bc1c3916ef045341ef59cc6
Reviewed-on: https://code.wireshark.org/review/4557
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08 18:54:13 +00:00
Gerald Combs
bdfff4d3c7 Re-enable the Wireshark test suite.
Change-Id: Icfd9edb8c6ef7620878bc9d60c8dcc569ad2abad
Reviewed-on: https://code.wireshark.org/review/4434
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-03 00:02:56 +00:00
Gerald Combs
ff7b51f920 Partially re-enable Wireshark tests.
Qt requires Xrender and XKEYBOARD. Unfortunately the Ubuntu and Solaris
buildbots run the test script under Xtightvnc, which provides neither of
those. Only enable the tests on Windows and OS X for now.

Change-Id: I84bc28f810782b862b4dca8fc8df088a4919066d
Reviewed-on: https://code.wireshark.org/review/4430
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02 22:49:46 +00:00
Gerald Combs
67f1fa5e56 Temporarily disable the Qt tests added in g58cde5c.
Apparently what works for me doesn't work for the Buildbot users.

Change-Id: I7d3e4f2b89ae8ae3dadc8d92438c0e1923b97ace
Reviewed-on: https://code.wireshark.org/review/4416
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02 02:20:07 +00:00
Gerald Combs
58cde5c74a Add tests for the Qt UI.
Make sure the Qt UI quits if WIRESHARK_QUIT_AFTER_CAPTURE is set. Make
sure Bourne shell scripts (*.sh) have UNIX/POSIX line endings. Reduce
some time values so that the tests run faster.

Change-Id: I81df7c6f72d7d807d1856863cbea1bb6326ca711
Reviewed-on: https://code.wireshark.org/review/4407
Tested-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01 22:30:33 +00:00
Evan Huus
45fb37718e Fix lua bindings to handle timestamp precision changes
The recent wiretap changes broke the generation of init.lua among other things,
though it did coincidentally fix one of the "yuck" comments in the generator
regex.

(Note that this is entirely untested, because out-of-tree init.lua is and always
has been broken, but it should work)

Change-Id: Id0c27b31c596613997de4ba2f6088eb9d6c8fc53
Reviewed-on: https://code.wireshark.org/review/4361
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-29 02:35:29 +00:00
Alex Badea
a1604bd5d6 test: add decryption test for isakmp with certificates
This was suggested in review 2297. Capture and key are from bug 7951.

Bug: 7951
Change-Id: I820c5e839b20ec464cc1be438633d5311f657fb2
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Reviewed-on: https://code.wireshark.org/review/4143
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-24 22:06:31 +00:00
Gerald Combs
b7fb1167e3 Qt → wireshark. GTK+ → wireshark-gtk.
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 15:39:17 +00:00
Evan Huus
5fda232659 make unit-test suite work out-of-tree
Change-Id: I638015a9b55712bb6843d6756c9c55915e142372
Reviewed-on: https://code.wireshark.org/review/2893
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-12 12:08:13 +00:00
Evan Huus
a87e292272 Tighten the dump-glossary test.
1. The only indication we get of an out-of-order value string is a message on
 STDERR, so check that and fail the test if STDERR wasn't empty.

 2. This exposes an out-of-order value string in packet-stun.c; fix it.

 3. This triggered the pre-commit hook on packet-stun.c, which noticed an API
 error (ENC_ASCII -> ENC_ASCII|ENC_NA); fix that too.

Change-Id: I36f87a2a87b40537119562f22a7e3012716ff239
Lesson: automated testing/tooling is both wonderful and scary.
Reviewed-on: https://code.wireshark.org/review/2682
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-27 03:47:32 +00:00
Gerald Combs
81963e7f1a Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s.
Change-Id: Ie6d6ac0489f0fcb506360a3900d33c44cb3477e9
Reviewed-on: https://code.wireshark.org/review/2664
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-25 23:02:55 +00:00
Evan Huus
fca7b3f4f8 Check for lua by grepping the output of tshark -v
Grepping config.h doesn't work for out-of-tree builds.

Change-Id: If3f551dffb04dd646f5adece57fac90dc48ff1c9
Reviewed-on: https://code.wireshark.org/review/2389
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 18:32:18 +00:00
Guy Harris
6db77b000f Allow wtap_read() and wtap_seek_read() to return records other than packets.
Add a "record type" field to "struct wtap_pkthdr"; currently, it can be
REC_TYPE_PACKET, for a record containing a packet, or
REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific
data.

Modify code that reads packets to be able to handle non-packet records,
even if that just means ignoring them.

Rename some routines to indicate that they handle more than just
packets.

We don't yet have any libwiretap code that supplies records other than
REC_TYPE_PACKET or that supporting writing records other than
REC_TYPE_PACKET, or any code to support plugins for handling
REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug
8590.

Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813
Reviewed-on: https://code.wireshark.org/review/1773
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-24 18:31:25 +00:00
Evan Huus
a1e6b10239 Fix lua directory tests.
The underlying directory iterator is not guaranteed to return directories in the
same order according to the glib documentation, so don't rely on the directory
order being the same when testing it.
https://developer.gnome.org/glib/2.37/glib-File-Utilities.html#g-dir-read-name

Bug:10009
Change-Id: I4b1078e1f3981921b1e83c4f77b4bc30a5d21b46
Reviewed-on: https://code.wireshark.org/review/1671
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-21 03:17:15 +00:00
Evan Huus
4272cb8786 Revert part of g757db64e484b009c3
It was intended to change the DTLS decryption test, but changed the SSL test
file instead, which led to the SSL test mysteriously failing. The SSL capture
really is http, so that's the right protocol, and the port is the standard 443,
not 4433 (which was perhaps a typo?).

Change-Id: I84448c2326d2a4301a4bba9607f8ba90a495531d
Reviewed-on: https://code.wireshark.org/review/1401
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-27 21:55:03 +00:00
Evan Huus
c6d41f961b Have DTLS just dissect the test capture as data
Follow-up to g757db64e484b009c33b67b5fa38e109d7b8f5e78 which changed the filter
being tested but didn't change the target protocol, so the test was still
failing because it was still trying to use HTTP.

Change-Id: I6675cfad3bba63f7a536eb7ae82e4b25132d108e
Reviewed-on: https://code.wireshark.org/review/1375
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-26 21:45:48 +00:00
Michael Mann
757db64e48 Don't use HTTP filter for DTLS decryption test as it's not really HTTP traffic (and a more discerning HTTP dissector will cause this to fail)
Change-Id: I74ea78f541f87000d84c85794d04e9de46d477f2
Reviewed-on: https://code.wireshark.org/review/1333
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25 04:20:27 +00:00
Hadriel Kaplan
f52626cc83 Add tvb_get and proto_tree_add for string-encoded byte arrays
This commit adds tvb_get_string_bytes and proto_tree_add_bytes_item routines for
getting GByteArrays fields from the tvb when they are encoded in ASCII hex string form.

The proto_tree_add_bytes_item routine is also usable for normal
binary encoded byte arrays, and has the advantage of retrieving
the array values even if there's no proto tree.

It also exposes the routines to Lua, both so that a Lua script can take
advantage of this, but also so I can write a testsuite to test the functions.

Change-Id: I112a038653df6482a5d0ebe7c95708f207319e20
Reviewed-on: https://code.wireshark.org/review/1158
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-17 14:04:19 +00:00
Hadriel Kaplan
dd002649c3 Add tvb_get and proto_tree_add for string-encoded timestamps
This commit adds tvb_get_string_time and proto_tree_add_time_item routines for
getting nstime fields from the tvb when they are encoded in ASCII string form.

The proto_tree_add_time_item routine is also usable for normal
big/little-endian encoded time_t, and has the advantage of retrieving
the value even if there's no proto tree.

It also exposes the routines to Lua, both so that a Lua script can take
advantage of this, but also so I can write a testsuite to test the functions.

Change-Id: I955da10f68f2680e3da3a5be5ad8fdce7ed6808c
Reviewed-on: https://code.wireshark.org/review/1084
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14 11:47:39 +00:00
Pascal Quantin
cc3c05ed5f Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW gcc 4.3
Fixes bug 9957

Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6
Reviewed-on: https://code.wireshark.org/review/991
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-07 05:54:19 +00:00
Hadriel Kaplan
85aa07157a Get it compiling again: WindowsXP build failing
The WindowsXP build is failing due to a wslua testsuite failure, in the
file reader/writer tests. I've looked at it a bit and I don't know
why it's failing yet - I know why it says it's failing, but it doesn't
fail for me. And it was passing on WindowsXP until the change to Lua 5.2.3,
but I run 5.2.3 all the time and it passes for me, and there's nothing
special about the portion that's failing.

The only way to debug it is to run it on WindowsXP myself, but I need
a build to do that with, so I've commented out the failing test and
hopefull it will build now and I can grab the automated build to debug
the issue.

Change-Id: Ib75e8f75829e8f506823e648605ba16e21c7973a
Reviewed-on: https://code.wireshark.org/review/982
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-06 17:51:34 +00:00
Alexis La Goutte
757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte
94a791a76e Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)

Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 16:00:04 +00:00
Hadriel Kaplan
8c2bb80574 Add various functions for Lua directory handling and path info
This adds new functions to get plugins path info, find out if a directory
exists, make a new one, remove one, etc. It also creates a file environment
for user-supplied Lua scripts, to prevent global variable contamination as
well as supply the script-specific file name.  Some other minor cleanup was
done as I found them.

A new testsuite was added to test the existing and new directory functions.

Change-Id: I19bd587b5e8a73d89b8521af73670e023314fb33
Reviewed-on: https://code.wireshark.org/review/832
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26 07:37:34 +00:00
Hadriel Kaplan
da1af6e549 Add filterable expert info for Lua
This adds the ability for a Lua script to register expert info fields,
similar to C-code dissectors. This change also removes the need for
the expert_add_info_format_internal() function. Existing Lua scripts
do not have to change, because the existing expert info function
uses the internal "_ws.lua" protocol instead of nothing; but using
the new functionality provides more benefits since it correctly
registers the expert info fields to the dissector's protocol.

The test suite was amended to generate both old and new forms.

Change-Id: Ib5ae74e927cfa81312baf7b04ff4104b0b4f936e
Reviewed-on: https://code.wireshark.org/review/830
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26 05:20:17 +00:00
Hadriel Kaplan
21a61a8cb1 Add Lua Struct.values() function, and prevent coercion in all Struct functions
This adds a Struct.values() function to get the number of values
needed/returned with Struct.pack/unpack. It also changes the existing
Struct functions such that they don't coerce a non-string argument
into a string. (not preventing it confused a user on ask.wireshark.org)

Change-Id: I93d5846105e55b67680e1c276a7286535c77b039
Reviewed-on: https://code.wireshark.org/review/790
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-23 07:05:30 +00:00
Hadriel Kaplan
69af33f0f3 Fix spelling mistakes in Lua test scripts
Change-Id: I8671eb3d3b46ec5c723a6545451ecbb33a10c807
Reviewed-on: https://code.wireshark.org/review/788
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-22 17:42:16 +00:00
Hadriel Kaplan
66719c9b6a Add way for Lua file reader to save state per file read/write ops
Lua can create a file reader/writer, to open new capture file
formats or write to new ones. To save local state, it can save
things in Lua itself; but since there can be multiple open files
at the same time (for example during a reload), the Lua script
won't know for which file and state its read/write functions are
being invoked for. To remedy this, and also provide a convenient
way to store such state, this commit adds the ability for a Lua
script to store a Lua table in the wtap/wtap_dumper's priv
data member, just like C-code-based reader/writers do.

Change-Id: Ifc9e0d5f0379accee56f2a04b6080238670fec52
Reviewed-on: https://code.wireshark.org/review/766
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-22 08:06:47 +00:00
Hadriel Kaplan
c8a98f37ec Fix lua file testsuite not working and weak heuristic readers not being registered
The testsuite for Lua file reader/writer uses the acme_file.lua script to
generate a pcapng file from an Acme sipmsg.log file. It then compares the
tshark verbose output of this new pcapng file to a sip.pcapng file in
the test/captures directory that was previously made. Unfortunately, the
acme_file.lua script generates a timestamp based on local system timezone,
rather than UTC, so the testsuite fails if not run in the EST timezone where
the sip.pcapng file was originally made. This has now been fixed.

Also, trying to register new weak heuristic readers fails because the GArray
is terminated with a NULL-based row without Glib knowing about that. So this
commit changes it to let Glib handle the NULL-terminated row, so that appending
takes it into account automatically.

Change-Id: I037ce1cfbda03585b3a1e159df78ff8ebb41fc32
Reviewed-on: https://code.wireshark.org/review/741
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 17:02:40 +00:00
Michael Mann
04d9501306 Add capture file reader/writer support for Lua so scripts can implement new capture file formats.
This enables a Lua script to implement a brand new capture file format reader/writer, so that for example one could write a script to read from vendor-specific "logs" of packets, and show them as normal packets in wireshark.

Change-Id: Id394edfffa94529f39789844c382b7ab6cc2d814
Reviewed-on: https://code.wireshark.org/review/431
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19 05:04:54 +00:00
Hadriel Kaplan
04c39bb097 Add Lua heuristic dissector support
This adds the ability for Lua scripts to register heuristic dissectors
for any protocol that has registered a heuristic dissector list, such
as UDP, TCP, and ~50 others. The Lua function can also establish a
conversation tied to its Proto dissector, to avoid having to check the
heuristics for the same flow. The example dissector in the testsuite
has also been enhanced to include a heuristic dissector, to verify
the functionality and provide an example implementation.

Change-Id: Ie232602779f43d3418fe8db09c61d5fc0b59597a
Reviewed-on: https://code.wireshark.org/review/576
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-14 07:29:15 +00:00
Martin Kaiser
ba32257cb6 add a test for SSL/TLS decryption using the master secret
rename the existing SSL test to clarify that it uses the server's
private key for decryption

Change-Id: I13598fc4cf724b144a8f27bfa7a3316acfc78728
Reviewed-on: https://code.wireshark.org/review/640
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-13 21:42:50 +00:00
Hadriel Kaplan
9961ee369c Fix Bug 9870 'Lua: trying to call/get an invalid name results in a get-loop error'
Due to the change I made previously for how methods are accessed, if you try
to access one that doesn't exist (for example mistype it or whatever), you get
an internal Lua error about a loop in table get, as opposed to the right error
message about the field not existing.

That's because I had set the class' metatable __index metamethod to point to
the class table, which of course has the metatable with the __index
metamethod, causing a lookup loop.  Blech.

Change-Id: I20d3717feadd45f652c2640e1671846184e7082d
Reviewed-on: https://code.wireshark.org/review/593
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-11 05:30:58 +00:00
Hadriel Kaplan
ea46cdc474 Add GLib's regex library into Lua
While Lua's built-in pattern support is ok for simple things, many people end
up wanting a real regex engine. Since Wireshark already includes the GLib
Regex library (a wrapper for PCRE), it makes sense to expose that library to
Lua scripts. This has been done using Lrexlib, one of the most popular regex
bindings for Lua. Lrexlib didn't support binding GLib's Regex in particular -
it does for PCRE but GLib is a different API - so I've done that. A fairly
thorough testsuite came along with that, which has been incorporated into the
wireshark wslua testuites as well in this commit.

Change-Id: I05811d1edf7af8d7c9f4f081de6850f31c0717c7
Reviewed-on: https://code.wireshark.org/review/332
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-10 07:11:12 +00:00
Evan Huus
be0b4b9dc8 Add test to dump glossaries.
All it checks is that they don't crash, but this is enough to catch malformed
extended value strings and other oddities.

Change-Id: If853e8e2b19517a784daa4bbb8e41eddc7c7ddd9
Reviewed-on: https://code.wireshark.org/review/520
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-05 19:55:10 +00:00
Hadriel Kaplan
bd36fe1bcb Fix bug 6357: Lua all_field_infos() broken within tap/listener
The current API for Lua provides a global function
"all_field_infos()" which returns all the populated field_info nodes
in the current proto_tree.

By default all_field_infos() "works", in the literal sense: it returns
exactly the fields the previous dissectors of the packet have
populated at that instant of time.  But of course dissectors don't
populate all the applicable fields most of the time, because of the
TRY_TO_FAKE_THIS_ITEM optimization where they don't fill in things
that aren't needed at the time by a display, color, or tap's dfilter.

So this commit offers a way to force the dissectors to populate
all the applicable field_infos in the tree, by setting the proto_tree
to be visible.  Obviously that is going to impact performance, since
it basically bypasses the TRY_TO_FAKE_THIS_ITEM optimization; so the
patch only does this if the Lua script author told it to explicitly,
by adding an argument to Listener.new() and register_postdissector().

Change-Id: I11d3559fbe8c14fbadf1b51415a3701dc1200b7b
Reviewed-on: https://code.wireshark.org/review/286
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 21:06:50 +00:00
Hadriel Kaplan
860747e1e7 Adds some Lua helper functions: some commonly used functions, and to help troubleshooting Lua scripts
There are some common things people need to do, such as convert to/from hex or get
the raw binary string in a ByteArray/Tvb/TvbRange. These have been added, as well
as some tests for them in the testsuites. Also, functions have been added to allow
a script to get all the available tap types and filter fields, since they are
not exactly what one can see in the Wireshark gui.

Change-Id: I92e5e4eae713bb90d79b0c024eaa4e55b99cc96b
Reviewed-on: https://code.wireshark.org/review/249
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 21:06:21 +00:00
Pascal Quantin
58db464aff Remove executable bit from a few files
Change-Id: Ib9be221e3d325379c8b665ab73d976254bb23bb6
Reviewed-on: https://code.wireshark.org/review/342
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-24 22:34:26 +00:00
Hadriel Kaplan
7f074364b6 Fix bug 9790: Lua: wslua allows duplicate field registration
As discussed in bug 3513 and 9709, one can register more than one new ProtoFields for
the same field name. Of course C-code can do that too, and does a LOT apparently, but
if they're not similar ftypes then things can get scrweed up in display filters.

So this change prevents duplicate field registration of dissimilar ftypes. The
similarity is based on the discussion on the mailing list, and the listing in
README.developer has been updated to refelect that as well.

Also, this change adds a testscript for Proto/ProtoFields.

Change-Id: I43bd323f785245941a21289647332a19adec2a9d
Reviewed-on: https://code.wireshark.org/review/285
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-21 20:57:43 +00:00
Hadriel Kaplan
696353c129 Add test suite for verifying Lua global variables/tables of previous releases have not disappeared.
Several bugs have been introduced due to changing of perl scripts or #define names, such
that things exported into Lua have dissapeared or changed unintentionally. This commit
adds a test suite which compares the Lua global table with the ones from previous
releases (1.8 and 1.10), to verify nothing has gone missing. New items can be added, but
old ones cannot go away. The added script to verify these things, called 'verify_globals.lua',
also has the ability to display what's new - i.e., what was not in the olrder releases.

Lastly, this commit also fixes a bug: MENU_STAT_ENDPOINT became MENU_STAT_ENDPOINT_LIST
due to a change in the make-init-lua.pl perl script in this 1.11 release.

Change-Id: Iba143d1a436e706970635a5f8cc2b317955392bf
Reviewed-on: https://code.wireshark.org/review/284
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-21 16:28:07 +00:00
Evan Huus
3f2be6dbe8 Revert "Add test suite for verifying Lua global variables/tables of previous releases have not disappeared."
This reverts commit 5b7f00178f.

Change-Id: Idf09d25270847970713b67d02bcd7cbc411a4e9c
Reviewed-on: https://code.wireshark.org/review/280
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-21 02:16:51 +00:00
Hadriel Kaplan
5b7f00178f Add test suite for verifying Lua global variables/tables of previous releases have not disappeared.
Several bugs have been introduced due to changing of perl scripts or #define names, such
that things exported into Lua have dissapeared or changed unintentionally. This commit
adds a test suite which compares the Lua global table with the ones from previous
releases (1.8 and 1.10), to verify nothing has gone missing. New items can be added, but
old ones cannot go away. The added script to verify these things, called 'verify_globals.lua',
also has the ability to display what's new - i.e., what was not in the olrder releases.

Lastly, this commit also fixes a bug: MENU_STAT_ENDPOINT became MENU_STAT_ENDPOINT_LIST
due to a change in the make-init-lua.pl perl script in this 1.11 release.

Change-Id: Ic46172904256dc535b0fe4543237c07dddb3b9b5
Reviewed-on: https://code.wireshark.org/review/242
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-21 02:06:18 +00:00
Evan Huus
b7985c57a4 Fix mode for lua test suite
Change-Id: If516472ca9c4a0ae84da22a0ecfc9449f0495cbb
Reviewed-on: https://code.wireshark.org/review/273
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-20 22:16:47 +00:00
Hadriel Kaplan
fe769e7350 Add 4 more test scripts for Lua, and its own testsuite menu
This adds test scripts for verifying Pinfo, Address, Field, FieldInfo, NSTime
and Listener classes/functions.  It also moves Lua test scripts out of
unittests and into its own new testsuite.

Change-Id: I65c238fd459efb96db3f8f9145842cd038dea7c7
Reviewed-on: https://code.wireshark.org/review/270
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20 18:42:13 +00:00
Hadriel Kaplan
c4f1777a97 Adds support for Lua struct library so one can pack/unpack binary structures
This is based on Roberto Ierusalimschy's struct library, along with additional
options based on Flemming Madsen's patch to the lua-users mailing list, and
some changes I made to support 64-bit integer packing/unpacking.  Details
are in the top comments for wslua_struct.c.  This also includes a test script.

Change-Id: Ifcd0116ba013d5c760927721c8d6e9f28965534b
Reviewed-on: https://code.wireshark.org/review/98
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-14 10:11:50 +00:00
Hadriel Kaplan
58fe488822 Lua: add ability for scripts loaded from command-line to be passed arguments
This change adds the ability to pass on to lua scripts loaded from the
command-line (tshark or wireshark) additional arguments supplied by the
command-line.  This will help us in our testsuites, but also might be
useful for user-created scripts.  The additional arguments are passed in
using the '-X' eXtension switch.

Change-Id: Ib94cdf1ffd194ca84692fee7816665e4ff95efbd
Reviewed-on: https://code.wireshark.org/review/156
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-13 22:32:58 +00:00
Hadriel Kaplan
f5a1786ea1 Add test suite for Lua dissector-related functions
This isn't super-fancy, but it runs a simple protocol dissector and verifies the tshark output
matches what it expects.  Things like Proto, ProtoField, Field, Tvb, TvbRange, etc., are used
in an example dissector script - it dissects DNS... partially.  Enough to make sure things
aren't fundamentally broken.  This provides something to add on top of later as well.

Change-Id: Icf3c8e9534944bcf4c4f6150f02a9a43f999cd75
Reviewed-on: https://code.wireshark.org/review/126
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-09 19:55:43 +00:00
Hadriel Kaplan
4e8832bb0a Fix bug 9736 'Lua: new Int64/UInt64 functions don't prevent division by zero'
OK, in all fairness this does a bit more than just fix that bug. It also
adds a 'Int64()' and 'UInt64()' __call metamethods. I generally dislike
using __call metamethods, because they're often unintuitive (for example
the wireshark Field and FielInfo use this in a bizarre fashion).  But this
happens to be a perfect use for it, and very natural, imho.  Another change
is to make the metatables of classes visible to scripts. There was never
really a good reason not to make them visible, and they have to be visible
to do things like use __call on a plain table... not to mention I need them
to be visible to run test scripts verifying evrything is kosher.

I also updated the test suite to test for the div/mod by zero.

Change-Id: Ia4c594c8f59d4e799090716bd032ba2815df032f
Reviewed-on: https://code.wireshark.org/review/149
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-09 16:04:36 +00:00
Evan Huus
1cd7828527 Various fixes to the Lua int64 code
- add casts to pacify certain buildbots
- skip test if lua isn't available

Change-Id: I614c05dca40cb848c87b361e4b3d3c4e94aafb9e
Reviewed-on: https://code.wireshark.org/review/97
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-04 00:59:07 +00:00
Hadriel Kaplan
2e7f771a18 Adds support for Lua Int64 and UInt64 operators, functions, and general
usefulness, working around bug #9162 until Lua 5.3 is released.

The existing Int64 and UInt64 classes provide virtually no
usefullness, other than for creating a string of their value.  While
one could then write Lua code to convert the string to Lua numbers and
such, ultimately Lua has no native 64-bit integer support, making such
a task difficult to handle in Lua.  This change adds a host of
functions and operators to the existing Int64 (gint64) and UInt64
(guint64) classes, to enable true 64-bit integer support on par with
native Lua numbers.

A test script is also provided, which tests the functions/operators.

Change-Id: I4c5f8f5219b9a88198902283bd32ddf24c346bbe
Reviewed-on: https://code.wireshark.org/review/83
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-04 00:37:46 +00:00
Jakub Zawadzki
2abbb53d67 Remove svn:executable attribute.
svn path=/trunk/; revision=54637
2014-01-07 22:55:03 +00:00
Jakub Zawadzki
1482ce4997 Revert part of r53874
svn path=/trunk/; revision=53944
2013-12-11 20:52:05 +00:00
Jakub Zawadzki
2b0797a361 It's DTLS failing not DVB_CI.
svn path=/trunk/; revision=53874
2013-12-08 22:16:22 +00:00
Jakub Zawadzki
23c9eb270f Try to check why test.sh fails.
svn path=/trunk/; revision=53871
2013-12-08 21:29:30 +00:00
Martin Kaiser
f38af18c2c add a decryption test for DVB-CI to the testsuite
svn path=/trunk/; revision=53830
2013-12-07 17:56:39 +00:00
Michael Mann
0e669d534d README update. Bug 9174 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174)
From Peter Wu

svn path=/trunk/; revision=53671
2013-11-30 01:50:12 +00:00
Michael Mann
3635bea0a4 Add OID unit tests. Bug 9294 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9294)
From Ed Beroset

svn path=/trunk/; revision=52692
2013-10-19 18:52:13 +00:00
Evan Huus
4860e101c8 Slight simplification, inline a function only ever called once.
svn path=/trunk/; revision=52470
2013-10-09 17:24:16 +00:00
Evan Huus
7058b87833 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9238
Add test for ANSI C12.22 decryption.

svn path=/trunk/; revision=52469
2013-10-09 17:21:30 +00:00
Evan Huus
2553de177d From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9245
Fix test suite so that it doesn't attempt to use color if ncurses is not
installed.  This came up when I attempted to use the test suite under Windows
with cygwin installed but not ncurses.  The result is not entirely broken but
the error messages saying that "tput is not a valid command" make the menus and
results difficult to read.

svn path=/trunk/; revision=52449
2013-10-08 15:09:59 +00:00
Evan Huus
0777f96c63 Another path and ordering tweak.
svn path=/trunk/; revision=52430
2013-10-06 23:39:16 +00:00
Evan Huus
087c885c66 More tweaking of test suite path variables, trying to make everything play
nicely on Windows and Linux both.

svn path=/trunk/; revision=52428
2013-10-06 23:29:59 +00:00
Evan Huus
13ae682c75 Fix nameres test suite cleanup after recent changes.
svn path=/trunk/; revision=52417
2013-10-06 20:30:12 +00:00
Evan Huus
62c230c7b1 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174
Reorg more of the test variables, still separating source and test directories.
More minor fixes from me.

svn path=/trunk/; revision=52412
2013-10-06 18:57:01 +00:00
Evan Huus
81a0f156cd Try to fix unittest path magic on windows.
svn path=/trunk/; revision=52400
2013-10-06 14:15:38 +00:00
Evan Huus
e0cc11c92b From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174
Support running most tests out-of-tree. Use case is to have a source tree and
use a semi-unprivileged user to perform tests (to rule out interference).

From me:
- fix unit-test suite, it has to build the binaries it runs so it must
  more-or-less ignore the out-of-tree stuff
- fix name-res suite, just missing a path qualifier


svn path=/trunk/; revision=52397
2013-10-06 12:44:10 +00:00
Guy Harris
800b45f0a9 From Peter Wu: on systems other than Windows, skip the GUI tests if the
DISPLAY environment variable isn't set.

From me: note that this won't be the right thing to do on OS X if we
switch to a toolkit that doesn't use X11, and that this may or may not
be the right thing to do with toolkits using Wayland or Mir directly.

svn path=/trunk/; revision=52182
2013-09-22 21:51:05 +00:00
Evan Huus
c660aab935 Update the test suite for r51556. Use -Y in one place instead of -R where only
filtering is important. Use -2 and -R together in one place where the counting
functionality is important.

svn path=/trunk/; revision=51558
2013-08-28 02:30:50 +00:00
Gerald Combs
fe0b28463f Assume we always have GNU diff and that we can use --strip-trailing-cr.
svn path=/trunk/; revision=51496
2013-08-23 21:17:56 +00:00
Gerald Combs
a8c728533d Add a test for rawshark.
svn path=/trunk/; revision=51494
2013-08-23 18:54:22 +00:00
Gerald Combs
d5e30ea820 Fix the name resolution tests so that they run on Windows. Enable them
by default. Remove some unused code.

svn path=/trunk/; revision=49661
2013-05-31 22:32:14 +00:00
Gerald Combs
bfe9967fc8 nameres.hosts_file_handling shouldn't affect loading the profile "hosts"
file. That should be loaded no matter what if we have name resolution
enabled.

Add a name resolution test suite. Currently disabled until I can test it
on Windows.

svn path=/trunk/; revision=49657
2013-05-31 21:40:26 +00:00
Evan Huus
0a396007fe Use -Y instead of -R to filter tshark in decryption tests. We're not doing
2-pass analysis so -Y makes more sense and doesn't print deprecation warnings.

svn path=/trunk/; revision=48808
2013-04-10 14:27:24 +00:00
Evan Huus
51a1e7e91e Run the wmem unit tests with --verbose (provided by glib) so that if
one of the random bits fails we get the seed to reproduce with.

svn path=/trunk/; revision=48576
2013-03-27 02:35:32 +00:00
Evan Huus
4ba4e1df70 Add wmem unit test binary (still empty) to nmake build and to
the unit test part of the test suite. Once I know it's building and
running properly on the buildbots then I'll actually start writing tests.

svn path=/trunk/; revision=48517
2013-03-23 23:51:07 +00:00
Gerald Combs
6de14cd99b Disable software updates in a blind attempt to fix the recent test
failures.

svn path=/trunk/; revision=48391
2013-03-18 15:39:12 +00:00
Gerald Combs
87faeaead3 Minor updates.
svn path=/trunk/; revision=48268
2013-03-12 20:23:23 +00:00
Chris Maynard
ce6f1d2f9c Whitespace changes: Convert spaces to tabs. Add modelines.
svn path=/trunk/; revision=47975
2013-03-01 16:13:44 +00:00
Chris Maynard
53893a8a75 Convert spaces to tabs in capture_step_snapshot().
(Maybe this will make the XP buildbot happy so test.sh succeeds again?)

svn path=/trunk/; revision=47969
2013-03-01 06:20:41 +00:00
Jeff Morriss
f0b9d97f18 tshark now accepts -Q.
svn path=/trunk/; revision=46633
2012-12-20 14:36:06 +00:00
Jeff Morriss
349e61ce9e tshark now accepts -g.
svn path=/trunk/; revision=46519
2012-12-12 14:11:53 +00:00
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
Guy Harris
8d949600af Use return rather than exit in main().
Return 2 for a capture error - we mainly use 1 for command-line syntax
errors (rather than, say, filter syntax errors or an invalid interface).

Now that TShark exits with an error status when given an invalid capture
filter or invalid interface, check for "error" rather than "success" as
an exit status.

svn path=/trunk/; revision=33006
2010-05-28 01:09:28 +00:00
Guy Harris
427ce576a7 -I is now a valid TShark option (at least if you have libpcap 1.x).
svn path=/trunk/; revision=32708
2010-05-07 05:59:32 +00:00
Guy Harris
09a7c78848 "Unit tests" is two words (at least in English).
svn path=/trunk/; revision=32072
2010-03-01 22:53:15 +00:00
Kovarththanan Rajaratnam
d3c29ea981 -P is no longer invalid. We use it for the 'two pass analysis'
svn path=/trunk/; revision=30083
2009-09-22 21:29:56 +00:00
Gerald Combs
507deea5cd Update the adapter name check to match the buildbot.
svn path=/trunk/; revision=29221
2009-07-28 17:27:59 +00:00
Bill Meier
f471a317dc test.sh: revise tests to handle revised capinfos output.
svn path=/trunk/; revision=28332
2009-05-11 18:57:08 +00:00
Ulf Lamping
e8203bb1b1 add a comment that the ping code is running in the background (that caused me some headache :-)
change the ping packet length, so the last packet will have exactly 100 bytes (at least on Windows)

svn path=/trunk/; revision=24998
2008-04-13 18:50:45 +00:00
Ulf Lamping
a2f91ba610 fix a comment
svn path=/trunk/; revision=24980
2008-04-13 15:10:59 +00:00
Ulf Lamping
855d104ac7 update some prerequisites
svn path=/trunk/; revision=24979
2008-04-13 15:09:34 +00:00
Bill Meier
f232875378 OK: comment out gathering of debug info; nothing interesting.
svn path=/trunk/; revision=24451
2008-02-24 02:21:37 +00:00
Bill Meier
0deb0a6555 Add some debug info to help in diagnosing buildbot 'run tests' failures
svn path=/trunk/; revision=24447
2008-02-23 21:19:44 +00:00
Guy Harris
503a02879c Is ping not installed on the Solaris buildbot, or does the path of the
script not include /usr/sbin, or is ping installed somewhere other than
where it is on my Solaris "machine"?  Try explicitly running it as
/usr/sbin/ping on Solaris.

svn path=/trunk/; revision=23670
2007-11-29 08:17:44 +00:00
Ulf Lamping
54e08d8e3d fix a comment: manifest files are now embedded into .exe / .dll files, no need to copy them
svn path=/trunk/; revision=23547
2007-11-23 08:42:58 +00:00
Ulf Lamping
9b101b1437 because of the privilege separation done, read filters won't work by definition now. Comment out the corresponding test case
svn path=/trunk/; revision=23546
2007-11-23 08:39:11 +00:00
Gerald Combs
cd7cc1557e Move SKIP_CAPTURE from suite-capture.sh to config.sh so that we can use it
in suite-clopts as well.  Allow it to be set externally.  This should fix
the "test" failure in the Solairs builder.

svn path=/trunk/; revision=23399
2007-11-08 16:59:30 +00:00
Jeff Morriss
e32c9da434 As requested on -dev, put the (currently failing) 'Capture 10 packets using stdout' test back in for tshark
svn path=/trunk/; revision=23110
2007-10-09 13:34:08 +00:00
Ulf Lamping
3cc99bbe53 alpha -> beta
svn path=/trunk/; revision=23107
2007-10-09 06:55:24 +00:00