From c599d075cb9d8b843dcc40a34c37ad5392bca767 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 4 Jul 2011 18:52:47 +1000 Subject: [PATCH] s3-lib Move event_add_idle() to source3/lib/events.c This allows libauth not to depend on smbd_base. Andrew Bartlett --- source3/include/event.h | 10 ++++- source3/lib/events.c | 82 ++++++++++++++++++++++++++++++++++++++++- source3/smbd/process.c | 80 ---------------------------------------- source3/smbd/proto.h | 7 ---- 4 files changed, 90 insertions(+), 89 deletions(-) diff --git a/source3/include/event.h b/source3/include/event.h index 1e5dfaba5e1..fad5de7848c 100644 --- a/source3/include/event.h +++ b/source3/include/event.h @@ -2,7 +2,7 @@ Unix SMB/CIFS implementation. event handling Copyright (C) Andrew Tridgell 1992-1998 - Copyright (C) Volker Lendecke 2005 + Copyright (C) Volker Lendecke 2005-2007 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 @@ -36,3 +36,11 @@ bool event_add_to_poll_args(struct tevent_context *ev, TALLOC_CTX *mem_ctx, int *ptimeout); bool run_events_poll(struct tevent_context *ev, int pollrtn, struct pollfd *pfds, int num_pfds); + +struct idle_event *event_add_idle(struct event_context *event_ctx, + TALLOC_CTX *mem_ctx, + struct timeval interval, + const char *name, + bool (*handler)(const struct timeval *now, + void *private_data), + void *private_data); diff --git a/source3/lib/events.c b/source3/lib/events.c index f077f585812..b0d3ce53626 100644 --- a/source3/lib/events.c +++ b/source3/lib/events.c @@ -2,7 +2,7 @@ Unix SMB/CIFS implementation. Timed event library. Copyright (C) Andrew Tridgell 1992-1998 - Copyright (C) Volker Lendecke 2005 + Copyright (C) Volker Lendecke 2005-2007 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 @@ -456,3 +456,83 @@ struct tevent_context *s3_tevent_context_init(TALLOC_CTX *mem_ctx) return ev; } +struct idle_event { + struct timed_event *te; + struct timeval interval; + char *name; + bool (*handler)(const struct timeval *now, void *private_data); + void *private_data; +}; + +static void smbd_idle_event_handler(struct event_context *ctx, + struct timed_event *te, + struct timeval now, + void *private_data) +{ + struct idle_event *event = + talloc_get_type_abort(private_data, struct idle_event); + + TALLOC_FREE(event->te); + + DEBUG(10,("smbd_idle_event_handler: %s %p called\n", + event->name, event->te)); + + if (!event->handler(&now, event->private_data)) { + DEBUG(10,("smbd_idle_event_handler: %s %p stopped\n", + event->name, event->te)); + /* Don't repeat, delete ourselves */ + TALLOC_FREE(event); + return; + } + + DEBUG(10,("smbd_idle_event_handler: %s %p rescheduled\n", + event->name, event->te)); + + event->te = event_add_timed(ctx, event, + timeval_sum(&now, &event->interval), + smbd_idle_event_handler, event); + + /* We can't do much but fail here. */ + SMB_ASSERT(event->te != NULL); +} + +struct idle_event *event_add_idle(struct event_context *event_ctx, + TALLOC_CTX *mem_ctx, + struct timeval interval, + const char *name, + bool (*handler)(const struct timeval *now, + void *private_data), + void *private_data) +{ + struct idle_event *result; + struct timeval now = timeval_current(); + + result = talloc(mem_ctx, struct idle_event); + if (result == NULL) { + DEBUG(0, ("talloc failed\n")); + return NULL; + } + + result->interval = interval; + result->handler = handler; + result->private_data = private_data; + + if (!(result->name = talloc_asprintf(result, "idle_evt(%s)", name))) { + DEBUG(0, ("talloc failed\n")); + TALLOC_FREE(result); + return NULL; + } + + result->te = event_add_timed(event_ctx, result, + timeval_sum(&now, &interval), + smbd_idle_event_handler, result); + if (result->te == NULL) { + DEBUG(0, ("event_add_timed failed\n")); + TALLOC_FREE(result); + return NULL; + } + + DEBUG(10,("event_add_idle: %s %p\n", result->name, result->te)); + return result; +} + diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 39fd3d7cd19..ca526267d28 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -844,86 +844,6 @@ bool push_deferred_open_message_smb(struct smb_request *req, private_data, priv_len); } -struct idle_event { - struct timed_event *te; - struct timeval interval; - char *name; - bool (*handler)(const struct timeval *now, void *private_data); - void *private_data; -}; - -static void smbd_idle_event_handler(struct event_context *ctx, - struct timed_event *te, - struct timeval now, - void *private_data) -{ - struct idle_event *event = - talloc_get_type_abort(private_data, struct idle_event); - - TALLOC_FREE(event->te); - - DEBUG(10,("smbd_idle_event_handler: %s %p called\n", - event->name, event->te)); - - if (!event->handler(&now, event->private_data)) { - DEBUG(10,("smbd_idle_event_handler: %s %p stopped\n", - event->name, event->te)); - /* Don't repeat, delete ourselves */ - TALLOC_FREE(event); - return; - } - - DEBUG(10,("smbd_idle_event_handler: %s %p rescheduled\n", - event->name, event->te)); - - event->te = event_add_timed(ctx, event, - timeval_sum(&now, &event->interval), - smbd_idle_event_handler, event); - - /* We can't do much but fail here. */ - SMB_ASSERT(event->te != NULL); -} - -struct idle_event *event_add_idle(struct event_context *event_ctx, - TALLOC_CTX *mem_ctx, - struct timeval interval, - const char *name, - bool (*handler)(const struct timeval *now, - void *private_data), - void *private_data) -{ - struct idle_event *result; - struct timeval now = timeval_current(); - - result = talloc(mem_ctx, struct idle_event); - if (result == NULL) { - DEBUG(0, ("talloc failed\n")); - return NULL; - } - - result->interval = interval; - result->handler = handler; - result->private_data = private_data; - - if (!(result->name = talloc_asprintf(result, "idle_evt(%s)", name))) { - DEBUG(0, ("talloc failed\n")); - TALLOC_FREE(result); - return NULL; - } - - result->te = event_add_timed(event_ctx, result, - timeval_sum(&now, &interval), - smbd_idle_event_handler, result); - if (result->te == NULL) { - DEBUG(0, ("event_add_timed failed\n")); - TALLOC_FREE(result); - return NULL; - } - - DEBUG(10,("event_add_idle: %s %p\n", result->name, result->te)); - return result; -} - static void smbd_sig_term_handler(struct tevent_context *ev, struct tevent_signal *se, int signum, diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index adeaf688996..ae63f0adf25 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -791,13 +791,6 @@ bool push_deferred_open_message_smb(struct smb_request *req, struct file_id id, char *private_data, size_t priv_len); -struct idle_event *event_add_idle(struct event_context *event_ctx, - TALLOC_CTX *mem_ctx, - struct timeval interval, - const char *name, - bool (*handler)(const struct timeval *now, - void *private_data), - void *private_data); NTSTATUS allow_new_trans(struct trans_state *list, uint64_t mid); void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes); const char *smb_fn_name(int type); -- 2.34.1