Commit graph

167 commits

Author SHA1 Message Date
Jaap Keuter
bba09f0284 From Alexis La Goutte:
Add support of TCP Packet Mood (TCP Option 25)
More information is available in RFC 5841

svn path=/trunk/; revision=32498
2010-04-16 19:21:31 +00:00
Jaap Keuter
3f6e8b0284 From Martin Visser:
Please change the dissector so that TCP packets that have the "SACK permitted"
option set, set the "tcp.options.sack_perm" field to 1.

svn path=/trunk/; revision=32273
2010-03-23 20:05:04 +00:00
Jaap Keuter
ac07c187ee Harden "Process Information" presentation functions.
svn path=/trunk/; revision=31806
2010-02-05 22:08:29 +00:00
Stig Bjørlykke
47e732e29e Changed "reassembled_length" -> "reassembled.length".
svn path=/trunk/; revision=31776
2010-02-03 08:47:15 +00:00
Stig Bjørlykke
98df26f3a9 Added protocol name to "Reassembled length" text.
svn path=/trunk/; revision=31774
2010-02-02 22:32:31 +00:00
Stig Bjørlykke
88b72356ad Introduce "Reassembled length" filter element for all protocols doing
reassembly.

svn path=/trunk/; revision=31767
2010-02-02 16:01:52 +00:00
Bill Meier
73eb16d678 Fix some gcc -Wshadow warnings
svn path=/trunk/; revision=31623
2010-01-22 17:41:47 +00:00
Anders Broman
4a38ad658c Get rid of check_col();
svn path=/trunk/; revision=31533
2010-01-15 07:32:04 +00:00
Anders Broman
90bf722451 From Chris Costa:
tcp.analysis.acks_frame and tcp.analysis.ack_rtt is not reliable.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3311

svn path=/trunk/; revision=31532
2010-01-15 07:20:25 +00:00
Anders Broman
a230916b8e From Didier Gautheron:
Don't use packet without data in sequence analysis.

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

svn path=/trunk/; revision=31531
2010-01-15 07:07:28 +00:00
Sake Blok
1580d332f4 Fix for bug 3955 and 4288. When doing Follow TCP stream, there was no
check whether a packet belonged to the correct tcp stream (when there 
are multiple streams in the tracefile with the samen ip addresses and 
tcp ports.


svn path=/trunk/; revision=31252
2009-12-13 01:10:55 +00:00
Ronnie Sahlberg
6c05ca1051 dont print the window size for the initial SYN packet
svn path=/trunk/; revision=30979
2009-11-16 21:26:55 +00:00
Anders Broman
88bb44a51e From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164

svn path=/trunk/; revision=30691
2009-10-25 11:43:30 +00:00
Kovarththanan Rajaratnam
00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Jeff Morriss
95251d8f46 From Didier Gautheron via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3417
Don't scale the window if the SYN flag is set.

svn path=/trunk/; revision=29885
2009-09-13 23:10:11 +00:00
Anders Broman
ce829a0f94 packet-tcp.c:1551: warning: 'cleared_writable' may be used uninitialized in this function
svn path=/trunk/; revision=29536
2009-08-24 09:29:05 +00:00
Anders Broman
553ef57224 From: : " Michael"
packet-tcp marks a row as unwritable if there is more
than 1 PDU in a packet to prevent overwriting of the
protocol column.

However this breaks the proto,colinfo tap which checks
rows are writable or dies EVEN if it doesn't alter anything.

Suggested patch attached to restore the initial value
after all PDUs have been processed.

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

svn path=/trunk/; revision=29535
2009-08-24 09:05:23 +00:00
Kovarththanan Rajaratnam
23d4eba3b1 Custom columnfication:
* Deprecate COL_DELTA_CONV_TIME (Delta time (conversation)). Use tcp.time_delta

svn path=/trunk/; revision=29524
2009-08-23 12:30:48 +00:00
Kovarththanan Rajaratnam
b9cbd15469 Custom columnfication:
* Deprecate COL_REL_CONV_TIME (Relative time (conversation)). Use tcp.time_relative

svn path=/trunk/; revision=29523
2009-08-23 12:24:14 +00:00
Kovarththanan Rajaratnam
602e3a09e0 Remove col_check() guard wrt. COL_REL_CONV_TIME/COL_DELTA_CONV_TIME
svn path=/trunk/; revision=29508
2009-08-22 19:53:54 +00:00
Kovarththanan Rajaratnam
8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Kovarththanan Rajaratnam
6110a96f68 Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
Kovarththanan Rajaratnam
0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
Kovarththanan Rajaratnam
e971354a54 Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
Stig Bjørlykke
4d8dd01e8e Changed flags_set_truth -> tfs_set_notset
svn path=/trunk/; revision=28989
2009-07-07 14:54:15 +00:00
Stig Bjørlykke
b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Anders Broman
b4aeb97ed5 tvb_new_real_data -> tvb_new_child_real_data
svn path=/trunk/; revision=28517
2009-05-29 06:16:43 +00:00
Gerald Combs
9a72434b1e Add support for process flow records to IPFIX, which required adding
support for vendor-specific IEs. Fix variable-length record handling. Add
conversation tracking to the UDP dissector and add process flow
information to TCP and UDP conversations.

This lets us run process flow collectors on one or more machines and
have the process username, PID, command name, etc. show up in the TCP
and UDP protocol trees.

svn path=/trunk/; revision=28366
2009-05-14 23:33:17 +00:00
Anders Broman
64a33ad7af Apply some of the patches from:
http://wiki.wireshark.org/Development/Optimization

svn path=/trunk/; revision=28364
2009-05-14 20:04:28 +00:00
Jaap Keuter
a6f9c55480 From Chris A:
Right now with DESEGMENT_UNTIL_FIN, the TCP dissector doesn't display the
fragment tree (the "Reassembled TCP segments" with links to the frames that
were reassembled).

Attached is one possible patch to packet-tcp.c to display the fragment tree.
Because DESEGMENT_UNTIL_FIN dissects the FIN packet as the high-level PDU, the
fragment tree also contains the FIN packet. It has 0 bytes of PDU data. Ugly but logical..

svn path=/trunk/; revision=28090
2009-04-20 05:48:04 +00:00
Gerald Combs
446d43351c Add initial support for string buffers - ep_allocated, growable strings
similar to GLib's GStrings. Use them to create the list of TCP flags.

svn path=/trunk/; revision=27872
2009-03-27 23:05:37 +00:00
Bill Meier
d6a5a7c761 P64 changes: Fix some cases for which size_t is not required
svn path=/trunk/; revision=27822
2009-03-22 20:55:31 +00:00
Gerald Combs
6d04f793f0 Back out r27047 and r27053.
svn path=/trunk/; revision=27062
2008-12-19 17:39:52 +00:00
Gerald Combs
fc71188963 Update calls to proto_tree_add_bytes_format to reflect r27047.
svn path=/trunk/; revision=27053
2008-12-18 20:19:49 +00:00
Bill Meier
33c99f44fd Fix typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27028
2008-12-17 00:08:38 +00:00
Gerald Combs
6f659679f7 Make sure all of our struct members are initialized.
svn path=/trunk/; revision=26948
2008-12-09 17:50:02 +00:00
Stig Bjørlykke
9936884558 The stream index does not belong to the source and destination port bytes.
Do not let the generated TCP Analysis Flags get all TCP bytes.
Point the hidden TCP Segment Len to the header length byte.

svn path=/trunk/; revision=26806
2008-11-18 16:38:08 +00:00
Stig Bjørlykke
30991af2f1 From Didier Gautheron (bug 3032):
Use se_alloc0 rather then se_alloc for tcp_acked allocation.

svn path=/trunk/; revision=26685
2008-11-04 08:31:23 +00:00
Stephen Fisher
0feefaf9a0 Fix minor typo in comment field
svn path=/trunk/; revision=26671
2008-11-02 00:48:41 +00:00
Jaap Keuter
aba73d539f Add option 22 and 23 dissection.
svn path=/trunk/; revision=26463
2008-10-15 17:51:57 +00:00
Sake Blok
a550fb9d78 Make the index from the conversation-struct available as field
"tcp.stream", this will make it possible to sort packets by
tcp stream, filter tcp streams exactly, etc.

It is also the preparation for a fix for bug 1447


svn path=/trunk/; revision=26305
2008-09-30 12:24:27 +00:00
Ronnie Sahlberg
ed83f835e6 add a preference and code for tracking how many un-acked bytes are in
flight on a tcp connection.

this is quite useful toghether with io-grapgs to track how much of the 
tcp window that an application actually uses



svn path=/trunk/; revision=26067
2008-08-25 02:15:36 +00:00
Jaap Keuter
90af2cb097 Lint reports addressed.
Whitespace cleanup.

svn path=/trunk/; revision=26046
2008-08-20 05:56:31 +00:00
Jaap Keuter
fd86b5d61a From Eric Travis:
The included tweak allows for the filtering of packets on the presence of
TCP Option 20: tcp.options.scps;

svn path=/trunk/; revision=26045
2008-08-20 05:42:35 +00:00
Jaap Keuter
d24ee65df8 From Steve Friedman:
s/Acknowledgment/Acknowledgement/

svn path=/trunk/; revision=26044
2008-08-20 05:40:25 +00:00
Jaap Keuter
3f9ad89606 Updates based on lint output provided by Chris Maynard.
svn path=/trunk/; revision=26010
2008-08-13 21:44:53 +00:00
Stig Bjørlykke
675db70a1b Rewrote to avoid prohibited API strcpy.
svn path=/trunk/; revision=26006
2008-08-13 15:23:15 +00:00
Anders Broman
9aa1b43f9c From Eric Travis:
Enhancement providing parsing capability for TCP Options 20 & 21 (IANA assigned).

svn path=/trunk/; revision=25991
2008-08-12 21:08:46 +00:00
Anders Broman
832a507988 From Gerhard Olsson :
tcp_dissect_pdus will not req one_more_segm when tvb<fixed_len

svn path=/trunk/; revision=25869
2008-07-30 12:23:18 +00:00
Tomas Kukosa
edbcca785f Fix TCP desegmentation when minimal header spans multiple segments.
svn path=/trunk/; revision=25814
2008-07-24 06:33:23 +00:00