s3-talloc Change TALLOC_P() to talloc()

[nivanova/samba-autobuild/.git] / source3 / smbd / notify.c

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 8f37923865bedfaa444490203bfa7b171ae2e57c..a70f86df007b486f1e2e9e5fd95ef70bbab96c49 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -20,7 +20,9 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

+#include "smbd/smbd.h"

 #include "smbd/globals.h"
 #include "smbd/globals.h"

+#include "../librpc/gen_ndr/ndr_notify.h"

 
 struct notify_change_request {
        struct notify_change_request *prev, *next;
 
 struct notify_change_request {
        struct notify_change_request *prev, *next;


@@ -45,7 +47,7 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name);
 struct notify_mid_map {
        struct notify_mid_map *prev, *next;
        struct notify_change_request *req;
 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_change_record_identical(struct notify_change *c1,


@@ -62,22 +64,19 @@ 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,
 static bool notify_marshall_changes(int num_changes,
                                uint32 max_offset,
                                struct notify_change *changes,

-                               prs_struct *ps)
+                               DATA_BLOB *final_blob)

 {
        int i;
 {
        int i;

-       UNISTR uni_name;

 
        if (num_changes == -1) {
                return false;
        }
 
 
        if (num_changes == -1) {
                return false;
        }
 

-       uni_name.buffer = NULL;
-

        for (i=0; i<num_changes; i++) {
        for (i=0; i<num_changes; i++) {

+               enum ndr_err_code ndr_err;

                struct notify_change *c;
                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 &&
 
                /* Coalesce any identical records. */
                while (i+1 < num_changes &&


@@ -88,66 +87,58 @@ static bool notify_marshall_changes(int num_changes,
 
                c = &changes[i];
 
 
                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
                 */
 
 
                /*
                 * 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,
                        /* 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;
                        return False;
                }
        }
 
        return True;

-
- fail:
-       TALLOC_FREE(uni_name.buffer);
-       return False;

 }
 
 /****************************************************************************
  Setup the common parts of the return packet and send it.
 *****************************************************************************/
 
 }
 
 /****************************************************************************
  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,
                         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);
 
        if (!NT_STATUS_IS_OK(error_code)) {
                reply_fn(req, error_code, NULL, 0);


@@ -159,21 +150,18 @@ void change_notify_reply(connection_struct *conn,
                return;
        }
 
                return;
        }
 

-       prs_init_empty(&ps, NULL, MARSHALL);
-

        if (!notify_marshall_changes(notify_buf->num_changes, max_param,
        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.
                 */
                /*
                 * 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;
 
        TALLOC_FREE(notify_buf->changes);
        notify_buf->num_changes = 0;


@@ -234,7 +222,7 @@ NTSTATUS change_notify_add_request(struct smb_request *req,
 {
        struct notify_change_request *request = NULL;
        struct notify_mid_map *map = NULL;
 {
        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));
 
        DEBUG(10, ("change_notify_add_request: Adding request for %s: "
                   "max_param = %d\n", fsp_str_dbg(fsp), (int)max_param));


@@ -264,11 +252,11 @@ NTSTATUS change_notify_add_request(struct smb_request *req,
        return NT_STATUS_OK;
 }
 
        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;
 {
        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
 
        /*
         * Paranoia checks, the fsp referenced must must have the request in


@@ -297,10 +285,10 @@ static void change_notify_remove_request(struct notify_change_request *remove_re
  Delete entries by mid from the change notify pending queue. Always send reply.
 *****************************************************************************/
 
  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;
 {
        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) {
 
        for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
                if (map->mid == mid) {


@@ -312,9 +300,29 @@ void remove_pending_change_notify_requests_by_mid(uint16 mid)
                return;
        }
 
                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(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);
                            NT_STATUS_CANCELLED, 0, NULL, map->req->reply_fn);

-       change_notify_remove_request(map->req);
+       change_notify_remove_request(sconn, map->req);

 }
 
 /****************************************************************************
 }
 
 /****************************************************************************


@@ -329,10 +337,11 @@ void remove_pending_change_notify_requests_by_fid(files_struct *fsp,
        }
 
        while (fsp->notify->requests != NULL) {
        }
 
        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);
                                    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);

        }
 }
 
        }
 }
 


@@ -347,20 +356,16 @@ void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
                path += 2;
        }
        if (parent_dirname(talloc_tos(), path, &parent, &name)) {
                path += 2;
        }
        if (parent_dirname(talloc_tos(), path, &parent, &name)) {

-               struct smb_filename *smb_fname_parent = NULL;
-               NTSTATUS status;
+               struct smb_filename smb_fname_parent;

 
 

-               status = create_synthetic_smb_fname(talloc_tos(), parent, NULL,
-                                                   NULL, &smb_fname_parent);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return;
-               }
-               if (SMB_VFS_STAT(conn, smb_fname_parent) != -1) {
+               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,
                        notify_onelevel(conn->notify_ctx, action, filter,

-                           SMB_VFS_FILE_ID_CREATE(conn, &smb_fname_parent->st),
+                           SMB_VFS_FILE_ID_CREATE(conn, &smb_fname_parent.st),

                            name);
                }
                            name);
                }

-               TALLOC_FREE(smb_fname_parent);

        }
 
        fullpath = talloc_asprintf(talloc_tos(), "%s/%s", conn->connectpath,
        }
 
        fullpath = talloc_asprintf(talloc_tos(), "%s/%s", conn->connectpath,


@@ -401,13 +406,13 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
                TALLOC_FREE(fsp->notify->changes);
                fsp->notify->num_changes = -1;
                if (fsp->notify->requests != NULL) {
                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);
                                            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;
        }


@@ -419,7 +424,7 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
                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"));
                      fsp->notify, fsp->notify->changes,
                      struct notify_change, fsp->notify->num_changes+1))) {
                DEBUG(0, ("talloc_realloc failed\n"));


@@ -462,14 +467,13 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
         * TODO: do we have to walk the lists of requests pending?
         */
 
         * 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);
 
                            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)
 }
 
 char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter)


@@ -516,7 +520,7 @@ struct sys_notify_context *sys_notify_context_create(connection_struct *conn,
 {
        struct sys_notify_context *ctx;
 
 {
        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;
        }
                DEBUG(0, ("talloc failed\n"));
                return NULL;
        }