diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-07-04 18:52:47 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-04 18:53:59 +1000 |
commit | c599d075cb9d8b843dcc40a34c37ad5392bca767 (patch) | |
tree | 17287ba030a47581f067b5f6452fef5d84cce1ed /source3/smbd | |
parent | b8b504a484043e7f61f32b9621549579701817b7 (diff) | |
download | samba-c599d075cb9d8b843dcc40a34c37ad5392bca767.tar.gz samba-c599d075cb9d8b843dcc40a34c37ad5392bca767.tar.bz2 samba-c599d075cb9d8b843dcc40a34c37ad5392bca767.zip |
s3-lib Move event_add_idle() to source3/lib/events.c
This allows libauth not to depend on smbd_base.
Andrew Bartlett
Diffstat (limited to 'source3/smbd')
-rw-r--r-- | source3/smbd/process.c | 80 | ||||
-rw-r--r-- | source3/smbd/proto.h | 7 |
2 files changed, 0 insertions, 87 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 39fd3d7cd1..ca526267d2 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 adeaf68899..ae63f0adf2 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); |