r10537: - we now use a much nicer way to handle talloc_free(timed_event)

[bbaumbach/samba-autobuild/.git] / source4 / lib / events / events_liboop.c

diff --git a/source4/lib/events/events_liboop.c b/source4/lib/events/events_liboop.c
index ad7c43cd4e1971d74ccd14d41b21e8f9c33f41bb..54cb8d5a526ab363755c25ba41fc653c951bfd4e 100644 (file)
--- a/source4/lib/events/events_liboop.c
+++ b/source4/lib/events/events_liboop.c
@@ -172,12 +172,23 @@ static void oop_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
        fde->flags = flags;
 }
 
+static int oop_event_timed_destructor(void *ptr);
+static int oop_event_timed_deny_destructor(void *ptr)
+{
+       return -1;
+}
+
 static void *oop_event_timed_handler(oop_source *oop, struct timeval t, void *ptr)
 {
        struct timed_event *te = ptr;
 
+       /* deny the handler to free the event */
+       talloc_set_destructor(te, oop_event_timed_deny_destructor);
        te->handler(te->event_ctx, te, t, te->private_data);
 
+       talloc_set_destructor(te, oop_event_timed_destructor);
+       talloc_free(te);
+
        return OOP_CONTINUE;
 }
 
@@ -218,7 +229,7 @@ static struct timed_event *oop_event_add_timed(struct event_context *ev, TALLOC_
        te->private_data        = private_data;
        te->additional_data     = NULL;
 
-       oop->cancel_time(oop, te->next_event, oop_event_timed_handler, te);
+       oop->on_time(oop, te->next_event, oop_event_timed_handler, te);
 
        talloc_set_destructor(te, oop_event_timed_destructor);