Commit Graph

213 Commits

Author SHA1 Message Date
Pascal Quantin 79f67d319e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7790 :
Add missing offset increment after displaying minimum count

svn path=/trunk/; revision=45823
2012-10-28 20:59:04 +00:00
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
Jakub Zawadzki 5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Bill Meier 1b8e41afab General cleanup of whitespace formatting.
svn path=/trunk/; revision=44543
2012-08-16 18:06:57 +00:00
Bill Meier cf706ca547 From Stefan Metzmacher: Updates for the SMB2/3
This patches add some missing things for SMB2/3 and support for decryption
of SMB3 traffic

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

From me: Change an initializer from C99 to C89 style (since the
 Microsoft compiler doesn't support C99).

svn path=/trunk/; revision=44542
2012-08-16 17:03:07 +00:00
Michael Mann a3db9aedfb bugfix minor memory leaks with GString use
svn path=/trunk/; revision=44514
2012-08-15 13:55:29 +00:00
Pascal Quantin c299201935 Fix a few Clang warnings (dead increment, dead assignment)
svn path=/trunk/; revision=44082
2012-07-27 21:58:26 +00:00
Michael Mann 0d4eafb04d Update display filter names per Bug 2794. Part 1 of many.
svn path=/trunk/; revision=43907
2012-07-22 03:06:37 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Bill Meier 5efda930a6 From Richard Sharpe:
I noticed some inconsistencies in the command naming. The following
patch fixes those (so that they now match between SMB and SMB2):


svn path=/trunk/; revision=43495
2012-06-26 13:02:13 +00:00
Bill Meier fabd558ffe Fix invalid hf[] entry 'display' field value.
result: incorect display of value (and, incidentally,
        a crash in 'tshark -G values'

svn path=/trunk/; revision=43147
2012-06-07 17:39:11 +00:00
Ronnie Sahlberg b3bfefd03c packet-smb2: dissect the channel sequence in the SMB 2.2 header
From Stefan Metzmacher <metze@samba.org>

svn path=/trunk/; revision=42772
2012-05-22 05:56:39 +00:00
Ronnie Sahlberg 4ded3c7fe0 SMB2: Add dissection of the encrypted SMB2 headers
From Matthieu Patou <mat@matws.net>


svn path=/trunk/; revision=42768
2012-05-22 05:48:55 +00:00
Ronnie Sahlberg cf0a6d0b96 SMB2: Add support for the "encrypted" flag for shares
From Michael Adam <obnox@samba.org>

svn path=/trunk/; revision=42767
2012-05-22 05:46:47 +00:00
Ronnie Sahlberg 0882a858c4 SMB2: Fix, the flag is called PERSISTENT_HANDLES, not LARGE_MTU
From Michael Adam <obnox@samba.org>


svn path=/trunk/; revision=42766
2012-05-22 05:45:30 +00:00
Ronnie Sahlberg b5b00d5654 SMB2: Add support for SMB2_GLOBAL_CAP_ENCRYPTION flag
From Michael Adam <obnox@samba.org>


svn path=/trunk/; revision=42765
2012-05-22 05:44:07 +00:00
Jakub Zawadzki b4624651e9 Fix copy&paste: hf variable name in hfi->abbrev
svn path=/trunk/; revision=42682
2012-05-17 19:41:19 +00:00
Guy Harris ab124ec901 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.  (dissect_smb2_olb_buffer() dissects an
offset-length-buffer the contents of which are a structured blob of
bytes, so the top-level item should be an FT_NONE, hence ENC_NA.)

svn path=/trunk/; revision=42555
2012-05-11 03:24:32 +00:00
Jakub Zawadzki 23494db817 Add missing const attribute to some char *
Fix some "assignment discards qualifiers from pointer target type", etc

svn path=/trunk/; revision=41996
2012-04-09 18:44:10 +00:00
Bill Meier 2df5dc3d53 From Reinhard Speyerer: Fix several misspellings/typos in Wireshark
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6967

svn path=/trunk/; revision=41645
2012-03-18 22:24:24 +00:00
Chris Maynard fb6cce75d9 Fix some duplicate display filter names.
svn path=/trunk/; revision=40669
2012-01-23 20:14:37 +00:00
Bill Meier 54b72021bb Fix encoding arg for various fcn calls:
- proto_tree_add_bits_item
 - proto_tree_add_bits_ret_val
 - proto_tree_add_bitmask
 - tvb_get_bits
 - tvb_get_bits16
 - tvb_get_bits24
 - tvb_get_bits32
 - tvb_get_bits64


svn path=/trunk/; revision=39539
2011-10-24 19:57:53 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier 4e57694d4a 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_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39288
2011-10-06 03:35:44 +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 838c1b337b Fix a typo
svn path=/trunk/; revision=39245
2011-10-03 17:22:47 +00:00
Anders Broman 797c140887 Set ENC
svn path=/trunk/; revision=39244
2011-10-03 16:47:54 +00:00
Alexis La Goutte 4ce630cead Fix checkhf error in packet-smb2.c file.
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_data_length => Add in Revision #16546 and never used
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_file_name_info => Add in Revision #25371 and never used
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_security_blob_len => Remove in Revision #16557
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_response_buffer_offset => Remove in Revision #21793
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_security_blob_offset => Remove in Revision #16557
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_response_size => Remove in Revision #16605

svn path=/trunk/; revision=39243
2011-10-03 11:49:17 +00:00
Bill Meier b9e8adf0f8 Fix checkAPI error:
Error: the blurb for field "Flags" ("smb2.ses_req_flags") matches the field name in packet-smb2.c

svn path=/trunk/; revision=39208
2011-10-01 02:51:28 +00:00
Bill Meier c90ab1ede1 Fix "unused_but_set_variable" GCC warning: Remove apparently unneeded code.
svn path=/trunk/; revision=39207
2011-10-01 02:13:15 +00:00
Bill Meier c4b4394936 From Stefan Metzmacher: Support for SMB 2.22 features;
"Patches to add most things for SMB 2.22"

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

svn path=/trunk/; revision=39205
2011-10-01 01:57:38 +00:00
Alexis La Goutte 36972d9cda Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=37711
2011-06-19 16:04:57 +00:00
Anders Broman 6a4ed4f4c3 From Michael Mann.
Part of "display filters with redundancies of PROTABBREV in them."
The ones left outs should be fixed differently I think.
Rename som ndps hf variables while at it.

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

svn path=/trunk/; revision=37406
2011-05-26 06:32:51 +00:00
Guy Harris 375b1bf4b4 Give some routines used for info levels that appear both in set and get
names beginning with dissect_qspi_, and give some of them names with the
info level structure in them rather than the SNIA CIFS specification
section number.

Have separate routines for SMB_INFO_STANDARD and SMB_INFO_QUERY_EA_SIZE;
SMB_INFO_STANDARD is specified differently in the SNIA CIFS
specification and the MS-CIFS specification, and some captures have the
SNIA CIFS version, with the EA length and some have the MS-CIFS version
without it.  The dissector for SMB_INFO_STANDARD will dissect it if it's
there and not say "this structure is truncated" if it's not there.

Rename dissect_qfi_SMB_FILE_ALTERNATE_NAME_INFO() to
dissect_qfi_SMB_FILE_NAME_INFO(), as it also dissects
SMB_QUERY_FILE_NAME_INFO.

Merge the dissectors for SMB_FILE_ALLOCATION_INFO and
SMB_SET_FILE_ALLOCATION_INFO, and for SMB_FILE_END_OF_FILE_INFO and
SMB_SET_FILE_END_OF_FILE_INFO, as the structures are the same.

Dissect some presumed "passthrough info levels" the same way the
corresponding official SMB infos are dissected.

Expand some comments for info level dissectors to give the MS-CIFS
section number and to give some other details.
 
If an info level is truncated, put in an expert info error.

If we don't know about a given info level, just dissect the body as
"Information level unknown", rather than having it dissected as an
"unknown information" trailer.

svn path=/trunk/; revision=37297
2011-05-19 16:22:21 +00:00
Jeff Morriss 009156289f Fix the test.sh failures based on Guy's suggestion in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5445#c15 :
Add a new tap flag to indicate that a tap listener is just a "dissector helper",
that is, a tap which is used by a dissector to help it do its dissection but
does not, itself, require dissection.

Use this new flag in the dissectors which register taps.

Remove the (now-unused) have_tap_listeners() function.

svn path=/trunk/; revision=37069
2011-05-12 03:18:34 +00:00
Bill Meier 7050847bc9 Add missing line of code: Fixes Coverity 1042 (UNUSED);
Remove unneeded lines of code: Coverity 1043 (UNUSED).

svn path=/trunk/; revision=37051
2011-05-10 18:43:40 +00:00
Jakub Zawadzki 38c2f2a151 Cleanup: replace sizeof(arr)/sizeof(arr[0]) with shorter array_length(arr)
svn path=/trunk/; revision=36986
2011-05-04 19:32:35 +00:00
Ronnie Sahlberg 8d93bec973 remove an unused variable
coverity 1044


svn path=/trunk/; revision=36326
2011-03-25 07:15:48 +00:00
Bill Meier 523d4d1cbe From Stefan Metzmacher: smb2 multi-credit / large mtu support
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5729

From me: Update a comment re the "epoch" field: It's now called "credit charge".

svn path=/trunk/; revision=36156
2011-03-07 16:43:55 +00:00
Stephen Fisher c69fe6a4b9 Add MS-SMB2 to the list of URLs to reference for this protocol.
svn path=/trunk/; revision=35670
2011-01-26 21:00:06 +00:00
Stephen Fisher f0a125624d Improve display of names and descriptions of SMB2 share flags and
share capabilities including adding two new flags with the help of
the MS-SMB2 specification. 


svn path=/trunk/; revision=35669
2011-01-26 20:58:26 +00:00
Stephen Fisher 014de8fefd Minor changes to SMB2 Share Type value string: rename values and change
from 2 bytes to 1 byte (the next byte is reserved) according to MS-SMB2
specification. 


svn path=/trunk/; revision=35663
2011-01-26 19:01:10 +00:00
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