Commit Graph

36273 Commits

Author SHA1 Message Date
Chris Maynard 531a787d9c Based on user feedback from Sharkfest '11, make the default choice when saving or printing packets apply to only displayed packets and not all packets.
svn path=/trunk/; revision=37833
2011-06-29 16:31:44 +00:00
Chris Maynard 3dd1b0c0de Based on Guy's suggestion from the user mailing list, dissect Ethernet frames with a type/len field in the range of 1501-1535 as invalid, and add an expert info to make it that much easier to find such invalid frames.
Also did some whitespace cleanup, converting tabs to spaces since most of the file was spaced, not tabbed, and swapped the order that the lg and ig bits get added to the tree because I think it looks better reading bits left-to-right.

TODO: I'm not entirely sure what to do in capture_eth() if that invalid range is encountered, so for now I just added some #if 0'd code as a placeholder.

Ref: http://www.wireshark.org/lists/wireshark-users/201106/msg00127.html


svn path=/trunk/; revision=37832
2011-06-29 16:05:56 +00:00
Jakub Zawadzki abe9ce28a5 Update my email address.
svn path=/trunk/; revision=37831
2011-06-29 11:03:41 +00:00
Stig Bjørlykke 6747aef250 Added a preference to turn of capture filter syntax check.
This can be used to disable the effect in bug 5356.

svn path=/trunk/; revision=37830
2011-06-29 10:42:29 +00:00
Stig Bjørlykke e015eca944 Show locale in version info (if !win32).
This may help us identifying bugs related to locale.

svn path=/trunk/; revision=37829
2011-06-29 08:05:53 +00:00
Stig Bjørlykke 958919b8ca Strengthen heuristics for Packets.
This fixes bug 6073.

svn path=/trunk/; revision=37828
2011-06-29 07:02:04 +00:00
Michael Tüxen 132c09f2d5 Cleanup whitespaces/indentation.
svn path=/trunk/; revision=37827
2011-06-29 06:33:54 +00:00
Guy Harris c5a413c569 Don't return an offset that you won't later use.
The length fields in a pcap_pkthdr are unsigned, so presumably the
equivalent fields in the rpcap protocol are also unsigned.

Make sure the captured data length isn't bigger than the remaining data
in the packet before attempting to construct a tvbuff for the packet
data.  If it is, report that as an error, and don't even try to
construct the tvbuff; that'll fail.  This fixes bug 6073.

svn path=/trunk/; revision=37826
2011-06-29 05:21:10 +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
Michael Tüxen bd6db2a824 Document the handling of command line parameters with respect to
the capturing on multiple interfaces.

svn path=/trunk/; revision=37824
2011-06-28 22:02:43 +00:00
Michael Tüxen 52abc59011 Code cleanup.
svn path=/trunk/; revision=37820
2011-06-28 16:57:42 +00:00
Stig Bjørlykke 92dde3023c Add $(GENERATED_H_FILES) to libui_a_SOURCES.
svn path=/trunk/; revision=37819
2011-06-28 16:57:10 +00:00
Stig Bjørlykke dcbfc168b1 Add a missing dependency for text_import_scanner_lex.h
svn path=/trunk/; revision=37817
2011-06-28 15:30:28 +00:00
Stig Bjørlykke 0623a49e2d From Jose Pedro Oliveira via bug 5803:
#ifdef HAVE_LIBGCRYPT block includes a line too many.
"Fixes 2nd instance of the problem"

svn path=/trunk/; revision=37816
2011-06-28 15:18:21 +00:00
Stig Bjørlykke 624c40ae25 Use the generated header file from Guy's Flex front-end script from
revision 22446 for text_import_scanner.

svn path=/trunk/; revision=37815
2011-06-28 15:04:24 +00:00
Jakub Zawadzki 22802db4a6 Export all tfs from tfs.h
svn path=/trunk/; revision=37814
2011-06-28 09:58:26 +00:00
Stig Bjørlykke 8dd3dc1ef2 From bug 6057:
Improved set_color_filter_slot documentation.

svn path=/trunk/; revision=37813
2011-06-28 09:11:18 +00:00
Stig Bjørlykke 8443bbbf75 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.

svn path=/trunk/; revision=37812
2011-06-28 09:00:11 +00:00
Michael Tüxen 6c094f6775 Use the filter argument as the capture filter for all interfaces.
Signal an error if another capture filter is provided using the
-f option.

svn path=/trunk/; revision=37811
2011-06-28 08:00:14 +00:00
Gerald Combs add36f416d Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows.

svn path=/trunk/; revision=37808
2011-06-27 20:48:26 +00:00
Michael Tüxen 741c973afe Put variable under the correct #ifdef.
svn path=/trunk/; revision=37807
2011-06-27 20:00:30 +00:00
Michael Tüxen df70b4c15c Fix the bug reported by Guy. Now
tshark -i en0 icmpp
returns a correct error message.


svn path=/trunk/; revision=37806
2011-06-27 19:07:36 +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
Michael Tüxen 4bc67de4ea Report the correct interface when there is a problem with a capture filter.
This patch is from Irene Ruengeler.

svn path=/trunk/; revision=37804
2011-06-27 12:13:15 +00:00
Michael Tüxen 043ea23beb Enable the cap_history again. It was temporary disabled a couple of hours ago.
svn path=/trunk/; revision=37803
2011-06-27 11:45:27 +00:00
Michael Tüxen 2c8c178f71 Improve the report of illegal capture filters. Also show the interface description.
svn path=/trunk/; revision=37802
2011-06-27 11:30:39 +00:00
Stig Bjørlykke b979f2da27 From bug 6057:
Lua API: add support to temporary color filters (10 color slots)

svn path=/trunk/; revision=37801
2011-06-27 11:07:31 +00:00
Stig Bjørlykke 53debee8a8 List cygwin 'zip' as a needed tool to build the U3 package.
svn path=/trunk/; revision=37800
2011-06-27 10:39:50 +00:00
Michael Tüxen 65d8f7c4c0 Use the interface description instead of the interface name when
reporting an error.

svn path=/trunk/; revision=37799
2011-06-27 10:11:15 +00:00
Stig Bjørlykke 54e59e8cdd Remove compile and ylwrap when 'make maintainer-clean'.
svn path=/trunk/; revision=37797
2011-06-27 08:38:37 +00:00
Stig Bjørlykke 4244ec0357 Remove Makefile.in when 'make maintainer-clean'.
svn path=/trunk/; revision=37796
2011-06-27 08:02:46 +00:00
Michael Tüxen 83eccec8fb Fix a bug when starting the capture without specifying an interface.
The capability history needs to be fixed.

svn path=/trunk/; revision=37795
2011-06-27 01:32:22 +00:00
Michael Tüxen 421dafd2de Get rid of old non-interface specific settings which are now interface
specifc. This finalizes the change of the infrastructure.
This patch is based on work by Irene Ruengeler.

svn path=/trunk/; revision=37794
2011-06-27 00:09:03 +00:00
Stig Bjørlykke d374df09c0 Changed adding a new coloring rule to put the new rule at the top of the list.
This because the user most likely wants to use the new rule right away, and do
not want to think about which filters it should be above.

This was requested in bug 5669.

svn path=/trunk/; revision=37793
2011-06-26 18:25:03 +00:00
Gerald Combs ca7b1bb84c [Automatic manuf, services and enterprise-numbers update for 2011-06-26]
svn path=/trunk/; revision=37789
2011-06-26 15:03:44 +00:00
Stig Bjørlykke 4ac2487d38 From Tony Trinh via bug 6018:
Add NULL checks and fix typos in Lua error print-outs

From me:
Use the error message "GUI not available" when using GUI functions in tshark.

svn path=/trunk/; revision=37788
2011-06-25 20:47:13 +00:00
Stig Bjørlykke a4dc6c0a7d Added check for invalid chars in abbrev in ProtoField functions.
This fixes bug 5569.

svn path=/trunk/; revision=37787
2011-06-25 19:39:16 +00:00
Stig Bjørlykke 1255b45566 Remove "range" from Lua's Pref.range(), as this value shall be fetched from
the "default".

This fixes bug 5896.

svn path=/trunk/; revision=37786
2011-06-25 15:42:41 +00:00
Stig Bjørlykke 0f24c1eb09 From Tony Trinh via bug 5894:
Added argument validation to Pref.range.

svn path=/trunk/; revision=37785
2011-06-25 15:24:55 +00:00
Stig Bjørlykke 08c7a1d0f1 From Tony Trinh via bug 5895:
Add sanity checks in range.c

svn path=/trunk/; revision=37784
2011-06-25 15:21:17 +00:00
Stig Bjørlykke 7491b68a3a Make guy's fix in revision 37236 actually work:
"You cannot just make the "len" field of a GByteArray larger, if there's
no data to back that length; you can only make it smaller."

Two equal values are always equal!

This fixes bug 5941.

svn path=/trunk/; revision=37783
2011-06-25 14:58:06 +00:00
Jaap Keuter eaa3542ae7 Update the dissector_add call to use the current API.
svn path=/trunk/; revision=37782
2011-06-24 19:57:14 +00:00
Jaap Keuter c9809b51dc From Peter Nahas:
This patch adds support for the two-way Sythetic Loss Measurement 
opcodes (SLM & SLR) defined in the latest ITU-T Y.1731. 

svn path=/trunk/; revision=37781
2011-06-24 06:49:20 +00:00
Chris Maynard 13a6a325c3 Print the filter string, if one was specified, just like Wireshark does.
svn path=/trunk/; revision=37780
2011-06-24 02:45:23 +00:00
Chris Maynard 343c20e215 Make Wireshark portable to all locales by calling setlocale(). This, along with my previous commits in revisions 36160 and 36166 ought to fix the problem that Bartosz Kiziukiewicz first reported on the wireshark-users mailing list here:
http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html

(I successfully generated Wireshark compare statistics after applying this change and also changing my locale to Polish.)

svn path=/trunk/; revision=37779
2011-06-24 02:35:46 +00:00
Gerald Combs 0501a48552 Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

svn path=/trunk/; revision=37778
2011-06-23 23:04:03 +00:00
Jaap Keuter f1bb0e1735 From Dejan Bucar:
Added support new multicore header in the LINX Ethernet protocol.
Added linx/tcp.

svn path=/trunk/; revision=37777
2011-06-23 21:52:58 +00:00
Jaap Keuter 9832ff5657 From Andrey Kulikov:
Patch to show GOST certificate types in CertificateRequest message.

svn path=/trunk/; revision=37776
2011-06-23 21:33:29 +00:00
Jaap Keuter 525b5fb796 From Andrey Kulikov:
Patch to TLS dissector to show GOST ciphesuites names. 

svn path=/trunk/; revision=37775
2011-06-23 21:17:42 +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