smbd: Add a timestamp to queued notify events

In a cluster and with changed messaging it can happen that messages are
scheduled after new SMB requests. This re-ordering breaks a few notify tests.
This starts the infrastructure to add timestamps to notify events, so that they
can be sorted before they are sent out. The timestamp will be the current local
time of notify_fname, that's all we can do.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index c19982ac3a6be2836a8517ddb0bbb1990412ee95..6a4b52c5d93d6afab7c4e3a0ce37b2ab3a61e8e4 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -24,6 +24,12 @@
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/ndr_notify.h"
 
+struct notify_change_event {
+       struct timespec when;
+       uint32_t action;
+       const char *name;
+};
+
 struct notify_change_buf {
        /*
         * If no requests are pending, changes are queued here. Simple array,
@@ -35,7 +41,7 @@ struct notify_change_buf {
         * asked we just return NT_STATUS_OK without specific changes.
         */
        int num_changes;
-       struct notify_change *changes;
+       struct notify_change_event *changes;
 
        /*
         * If no changes are around requests are queued here. Using a linked
@@ -87,8 +93,8 @@ struct notify_mid_map {
        uint64_t mid;
 };
 
-static bool notify_change_record_identical(struct notify_change *c1,
-                                       struct notify_change *c2)
+static bool notify_change_record_identical(struct notify_change_event *c1,
+                                          struct notify_change_event *c2)
 {
        /* Note this is deliberately case sensitive. */
        if (c1->action == c2->action &&
@@ -100,7 +106,7 @@ 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,
+                               struct notify_change_event *changes,
                                DATA_BLOB *final_blob)
 {
        int i;
@@ -111,7 +117,7 @@ static bool notify_marshall_changes(int num_changes,
 
        for (i=0; i<num_changes; i++) {
                enum ndr_err_code ndr_err;
-               struct notify_change *c;
+               struct notify_change_event *c;
                struct FILE_NOTIFY_INFORMATION m;
                DATA_BLOB blob;
 
@@ -437,7 +443,7 @@ void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
 
 static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
 {
-       struct notify_change *change, *changes;
+       struct notify_change_event *change, *changes;
        char *tmp;
 
        if (fsp->notify == NULL) {
@@ -483,7 +489,8 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
 
        if (!(changes = talloc_realloc(
                      fsp->notify, fsp->notify->changes,
-                     struct notify_change, fsp->notify->num_changes+1))) {
+                     struct notify_change_event,
+                     fsp->notify->num_changes+1))) {
                DEBUG(0, ("talloc_realloc failed\n"));
                return;
        }