Commit Graph

59 Commits

Author SHA1 Message Date
Jeff Morriss aaec1d956f Replace a (small) for loop with a memset(). Don't memset() the entire sctp_info.tvb array--it contains 2k pointers (8k or 16k of memory)--each time we start dissecting a frame. This speeds up loading a capture file full of SCTP packets by 6-8%.
svn path=/trunk/; revision=23118
2007-10-09 18:58:34 +00:00
Michael Tüxen 9bfcf2b471 Change the ADDIP error causes as changed by IANA for RFC 5061 publication.
svn path=/trunk/; revision=22875
2007-09-14 21:30:26 +00:00
Jeff Morriss c360b112a1 If the whole packet was not captured (e.g., due to the snapshot length), do not attempt to verify the checksum of the packet. Rather, inform the user that we didn't/couldn't verify the checksum.
svn path=/trunk/; revision=22826
2007-09-07 21:46:31 +00:00
Jeff Morriss 3f52508caf Count the number of TSNs gap-acked in a SACK. Warn the user (with an Expert info) if the number is greater than, say, 100. Also reindent large portions of the sack dissector function to make it readable.
svn path=/trunk/; revision=22814
2007-09-06 21:57:56 +00:00
Jeff Morriss 1af3ee0936 Check COL_INFO before calling col_set_fence(..., COL_INFO) rather than COL_PROTOCOL
svn path=/trunk/; revision=22408
2007-07-26 19:27:22 +00:00
Anders Broman cbb9271a0a Make it possible to "decode as" NBAP over SCTP, update IANA registered PPID's
for SCTP.

svn path=/trunk/; revision=21927
2007-05-24 20:42:55 +00:00
Gerald Combs 965fda1995 Add NULL dereference checks. Fixes Coverity CID 241.
svn path=/trunk/; revision=21724
2007-05-08 16:18:59 +00:00
Luis Ontanon ddddf2d668 Have retransmissions added only once per retransmitted packet.
svn path=/trunk/; revision=21232
2007-03-27 22:41:28 +00:00
Ulf Lamping 411249419d fix some more warnings (type casts)
svn path=/trunk/; revision=21141
2007-03-23 00:51:21 +00:00
Luis Ontanon e9bb1d5670 Avoid calling ep_alloc for 0 bytes.
svn path=/trunk/; revision=21121
2007-03-22 21:51:56 +00:00
Jeff Morriss 62c61a071c Add tracking of retransmitted TSNs. That is, for a TSN that we found was
retransmitted, add items to its tree describing those retransmissions (frame
where the retransmission is and RTO).  Limit this to 100 retransmissions to
avoid running out of memory in pathological cases.

This adds the filters "sctp.retransmitted" (TSNs that were retransmitted)
and "sctp.retransmitted_count" (count of number of times the TSN was
retransmitted).

The RTO is intentionally not added to the retransmitted TSN tree as it is
already added to the retransmission(s).  The RTO is displayed, however.

svn path=/trunk/; revision=21081
2007-03-21 04:48:32 +00:00
Ronnie Sahlberg 9cd50d5064 remove some compiler warnings about unused parameters
svn path=/trunk/; revision=21070
2007-03-20 14:50:15 +00:00
Jeff Morriss 93af79c80d - Set hf_sctp_acked and hf_sctp_rtt as generated.
- Change "sctp.retransmitted" to "sctp.retransmission" since that field
  is set on messages that are retransmissions, not messages that were
  retransmitted.
- Change some formatting to make it more consistent.

svn path=/trunk/; revision=21065
2007-03-19 10:34:26 +00:00
Jörg Mayer fb820f0a07 GCC warning fixes
epan/dissectors/
packet-bctp.c:
	no newline at end of file
packet-epl.c:
	C++ style comments are not allowed in ISO C90
packet-sccp.c:
	missing initializer
packet-sccp.h:
	comma at end of enumerator list
packet-sctp.c:
	suggest parentheses around assignment used as truth value
packet-vnc.c:
	control reaches end of non-void function
	pointer targets in passing argument 1 of 'g_strtod' differ in
		signedness
	pointer targets in passing argument 3 of 'vnc_client_to_server'
		differ in signedness
gtk/
main.c:
	C++ style comments are not allowed in ISO C90
u3.h:
	function declaration isn't a prototype

Other (trivial) stuff
packet-sccp.h:
	Add svn properties


svn path=/trunk/; revision=21011
2007-03-09 13:14:09 +00:00
Michael Tüxen da56836f74 Add HMAC Algo constants.
svn path=/trunk/; revision=21008
2007-03-09 10:49:23 +00:00
Luis Ontanon b6ab56f26d fix a syntax error on the last check-in...
svn path=/trunk/; revision=21000
2007-03-08 00:43:08 +00:00
Luis Ontanon 8c8595e496 avoid using an "uninitialized" start variable on gap blocks
svn path=/trunk/; revision=20999
2007-03-08 00:37:07 +00:00
Luis Ontanon cf0379278b in TSN tracking: handle the TSN rollover.
I'll keep TSN tracking disabled by default, as it slows down dissection significantly and eats tons of memory!

svn path=/trunk/; revision=20998
2007-03-08 00:18:25 +00:00
Luis Ontanon c0a373d26b + get the Acks in the block where they belong.
+ change the ack tree root to be the TSN being acked and have the chunk frame and rtt under it.

still to do: TSN wrap

svn path=/trunk/; revision=20981
2007-03-06 00:48:46 +00:00
Luis Ontanon 1b65a2e986 + Quick and dirty fix in association matching code to avoid a vtag==0 (init) to "curse" an entire association. Yes, it has to be reworked... but I need it for debugging purposes.
+ Add the fields sctp.sack_gap_block_start_tsn and sctp.sack_gap_block_end_tsn so that one can filter over a tsn ack acked by a gap block.


svn path=/trunk/; revision=20976
2007-03-05 22:47:40 +00:00
Luis Ontanon e8c5d47e26 SCTP TSN analysis part 1.
Up and running.
As it is analysis will stop at TSN rollover (0xffffffff->0x00000000).

And It will start to misbehave when a TSN is seen again in the same half association (that's a case where an out-of-memory error will probably had happened before).

It still needs testing.

svn path=/trunk/; revision=20947
2007-02-28 14:09:25 +00:00
Jeff Morriss 01a71d7277 Some minor readability enhancements to the (still disabled) sequence analysis: use PROTO_ITEM_SET_GENERATED() on all the new fields and change hf_sctp_dup_ack's description to indicate that it's showing you the frame number of the previous ack.
svn path=/trunk/; revision=20942
2007-02-27 10:02:28 +00:00
Luis Ontanon 83682b6a5f I'm checking in what I got so far for TSN analysis.
It's disabled. To enable uncomment the preference, recompile and enable it from preferences.

I checking it in because I need it as a reference.

svn path=/trunk/; revision=20929
2007-02-25 18:22:08 +00:00
Luis Ontanon 46956317e2 I unadvertedly checked in this one, it adds tsn analysis to sctp which is still broken (although it is disabled by default).
Revert to previous version.

svn path=/trunk/; revision=20909
2007-02-23 21:12:25 +00:00
Luis Ontanon 4211d0dba2 fix some bugs introduced in the latest releases and add value_strings for param, evt, sig and stat ids s well as "sub-parameters".
svn path=/trunk/; revision=20908
2007-02-23 20:57:22 +00:00
Bill Meier 3dbfb21cf9 packet-afp: remove unneeded line of code;
packet-sctp: register sctp dissector since packet-lge-monitor wants to call same


svn path=/trunk/; revision=20850
2007-02-19 01:27:16 +00:00
Michael Tüxen fc753d3f70 Provide a correct argument to g_hash_table_foreach_remove.
svn path=/trunk/; revision=20761
2007-02-09 23:29:57 +00:00
Michael Tüxen 63ff1f4bc1 Fix whitespaces.
svn path=/trunk/; revision=20760
2007-02-09 23:14:15 +00:00
Ronnie Sahlberg f4fcbc9e14 use se_alloc() instead of g_malloc() to allocate storage for the key to the hash table.
this allows us to use g_hash_table_new() instead of g_hash_table_new_full() and thus make it compileable under gtk1.2


this should probably be completely converted into se_tree's and se_alloc to completely remove the hashtable altogether



svn path=/trunk/; revision=20758
2007-02-09 21:03:41 +00:00
Michael Tüxen f20299ba4b Add support for SCTP reassembly from Robin Seggelmann.
You must enable this feature via Edit/Preferences/Protocols/SCTP

svn path=/trunk/; revision=20756
2007-02-09 16:38:57 +00:00
Michael Tüxen 30fac686ac Adopt the chunk list parameter name to the notion used in the next version
of the ID.

svn path=/trunk/; revision=18812
2006-08-01 18:06:35 +00:00
Ronnie Sahlberg 0911f08cb2 change a parenthesis
svn path=/trunk/; revision=18570
2006-06-24 05:39:38 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Michael Tüxen 083cda3e63 Update PPIDs to latest IANA regsitration status.
svn path=/trunk/; revision=17819
2006-04-05 20:24:48 +00:00
Michael Tüxen fd0640e930 Update to draft-ietf-tsvwg-sctp-auth-02.txt.
svn path=/trunk/; revision=17701
2006-03-23 00:36:35 +00:00
Michael Tüxen af27e7c520 Add support for
- http://www.ietf.org/internet-drafts/draft-stewart-sctpstrrst-01.txt

svn path=/trunk/; revision=16626
2005-11-29 23:09:01 +00:00
Guy Harris b7b80d94be Move a pile of protocol-related headers from the top-level source
directory to the epan directory.  Some of them should perhaps ultimately
be moved to epan/dissectors, if they pertain only to stuff exported by a
particular dissector.

Fix Gerald's e-mail address in files we're moving.

svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
Michael Tüxen fec9c0ec2b In now supports also:
- http://www.ietf.org/internet-drafts/draft-ietf-tsvwg-sctpimpguide-15.txt
  - http://www.ietf.org/internet-drafts/draft-ietf-tsvwg-addip-sctp-13.txt
  - http://www.ietf.org/internet-drafts/draft-stewart-sctp-pktdrprep-02.txt
  - http://www.ietf.org/internet-drafts/draft-ietf-tsvwg-sctp-auth-01.txt
  - http://www.ietf.org/internet-drafts/draft-ladha-sctp-nonce-02.txt


svn path=/trunk/; revision=15765
2005-09-12 06:24:02 +00:00
Michael Tüxen 200571c143 Fix a typo.
svn path=/trunk/; revision=15044
2005-07-24 19:58:05 +00:00
Michael Tüxen 3b62802faa Use brackets instead of parentheses for the checksum info, which is generated.
svn path=/trunk/; revision=14833
2005-07-02 21:16:17 +00:00
Michael Tüxen d8ff9be3ba Add support for draft-ietf-tsvwg-sctp-auth-00.txt.
svn path=/trunk/; revision=14686
2005-06-17 21:02:40 +00:00
Guy Harris f17c1822cc Re-parenthesize an expression, to squelch a compiler warning.
svn path=/trunk/; revision=14312
2005-05-05 10:00:29 +00:00
Michael Tüxen b4af92846c Provide an indication to taps if the verification tag is reflected.
svn path=/trunk/; revision=14278
2005-05-02 20:45:22 +00:00
Michael Tüxen e0d7600bb5 Fix chunk length handling. Go back to initial concept that
the chunk_length always is the length indicated in the packet header.

svn path=/trunk/; revision=14258
2005-05-01 21:00:26 +00:00
Michael Tüxen 1de67556ea Fix the handling of the length parameter in the DATA chunk.
This is a quick fix. A systematic follows...

svn path=/trunk/; revision=13978
2005-03-30 16:16:07 +00:00
Guy Harris ff24a4ecc8 Update the URL for draft-stewart-sctp-pktdrprep to the -02 draft.
Clean up indentation.

Have the main loop for dissecting chunks check that the chunk size is
large enough for the chunk header, and have it pass the chunk size,
minus the size of the chunk header, to dissectors for particular chunk
types.  Make those dissectors check that value to make sure it's large
enough for any fixed-length portion before subtracting the length of
that portion and using the result as a remaining data length.

svn path=/trunk/; revision=13924
2005-03-26 21:31:13 +00:00
Ulf Lamping 63cd52a5ae buildbot bugfix: another (un-)signed one
svn path=/trunk/; revision=13911
2005-03-26 01:23:39 +00:00
Michael Tüxen 3aa6383210 From Oleg Terletsky: Support for SCTP chunk counters. Modified to handle bundling correctly.
svn path=/trunk/; revision=13823
2005-03-20 12:02:00 +00:00
Michael Tüxen 10edbd81c3 Enable details in protocol tree by default like TCP and UDP.
svn path=/trunk/; revision=13592
2005-03-05 00:51:33 +00:00
Michael Tüxen a88d115a38 Show prot numbers in protocol tree, if wanted. Suggested by Jeff Morris.
svn path=/trunk/; revision=13518
2005-02-25 21:03:48 +00:00