Commit graph

304 commits

Author SHA1 Message Date
Tim Potter
1e85fd9ed5 Modify dissect_nt_sid() function to return a string version of the SID.
Fix all callers to use the new function form.

svn path=/trunk/; revision=7054
2003-01-31 04:11:25 +00:00
Ronnie Sahlberg
48d3d8eb26 SMB RTT statistics for tethereal and ethereal.
SMB RTT statistics are similar to the RTT statistics already supported by ONC-RPC and DCE-RPC.
It will present a table with all seen SMB commands and present the Min/Max and Avg response time in ms.

Transaction2 and NT-Transaction commands are broken out and presented in its own subtables.

tethereal feature is activated with -z smb,rtt    switch
and in ethereal it is activated either through -0z smb,rtt switch or through the Menu.

svn path=/trunk/; revision=6966
2003-01-22 00:40:36 +00:00
Richard Sharpe
3340b685d7 Small fix from Andrew Bartlett to make Is Directory come out right.
svn path=/trunk/; revision=6823
2002-12-31 04:24:18 +00:00
Ronnie Sahlberg
e4633bc783 Update reassemble.c/show_item and all callers to use FT_FRAMENUM for the list of packets corresponding to a reassembled pdu
svn path=/trunk/; revision=6807
2002-12-19 11:22:38 +00:00
Ronnie Sahlberg
54ac42f379 Update packet-smb.c to use the new FT_FRAMENUM type
svn path=/trunk/; revision=6806
2002-12-19 10:31:38 +00:00
Ronnie Sahlberg
6488851a0b Fix for DCERPC detection when carried ontop of SMB.
If we do not see the TreeConnect call when a TID is connected, we did not
know it was a IPC share.
If we do not know what kind of share it is we assume it being a normal one
and thus read/write data to that share is normal file i/o.


Update the dissector so that IF it sees a Transaction SMB carrying PIPE (dcerpc)
then we assume that all other read/write to that TID is also DCERPC.
I.e. we assume the entire TID is IPC.

svn path=/trunk/; revision=6747
2002-12-05 22:15:54 +00:00
Tim Potter
a20ae99262 Only display errors in SMB headers in the COL_INFO field. This gets
rid of the annoying STATUS_BUFFER_OVERFLOW messages when dissecting
large DCERPC responses as a buffer overflow is only a informational
message not an error.

svn path=/trunk/; revision=6632
2002-11-14 23:14:14 +00:00
Guy Harris
1177828349 Use the same ett_ value for all security blobs, regardless of whether
they're raw NTLMSSP or GSS-API.

svn path=/trunk/; revision=6584
2002-11-08 05:51:33 +00:00
Richard Sharpe
e914e4fa6a A small fix to NtCreat&X from Jim McDonough ...
svn path=/trunk/; revision=6562
2002-11-05 19:44:51 +00:00
Guy Harris
07d0032f1c Add a "fragment_add_seq_next()" to reassemble fragments that don't have
sequence numbers or offsets and are thus assumed to be received in order
with no duplicates or dropped fragments (e.g., for NetBIOS Frame, where
802.2 LLC guarantees in-order delivery to NetBIOS with no duplicates or
dropped fragments).

"show_fragment_tree()' and "show_fragment_seq_tree()" don't modify the
"fragment_items" to which the "fit" argument points, so make that
argument a "const fragment_items *".

Make all the "fragment_items" tables "static" (as they're not used
outside the modules defining them) and "const" (as they're not
modified).

Add support for reassembly of NetBIOS fragmented requests and responses.

Get rid of an unnecessary include of "packet-tr.c" in the NetBIOS
dissector, and make its table of dissection function pointers static.

Fix some typos in the AppleTalk and NetBIOS dissectors.

svn path=/trunk/; revision=6491
2002-10-24 06:17:36 +00:00
Richard Sharpe
29eb4e3c65 More pretty-boy stuff for Write&X responses ...
svn path=/trunk/; revision=6307
2002-09-20 07:43:02 +00:00
Richard Sharpe
c2e6d4fcb2 Add more info in the info col for write&X.
svn path=/trunk/; revision=6306
2002-09-20 07:28:20 +00:00
Richard Sharpe
6605085126 Fix the handling of the NTLMSSP blobs in the case when the server asks
for RAW NTLMSSP, but the client actually sends SPNEGO encapsulated NTLMSSP.

svn path=/trunk/; revision=6173
2002-09-04 05:46:02 +00:00
Richard Sharpe
2d8152c072 Further fixes. Properly account for the length of headers. Still some headers
that we do not account for properly, like Octet Strings.

svn path=/trunk/; revision=6152
2002-08-31 07:26:10 +00:00
Richard Sharpe
7dd034e9bf Properly handle raw ntlmssp ...
svn path=/trunk/; revision=6151
2002-08-31 05:31:42 +00:00
Richard Sharpe
284d6547e2 Handle the lack of a security blob in negprot response when raw NTLMSSP is
being used properly.

svn path=/trunk/; revision=6149
2002-08-31 00:12:14 +00:00
Richard Sharpe
f44c41f4ed Add support for raw NTLMSSP blobs when talking to XP etc ...
More to do yet though ...

svn path=/trunk/; revision=6148
2002-08-30 23:49:22 +00:00
Guy Harris
3f4397bbb0 From Ulf Lamping: change some #define names to avoid name collisions on
Windows that cause compiler warnings.

svn path=/trunk/; revision=6129
2002-08-29 19:05:41 +00:00
Richard Sharpe
0934975cc1 Guided by Guy and an examination of RFC2078 and RFC2478, I have added some
comments about what we need to do to get SPNEGO properly implemented.

More work to do.

svn path=/trunk/; revision=6121
2002-08-29 05:26:45 +00:00
Richard Sharpe
e0523f9acb Fix up dissect_file_attributes
svn path=/trunk/; revision=6119
2002-08-29 00:35:55 +00:00
Jörg Mayer
7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Guy Harris
9aaf4916af Expand on a note in a comment.
svn path=/trunk/; revision=6085
2002-08-25 22:57:26 +00:00
Tim Potter
66bc3e597f These guys got lost in a merge. Actually call the gssapi dissector from
the relevant parts of the SMB and DCERPC dissectors.

svn path=/trunk/; revision=6066
2002-08-22 20:04:55 +00:00
Richard Sharpe
4b66eaac73 First part of support for Thursby's Mac extenstions from CIFS2002.
svn path=/trunk/; revision=6058
2002-08-22 06:47:08 +00:00
Guy Harris
1ae796de00 Limit the parameter and data tvbuffs to the actual number of bytes of
parameter and data, so the LANMAN RAP pipe dissector, for example,
doesn't get confused and think there is an auxiliary data descriptor in
the parameters when there isn't.

Note that in at least one Negotiate Protocol reply it looks as if a
Unicode domain name might've been aligned.

svn path=/trunk/; revision=6017
2002-08-19 10:53:21 +00:00
Ronnie Sahlberg
159e4ff083 Added server name to negprot reply and fixed a pointer deferral problem.
svn path=/trunk/; revision=5980
2002-08-13 02:14:39 +00:00
Guy Harris
2cfb231081 From Devin Heitmueller: dissect NTLMSSP authentication messages, and handle
the flags field in NTLMSSP messages as a 32-bit field.

Make "get_unicode_or_ascii_string()" take a "Unicode or not" flag rather
than a "packet_info *" as an argument, make it not static, and move it
to "packet-smb-common.c", so that it can be used by the SMB dissector
and the NTLMSSP dissector.  Also get rid of some _U_'s that are applied
to arguments that are, in fact, used.

svn path=/trunk/; revision=5976
2002-08-10 21:15:37 +00:00
Tim Potter
7dfb105011 Added DOS error 259 - no more items.
svn path=/trunk/; revision=5962
2002-08-07 00:48:53 +00:00
Guy Harris
6653e18eb2 Typo fix.
svn path=/trunk/; revision=5959
2002-08-06 19:02:24 +00:00
Jörg Mayer
173fe5aef4 Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.

svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
Ronnie Sahlberg
af6da1a420 Changed the SMB dissector to put ALL command PDUs in one SMB in the summary
line, separated by ;

It only prints "Request"/"Response" for the first command to save space

svn path=/trunk/; revision=5907
2002-07-27 05:03:53 +00:00
Ronnie Sahlberg
0fa3c02231 If conversations have already been created in lower layers, say TCP before
SMB sees the PDU, then SMB would forget to create the proper state variables and crash.

SMB is changed to split the operation into
1, only create a conversation if it needs to. (as before)
2, detect if it needs to create the si.ct state variables independant of
whether smb also created a conversation or not.

Without this patch and with changes to say TCP to create conversations ethereal would crash at the first packet the SMB dissector would see.

svn path=/trunk/; revision=5906
2002-07-27 03:18:29 +00:00
Guy Harris
ca637b4413 From Prabhakar Krishnan: add item to SMB protocol tree for time between
request and response.

svn path=/trunk/; revision=5895
2002-07-20 23:14:39 +00:00
Tim Potter
784204a500 Fixed up some warnings.
svn path=/trunk/; revision=5862
2002-07-13 04:32:14 +00:00
Guy Harris
4f9508837a Add "show_fragment_seq_tree()", which is like "show_fragment_tree()",
but for stuff reassembled with "fragment_add_seq()" or
"fragment_add_seq_check()".

Add a "fragment tag" string to the "fragment_items", so that packets
with fragmentation errors can be properly flagged as having "Illegal
fragments" or "Illegal segments" depending on the term used with the
protocol in question.

Make all the dissectors that can use "show_fragment_tree()" or
"show_fragment_seq_tree()", and don't already use them, do so.

svn path=/trunk/; revision=5644
2002-06-07 10:11:41 +00:00
Ronnie Sahlberg
31823cb851 Added show_fragment_tree() to reassemble. This function will do the common
task of creating a fregment tree for the fragmented packets.
Having this identical code to create this tree in every dissector that does
PDU reassembly is a huge waste and duplication of code.

Updated IP, SMB and DCERPC to use the new function.

svn path=/trunk/; revision=5626
2002-06-05 11:21:49 +00:00
Guy Harris
392a7dfc04 Get rid of the "data_src" member of the "frame_data" structure; put it
in the "packet_info" structure instead, as we don't need a pointer for
every single frame in the capture file, just for each frame for which we
currently have an open "epan_dissect_t".

svn path=/trunk/; revision=5614
2002-06-04 07:03:57 +00:00
Ronnie Sahlberg
c9f2880cff Another small DCERPC interface from the winsows world implemented. TAPI.
svn path=/trunk/; revision=5608
2002-06-02 12:32:10 +00:00
Guy Harris
1504346601 SMB 0x31 is "Close And Tree Disconnect", not "Close And Tree Discover",
and it looks like "Close" (it's a close that also disconnects the tree
used for the SMB).

svn path=/trunk/; revision=5603
2002-05-30 11:29:38 +00:00
Guy Harris
2a8dfde425 Display unsigned quantities with "%u".
svn path=/trunk/; revision=5592
2002-05-29 19:55:55 +00:00
Guy Harris
37c5eef9cb Put back the stuff to dissect the last 2 bytes of
TRANS2_SET_FILE_INFORMATION parameters as reserved.

Change/add comments to reflect information from Microsoft Networks SMB
File Sharing Protocol Extensions Version 3.0, Document Version 1.11,
July 19, 1990.

svn path=/trunk/; revision=5568
2002-05-26 09:47:47 +00:00
Guy Harris
130b2e755a Fix "dissect_unknown()" to properly step through the word and byte
parameters.

svn path=/trunk/; revision=5567
2002-05-26 01:42:48 +00:00
Guy Harris
83dde747ff Put in some additional information from:
Microsoft Networks SMB File Sharing Protocol Extensions Version
	2.0, Document Version 3.3, November 7, 1988;

	Microsoft Networks SMB File Sharing Protocol Extensions Version
	3.0, Document Version 1.11, July 19, 1990.

svn path=/trunk/; revision=5566
2002-05-26 01:30:05 +00:00
Guy Harris
e2a33ae644 Add messaging SMBs.
Fix a typo.

svn path=/trunk/; revision=5563
2002-05-25 12:33:59 +00:00
Ronnie Sahlberg
c33e33fb7e Additions to the MAPI dissector. Function 02 for MAPI.
The function request/call are dissected but the main body of the function
in/out parameters consists of a unidimensional conformant and varying array of bytes which content is encrypted/obfuscated.
Whoever can tell me how to decrypt/unobfuscate these bytes will get
a case of VB next time in Sydney.

svn path=/trunk/; revision=5532
2002-05-23 12:23:29 +00:00
Guy Harris
529e38321f From Andrew Esh: support for additional interest levels in
TRANS2_QUERY_FS_INFORMATION, and fix handling of level 1022 to treat the
file name as always being in Unicode.

svn path=/trunk/; revision=5494
2002-05-16 23:36:43 +00:00
Guy Harris
870c706685 From Andrew Esh: support for interest level 1003 and 1007 in
TRANS2_QUERY_FS_INFORMATION.

svn path=/trunk/; revision=5477
2002-05-15 19:37:26 +00:00
Guy Harris
42c395b0e2 Update the URL and comment for the SNIA CIFS spec, now that it's final.
svn path=/trunk/; revision=5440
2002-05-10 22:09:24 +00:00
Tim Potter
b4248be92d Added constant and value_string for invalid security descriptor owner
error.

svn path=/trunk/; revision=5415
2002-05-08 05:15:11 +00:00
Guy Harris
a06dd1c724 From Joerg Mayer: get rid of unused "pinfo" argument to
"dissect_nt_sec_desc()".

Also, get rid of code to handle lengths of -1 in "dissect_nt_sec_desc()"
- we never pass it a length of -1, as security descriptors aren't sent
over the wire with NDR syntax.

svn path=/trunk/; revision=5317
2002-04-30 23:48:15 +00:00