Commit Graph

32272 Commits

Author SHA1 Message Date
Guy Harris 2326b33f0a No need to link dumpcap with libgnutls.
svn path=/trunk/; revision=33533
2010-07-15 03:28:42 +00:00
Guy Harris 9b7176f7b4 If we have neither libgnutls nor libgcrypt,
epan_get_runtime_version_info() does nothing, and thus doesn't use its
argument.

svn path=/trunk/; revision=33532
2010-07-15 03:22:49 +00:00
Guy Harris cc3540b0fb Move the code to get version information for libraries used by
libwireshark into libwireshark, and call it only in programs linked with
libwireshark.  That way, programs that don't link with libwireshark
don't have to link with libgcrypt or libgnutls solely so that they can
say that they're linked with a particular version of libgcrypt or
libgnutls.

Don't link dumpcap with libgcrypt or libgnutls any more.

svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
Sake Blok e10147fb73 Add an option to print the first, the last or all occurrences of each field
(when using tshark -T fields)


svn path=/trunk/; revision=33529
2010-07-14 21:53:57 +00:00
Sake Blok 83a027afb8 Oops... forgot to update the "-E usage" text
svn path=/trunk/; revision=33528
2010-07-14 21:05:11 +00:00
Sake Blok 717abac483 Make 'tshark -T fields' print all values for fields with multiple occurences.
svn path=/trunk/; revision=33527
2010-07-14 20:28:34 +00:00
Stig Bjørlykke 30f105640f Don't pass tvb data to col_set_str(), as it will not stay around.
Added support for Note (dumping as text).
Renamed Info to Power (as used in PacketLogger).

svn path=/trunk/; revision=33526
2010-07-14 20:24:38 +00:00
Gerald Combs aa75147f9b Get our dynamic payload name from the correct location.
svn path=/trunk/; revision=33525
2010-07-14 18:40:11 +00:00
Jörg Mayer 08619accd1 - Update todo list
- Add dftest and randpkt manpages to sync with autofoo


svn path=/trunk/; revision=33521
2010-07-14 16:16:29 +00:00
Gerald Combs 3fa695d39e Fix a typo.
svn path=/trunk/; revision=33520
2010-07-14 15:18:08 +00:00
Jörg Mayer 3a8eea122f Add #ifdef HAVE_BPF_IMAGE
around
show_filter_code(capture_options *capture_opts)

To fix a warning about an unused function.


svn path=/trunk/; revision=33519
2010-07-14 13:22:34 +00:00
Anders Broman b5753ef3fc Add a field for "Revision Level Indicator" in the "MS Radio Access Capability IE".
svn path=/trunk/; revision=33518
2010-07-14 12:01:05 +00:00
Guy Harris 6582e265a8 Fix warnings.
svn path=/trunk/; revision=33517
2010-07-14 08:56:35 +00:00
Guy Harris 22c690ab9d Add dftest.pod and randpkt.pod to the release tarball.
Clean up tabs.

svn path=/trunk/; revision=33516
2010-07-14 08:29:28 +00:00
Guy Harris 61ffcf2618 Fix build errors.
svn path=/trunk/; revision=33515
2010-07-14 08:27:26 +00:00
Guy Harris 6a8c39c59f Define print_caps() before we use it.
svn path=/trunk/; revision=33514
2010-07-14 04:31:52 +00:00
Guy Harris b277e17e7b Ensure, at compile time, that the error-message-buffer argument to
open_captur_device() is an array of PCAP_ERRBUF_SIZE chars.  That means
we don't need to pass the size.

Unfortunately, pcap_compile() didn't always take a "const char *" as the
filter string argument, even though it didn't modify the argument; don't
pass it a "const char *".

Don't print the secondary error message if it's empty.

svn path=/trunk/; revision=33513
2010-07-14 04:30:37 +00:00
Guy Harris 31c8eaf95e Define relinquish_all_capabilities() before we use it.
If we get an "XXX is not one of the DLTs supported by this device" error
when we try to set the link-layer header type, don't tell the user to
report it to the Wireshark developers, as that's probably just the
result of them giving a link-layer header type that the device doesn't
support.

svn path=/trunk/; revision=33512
2010-07-14 02:14:54 +00:00
Guy Harris 7d45ac7dd5 Get rid of no-longer-used variable.
svn path=/trunk/; revision=33511
2010-07-14 02:12:55 +00:00
Guy Harris c85fa2cd46 We must also set the link-layer header type before compiling the capture
filter, as that affects the generated code.

svn path=/trunk/; revision=33510
2010-07-14 00:50:25 +00:00
Guy Harris 4d6cb744df Add a "-d" flag to dumpcap, to print out the generated code for the
capture filter in human-readable form.  (Well, readable by humans who
know BPF machine language, at least. :-))

svn path=/trunk/; revision=33509
2010-07-13 23:26:07 +00:00
Gerald Combs 3a5ba15b4d Rename a variable. "tmp_len" was too similar to "tmp_length".
svn path=/trunk/; revision=33506
2010-07-13 22:49:17 +00:00
Gerald Combs 041cd31c9e Revert get_ber_length() back to r32530, which removes all of the changes
back to and including my attempt to make it iterative. Move its guts
back into try_get_ber_length() and add a recursion level check.

This should fix CVE-2010-2284 and preserve existing behavior without
introducing any new regressions (such as bug 5000).

svn path=/trunk/; revision=33505
2010-07-13 22:41:34 +00:00
Jaap Keuter 526a2946a3 From Jan Šafránek:
dftest and randpkt are installed during make install, but they are not
documented in any man page.
This is a start. It's more or less a compilation of information found elsewhere.

svn path=/trunk/; revision=33504
2010-07-13 21:21:38 +00:00
Martin Mathieson db478debbd Allocate tap structs rather than using one static struct.
svn path=/trunk/; revision=33503
2010-07-13 16:25:34 +00:00
Bill Meier 08fb59e773 Trivial: Replace deprecated GTK_CHECK... macros with apropriate G_TYPE_CHECK... macros
svn path=/trunk/; revision=33502
2010-07-13 14:50:16 +00:00
Stig Bjørlykke a0022b31f2 From Mellanox Technologies Ltd. via bug 5004:
Added missing variable assignment for dst_qp.

svn path=/trunk/; revision=33501
2010-07-13 14:38:23 +00:00
Bill Meier dd47063e3d Minor cleanup:
- GHFunc's return void not void *;
 - Use gboolean where apropriate.

svn path=/trunk/; revision=33500
2010-07-13 14:12:06 +00:00
Bill Meier 2da541c42e Minor cleanup:
- rename rpcstat_t to dcerpcstat_t since a different definition of rpcstat_t in
  another Wireshark source file apparently confuses the Windows debugger;
- GHFunc's return void not void *;
- Use gboolean where apropriate.

svn path=/trunk/; revision=33499
2010-07-13 13:51:25 +00:00
Bill Meier b139720101 Whitespace cleanup: consistent indentation; tabs==>spaces; etc
svn path=/trunk/; revision=33498
2010-07-13 01:38:54 +00:00
Bill Meier c76f89bf35 GtkOptionMenu ==> GtkComboBox
svn path=/trunk/; revision=33497
2010-07-13 00:46:00 +00:00
Bill Meier 40de4ed2b0 ws_combo_box_text_and_pointer: allow setting entries as "insensitive".
svn path=/trunk/; revision=33494
2010-07-13 00:17:08 +00:00
Gerald Combs df14866685 WinPcap 4.1.1 -> 4.1.2.
svn path=/trunk/; revision=33493
2010-07-12 23:52:35 +00:00
Gerald Combs cfe9b05691 Add length checks.
svn path=/trunk/; revision=33488
2010-07-12 17:30:14 +00:00
Gerald Combs 55d68ba4bc [Automatic manuf and enterprise-numbers update for 2010-07-11]
svn path=/trunk/; revision=33484
2010-07-11 15:03:33 +00:00
Jaap Keuter f33d886525 Fix for bug 4993:
Mac support flags are little endian too.

svn path=/trunk/; revision=33483
2010-07-10 09:47:20 +00:00
Guy Harris 75ffa6bb71 The only reason to escape "%" in a string is if you are, incorrectly,
passing a string directly to a routine that expects a format string. 
The correct way to handle that is to pass "%s" as the string.

As long as you're escaping non-printable characters, just let
tvb_format_string() handle that.

For null-terminated strings, get the length of the string with
tvb_strsize(), and then just put the string into the protocol tree as a
regular item.

svn path=/trunk/; revision=33482
2010-07-09 21:27:08 +00:00
Gerald Combs b4a8226906 Check our field lengths. Should fix the recent randpkt errors.
svn path=/trunk/; revision=33481
2010-07-09 20:27:02 +00:00
Gerald Combs edb7f000dc Assume that if we have more than 500 levels of nested indefinite lengths
we have a malformed packet.

svn path=/trunk/; revision=33480
2010-07-09 17:07:34 +00:00
Bill Meier 05b7c16830 Implement a separate pref for enabling tracking of tcp window scaling
(instead of including this pref as part of enabling tcp relative sequence numbers).

svn path=/trunk/; revision=33479
2010-07-09 01:46:11 +00:00
Bill Meier 40c1c5b28b From Ian Schorr: "NFSv4 COMMIT Calls not decoding"
NFSv4 COMMIT Requests are not decoded.  NFS "malformed packet" logic is
tripped.

This was a bug introduced with the changes in bug 4975.  The dissector
erroneously tries to decode 4 bytes past the end of the packet.

A patch is attached that fixes that, as well as adds "Offset" info in the Info
column for COMMIT calls.

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

svn path=/trunk/; revision=33478
2010-07-09 00:23:27 +00:00
Jörg Mayer bd09fbef8a Add dissector_tables_dlg.c
svn path=/trunk/; revision=33477
2010-07-08 14:19:32 +00:00
Stig Bjørlykke e64762a0d8 From Thomas Dreibholz via bug 4989:
Extend the SSP dissector to support the SSP Environment message type.

svn path=/trunk/; revision=33476
2010-07-08 14:14:11 +00:00
Anders Broman 7f90713b6e from Tarjei Knapstad.
Minor cleanups in packet-xml dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4987

svn path=/trunk/; revision=33475
2010-07-08 12:55:03 +00:00
Anders Broman ab2eaa1001 Add "WS internal" to the menues this can be used to display internal information like the curren "entry" dissector tables. Emem statistics
could be another item to add.

Add dissector tables treview. This cab be used to find which UDP ports are registered for example.

svn path=/trunk/; revision=33474
2010-07-08 11:05:16 +00:00
Stig Bjørlykke 8846a92d9c Update the services file from IANA's port-numbers.
svn path=/trunk/; revision=33473
2010-07-08 10:04:06 +00:00
Jeff Morriss b0cf38c06c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4854 (crash when adding
2nd info column):

Duplicate col_do_append_sep_va_fstr()'s code into col_append_fstr() and
col_append_sep_fstr() (and remove col_do_append_sep_va_fstr()) because we need
to call va_start() and va_end() after each call to g_vsnprintf().  (This is a
followon to rev 32961.)

svn path=/trunk/; revision=33472
2010-07-08 02:54:26 +00:00
Jeff Morriss 4e76ef92cb For: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4984#c4 : In try_get_ber_length() don't let a negative length make us go backwards. This should eliminate a possible infinite loop and appears to /help/ limit the depth of recursion.
svn path=/trunk/; revision=33471
2010-07-07 22:00:44 +00:00
Gerald Combs 820be405e2 Fix a buffer overflow found by recent randpkt testing. Replace raw data
pointer access with tvb_memcpy() and tvb_get_ntohs().

svn path=/trunk/; revision=33470
2010-07-07 21:27:13 +00:00
Guy Harris e1d0087af9 NEW_FILTER_COMBO_BOX no longer does anything - it's not checked for - so
there's no need to define it.

svn path=/trunk/; revision=33469
2010-07-07 20:33:19 +00:00