*/
#include "includes.h"
+#include "smbd/smbd.h"
#include "smbd/globals.h"
-#include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_LOCKING
struct server_id server_id,
DATA_BLOB *data);
-void brl_timeout_fn(struct event_context *event_ctx,
- struct timed_event *te,
+void brl_timeout_fn(struct tevent_context *event_ctx,
+ struct tevent_timer *te,
struct timeval now,
void *private_data)
{
change_to_root_user(); /* TODO: Possibly run all timed events as
* root */
- process_blocking_lock_queue();
+ process_blocking_lock_queue(sconn);
}
/****************************************************************************
return True;
}
- /*
+ /*
to account for unclean shutdowns by clients we need a
maximum timeout that we use for checking pending locks. If
we have any pending locks at all, then check if the pending
(int)from_now.tv_sec, (int)from_now.tv_usec));
}
- sconn->smb1.locks.brl_timeout = event_add_timed(smbd_event_context(),
- NULL, next_timeout,
- brl_timeout_fn, sconn);
+ sconn->smb1.locks.brl_timeout = tevent_add_timer(sconn->ev_ctx,
+ NULL, next_timeout,
+ brl_timeout_fn, sconn);
if (sconn->smb1.locks.brl_timeout == NULL) {
return False;
}
blr->expire_time.tv_sec = 0;
blr->expire_time.tv_usec = 0; /* Never expire. */
} else {
- blr->expire_time = timeval_current_ofs(lock_timeout/1000,
- (lock_timeout % 1000) * 1000);
+ blr->expire_time = timeval_current_ofs_msec(lock_timeout);
}
blr->lock_num = lock_num;
blr->smblctx = smblctx;
blr->lock_type = lock_type;
blr->offset = offset;
blr->count = count;
-
+
/* Specific brl_lock() implementations can fill this in. */
blr->blr_private = NULL;
/* Add a pending lock record for this. */
- status = brl_lock(smbd_messaging_context(),
+ status = brl_lock(req->sconn->msg_ctx,
br_lck,
smblctx,
- procid_self(),
+ messaging_server_id(req->sconn->msg_ctx),
offset,
count,
lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK,
/* Ensure we'll receive messages when this is unlocked. */
if (!sconn->smb1.locks.blocking_lock_unlock_state) {
- messaging_register(smbd_messaging_context(), NULL,
+ messaging_register(sconn->msg_ctx, sconn,
MSG_SMB_UNLOCK, received_unlock_msg);
sconn->smb1.locks.blocking_lock_unlock_state = true;
}
DEBUG(3,("push_blocking_lock_request: lock request blocked with "
- "expiry time (%u sec. %u usec) (+%d msec) for fnum = %d, name = %s\n",
+ "expiry time (%u sec. %u usec) (+%d msec) for %s, name = %s\n",
(unsigned int)blr->expire_time.tv_sec,
(unsigned int)blr->expire_time.tv_usec, lock_timeout,
- blr->fsp->fnum, fsp_str_dbg(blr->fsp)));
+ fsp_fnum_dbg(blr->fsp), fsp_str_dbg(blr->fsp)));
return True;
}
static void reply_lockingX_success(struct blocking_lock_record *blr)
{
- reply_outbuf(blr->req, 2, 0);
+ struct smb_request *req = blr->req;
+
+ reply_outbuf(req, 2, 0);
+ SSVAL(req->outbuf, smb_vwv0, 0xff); /* andx chain ends */
+ SSVAL(req->outbuf, smb_vwv1, 0); /* no andx offset */
/*
* As this message is a lockingX call we must handle
* that here and must set up the chain info manually.
*/
- chain_reply(blr->req);
- TALLOC_FREE(blr->req->outbuf);
+ if (!srv_send_smb(req->sconn,
+ (char *)req->outbuf,
+ true, req->seqnum+1,
+ IS_CONN_ENCRYPTED(req->conn)||req->encrypted,
+ &req->pcd)) {
+ exit_server_cleanly("construct_reply: srv_send_smb failed.");
+ }
+
+ TALLOC_FREE(req->outbuf);
}
/****************************************************************************
if (fsp) {
fsp->last_lock_failure.context.smblctx = blr->smblctx;
fsp->last_lock_failure.context.tid = fsp->conn->cnum;
- fsp->last_lock_failure.context.pid = procid_self();
+ fsp->last_lock_failure.context.pid =
+ messaging_server_id(fsp->conn->sconn->msg_ctx);
fsp->last_lock_failure.start = blr->offset;
fsp->last_lock_failure.size = blr->count;
fsp->last_lock_failure.fnum = fsp->fnum;
}
reply_nterror(blr->req, status);
- if (!srv_send_smb(smbd_server_fd(), (char *)blr->req->outbuf,
+ if (!srv_send_smb(blr->req->sconn, (char *)blr->req->outbuf,
true, blr->req->seqnum+1,
blr->req->encrypted, NULL)) {
exit_server_cleanly("generic_blocking_lock_error: srv_send_smb failed.");
}
/****************************************************************************
- Return a lock fail error for a lockingX call. Undo all the locks we have
+ Return a lock fail error for a lockingX call. Undo all the locks we have
obtained first.
*****************************************************************************/
-static void reply_lockingX_error(struct blocking_lock_record *blr, NTSTATUS status)
+static void undo_locks_obtained(struct blocking_lock_record *blr)
{
files_struct *fsp = blr->fsp;
uint16 num_ulocks = SVAL(blr->req->vwv+6, 0);
uint8_t *data;
int i;
- data = (uint8_t *)blr->req->buf
+ data = discard_const_p(uint8_t, blr->req->buf)
+ ((large_file_format ? 20 : 10)*num_ulocks);
- /*
+ /*
* Data now points at the beginning of the list
* of smb_lkrng structs.
*/
* request would never have been queued. JRA.
*/
- do_unlock(smbd_messaging_context(),
+ do_unlock(fsp->conn->sconn->msg_ctx,
fsp,
smblctx,
count,
offset,
WINDOWS_LOCK);
}
-
- generic_blocking_lock_error(blr, status);
}
/****************************************************************************
switch(blr->req->cmd) {
case SMBlockingX:
- reply_lockingX_error(blr, status);
+ /*
+ * This code can be called during the rundown of a
+ * file after it was already closed. In that case,
+ * blr->fsp==NULL and we do not need to undo any
+ * locks, they are already gone.
+ */
+ if (blr->fsp != NULL) {
+ undo_locks_obtained(blr);
+ }
+ generic_blocking_lock_error(blr, status);
break;
case SMBtrans2:
case SMBtranss2:
*/
SCVAL(blr->req->outbuf,smb_com,SMBtrans2);
- if (!srv_send_smb(smbd_server_fd(),
+ if (!srv_send_smb(blr->req->sconn,
(char *)blr->req->outbuf,
true, blr->req->seqnum+1,
IS_CONN_ENCRYPTED(blr->fsp->conn),
uint8_t *data;
NTSTATUS status = NT_STATUS_OK;
- data = (uint8_t *)blr->req->buf
+ data = discard_const_p(uint8_t, blr->req->buf)
+ ((large_file_format ? 20 : 10)*num_ulocks);
- /*
+ /*
* Data now points at the beginning of the list
* of smb_lkrng structs.
*/
* request would never have been queued. JRA.
*/
errno = 0;
- br_lck = do_lock(smbd_messaging_context(),
+ br_lck = do_lock(fsp->conn->sconn->msg_ctx,
fsp,
smblctx,
count,
* Success - we got all the locks.
*/
- DEBUG(3,("process_lockingX file = %s, fnum=%d type=%d "
- "num_locks=%d\n", fsp_str_dbg(fsp), fsp->fnum,
+ DEBUG(3,("process_lockingX file = %s, %s, type=%d "
+ "num_locks=%d\n", fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
(unsigned int)locktype, num_locks));
reply_lockingX_success(blr);
* Still can't get all the locks - keep waiting.
*/
- DEBUG(10,("process_lockingX: only got %d locks of %d needed for file %s, fnum = %d. \
-Waiting....\n",
- blr->lock_num, num_locks, fsp_str_dbg(fsp), fsp->fnum));
+ DEBUG(10, ("process_lockingX: only got %d locks of %d needed for "
+ "file %s, %s. Waiting....\n",
+ blr->lock_num, num_locks, fsp_str_dbg(fsp),
+ fsp_fnum_dbg(fsp)));
return False;
}
{
char params[2];
NTSTATUS status;
- struct byte_range_lock *br_lck = do_lock(smbd_messaging_context(),
+ struct byte_range_lock *br_lck = do_lock(
+ blr->fsp->conn->sconn->msg_ctx,
blr->fsp,
blr->smblctx,
blr->count,
if (ERROR_WAS_LOCK_DENIED(status)) {
/* Still can't get the lock, just keep waiting. */
return False;
- }
+ }
/*
* We have other than a "can't get lock"
* error. Send an error and return True so we get dequeued.
SSVAL(params,0,0);
/* Fake up max_data_bytes here - we know it fits. */
- send_trans2_replies(blr->fsp->conn, blr->req, params, 2, NULL, 0, 0xffff);
+ send_trans2_replies(blr->fsp->conn, blr->req, NT_STATUS_OK, params, 2, NULL, 0, 0xffff);
return True;
}
Called when a file is closed.
*****************************************************************************/
-void cancel_pending_lock_requests_by_fid(files_struct *fsp,
- struct byte_range_lock *br_lck,
- enum file_close_type close_type)
+void smbd_cancel_pending_lock_requests_by_fid(files_struct *fsp,
+ struct byte_range_lock *br_lck,
+ enum file_close_type close_type)
{
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct blocking_lock_record *blr, *blr_cancelled, *next = NULL;
}
DEBUG(10, ("remove_pending_lock_requests_by_fid - removing "
- "request type %d for file %s fnum = %d\n",
- blr->req->cmd, fsp_str_dbg(fsp), fsp->fnum));
+ "request type %d for file %s, %s\n",
+ blr->req->cmd, fsp_str_dbg(fsp), fsp_fnum_dbg(fsp)));
blr_cancelled = blocking_lock_cancel_smb1(fsp,
blr->smblctx,
brl_lock_cancel(br_lck,
blr->smblctx,
- procid_self(),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
if (br_lck) {
DEBUG(10, ("remove_pending_lock_requests_by_mid_smb1 - "
- "removing request type %d for file %s fnum "
- "= %d\n", blr->req->cmd, fsp_str_dbg(fsp),
- fsp->fnum ));
+ "removing request type %d for file %s, %s\n",
+ blr->req->cmd, fsp_str_dbg(fsp),
+ fsp_fnum_dbg(fsp)));
brl_lock_cancel(br_lck,
blr->smblctx,
- procid_self(),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
struct server_id server_id,
DATA_BLOB *data)
{
+ struct smbd_server_connection *sconn =
+ talloc_get_type_abort(private_data,
+ struct smbd_server_connection);
+
DEBUG(10,("received_unlock_msg\n"));
- process_blocking_lock_queue();
+ process_blocking_lock_queue(sconn);
}
/****************************************************************************
Process the blocking lock queue. Note that this is only called as root.
*****************************************************************************/
-void process_blocking_lock_queue(void)
+void process_blocking_lock_queue(struct smbd_server_connection *sconn)
{
- struct smbd_server_connection *sconn = smbd_server_conn;
struct timeval tv_curr = timeval_current();
struct blocking_lock_record *blr, *next = NULL;
if (sconn->using_smb2) {
- process_blocking_lock_queue_smb2(tv_curr);
+ process_blocking_lock_queue_smb2(sconn, tv_curr);
return;
}
if (br_lck) {
brl_lock_cancel(br_lck,
blr->smblctx,
- procid_self(),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
if (br_lck) {
DEBUG(5,("process_blocking_lock_queue: "
- "pending lock fnum = %d for file %s "
- "timed out.\n", blr->fsp->fnum,
+ "pending lock for %s, file %s "
+ "timed out.\n", fsp_fnum_dbg(blr->fsp),
fsp_str_dbg(blr->fsp)));
brl_lock_cancel(br_lck,
blr->smblctx,
- procid_self(),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
struct server_id server_id,
DATA_BLOB *data)
{
- struct smbd_server_connection *sconn = smbd_server_conn;
NTSTATUS err;
const char *msg = (const char *)data->data;
struct blocking_lock_record *blr;
+ struct smbd_server_connection *sconn =
+ talloc_get_type_abort(private_data,
+ struct smbd_server_connection);
if (data->data == NULL) {
smb_panic("process_blocking_lock_cancel_message: null msg");
unsigned char locktype,
NTSTATUS err)
{
- struct smbd_server_connection *sconn = smbd_server_conn;
+ struct smbd_server_connection *sconn = fsp->conn->sconn;
char msg[MSG_BLOCKING_LOCK_CANCEL_SIZE];
struct blocking_lock_record *blr;
if (!sconn->smb1.locks.blocking_lock_cancel_state) {
/* Register our message. */
- messaging_register(smbd_messaging_context(), NULL,
+ messaging_register(sconn->msg_ctx, sconn,
MSG_SMB_BLOCKING_LOCK_CANCEL,
process_blocking_lock_cancel_message);
memcpy(msg, &blr, sizeof(blr));
memcpy(&msg[sizeof(blr)], &err, sizeof(NTSTATUS));
- messaging_send_buf(smbd_messaging_context(), procid_self(),
+ messaging_send_buf(sconn->msg_ctx, messaging_server_id(sconn->msg_ctx),
MSG_SMB_BLOCKING_LOCK_CANCEL,
(uint8 *)&msg, sizeof(msg));
git.samba.org / samba.git / blobdiff