s4: Fix include path to work with tevent

[samba.git] / source4 / ntvfs / sysdep / sys_notify.c

diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index aedfd2a7defa6240ce5480b8c0a50d01d4f6aff7..117d16d20a689a2d0df562c8590540394842e06d 100644 (file)
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -26,30 +25,33 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "ntvfs/sysdep/sys_notify.h"
-#include "lib/events/events.h"
-#include "dlinklist.h"
+#include "../lib/tevent/tevent.h"
+#include "../lib/util/dlinklist.h"
+#include "param/param.h"
 
 /* list of registered backends */
 static struct sys_notify_backend *backends;
+static uint32_t num_backends;
 
+#define NOTIFY_BACKEND "notify:backend"
 
 /*
   initialise a system change notify backend
 */
-struct sys_notify_context *sys_notify_init(int snum,
-                                          TALLOC_CTX *mem_ctx, 
-                                          struct event_context *ev)
+_PUBLIC_ struct sys_notify_context *sys_notify_context_create(struct share_config *scfg,
+                                                             TALLOC_CTX *mem_ctx, 
+                                                             struct event_context *ev)
 {
        struct sys_notify_context *ctx;
        const char *bname;
-       struct sys_notify_backend *b;
+       int i;
 
-       if (backends == NULL) {
+       if (num_backends == 0) {
                return NULL;
        }
 
        if (ev == NULL) {
-               ev = event_context_find(mem_ctx);
+               return NULL;
        }
 
        ctx = talloc_zero(mem_ctx, struct sys_notify_context);
@@ -59,18 +61,38 @@ struct sys_notify_context *sys_notify_init(int snum,
 
        ctx->ev = ev;
 
-       bname = lp_parm_string(snum, "notify", "backend");
-       if (bname == NULL) {
-               bname = backends->name;
+       bname = share_string_option(scfg, NOTIFY_BACKEND, NULL);
+       if (!bname) {
+               if (num_backends) {
+                       bname = backends[0].name;
+               } else {
+                       bname = "__unknown__";
+               }
        }
 
-       for (b=backends;b;b=b->next) {
-               if (strcasecmp(b->name, bname) == 0) break;
+       for (i=0;i<num_backends;i++) {
+               char *enable_opt_name;
+               bool enabled;
+               
+               enable_opt_name = talloc_asprintf(mem_ctx, "notify:%s", 
+                                                                                 backends[i].name);
+               enabled = share_bool_option(scfg, enable_opt_name, true);
+               talloc_free(enable_opt_name);
+
+               if (!enabled) 
+                       continue;
+
+               if (strcasecmp(backends[i].name, bname) == 0) {
+                       bname = backends[i].name;
+                       break;
+               }
        }
 
-       if (b != NULL) {
-               ctx->name = b->name;
-               ctx->notify_watch = b->notify_watch;
+       ctx->name = bname;
+       ctx->notify_watch = NULL;
+
+       if (i < num_backends) {
+               ctx->notify_watch = backends[i].notify_watch;
        }
 
        return ctx;
@@ -78,19 +100,48 @@ struct sys_notify_context *sys_notify_init(int snum,
 
 /*
   add a watch
+
+  note that this call must modify the e->filter and e->subdir_filter
+  bits to remove ones handled by this backend. Any remaining bits will
+  be handled by the generic notify layer
 */
-NTSTATUS sys_notify_watch(struct sys_notify_context *ctx, const char *dirpath,
-                         uint32_t filter, sys_notify_callback_t callback,
-                         void *private, void **handle)
+_PUBLIC_ NTSTATUS sys_notify_watch(struct sys_notify_context *ctx,
+                                  struct notify_entry *e,
+                                  sys_notify_callback_t callback,
+                                  void *private_data, void *handle)
 {
-       return ctx->notify_watch(ctx, dirpath, filter, callback, private, handle);
+       if (!ctx->notify_watch) {
+               return NT_STATUS_INVALID_SYSTEM_SERVICE;
+       }
+       return ctx->notify_watch(ctx, e, callback, private_data, handle);
 }
 
 /*
   register a notify backend
 */
-NTSTATUS sys_notify_register(struct sys_notify_backend *backend)
+_PUBLIC_ NTSTATUS sys_notify_register(struct sys_notify_backend *backend)
 {
-       DLIST_ADD(backends, backend);
+       struct sys_notify_backend *b;
+       b = talloc_realloc(talloc_autofree_context(), backends, 
+                          struct sys_notify_backend, num_backends+1);
+       NT_STATUS_HAVE_NO_MEMORY(b);
+       backends = b;
+       backends[num_backends] = *backend;
+       num_backends++;
+       return NT_STATUS_OK;
+}
+
+_PUBLIC_ NTSTATUS sys_notify_init(void)
+{
+       static bool initialized = false;
+       extern NTSTATUS sys_notify_inotify_init(void);
+
+       init_module_fn static_init[] = { STATIC_sys_notify_MODULES };
+
+       if (initialized) return NT_STATUS_OK;
+       initialized = true;
+
+       run_init_functions(static_init);
+       
        return NT_STATUS_OK;
 }