Commit Graph

36204 Commits

Author SHA1 Message Date
Gerald Combs 9661c3fdde Disable DEBUG_CHILD_DUMPCAP.
svn path=/trunk/; revision=37864
2011-07-02 15:44:17 +00:00
Jörg Mayer 7e0b65ff91 avoid warning about old style function definition
svn path=/trunk/; revision=37863
2011-07-02 11:33:32 +00:00
Jakub Zawadzki 5c801f3820 Revert r37857, r37861
svn path=/trunk/; revision=37862
2011-07-01 22:26:02 +00:00
Jakub Zawadzki fafa84d23e Try to get more information about AV.
svn path=/trunk/; revision=37861
2011-07-01 22:00:59 +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
Stig Bjørlykke 6bdd7eed16 Renamed "___tmp_color_filter___" to "___conversation_color_filter___"
in the coloring rule name to better describe where it comes from.

svn path=/trunk/; revision=37859
2011-07-01 21:13:40 +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
Jakub Zawadzki aeb81605de Catch system exceptions from pcap_open_live() :)
svn path=/trunk/; revision=37857
2011-07-01 20:07:34 +00:00
Chris Maynard 5f2f261f52 Since the TCP Flags tree encompasses 12 bits including the 3 reserved bits and
the nonce bit, we should display 3 nibbles on the Flags summary line in order
to represent all flag bits.  While arguably we need not worry about reserved
bits, the nonce bit is not currently represented, so that bit alone pushes us
into the next nibble.


svn path=/trunk/; revision=37856
2011-07-01 19:40:35 +00:00
Gerald Combs dd82c59ff9 Fix indentation.
svn path=/trunk/; revision=37855
2011-07-01 19:36:57 +00:00
Chris Maynard 220341f369 I decode_tcp_ports(), don't abort processing zero window probe packets, even if the payload is only a single byte. Also, for the keep-alives, display any payload that might be present.
svn path=/trunk/; revision=37854
2011-07-01 19:17:02 +00:00
Chris Maynard d927b60f21 Initialize the TCP windows to the maximum value instead of 0 to avoid false zero window conditions, especially at the beginning of a capture or if only one side of a conversation is captured. This resolves bug 4716: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4716.
svn path=/trunk/; revision=37853
2011-07-01 19:00:14 +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
Chris Maynard 2d11ac9051 From spamlookup via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6083:
Fix compile error introduced with r37830.


svn path=/trunk/; revision=37851
2011-07-01 15:44:42 +00:00
Guy Harris 4bdb1926c5 Oops, indented one of the "Promiscuous" ones.
svn path=/trunk/; revision=37850
2011-06-30 23:34:53 +00:00
Guy Harris 88f7858de3 Line up the colons.
svn path=/trunk/; revision=37849
2011-06-30 22:41:54 +00:00
Guy Harris bf89288f87 It's not made from semolina. :-)
svn path=/trunk/; revision=37848
2011-06-30 22:21:16 +00:00
Michael Tüxen be3a756582 Add paranoid debug output in open_capture_device().
svn path=/trunk/; revision=37847
2011-06-30 21:02:11 +00:00
Gerald Combs 031a28f65e Log the success or failure of pcap_open/pcap_create/pcap_open_live.
svn path=/trunk/; revision=37846
2011-06-30 20:17:26 +00:00
Guy Harris c16a2eed34 Export tvb_get_unicode_string().
svn path=/trunk/; revision=37845
2011-06-30 18:08:42 +00:00
Gerald Combs f04a525e79 Temporarily enable dumpcap debugging.
svn path=/trunk/; revision=37844
2011-06-30 17:41:46 +00:00
Michael Tüxen 2b439f46f3 Remove all interfaces when available.
Add a missing g_strdup.

svn path=/trunk/; revision=37843
2011-06-30 11:40:50 +00:00
Stig Bjørlykke c026f4b01c Avoid absurdly large values used in for-loops.
svn path=/trunk/; revision=37842
2011-06-30 09:31:11 +00:00
Jakub Zawadzki 9fb3af3bf1 Fix memory leak.
svn path=/trunk/; revision=37841
2011-06-30 08:54:24 +00:00
Michael Tüxen 185305aea6 Cleanup.
svn path=/trunk/; revision=37840
2011-06-30 06:31:52 +00:00
Chris Maynard 0eb0b8f1f3 Undo r37833 in favor of Sake's changes to be committed at some future date.
svn path=/trunk/; revision=37839
2011-06-30 01:05:49 +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
Chris Maynard 94159d5d0e Don't colorize TCP window updates as "Bad TCP". This change was made in response to a user request at Sharkfest '11.
svn path=/trunk/; revision=37836
2011-06-29 18:45:14 +00:00
Chris Maynard 2d99c2dbb4 Although technically not needed, for clarity, explicity catch invalid Ethernet frames, increment the "other" count and return. Previously, code execution would have fallen through to the ETHERNET_II case and capture_ethertype() would have incremented the "other" count.
svn path=/trunk/; revision=37835
2011-06-29 17:22:18 +00:00
Chris Maynard e27a75ac39 Indicate TCP fast retransmissions as an expert info note, rather than a warning,just as TCP retransmissions are. This was a user request from Sharkfest '11.
svn path=/trunk/; revision=37834
2011-06-29 16:59:37 +00:00
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