*/
#include "includes.h"
+#include "smbd/smbd.h"
+#include "smbd/globals.h"
+#include "../librpc/gen_ndr/ndr_notify.h"
struct notify_change_request {
struct notify_change_request *prev, *next;
struct smb_request *req;
uint32 filter;
uint32 max_param;
+ void (*reply_fn)(struct smb_request *req,
+ NTSTATUS error_code,
+ uint8_t *buf, size_t len);
struct notify_mid_map *mid_map;
void *backend_data;
};
static void notify_fsp(files_struct *fsp, uint32 action, const char *name);
-static struct notify_mid_map *notify_changes_by_mid;
-
/*
* For NTCancel, we need to find the notify_change_request indexed by
* mid. Separate list here.
struct notify_mid_map {
struct notify_mid_map *prev, *next;
struct notify_change_request *req;
- uint16 mid;
+ uint64_t mid;
};
static bool notify_change_record_identical(struct notify_change *c1,
static bool notify_marshall_changes(int num_changes,
uint32 max_offset,
struct notify_change *changes,
- prs_struct *ps)
+ DATA_BLOB *final_blob)
{
int i;
- UNISTR uni_name;
- uni_name.buffer = NULL;
+ if (num_changes == -1) {
+ return false;
+ }
for (i=0; i<num_changes; i++) {
+ enum ndr_err_code ndr_err;
struct notify_change *c;
- size_t namelen;
- uint32 u32_tmp; /* Temp arg to prs_uint32 to avoid
- * signed/unsigned issues */
+ struct FILE_NOTIFY_INFORMATION m;
+ DATA_BLOB blob;
/* Coalesce any identical records. */
while (i+1 < num_changes &&
c = &changes[i];
- if (!convert_string_allocate(NULL, CH_UNIX, CH_UTF16LE,
- c->name, strlen(c->name)+1, &uni_name.buffer,
- &namelen, True) || (uni_name.buffer == NULL)) {
- goto fail;
- }
-
- namelen -= 2; /* Dump NULL termination */
+ m.FileName1 = c->name;
+ m.FileNameLength = strlen_m(c->name)*2;
+ m.Action = c->action;
+ m.NextEntryOffset = (i == num_changes-1) ? 0 : ndr_size_FILE_NOTIFY_INFORMATION(&m, 0);
/*
* Offset to next entry, only if there is one
*/
- u32_tmp = (i == num_changes-1) ? 0 : namelen + 12;
- if (!prs_uint32("offset", ps, 1, &u32_tmp)) goto fail;
-
- u32_tmp = c->action;
- if (!prs_uint32("action", ps, 1, &u32_tmp)) goto fail;
-
- u32_tmp = namelen;
- if (!prs_uint32("namelen", ps, 1, &u32_tmp)) goto fail;
+ ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), &m,
+ (ndr_push_flags_fn_t)ndr_push_FILE_NOTIFY_INFORMATION);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ return false;
+ }
- if (!prs_unistr("name", ps, 1, &uni_name)) goto fail;
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_DEBUG(FILE_NOTIFY_INFORMATION, &m);
+ }
- /*
- * Not NULL terminated, decrease by the 2 UCS2 \0 chars
- */
- prs_set_offset(ps, prs_offset(ps)-2);
+ if (!data_blob_append(talloc_tos(), final_blob,
+ blob.data, blob.length)) {
+ data_blob_free(&blob);
+ return false;
+ }
- SAFE_FREE(uni_name.buffer);
+ data_blob_free(&blob);
- if (prs_offset(ps) > max_offset) {
+ if (final_blob->length > max_offset) {
/* Too much data for client. */
DEBUG(10, ("Client only wanted %d bytes, trying to "
"marshall %d bytes\n", (int)max_offset,
- (int)prs_offset(ps)));
+ (int)final_blob->length));
return False;
}
}
return True;
-
- fail:
- SAFE_FREE(uni_name.buffer);
- return False;
}
/****************************************************************************
Setup the common parts of the return packet and send it.
*****************************************************************************/
-static void change_notify_reply_packet(connection_struct *conn,
- struct smb_request *req,
- NTSTATUS error_code)
+void change_notify_reply(struct smb_request *req,
+ NTSTATUS error_code,
+ uint32_t max_param,
+ struct notify_change_buf *notify_buf,
+ void (*reply_fn)(struct smb_request *req,
+ NTSTATUS error_code,
+ uint8_t *buf, size_t len))
{
- reply_outbuf(req, 18, 0);
+ DATA_BLOB blob = data_blob_null;
if (!NT_STATUS_IS_OK(error_code)) {
- error_packet_set((char *)req->outbuf, 0, 0, error_code,
- __LINE__,__FILE__);
- }
-
- show_msg((char *)req->outbuf);
- if (!srv_send_smb(smbd_server_fd(), (char *)req->outbuf,
- req->encrypted)) {
- exit_server_cleanly("change_notify_reply_packet: srv_send_smb "
- "failed.");
+ reply_fn(req, error_code, NULL, 0);
+ return;
}
- TALLOC_FREE(req->outbuf);
-}
-void change_notify_reply(connection_struct *conn,
- struct smb_request *req, uint32 max_param,
- struct notify_change_buf *notify_buf)
-{
- prs_struct ps;
-
- if (notify_buf->num_changes == -1) {
- change_notify_reply_packet(conn, req, NT_STATUS_OK);
- notify_buf->num_changes = 0;
+ if (max_param == 0 || notify_buf == NULL) {
+ reply_fn(req, NT_STATUS_OK, NULL, 0);
return;
}
- prs_init_empty(&ps, NULL, MARSHALL);
-
if (!notify_marshall_changes(notify_buf->num_changes, max_param,
- notify_buf->changes, &ps)) {
+ notify_buf->changes, &blob)) {
/*
* We exceed what the client is willing to accept. Send
* nothing.
*/
- change_notify_reply_packet(conn, req, NT_STATUS_OK);
- goto done;
+ data_blob_free(&blob);
}
- send_nt_replies(conn, req, NT_STATUS_OK, prs_data_p(&ps),
- prs_offset(&ps), NULL, 0);
+ reply_fn(req, NT_STATUS_OK, blob.data, blob.length);
- done:
- prs_mem_free(&ps);
+ data_blob_free(&blob);
TALLOC_FREE(notify_buf->changes);
notify_buf->num_changes = 0;
static void notify_callback(void *private_data, const struct notify_event *e)
{
files_struct *fsp = (files_struct *)private_data;
- DEBUG(10, ("notify_callback called for %s\n", fsp->fsp_name));
+ DEBUG(10, ("notify_callback called for %s\n", fsp_str_dbg(fsp)));
notify_fsp(fsp, e->action, e->path);
}
SMB_ASSERT(fsp->notify == NULL);
- if (!(fsp->notify = TALLOC_ZERO_P(NULL, struct notify_change_buf))) {
+ if (!(fsp->notify = talloc_zero(NULL, struct notify_change_buf))) {
DEBUG(0, ("talloc failed\n"));
return NT_STATUS_NO_MEMORY;
}
+ /* Do notify operations on the base_name. */
if (asprintf(&fullpath, "%s/%s", fsp->conn->connectpath,
- fsp->fsp_name) == -1) {
+ fsp->fsp_name->base_name) == -1) {
DEBUG(0, ("asprintf failed\n"));
+ TALLOC_FREE(fsp->notify);
return NT_STATUS_NO_MEMORY;
}
ZERO_STRUCT(e);
e.path = fullpath;
+ e.dir_fd = fsp->fh->fd;
+ e.dir_id = fsp->file_id;
e.filter = filter;
e.subdir_filter = 0;
if (recursive) {
NTSTATUS change_notify_add_request(struct smb_request *req,
uint32 max_param,
uint32 filter, bool recursive,
- struct files_struct *fsp)
+ struct files_struct *fsp,
+ void (*reply_fn)(struct smb_request *req,
+ NTSTATUS error_code,
+ uint8_t *buf, size_t len))
{
struct notify_change_request *request = NULL;
struct notify_mid_map *map = NULL;
+ struct smbd_server_connection *sconn = req->sconn;
DEBUG(10, ("change_notify_add_request: Adding request for %s: "
- "max_param = %d\n", fsp->fsp_name, (int)max_param));
+ "max_param = %d\n", fsp_str_dbg(fsp), (int)max_param));
if (!(request = talloc(NULL, struct notify_change_request))
|| !(map = talloc(request, struct notify_mid_map))) {
request->max_param = max_param;
request->filter = filter;
request->fsp = fsp;
+ request->reply_fn = reply_fn;
request->backend_data = NULL;
DLIST_ADD_END(fsp->notify->requests, request,
struct notify_change_request *);
map->mid = request->req->mid;
- DLIST_ADD(notify_changes_by_mid, map);
-
- /* Push the MID of this packet on the signing queue. */
- srv_defer_sign_response(request->req->mid);
+ DLIST_ADD(sconn->smb1.notify_mid_maps, map);
return NT_STATUS_OK;
}
-static void change_notify_remove_request(struct notify_change_request *remove_req)
+static void change_notify_remove_request(struct smbd_server_connection *sconn,
+ struct notify_change_request *remove_req)
{
files_struct *fsp;
struct notify_change_request *req;
}
DLIST_REMOVE(fsp->notify->requests, req);
- DLIST_REMOVE(notify_changes_by_mid, req->mid_map);
+ DLIST_REMOVE(sconn->smb1.notify_mid_maps, req->mid_map);
TALLOC_FREE(req);
}
Delete entries by mid from the change notify pending queue. Always send reply.
*****************************************************************************/
-void remove_pending_change_notify_requests_by_mid(uint16 mid)
+void remove_pending_change_notify_requests_by_mid(
+ struct smbd_server_connection *sconn, uint64_t mid)
{
struct notify_mid_map *map;
- for (map = notify_changes_by_mid; map; map = map->next) {
+ for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
if (map->mid == mid) {
break;
}
return;
}
- change_notify_reply_packet(map->req->fsp->conn, map->req->req,
- NT_STATUS_CANCELLED);
- change_notify_remove_request(map->req);
+ change_notify_reply(map->req->req,
+ NT_STATUS_CANCELLED, 0, NULL, map->req->reply_fn);
+ change_notify_remove_request(sconn, map->req);
+}
+
+void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq)
+{
+ struct smbd_server_connection *sconn = smbreq->sconn;
+ struct notify_mid_map *map;
+
+ for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
+ if (map->req->req == smbreq) {
+ break;
+ }
+ }
+
+ if (map == NULL) {
+ return;
+ }
+
+ change_notify_reply(map->req->req,
+ NT_STATUS_CANCELLED, 0, NULL, map->req->reply_fn);
+ change_notify_remove_request(sconn, map->req);
}
/****************************************************************************
}
while (fsp->notify->requests != NULL) {
- change_notify_reply_packet(
- fsp->conn, fsp->notify->requests->req, status);
- change_notify_remove_request(fsp->notify->requests);
+ change_notify_reply(fsp->notify->requests->req,
+ status, 0, NULL,
+ fsp->notify->requests->reply_fn);
+ change_notify_remove_request(fsp->conn->sconn,
+ fsp->notify->requests);
}
}
const char *path)
{
char *fullpath;
+ char *parent;
+ const char *name;
+
+ if (path[0] == '.' && path[1] == '/') {
+ path += 2;
+ }
+ if (parent_dirname(talloc_tos(), path, &parent, &name)) {
+ struct smb_filename smb_fname_parent;
+
+ ZERO_STRUCT(smb_fname_parent);
+ smb_fname_parent.base_name = parent;
+
+ if (SMB_VFS_STAT(conn, &smb_fname_parent) != -1) {
+ notify_onelevel(conn->notify_ctx, action, filter,
+ SMB_VFS_FILE_ID_CREATE(conn, &smb_fname_parent.st),
+ name);
+ }
+ }
- if (asprintf(&fullpath, "%s/%s", conn->connectpath, path) == -1) {
+ fullpath = talloc_asprintf(talloc_tos(), "%s/%s", conn->connectpath,
+ path);
+ if (fullpath == NULL) {
DEBUG(0, ("asprintf failed\n"));
return;
}
-
notify_trigger(conn->notify_ctx, action, filter, fullpath);
- SAFE_FREE(fullpath);
+ TALLOC_FREE(fullpath);
}
static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
if ((fsp->notify->num_changes > 1000) || (name == NULL)) {
/*
* The real number depends on the client buf, just provide a
- * guard against a DoS here.
+ * guard against a DoS here. If name == NULL the CN backend is
+ * alerting us to a problem. Possibly dropped events. Clear
+ * queued changes and send the catch-all response to the client
+ * if a request is pending.
*/
TALLOC_FREE(fsp->notify->changes);
fsp->notify->num_changes = -1;
+ if (fsp->notify->requests != NULL) {
+ change_notify_reply(fsp->notify->requests->req,
+ NT_STATUS_OK,
+ fsp->notify->requests->max_param,
+ fsp->notify,
+ fsp->notify->requests->reply_fn);
+ change_notify_remove_request(fsp->conn->sconn,
+ fsp->notify->requests);
+ }
return;
}
+ /* If we've exceeded the server side queue or received a NULL name
+ * from the underlying CN implementation, don't queue up any more
+ * requests until we can send a catch-all response to the client */
if (fsp->notify->num_changes == -1) {
return;
}
- if (!(changes = TALLOC_REALLOC_ARRAY(
+ if (!(changes = talloc_realloc(
fsp->notify, fsp->notify->changes,
struct notify_change, fsp->notify->num_changes+1))) {
DEBUG(0, ("talloc_realloc failed\n"));
* TODO: do we have to walk the lists of requests pending?
*/
- change_notify_reply(fsp->conn,
- fsp->notify->requests->req,
+ change_notify_reply(fsp->notify->requests->req,
+ NT_STATUS_OK,
fsp->notify->requests->max_param,
- fsp->notify);
+ fsp->notify,
+ fsp->notify->requests->reply_fn);
- change_notify_remove_request(fsp->notify->requests);
+ change_notify_remove_request(fsp->conn->sconn, fsp->notify->requests);
}
char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter)
{
struct sys_notify_context *ctx;
- if (!(ctx = TALLOC_P(mem_ctx, struct sys_notify_context))) {
+ if (!(ctx = talloc(mem_ctx, struct sys_notify_context))) {
DEBUG(0, ("talloc failed\n"));
return NULL;
}
git.samba.org / nivanova / samba-autobuild / .git / blobdiff