Commit Graph

193 Commits

Author SHA1 Message Date
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
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