summaryrefslogtreecommitdiff
path: root/source3/smbd/blocking.c
AgeCommit message (Collapse)AuthorFilesLines
2010-06-09Rename "allow_smb2" -> "using_smb2" and make the usage clearer.Jeremy Allison1-3/+3
2010-05-07This patch looks bigger than it is. It does 2 things. 1). Renames smbpid -> ↵Jeremy Allison1-27/+27
smblctx in our locking code. 2). Widens smblctx to 64-bits internally. Preparing to use the SMB2 handle as the locking context. Jeremy.
2010-05-07Make us pass all SMB2 lock tests except MULTIPLE-UNLOCK and CONTEXT. Them ↵Jeremy Allison1-2/+6
next :-). Jeremy.
2010-05-06Fix more SMB2 locking. We still crash but this won't last :-).Jeremy Allison1-3/+2
Jeremy.
2010-05-06s3: only include gen_ndr headers where needed.Günther Deschner1-0/+1
This shrinks include/includes.h.gch by the size of 7 MB and reduces build time as follows: ccache build w/o patch real 4m21.529s ccache build with patch real 3m6.402s pch build w/o patch real 4m26.318s pch build with patch real 3m6.932s Guenther
2010-05-05Fixed issue with return in a void function found by Björn JACKE <bj@SerNet.DE>Jeremy Allison1-1/+2
Jeremy.
2010-04-30Plumb the SMB2 front end into the blocking lock backend.Jeremy Allison1-5/+16
Metze, you'll probably be happier with this work as it doesn't abuse tevent in the way you dislike. This is a first cut at the code, which will need lots of testing but I'm hoping this will give people an idea of where I'm going with this. Jeremy.
2010-04-29Carefully label SMB1-specific locking calls.Jeremy Allison1-5/+14
Jeremy.
2010-04-29Move the global blocking lock records into the smb1 state.Jeremy Allison1-21/+30
Jeremy
2010-04-12Move to using 64-bit mid values in our internal open file database.Jeremy Allison1-2/+2
This will allow us to share logic much easier between SMB1 and SMB2 servers. Jeremy
2010-04-09Plumb SMB2 stubs into all the places we defer SMB1 operations.Jeremy Allison1-1/+1
Rename functions to be internally consistent. Next step is to cope queueing single (non-compounded) SMB2 requests to put some code inside the stubs. Jeremy.
2010-04-08Stop smb2 from calling into smb1 blocking lock request code.Jeremy Allison1-0/+14
Allocate a uint16_t internal SMB1 mid for an SMB2 request. Add a back pointer from the faked up smb_request struct to the smb2 request. Getting ready to add restart code for blocking locks, share mode violations and oplocks in SMB2. Jeremy.
2010-02-12s3/smbd: change locking behavior when "lock spin time = 0".Steven Danneman1-1/+1
The "lock spin time" parameter mimics the following Windows setting which by default is 250ms in Windows and 200ms in Samba. HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters\LockViolationDelay When a client sends repeated, non-blocking, contending BRL requests to a Windows server, after the first Windows starts treating these requests as timed blocking locks with the above timeout. As an efficiency, I've changed the behavior when this setting is 0, to skip this logic and treat all requests as non-blocking locks. This gives the smbd server behavior similar to the 3.0 release with the do_spin_lock() implementation. I've also changed the blocking lock parameter in the call from push_blocking_lock_request() to true as all requests made in this path are blocking by definition.
2010-02-05Fix trailing whitespace errors I added (sorry).Jeremy Allison1-2/+2
Jeremy.
2010-02-05s3-brlock: add a minimim retry time for pending blocking locksAndrew Tridgell1-0/+20
When we are waiting on a pending byte range lock, another smbd might exit uncleanly, and therefore not notify us of the removal of the lock, and thus not trigger the lock to be retried. We coped with this up to now by adding a message_send_all() in the SIGCHLD and cluster reconfigure handlers to send a MSG_SMB_UNLOCK to all smbd processes. That would generate O(N^2) work when a large number of clients disconnected at once (such as on a network outage), which could leave the whole system unusable for a very long time (many minutes, or even longer). By adding a minimum re-check time for pending byte range locks we avoid this problem by ensuring that pending locks are retried at a more regular interval.
2009-10-26Second part of the fix for bug 6828 - infinite timeout occurs when byte lock ↵Jeremy Allison1-6/+9
held outside of samba. Fixes case where a connection with a pending lock can me marked "idle", and ensures that the lock queue timeout is always recalculated. Jeremy.
2009-10-20Fix bug 6828 - infinite timeout occurs when byte lock held outside of sambaJeremy Allison1-8/+18
Jeremy.
2009-07-20s3: Change fsp->fsp_name to be an smb_filename struct!Tim Prouty1-7/+8
2009-03-23s3:smbd: use new simplified snb_signing code in the serverStefan Metzmacher1-3/+2
We keep the seqnum/mid mapping in the smb_request structure. This also moves one global variable into the smbd_server_connection struct. metze
2009-02-13Add VFS ops for Windows BRL: Lock, Unlock and Cancel:Zack Kirsch1-48/+59
This patch adds 3 new VFS OPs for Windows byte range locking: BRL_LOCK_WINDOWS, BRL_UNLOCK_WINDOWS and BRL_CANCEL_WINDOWS. Specifically: * I renamed brl_lock_windows, brl_unlock_windows and brl_lock_cancel to *_default as the default implementations of the VFS ops. * The blocking_lock_record (BLR) is now passed into the brl_lock_windows and brl_cancel_windows paths. The Onefs implementation uses it - future implementations may find it useful too. * Created brl_lock_cancel to do what brl_lock/brl_unlock do: set up a lock_struct and call either the Posix or Windows lock function. These happen to be the same for the default implementation. * Added helper functions: increment_current_lock_count() and decrement_current_lock_count(). * Minor spelling correction in brl_timeout_fn: brl -> blr. * Changed blocking_lock_cancel() to return the BLR that it has cancelled. This allows us to assert its the lock that we wanted to cancel. If this assert ever fires, this path will need to take in the BLR to cancel, rather than choosing on its own. * Adds a small helper function: find_blocking_lock_record_by_id(). Used by the OneFS implementation, but could be useful for others.
2009-02-13Remove typedef struct blocking_lock_record and move references to struct ↵Zack Kirsch1-19/+19
blocking_lock_record.
2009-02-09S3: New module interface for SMB message statistics gatheringtodd stecher1-2/+4
This changelist allows for the addition of custom performance monitoring modules through smb.conf. Entrypoints in the main message processing code have been added to capture the command, subop, ioctl, identity and message size statistics.
2009-01-31Remove the global variable "chain_size"Volker Lendecke1-6/+1
2009-01-16Add a new implementation of chain_replyVolker Lendecke1-6/+0
This the global variable "orig_inbuf" in the old chain_reply code. This global variable was one of the reasons why we had the silly restriction to not allow async requests within a request chain.
2009-01-08s3:smbd: move all globals and static variables in globals.[ch]Stefan Metzmacher1-15/+6
The goal is to move all this variables into a big context structure. metze
2009-01-05s3:events: change event_add_timed() prototype to match samba4Stefan Metzmacher1-2/+2
metze
2008-11-08Do not write into inbuf for the transs requestVolker Lendecke1-1/+0
Instead, fix up the outbuf in send_xx_reply. In those routines, we know what we are returning.
2008-11-08Remove the change to the user context in process_blocking_lock_queue()Volker Lendecke1-76/+8
2008-11-04Convert blocking.c to store a smb_request instead of just inbufVolker Lendecke1-88/+54
2008-11-04Simplify logic of cancel_pending_lock_requests_by_fid()Volker Lendecke1-20/+18
The only caller of this function is locking_close_file(). This checks itself if brl_lock != NULL. The additional check is not necessary here.
2008-11-04Slightly simplify logic in process_lockingX()Volker Lendecke1-7/+8
The "else" is pointless here, we did a "return True" in the if branch.
2008-11-04Slightly simplify logic in remove_pending_lock_requests_by_mid()Volker Lendecke1-13/+21
Use "continue" for (SVAL(blr->inbuf,smb_mid) != mid)
2008-11-04Slightly simplify logic in cancel_pending_lock_requests_by_fid()Volker Lendecke1-20/+24
Use a "continue" for (blr->fsp->fnum != fsp->fnum)
2008-11-04Convert blocking.c to use tallocVolker Lendecke1-23/+15
2008-11-04Make "inbuf" a talloc child of "smb_request" for normal smb requestsVolker Lendecke1-0/+2
This is necessary if we want to keep the whole smb_request for deferred ops. The explicit settings of req->inbuf will be removed once all those deferring operations are converted to store the whole request and not just the inbuf.
2008-11-03Fix nonempty blank linesVolker Lendecke1-14/+14
2008-11-02Remove some inbuf references by adding "cmd" to smb_requestVolker Lendecke1-1/+1
2008-11-01Apply some const to get_lock_*()Volker Lendecke1-4/+6
2008-10-14Use {u,}int64_t instead of SMB_BIG_{U,}INT.Jelmer Vernooij1-12/+12
2008-10-13Remove the chain_fsp globalVolker Lendecke1-1/+0
2008-01-10Some more talloc_tos()Volker Lendecke1-5/+5
(This used to be commit 444e35e7df1f13fc285183da8fb41b30ad99a3fa)
2008-01-05Fix %d / size_t printf arg missmatch.Jeremy Allison1-2/+2
Jeremy. (This used to be commit 3e3205309b75edf7d29633525adfdceb5f8856eb)
2008-01-04Fix interesting bug found with make valgrindtest. When cancellingJeremy Allison1-10/+14
a lock due to file closure make sure we null out the fsp pointer so it isn't dangling. This is an old bug (not related to the new changes). Jeremy. (This used to be commit b5ee972b0c04b4d119573d95ac458a3b6be30c5c)
2008-01-04Refactor the crypto code after a very helpful conversationJeremy Allison1-13/+21
with Volker. Mostly making sure we have data on the incoming packet type, not stored in the smb header. Jeremy. (This used to be commit c4e5a505043965eec77b5bb9bc60957e8f3b97c8)
2007-10-30Add new parameter, "min receivefile size" (by default setJeremy Allison1-2/+2
to zero). If non-zero, writeX calls greater than this value will be left in the socket buffer for later handling with recvfile (or userspace equivalent). Definition of recvfile for your system is left as an exercise for the reader (I'm working on getting splice working :-). Jeremy. (This used to be commit 11c03b75ddbcb6e36b231bb40a1773d1c550621c)
2007-10-18RIP BOOL. Convert BOOL -> bool. I found a few interestingJeremy Allison1-15/+15
bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-10r24809: Consolidate the use of temporary talloc contexts.Volker Lendecke1-2/+2
This adds the two functions talloc_stackframe() and talloc_tos(). * When a new talloc stackframe is allocated with talloc_stackframe(), then * the TALLOC_CTX returned with talloc_tos() is reset to that new * frame. Whenever that stack frame is TALLOC_FREE()'ed, then the reverse * happens: The previous talloc_tos() is restored. * * This API is designed to be robust in the sense that if someone forgets to * TALLOC_FREE() a stackframe, then the next outer one correctly cleans up and * resets the talloc_tos(). The original motivation for this patch was to get rid of the sid_string_static & friends buffers. Explicitly passing talloc context everywhere clutters code too much for my taste, so an implicit talloc_tos() is introduced here. Many of these static buffers are replaced by a single static pointer. The intended use would thus be that low-level functions can rather freely push stuff to talloc_tos, the upper layers clean up by freeing the stackframe. The more of these stackframes are used and correctly freed the more exact the memory cleanup happens. This patch removes the main_loop_talloc_ctx, tmp_talloc_ctx and lp_talloc_ctx (did I forget any?) So, never do a tmp_ctx = talloc_init("foo"); anymore, instead, use tmp_ctx = talloc_stackframe() :-) Volker (This used to be commit 6585ea2cb7f417e14540495b9c7380fe9c8c717b)
2007-10-10r24791: Fix logic error in timeout of blocking lock processing found byJeremy Allison1-22/+29
Ronnie. If a lock timeout expires, we must check we can get the lock before responding with failure. Volker is writing a torture test. Jeremy. (This used to be commit 45380f356b99d575645873b05af17c504b091dc8)
2007-10-10r24702: Remove the old API pointersVolker Lendecke1-3/+1
(This used to be commit 17df313db42199e26d7d2044f6a1d845aacd1a90)
2007-10-10r24404: Remove get_OutBuffer usage from blocking.cVolker Lendecke1-27/+14
(This used to be commit cb8fab5663db2cb408e1b85a7287d3670b09d503)