Commit Graph

170 Commits

Author SHA1 Message Date
Chris Maynard 606cb44a24 From Claes Nasten, submitted in bug 2952:
Here's a patch updating the decoding of write request/responses, decodes the 16
unknown bytes in write requests, decodes the 8 unknown bytes in write responses
and renames length to count as per the SMB2 spec.

svn path=/trunk/; revision=34760
2010-11-03 16:40:41 +00:00
Bill Meier f543357d14 Use value_string_ext fcns to access certain value_string arrays.
svn path=/trunk/; revision=34692
2010-10-29 20:22:02 +00:00
Jeff Morriss 0ff5638f37 Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34227
2010-09-23 21:46:31 +00:00
Jeff Morriss 381664535b As suggested by Kovarththanan Rajaratnam in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 :
Clean up hf fields some more: mostly removing leading and trailing spaces from names and blurbs.

svn path=/trunk/; revision=34165
2010-09-21 03:14:49 +00:00
Stig Bjørlykke bd3906e8d6 From yami via bug 3310:
SMB2 create context response fix.

svn path=/trunk/; revision=34070
2010-09-06 19:59:15 +00:00
Stig Bjørlykke 67a4451239 Apply the quick fix from bug 2952.
And it's true, this dissector really needs an overhaul!

svn path=/trunk/; revision=34048
2010-09-02 21:30:54 +00:00
Guy Harris 9a45206220 Dissect SMB_FILE_ATTRIBUTES, when used as file attributes rather than
search attributes, as a 16-bit quantity, with only the bits specified by
section 2.2.1.2.4 of [MS-CIFS].  Use dissect_file_ext_attr() in all
cases where we're dissecting SMB_EXT_FILE_ATTR, as specified by section
2.2.1.2.3 of [MS-CIFS].

svn path=/trunk/; revision=33753
2010-08-10 07:04:20 +00:00
Jeff Morriss 729de1a635 As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html
(as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 :

Write a new convenience routine for finding a conversation and, if it is not
found, create it.  The frame number and addresses are taken from pinfo (as is
the common case).

Use this function in a bunch of dissectors.

svn path=/trunk/; revision=32790
2010-05-13 18:28:34 +00:00
Ronnie Sahlberg 7fcf9485e0 From Metze
Subject: [PATCH 2/7] packet-smb2.c: fix handling of compounded 
SMB2 PDUs


svn path=/trunk/; revision=31793
2010-02-04 23:14:21 +00:00
Guy Harris 8e236e55de For fields of type FT_ABSOLUTE_TIME, have the "display" value be one of
ABSOLUTE_TIME_LOCAL or ABSOLUTE_TIME_UTC, indicating whether to display
the date/time in local time or UTC. (int)ABSOLUTE_TIME_LOCAL ==
(int)BASE_NONE, so there's no source or binary compatiblity issue,
although we might want to eliminate BASE_NONE at some point and have the
BASE_ values used with integral types start at 0, so that you can't
specify BASE_NONE for an integral field.

svn path=/trunk/; revision=31319
2009-12-19 03:17:44 +00:00
Stig Bjørlykke 7aa873dae6 A fix for bug 4301:
Check sip->extra_info for SMB_EI_NTI before usage.

svn path=/trunk/; revision=31187
2009-12-07 15:07:38 +00:00
Ronnie Sahlberg 0c00fbe644 we must create a fake dcerpc_call_value strucure before we call into the
dcerpc helpers


svn path=/trunk/; revision=30288
2009-10-04 08:27:17 +00:00
Kovarththanan Rajaratnam 65c53fedb6 Don't guard col_append_str with check_col
svn path=/trunk/; revision=30125
2009-09-24 20:00:21 +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
Stig Bjørlykke 44d725fac2 Header field cleanup.
svn path=/trunk/; revision=29090
2009-07-14 09:33:54 +00:00
Anders Broman be27e0d5b4 From Chris Costa:
SMB2 Error Response doesn't decode properly.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3609

svn path=/trunk/; revision=29083
2009-07-13 17:40:31 +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
Guy Harris cf91fdf16b Have tap listeners specify whether the "packet" routine requires
a protocol tree;

	the column values.

This includes stats-tree listeners.

Have the routines to build the packet list, and to retap packets, honor
those requirements.  This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.

This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.

While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.

Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.

Clean up some indentation and some gboolean vs. gint items.

svn path=/trunk/; revision=28645
2009-06-05 22:42:47 +00:00
Jaap Keuter 877c62b2bf From Reinhard Speyerer:
This patch fixes several misspellings/typos in Wireshark SVN revision 28201.

svn path=/trunk/; revision=28227
2009-05-01 07:20:47 +00:00
Bill Meier 7172127412 #include reassemble.h not req'd
svn path=/trunk/; revision=27911
2009-03-31 12:08:44 +00:00
Bill Meier 1391addb5a Modified version of a fix from Christopher Maynard as reported in bug 2822.
svn path=/trunk/; revision=26054
2008-08-21 18:51:17 +00:00
Ronnie Sahlberg 861761ef7c dissect te lock structures in the LOCK request
svn path=/trunk/; revision=25378
2008-05-26 02:51:36 +00:00
Ronnie Sahlberg bf7660d271 add more dissection of FIND infolevels
update the BREAK dissection


svn path=/trunk/; revision=25371
2008-05-23 11:31:01 +00:00
Ronnie Sahlberg af748dc493 add dissectors for some more FIND info levels FileBothDirectoryInfo and
FileIdBothDirectoryInfo


svn path=/trunk/; revision=25366
2008-05-23 04:44:23 +00:00
Ronnie Sahlberg e98012570b enhance the FIND dissector
svn path=/trunk/; revision=25365
2008-05-23 04:20:54 +00:00
Ronnie Sahlberg 9aa916dc74 update the dissection of NOTIFY
svn path=/trunk/; revision=25364
2008-05-23 02:51:14 +00:00
Ronnie Sahlberg 60d4c486f9 updte the CLOSE dissector
svn path=/trunk/; revision=25359
2008-05-23 01:28:11 +00:00
Ronnie Sahlberg cdc9669337 update to the ioctl dissector
svn path=/trunk/; revision=25358
2008-05-23 01:07:22 +00:00
Ronnie Sahlberg 425861d446 iupdates to the dissection of READ and LOCK for smb2
svn path=/trunk/; revision=25355
2008-05-23 00:21:58 +00:00
Ronnie Sahlberg d426498171 fixup and improve create
svn path=/trunk/; revision=24327
2008-02-14 06:08:11 +00:00
Ronnie Sahlberg 2d63ba2674 fixum tree disconnect
svn path=/trunk/; revision=24326
2008-02-14 05:15:20 +00:00
Ronnie Sahlberg f8660c6806 fixup tree connect
svn path=/trunk/; revision=24325
2008-02-14 05:13:29 +00:00
Ronnie Sahlberg eb2f7475f2 fixup sessionlogoff
svn path=/trunk/; revision=24324
2008-02-14 04:19:51 +00:00
Ronnie Sahlberg 0d97477e6d fixup sessionsetup
svn path=/trunk/; revision=24323
2008-02-14 04:16:11 +00:00
Ronnie Sahlberg bb9f7a373e update dissection of negprot
svn path=/trunk/; revision=24322
2008-02-14 03:38:29 +00:00
Ronnie Sahlberg d399fc0a1f fixup SMB2 header and decode async commands correctly
svn path=/trunk/; revision=24321
2008-02-14 02:36:43 +00:00
Anders Broman 6226035893 Apply yet another set of the optimization patches:
When offset parameter is 0 replace tvb_bytes_exist() with the faster tvb_length().

On the other hand 
	if (tvb_bytes_exist(tvb, 0, 20)
is more readable than
	if (tvb_length(tvb) >= 20

so only do it in heuristic function

svn path=/trunk/; revision=23412
2007-11-09 06:01:18 +00:00
Anders Broman 1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Jaap Keuter 4c22ba92f9 Flag error
svn path=/trunk/; revision=23218
2007-10-17 18:25:01 +00:00
Ronnie Sahlberg 8fde3b7561 rename dcerpc_smb_store_pol_name to dcerpc_store_polhnd_name
rename dcerpc_smb_fetch_pol  to dcerpc_fetch_polhnd_data and also make 
it take an additional parameter to return the "type" of the policy 
handle, if such a type was stored.

extend the pol_value structure used to track policy handles to also 
store a type to represent what created the policy handle
types could be USER/ALIAS/CONNECT/... etc handles returned from the 
SAMR interface

add a new helper function  dcerpc_store_polhnd_type()

track policy handles between request/responses for dcerpc

update the samr.cnf file to make the samr dissectors for
SetSecurity/QuerySecurity dissect the specific bits for the security 
descriptor correctly based on whether the policy handle refers to a 
CONNECT/DOMAIN/USER/ALIAS or GROUP



svn path=/trunk/; revision=22703
2007-08-28 11:45:08 +00:00
Guy Harris 5a43799a17 Use G_GINT64_MODIFIER, rather than the PRI[douxX]64 macros, for GLib
routines and routines using those routines.  GLib might use different
modifiers for 64-bit quantities than the platform's C library does.

svn path=/trunk/; revision=21990
2007-05-29 18:52:42 +00:00
Ronnie Sahlberg fce276b898 additional smb2 fixes from metze
svn path=/trunk/; revision=21860
2007-05-21 10:19:29 +00:00
Ronnie Sahlberg f4da83544d from metze
improved handling of smb2 errors


svn path=/trunk/; revision=21859
2007-05-21 10:16:21 +00:00
Ronnie Sahlberg 2c0a600046 from metze
prettify dissection of multiple chained smb2 pdus in one frame


svn path=/trunk/; revision=21801
2007-05-16 06:50:19 +00:00
Ronnie Sahlberg 99c98d6c6e when spawning off to the next smb2 pdu in a chain we need to create a
new tvb for it    or else the offset/length calculations for where blobs 
a		next_tvb=tvb_new_subset(tvb, chain_offset, MIN((int)len, 
tvb_length_remaining(tvb, off)), len);
re in the packets are wrong.



svn path=/trunk/; revision=21795
2007-05-15 20:46:45 +00:00
Ronnie Sahlberg 827df92fb1 add dissection of the end_of_chain bit in the header flags
svn path=/trunk/; revision=21794
2007-05-15 20:33:44 +00:00
Ronnie Sahlberg 9498ad3a2d from metze
patch to find and enhancement of extra_info handling


svn path=/trunk/; revision=21793
2007-05-15 20:13:30 +00:00
Ronnie Sahlberg 0977ea7e74 from metze
add support for smb2 chaining

rename sessionsetupandz to sessionsetup


svn path=/trunk/; revision=21792
2007-05-15 20:07:58 +00:00
Ronnie Sahlberg 0eae1cc0bd add dissection of smb1 ioctl data by tying it into the dissectors for
ioctl data that already exists for smb2


svn path=/trunk/; revision=21713
2007-05-07 09:07:29 +00:00