Commit Graph

141 Commits

Author SHA1 Message Date
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jakub Zawadzki dee4443809 Add data parameter to dissector_try_heuristic
svn path=/trunk/; revision=44871
2012-09-11 08:26:48 +00:00
Michael Mann 14a6d40267 Use capture scoped memory for hash table functionality
svn path=/trunk/; revision=44559
2012-08-18 02:55:18 +00:00
Michael Tüxen e7a645ad9f Update SCTP PPIDs.
This also fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7635

svn path=/trunk/; revision=44500
2012-08-14 20:31:49 +00:00
Bill Meier 638d74d43f Use val_to_str_const() where appropriate;
Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc

svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
Jakub Zawadzki b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Jeff Morriss 96a3da3e05 Use separate filters for the RTT found on a SACK and the RTT found on a
DATA chunk: having them in both places is helpful when looking at the
messages but having them separate is helpful when graphing the RTTs.

svn path=/trunk/; revision=43406
2012-06-20 13:30:07 +00:00
Jeff Morriss d4fdd6ad52 Only propose decoding PPID 0 if that PPID is in the currently-selected frame.
(I used PPID 0xffffffff as an end-of-list marker so that PPID can no longer
be used in this dialog; if someone starts using that PPID then we'll have
to put a count of PPIDs in pinfo.)

svn path=/trunk/; revision=42991
2012-06-01 21:18:59 +00:00
Michael Tüxen e62bb03dbc Fix a typo which resulted in displaying the wrong SCTP stream reset response
sequence number.

svn path=/trunk/; revision=42445
2012-05-05 21:06:16 +00:00
Jörg Mayer 40f379ea49 Fix:
trunk/epan/dissectors/packet-sctp.c: In function ‘dissect_add_outgoing_streams_parameter’:
trunk/epan/dissectors/packet-sctp.c:1175:9: error: variable ‘length’ set but not used [-Werror=unused-but-set-variable]
trunk/epan/dissectors/packet-sctp.c: In function ‘dissect_add_incoming_streams_parameter’:
trunk/epan/dissectors/packet-sctp.c:1195:9: error: variable ‘length’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=42025
2012-04-11 19:16:04 +00:00
Michael Tüxen 8421176e01 Add support for RFC 6525.
svn path=/trunk/; revision=41874
2012-03-31 22:01:36 +00:00
Michael Tüxen 34d5241775 Add support for SSH over SCTP.
svn path=/trunk/; revision=41556
2012-03-15 08:23:26 +00:00
Jeff Morriss 89cfdc3559 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3315 -
make Save-As/Displayed/All-Packets save not only the displayed packets but
also any other packets needed (e.g., for reassembly) to fully dissect the
displayed packets.

This works only for the "All packets" case; choosing only the Selected packet,
the Marked packets, or a range of packets would require actually storing which
packets depend on which (too much memory) or going through the packet list many
times (too slow).  Also, this behavior is always the case: you can't save the
displayed packets without their dependencies (I don't see why this would be
desirable).

So far this is done for SCTP and things using the reassembly routines (TCP has
been tested).

The Win32 dialog was modified but hasn't been tested yet.

One confusing aspect of the UI is that the Displayed count in the Save-As
dialog does not match the number of displayed packets.  (I tried renaming the
button "Displayed + Dependencies" but it looked too big.)  The tooltip tries
to explain this and the fact that this works only in the All-Packets case;
suggestions for improvement are welcome.


Implementation details:

Dissectors (or the reassembly code) can list frames which were needed to
build the current frame's tree.  If the current frame passes the display
filter then each listed frame is marked as "depended upon" (this takes up the
last free frame_data flag).

When performing a Save-As/Displayed/All-Packets then choose packets which
passed the dfilter _or_ are depended upon.

svn path=/trunk/; revision=41216
2012-02-28 03:19:49 +00:00
Jaap Keuter caa30d0c3d From Thomas Dreibholz:
ASCONF and ASCONF_ACK chunks have a "Sequence Number" field (RFC 5061, 4.1.1
and 4.1.2). The dissector wrongly calls it "Serial number". The attached patch
fixes this issue. 

svn path=/trunk/; revision=40140
2011-12-09 22:56:25 +00:00
Chris Maynard 647c5c0b27 packet_info's in_error_pkt is now a bitfield like in_gre_pkt.
svn path=/trunk/; revision=39764
2011-11-08 18:39:11 +00:00
Jeff Morriss cc4fe5789b Add an expert info if we found the checksum to be bad.
Add the checksum info to the tree even when !tree so that the expert_info
summary... "icon"... in the lower-left corner is correct.

svn path=/trunk/; revision=39460
2011-10-18 16:13:12 +00:00
Bill Meier 126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +00:00
Bill Meier 67ee5049d4 Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39328
2011-10-10 00:39:31 +00:00
Bill Meier 94f36ca4ff Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
   FT_BYTES
   FT_IPV6
   FT_IPXNET
   FT_OID

Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39260
2011-10-04 22:44:31 +00:00
Anders Broman f08f09ecd4 From Michael Mann:
Condense all SCTP CRC routines to wsutil/crc32.[ch]. Also made
crc32_ccitt_table not explicitly accessible (must use crc32_ccitt_table_lookup).

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

svn path=/trunk/; revision=39233
2011-10-03 04:53:17 +00:00
Stig Bjørlykke 5359494b1f Second try to move crc routines to libwsutil.
This time keep the tvb routines in epan.

Now we can use common crc routines outside epan.

svn path=/trunk/; revision=38810
2011-08-31 09:00:54 +00:00
Stig Bjørlykke 71f903b956 Revert r38800, as the crc routines contains some tvb functions.
svn path=/trunk/; revision=38803
2011-08-30 14:17:40 +00:00
Stig Bjørlykke 4132d40e50 Move all crc routines to libwsutil.
This way we can use the crc routines in wiretap.

svn path=/trunk/; revision=38800
2011-08-30 13:46:42 +00:00
Bill Meier 5db6069274 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38085
2011-07-18 15:52:16 +00:00
Bill Meier 01a13cc082 Don't assign to an unused 'proto item *': Coverity 1033 & 906
svn path=/trunk/; revision=37308
2011-05-19 20:21:08 +00:00
Stig Bjørlykke 3c53c25a0c Corrected equality check in frag_equal().
Found by clang.

svn path=/trunk/; revision=36685
2011-04-17 18:49:58 +00:00
Jeff Morriss e6ce1793e2 Don't pass retransmitted chunks to subdissectors. Instead just mark them as
retranmissions (in COL_INFO).  (Obviously this only works if TSN analysis is
enabled.)

This should make it more obvious to users which chunks are retransmissions and
will help avoid confusing the subdissector(s).

svn path=/trunk/; revision=36159
2011-03-07 19:23:55 +00:00
Michael Tüxen 7154ed5689 Obtained from Thomas Dreibholz: Update SCTP PPIDs.
svn path=/trunk/; revision=35895
2011-02-10 12:54:20 +00:00
Michael Tüxen df6d8f49f9 Add expert info related to gap ack blocks.
Based on a patch submitted by Thomas Dreibholz.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5616

svn path=/trunk/; revision=35672
2011-01-26 21:21:16 +00:00
Jeff Morriss a167206685 Introduce, and start using, tvb_ip_to_str() and tvb_ip6_to_str(). These
do the same as the non-tvb equivalents but take a TVB and an offset instead
of a pointer to an array of bytes.

Their purpose is to prevent (many) dissectors from doing:
ip_to_str(tvb_get_ptr(...)).

(About the names and the location: I like the names as they are but the names
imply that they should live in tvbuff.c.  That would make some sense but
I didn't want to pull to_str.h into tvbuff.c...)

svn path=/trunk/; revision=35519
2011-01-13 15:53:30 +00:00
Jeff Morriss 1c5d75288c Don't attempt to reassemble short (reported_len > len) chunks.
svn path=/trunk/; revision=35486
2011-01-11 22:41:19 +00:00
Jeff Morriss 6e7d85a92c Don't store message fragments whose length is 0: there's no point. (Otherwise
fragment->len was left unitialized.)

Also (unrelated): save a couple of calls to tvb_reported_length() since the
value is already stored in a variable.

svn path=/trunk/; revision=35485
2011-01-11 22:36:31 +00:00
Jeff Morriss d74bd3ce42 Don't pass the result of tvb_get_ptr() into a %s format string: the string may
not be NULL terminated.  Use tvb_get_ephemeral_string() instead.

svn path=/trunk/; revision=35375
2011-01-05 15:11:32 +00:00
Jeff Morriss d298b79628 Use reported length (instead of the captured length) when dissecting error
causes (should have been in rev 35366).

When generating TVB subsets, limit the subset's backing and reported lengths to
the (captured) TVB length and the reported TVB length, respectively.

This allows us to dissect most of the packet in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5546
before asserting out.

It also yields similar better behavior when the capture is limited by a
snapshot length.

svn path=/trunk/; revision=35368
2011-01-05 03:40:02 +00:00
Jeff Morriss 25485e9b3e When generating a tvb subset for chunks, parameters, and error causes, set the:
- "reported length" to be minimum of the entity's length (taken from the
   packet) or the reported length of the TVB.
 - "backing length" to be the minimum of the reported length (above) or the
   (captured) length of the TVB.

This prevents tvb_new_subset() from generating an exception if the entity's
length (in the packet) is bogus (bigger than what's in the TVB) which allows
dissection to continue to a point where we can show the user what the problem
is.

When dissecting chunks, add an expert info if the item's length is bigger than
what was on the wire (the reported length).  (The same could also be done for
parameters and error causes.)

This makes captures like that in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5546
easier to understand.

It also starts getting this dissector using the reported length instead of the
(captured) TVB length (there's more to be done with other tvb subsets).

svn path=/trunk/; revision=35366
2011-01-04 23:07:32 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Jaap Keuter 62067368a0 Separate out/update comment block.
Update IANA assignments.
Use available checksum routines.
Some cleanup and use of convenience macros.

svn path=/trunk/; revision=34922
2010-11-17 07:42:32 +00:00
Jeff Morriss a179cfb90a Catch exceptions from subdissectors, even when we're not handing the
subdissector the first fragment of a fragmented message so that an exception
in the first chunk doesn't abort dissection of subsquent chunks in the frame.

Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

svn path=/trunk/; revision=34420
2010-10-08 01:05:33 +00:00
Bill Meier dac0bf77ed Fix cases where the type of a for loop variable is smaller than the type of the "end" variable.
In some cases the usage may have been benign since it can be seen by code inspection that the maximum value of the end variable can't exceed the maximum value of the loop variable.
However, on general principles, all the usages have been fixed.

svn path=/trunk/; revision=33692
2010-08-02 13:09:01 +00:00
Michael Tüxen 690097963e Update SCTP PPIDs.
svn path=/trunk/; revision=33225
2010-06-14 21:49:23 +00:00
Guy Harris 1b444c55fd Refer to the endianness arguments as "encoding" rather than
"representation" - we already use "representation" to refer to the text
representation of fields.

Change some routines with an endianness argument to make it a
representation argument instead; 

svn path=/trunk/; revision=32929
2010-05-24 06:06:17 +00:00
Guy Harris 998677339e Create a new REP_NA value for fields where there are no representations
from which to choose; use that for protocol fields in some protocols
(modify the CORBA generator to use it, and manually update the generated
CORBA dissectors accordingly).

svn path=/trunk/; revision=32777
2010-05-13 00:20:40 +00:00
Guy Harris 308bb550da Instead of using private #defines for the last argument to
proto_tree_add_item(), use the new REP_BIG_ENDIAN and REP_LITTLE_ENDIAN
values.

Use those #defines in variables that represent the byte order, as well.

svn path=/trunk/; revision=32776
2010-05-12 23:45:16 +00:00
Bill Meier 10ffd14b8f Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)
svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Anders Broman fd887ba442 Add PPID 28 IRCP
svn path=/trunk/; revision=32686
2010-05-06 12:54:43 +00:00
Michael Tüxen c273169cbd Display correct chunk type for unknown chunks.
svn path=/trunk/; revision=31522
2010-01-13 21:31:24 +00:00
Anders Broman d5cfd0edc9 - Remove check_col.
- Make x2ap work.

svn path=/trunk/; revision=30746
2009-10-28 06:18:05 +00:00
Anders Broman cd8924f759 Update SCTP ppids, fix a faulty #define.
svn path=/trunk/; revision=30744
2009-10-28 05:09:32 +00:00
Bill Meier 92307f0dda (Trivial) Fix a typo in a comment.
svn path=/trunk/; revision=30574
2009-10-16 15:28:21 +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