*/
#include "includes.h"
+#include "smbd/smbd.h"
#include "smbd/globals.h"
-#include "../librpc/gen_ndr/notify.h"
+#include "../librpc/gen_ndr/ndr_notify.h"
struct notify_change_request {
struct notify_change_request *prev, *next;
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;
if (num_changes == -1) {
return false;
}
- uni_name.buffer = NULL;
-
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_talloc(talloc_tos(), 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;
+ }
- TALLOC_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:
- TALLOC_FREE(uni_name.buffer);
- return False;
}
/****************************************************************************
Setup the common parts of the return packet and send it.
*****************************************************************************/
-void change_notify_reply(connection_struct *conn,
- struct smb_request *req,
+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))
+ NTSTATUS error_code,
+ uint8_t *buf, size_t len))
{
- prs_struct ps;
+ DATA_BLOB blob = data_blob_null;
if (!NT_STATUS_IS_OK(error_code)) {
reply_fn(req, error_code, 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.
*/
- prs_mem_free(&ps);
- prs_init_empty(&ps, NULL, MARSHALL);
+ data_blob_free(&blob);
}
- reply_fn(req, NT_STATUS_OK, (uint8_t *)prs_data_p(&ps), prs_offset(&ps));
+ reply_fn(req, NT_STATUS_OK, blob.data, blob.length);
- prs_mem_free(&ps);
+ data_blob_free(&blob);
TALLOC_FREE(notify_buf->changes);
notify_buf->num_changes = 0;
{
struct notify_change_request *request = NULL;
struct notify_mid_map *map = NULL;
- struct smbd_server_connection *sconn = smbd_server_conn;
+ struct smbd_server_connection *sconn = req->sconn;
DEBUG(10, ("change_notify_add_request: Adding request for %s: "
"max_param = %d\n", fsp_str_dbg(fsp), (int)max_param));
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;
- struct smbd_server_connection *sconn = smbd_server_conn;
/*
* Paranoia checks, the fsp referenced must must have the request in
Delete entries by mid from the change notify pending queue. Always send reply.
*****************************************************************************/
-void remove_pending_change_notify_requests_by_mid(uint64_t mid)
+void remove_pending_change_notify_requests_by_mid(
+ struct smbd_server_connection *sconn, uint64_t mid)
{
struct notify_mid_map *map;
- struct smbd_server_connection *sconn = smbd_server_conn;
for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
if (map->mid == mid) {
return;
}
- change_notify_reply(map->req->fsp->conn, map->req->req,
+ change_notify_reply(map->req->req,
NT_STATUS_CANCELLED, 0, NULL, map->req->reply_fn);
- change_notify_remove_request(map->req);
+ change_notify_remove_request(sconn, map->req);
}
-void smbd_notify_cancel_by_smbreq(struct smbd_server_connection *sconn,
- const struct smb_request *smbreq)
+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) {
return;
}
- change_notify_reply(map->req->fsp->conn, map->req->req,
+ change_notify_reply(map->req->req,
NT_STATUS_CANCELLED, 0, NULL, map->req->reply_fn);
- change_notify_remove_request(map->req);
+ change_notify_remove_request(sconn, map->req);
}
/****************************************************************************
}
while (fsp->notify->requests != NULL) {
- change_notify_reply(fsp->conn, fsp->notify->requests->req,
+ change_notify_reply(fsp->notify->requests->req,
status, 0, NULL,
fsp->notify->requests->reply_fn);
- change_notify_remove_request(fsp->notify->requests);
+ change_notify_remove_request(fsp->conn->sconn,
+ fsp->notify->requests);
}
}
TALLOC_FREE(fsp->notify->changes);
fsp->notify->num_changes = -1;
if (fsp->notify->requests != NULL) {
- 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->requests->reply_fn);
- change_notify_remove_request(fsp->notify->requests);
+ change_notify_remove_request(fsp->conn->sconn,
+ fsp->notify->requests);
}
return;
}
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->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