Commit graph

38533 commits

Author SHA1 Message Date
Guy Harris
f210836a02 I had a capture_errs.c but capture-wpcap.c eated it.
svn path=/trunk/; revision=40339
2011-12-30 00:17:50 +00:00
Guy Harris
cc98c8a901 Get rid of extra blank line.
svn path=/trunk/; revision=40338
2011-12-29 23:34:20 +00:00
Guy Harris
32c1ee2010 Leave it up to dumpcap to determine whether WinPcap was loaded and, if
it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

svn path=/trunk/; revision=40337
2011-12-29 23:33:29 +00:00
Guy Harris
53eb852fa7 Leave it up to dumpcap to determine whether WinPcap was loaded and, if
it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

svn path=/trunk/; revision=40336
2011-12-29 23:21:18 +00:00
Guy Harris
7e531049a0 Swallow cant_load_winpcap_err() up into capture-wpcap.c, so that
anything that uses WinPcap can use that message text in its error
messages.

svn path=/trunk/; revision=40335
2011-12-29 23:09:42 +00:00
Guy Harris
3864d5d19d Add an additional DONT_HAVE_PCAP return value from get_interface_list()
and capture_interface_list().  Return it if, on Windows, we ask for the
interface list but don't have WinPcap installed.  Handle it like
CANT_GET_INTERFACE_LIST.

svn path=/trunk/; revision=40334
2011-12-29 22:49:49 +00:00
Guy Harris
21f5ea24e4 Just hard-code the error for "can't load WinPcap"; the one that
cant_load_winpcap_err() has some redundant gunk in it.

svn path=/trunk/; revision=40333
2011-12-29 22:06:22 +00:00
Guy Harris
71c7f43d37 On Windows, if we can't open a capture device, check whether WinPcap is
loaded and, if not, report that as the problem, rather than suggesting
that you didn't specify the proper interface.

svn path=/trunk/; revision=40332
2011-12-29 21:59:24 +00:00
Guy Harris
aefe098467 Forgot the buffer length argument to g_snprintf().
svn path=/trunk/; revision=40331
2011-12-29 21:43:59 +00:00
Guy Harris
757de7e1cf If pcap_open_live() or pcap_open() fails due to not having WinPcap,
supply an appropriate error string.

svn path=/trunk/; revision=40330
2011-12-29 21:18:08 +00:00
Bill Meier
dddb66178b AFAIKT sys/stat.h, sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes aren't needed.
also: Add #include <epan/packet.h>  (altho included by one of the other includes).

svn path=/trunk/; revision=40329
2011-12-29 21:08:53 +00:00
Bill Meier
9beae6eb86 AFAIKT sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes aren't needed.
svn path=/trunk/; revision=40328
2011-12-29 20:44:19 +00:00
Bill Meier
ab5ead6bb0 Do whitespace cleanup; Reformat long lines;
Move proto_register...() to be near the end of the file.

svn path=/trunk/; revision=40327
2011-12-29 20:23:18 +00:00
Bill Meier
96151f1910 Define GTK_DISABLE_DEPRECATED only if GTK lt 3.2 since
GTK 3.2 deprecates GtkVBox & GtkHBox which are currently used extensively by Wireshark.

svn path=/trunk/; revision=40326
2011-12-29 16:58:41 +00:00
Chris Maynard
b97844bcaa Fix LTP multiple bundle bug and allow LTP/DCCP. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5035
svn path=/trunk/; revision=40325
2011-12-29 16:22:02 +00:00
Stig Bjørlykke
87d587b53f Set filter text after connecting to filter string callback so the
initial filter will be syntax checked.

svn path=/trunk/; revision=40324
2011-12-29 11:54:08 +00:00
Stig Bjørlykke
5adae76d68 Fixed a typo: btyes -> bytes
svn path=/trunk/; revision=40323
2011-12-29 11:44:22 +00:00
Gerald Combs
dc9a4de8c9 Add PLACE_OF_INTEREST_SIGN, a.k.a. the OS X Command key symbol. Annotate
entries with their decimal and hexadecimal values. Add a modeline blurb.

svn path=/trunk/; revision=40322
2011-12-29 00:12:22 +00:00
Gerald Combs
6b178bd415 Add 'extern "C"' wrappers and #include guards to various header files.
svn path=/trunk/; revision=40321
2011-12-29 00:08:47 +00:00
Gerald Combs
cb9725ce2b Prepend the sita_phdr fields with "sita_" to make them less
collision-prone.

svn path=/trunk/; revision=40320
2011-12-28 23:39:14 +00:00
Gerald Combs
10dfe94842 Add some CMake files and directories.
svn path=/trunk/; revision=40319
2011-12-28 22:57:02 +00:00
Gerald Combs
1fc129282b Remove some NSIS 1.x cruft.
svn path=/trunk/; revision=40318
2011-12-28 22:42:40 +00:00
Gerald Combs
5ce69a0445 Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2
directory.  This picks up any DEP/ASLR-related changes. Run peflags on
more DLLs.

svn path=/trunk/; revision=40317
2011-12-28 22:37:38 +00:00
Gerald Combs
c9681dcb26 Add "peflags" to the list of required executables. Use it to make sure
the DLLs we use have DEP and ASLR enabled.

svn path=/trunk/; revision=40316
2011-12-28 20:29:13 +00:00
Chris Maynard
043f5f71d0 Fix Coverity CID 1342: UNUSED_VALUE
svn path=/trunk/; revision=40315
2011-12-28 17:02:43 +00:00
Chris Maynard
e7e36de7dd Add missing break; Fixes Coverity CID 1343.
svn path=/trunk/; revision=40314
2011-12-28 16:59:17 +00:00
Chris Maynard
ba47e1d521 min() -> MIN().
svn path=/trunk/; revision=40313
2011-12-28 16:53:50 +00:00
Chris Maynard
5debb5c5e3 Fix memory leaks involving tvb_get_string[z]().
svn path=/trunk/; revision=40312
2011-12-28 16:36:57 +00:00
Bill Meier
825850aa89 add_new_data_source() needed in several places.
svn path=/trunk/; revision=40311
2011-12-28 16:09:45 +00:00
Bill Meier
c2030be97b Add svn:executable property
svn path=/trunk/; revision=40310
2011-12-28 15:23:56 +00:00
Bill Meier
ebe33ba92a Add tshark option '-G heuristic-decodes' to dump heuristic dissector tables.
svn path=/trunk/; revision=40309
2011-12-28 15:05:59 +00:00
Bill Meier
2a1eaf14e2 Remove a not really relevant comment.
svn path=/trunk/; revision=40308
2011-12-28 15:01:17 +00:00
Bill Meier
1870f750a1 Remove unneeded #includes;
Reformat some long lines;
Convert '4 space tabs' to spaces.

svn path=/trunk/; revision=40307
2011-12-28 14:57:43 +00:00
Gerald Combs
3c1b8a6ca1 Add a "-G ftypes" option, which dumps our supprted FT_… names and
descriptions. Captitalize and fix up the descriptions. Use its output to
create the field type list in the wireshark-filter man page.

svn path=/trunk/; revision=40306
2011-12-27 20:35:41 +00:00
Bill Meier
727046dc35 Tighten up format string used for date/time parse;
Use 'static' in function definitions to match function declarations;
Do minor reformatting.

svn path=/trunk/; revision=40305
2011-12-27 18:54:32 +00:00
Chris Maynard
3362e174f6 From Jim Young via bug 5580: Only update the time elapsed between the previous displayed packet and this packet if the packet is actually displayed. Ref: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5580
svn path=/trunk/; revision=40304
2011-12-27 18:16:12 +00:00
Chris Maynard
8fdfd98ad7 Fix a comment. Correct a few typos.
svn path=/trunk/; revision=40303
2011-12-27 17:46:25 +00:00
Chris Maynard
adf0b2f274 Corrected some obvious typos.
svn path=/trunk/; revision=40302
2011-12-27 17:34:01 +00:00
Chris Maynard
a4599ecdb7 Use tvb_get_ntoh48() instead of tvb_get_ntohs() || tvb_get_ntohl().
svn path=/trunk/; revision=40301
2011-12-27 17:08:33 +00:00
Chris Maynard
4b46562c50 Use tvb_ether_to_str() instead of ether_to_str(ep_tvb_memdup()). Add modelines.
svn path=/trunk/; revision=40300
2011-12-27 16:51:59 +00:00
Anders Broman
eb722fa0c1 Initialise variables.
svn path=/trunk/; revision=40299
2011-12-27 11:08:52 +00:00
Anders Broman
1cab431dc9 From Gaurav Tungatkar:
support extended ICMP for multi-part messages as specified by
RFC 4884. Additionally, it adds support for the Interface Information Object
extension to ICMP as specified by RFC 5837.
1. RFC 4884 - This redefines certain ICMP messages to support multi-part
messages with extensions. It adds a length field to the ICMP header and defines
an extension structure to define extension objects that can be appended to the
selected ICMP messages. It retains backward compatibility with messages that do
not support the extensions defined by this RFC. 
2. RFC 5837 - This defines an extension object to identify the interface and
next-hop information to selected ICMP messages.

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

svn path=/trunk/; revision=40298
2011-12-27 10:48:04 +00:00
Anders Broman
35e767e28a Dissect Service Option Profile.
svn path=/trunk/; revision=40297
2011-12-27 10:15:00 +00:00
Martin Mathieson
4dbf893401 Display the meaning of the special values of the Stop MTCH field.
From Pascal Quantin

svn path=/trunk/; revision=40296
2011-12-27 00:27:46 +00:00
Guy Harris
911a3120c6 That's the 3GPP spec for this protocol layer, right?
svn path=/trunk/; revision=40295
2011-12-26 23:00:33 +00:00
Alexis La Goutte
8edf55985b Update ICMPv6 to last IANA Parameters (2011-12-21)
* RFC3775 => RFC6275
* draft-ietf-6lowpan-nd-17 => draft-ietf-6lowpan-nd-18

svn path=/trunk/; revision=40294
2011-12-26 14:59:50 +00:00
Alexis La Goutte
333bbe5079 Update IKEv2 to last IANA Parameters (2011-12-19)
RFC-kivinen-ipsecme-secure-password-framework-03 => RFC6467

svn path=/trunk/; revision=40293
2011-12-26 14:00:22 +00:00
Gerald Combs
632d4980d5 [Automatic manuf, services and enterprise-numbers update for 2011-12-25]
svn path=/trunk/; revision=40290
2011-12-25 15:03:26 +00:00
Anders Broman
fdef15ed5e Revisit the spec, value is 16 bits.
svn path=/trunk/; revision=40289
2011-12-25 11:48:31 +00:00
Anders Broman
c4a88586f3 Use packet-radius.c to dissect embedded AVP:s.
svn path=/trunk/; revision=40288
2011-12-25 11:25:39 +00:00