Commit graph

43587 commits

Author SHA1 Message Date
Anders Broman
d0e85eed92 - Include capture_win_ifnames.h
- false -> FALSE

svn path=/trunk/; revision=46139
2012-11-22 11:38:04 +00:00
Guy Harris
c8fc50e817 It's get_windows_interface_friendlyname(), not
get_windows_interface_friendly_name().

svn path=/trunk/; revision=46138
2012-11-22 08:08:52 +00:00
Guy Harris
8052d01fe2 Get the friendly name for interfaces. Also, no Windows interfaces are
loopback interfaces.

svn path=/trunk/; revision=46137
2012-11-22 08:08:06 +00:00
Guy Harris
308d1ffedd Some more if_info_t updates.
svn path=/trunk/; revision=46135
2012-11-22 07:33:39 +00:00
Guy Harris
1105a21a8c Fix another reference to the "description" member of an if_info_t (in
commented-out code).

svn path=/trunk/; revision=46134
2012-11-22 07:02:53 +00:00
Guy Harris
1d0b5f5d07 Add capture_unix_ifnames.c to the list of files needed when building for
UN*X.

svn path=/trunk/; revision=46133
2012-11-22 07:00:23 +00:00
Guy Harris
6a5d8a1e65 Fix a reference to the "description" member of an if_info_t.
svn path=/trunk/; revision=46132
2012-11-22 06:54:35 +00:00
Guy Harris
bd976ae6c0 On UN*X, if an interface has a description, use it as the "friendly
name".  If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.

If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.

Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.

svn path=/trunk/; revision=46131
2012-11-22 06:02:49 +00:00
Guy Harris
b9e8e95ffe Get rid of an unused variable.
svn path=/trunk/; revision=46130
2012-11-22 05:50:47 +00:00
Guy Harris
24d4323da6 Assume, at least for now, that "Darwin" means "OS X"; don't bother
checking whether the relevant frameworks are available.  (An iOS port's
going to require a *lot* more work, and I don't know whether
Darwin-the-pure-OS even builds and runs any more.)

We don't need Core Services any more, as we're no longer using
Gestalt().  We just need Core Foundation for getting the OS version and
Application Services for firing up Web browser or file manager windows.

svn path=/trunk/; revision=46129
2012-11-22 05:46:49 +00:00
Bill Meier
07c4d6ef7f Fix potential buffer overflow crash; (Bug #7880).
Rework code logic slightly so same code path (and tests)
 used whether or not 'if(tree)'.

svn path=/trunk/; revision=46128
2012-11-22 02:27:40 +00:00
Guy Harris
7a688c56fb Clean up indentation.
svn path=/trunk/; revision=46127
2012-11-22 02:09:46 +00:00
Guy Harris
69a454c744 Fix indentation.
svn path=/trunk/; revision=46126
2012-11-22 02:02:08 +00:00
Martin Kaiser
6b3bfa5507 fix
/home/wireshark/builders/trunk/ubuntu1204x64/build/epan/dissectors/packet-bssgp.c: In function de_bssgp_son_transfer_app_id:
/home/wireshark/builders/trunk/ubuntu1204x64/build/epan/dissectors/packet-bssgp.c:3173:12: error: variable next_tvb set but not used
[-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors


svn path=/trunk/; revision=46125
2012-11-21 22:20:22 +00:00
Martin Kaiser
bf0fede1eb display the content of cc status fields in the info colum
svn path=/trunk/; revision=46124
2012-11-21 21:55:29 +00:00
Martin Kaiser
ff9f439c9a all CI+ SAC messages are encrypted
there's no point in displaying this fact in the info column

svn path=/trunk/; revision=46123
2012-11-21 21:42:50 +00:00
Martin Kaiser
8a8956552f dissect config and cftable tuples in the Card Information Structure
svn path=/trunk/; revision=46122
2012-11-21 21:37:22 +00:00
Martin Kaiser
149880291e fix copy&paste error
svn path=/trunk/; revision=46121
2012-11-21 21:21:07 +00:00
Guy Harris
715065609b Clean up white space (no tabs).
svn path=/trunk/; revision=46120
2012-11-21 21:09:32 +00:00
Martin Kaiser
52f1565bd4 cc status 0x03 means either "authentication failed" or "no srm required"
svn path=/trunk/; revision=46119
2012-11-21 21:08:43 +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
6c6b37cada The previous change means the "len" argument is now being used.
svn path=/trunk/; revision=46113
2012-11-21 18:13:51 +00:00
Guy Harris
ca74add1c9 In capture_opts_add_iface_opt(), only *require* us to get the interface
list if the user specified a number; otherwise, if we couldn't get the
list, just use what the user specified, so they can specify interfaces
in order to test them to see why they're not showing up in the list.

svn path=/trunk/; revision=46112
2012-11-21 18:11:57 +00:00
Anders Broman
66c80c0f60 From l.wachowski:
Allign the tables for dissection.
From me try to fix the dissection of SONtransferApplicationIdentity_PDU.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8008

svn path=/trunk/; revision=46111
2012-11-21 17:59:19 +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
4c019d6807 If we don't find the specified interface name in the list, use it
anyway, so that, for example, if an interface doesn't show up in the
list for some reason, the user can try specifying it explicitly for
testing purposes.

svn path=/trunk/; revision=46109
2012-11-21 17:33:02 +00:00
Guy Harris
d415d3d87c On error, have capture_opts_trim_iface() return the exit status that
should be used (on success, have it return 0).  Exit with that exit
status; if the problem is that we couldn't get the interface list or if
there are no interfaces in that list, return 2, as that's not a
command-line syntax error.

svn path=/trunk/; revision=46108
2012-11-21 17:14:54 +00:00
Guy Harris
03f4fa5223 Make the "Invalid capture filter" message resemble that of other programs.
svn path=/trunk/; revision=46107
2012-11-21 16:05:21 +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
Guy Harris
7a9aef34a9 When dumpcap is being run by another program, its standard error gets
consumed by that program, and that program only ends up reporting one of
those errors.  Therefore, only log one of them; we're seeing errors in
the buildbot, and we want the more detailed error, so don't log a
message after GetInterfaceFriendlyNameFromDeviceGuid() returns an error,
just rely on the error logged by
GetInterfaceFriendlyNameFromDeviceGuid().

Ultimately, we don't want to print anything to the standard output or
error at all, as that stuff ends up being consumed by the program in
question; we should either ignore the error (if it's an "expected"
error) or report it through the API so the the caller can, in turn,
report it appropriately.

svn path=/trunk/; revision=46099
2012-11-21 00:44:21 +00:00
Bill Meier
303ce49ecd From Stephen Tarr: Fix 'misspelling (typo) in display filter field name'.
ipv6.framgent --> ipv6.fragment
#BACKPORT

svn path=/trunk/; revision=46098
2012-11-21 00:41:32 +00:00
Ronnie Sahlberg
323100545d SCSI: Sense buffers come in two flavors. Start decoding the descriptor format.
svn path=/trunk/; revision=46097
2012-11-20 03:17:46 +00:00
Guy Harris
85b5a71c73 Clean up white space.
Clarify that the other "friendly name" is NDIS's idea of a "friendly
name".

svn path=/trunk/; revision=46096
2012-11-20 01:15:00 +00:00
Guy Harris
fbaac1330a We don't use get_windows_interface_friendlyname() in capture_opts.c, so
we don't need to include capture_win_ifnames.h.

Clean up white space.

svn path=/trunk/; revision=46095
2012-11-20 01:12:57 +00:00
Bill Meier
b604e9c4cc Including config.h causes compile errors; Comment out for now...
svn path=/trunk/; revision=46094
2012-11-19 23:48:07 +00:00
Bill Meier
463f50d5b3 HAVE_CONFIG_H no longer req'd
svn path=/trunk/; revision=46093
2012-11-19 23:21:54 +00:00
Jeff Morriss
e1b2eda268 Attempt to fix the Windows Qt builds.
svn path=/trunk/; revision=46092
2012-11-19 22:16:39 +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
5681aa0fda Put a line of code on its own line (instead of following a comment).
svn path=/trunk/; revision=46090
2012-11-19 22:01:07 +00:00
Jeff Morriss
92aff2d548 Failure to find the interface should cause *shark to exit with a status of 1, not 2.
svn path=/trunk/; revision=46089
2012-11-19 21:41:40 +00:00
Jeff Morriss
89c33a8266 As suggested by Evan: just make the variable a size_t instead of casting away the warning.
svn path=/trunk/; revision=46088
2012-11-19 21:32:39 +00:00
Jeff Morriss
06efe50e5f I'm pretty confident the string length will fit in 32 bits; cast away the "possible loss of data" warning on the Win64 build.
svn path=/trunk/; revision=46087
2012-11-19 21:00:44 +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
Anders Broman
c9e72f9241 From Roland Knall:
Allow for specific enabling and disabling of heuristic dissectors.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7997

svn path=/trunk/; revision=46085
2012-11-19 20:20:34 +00:00