mirror of
https://github.com/samba-team/samba.git
synced 2025-01-07 17:18:11 +03:00
s4:lib/tevent: rename structs
list="" list="$list event_context:tevent_context" list="$list fd_event:tevent_fd" list="$list timed_event:tevent_timer" for s in $list; do o=`echo $s | cut -d ':' -f1` n=`echo $s | cut -d ':' -f2` r=`git grep "struct $o" |cut -d ':' -f1 |sort -u` files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4` for f in $files; do cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp mv $f.tmp $f done done metze
This commit is contained in:
parent
af29b82536
commit
183c379fe5
lib
tevent
pytevent.ctestsuite.ctevent.ctevent.htevent_aio.ctevent_debug.ctevent_epoll.ctevent_internal.htevent_liboop.ctevent_select.ctevent_signal.ctevent_standard.ctevent_timed.c
torture
libcli/nbt
source4
auth
client
dsdb
common
repl
samdb
kdc
ldap_server
lib
libcli
@ -23,7 +23,7 @@
|
||||
|
||||
typedef struct {
|
||||
PyObject_HEAD
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
} PyEventContextObject;
|
||||
|
||||
PyAPI_DATA(PyTypeObject) PyEventContext;
|
||||
@ -65,7 +65,7 @@ static PyObject *py_event_ctx_new(PyTypeObject *type, PyObject *args, PyObject *
|
||||
{
|
||||
const char *kwnames[] = { "name", NULL };
|
||||
char *name = NULL;
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
PyEventContextObject *ret;
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", (char **)kwnames, &name))
|
||||
return NULL;
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
static int fde_count;
|
||||
|
||||
static void fde_handler(struct event_context *ev_ctx, struct fd_event *f,
|
||||
static void fde_handler(struct tevent_context *ev_ctx, struct tevent_fd *f,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
int *fd = (int *)private;
|
||||
@ -40,14 +40,14 @@ static void fde_handler(struct event_context *ev_ctx, struct fd_event *f,
|
||||
fde_count++;
|
||||
}
|
||||
|
||||
static void finished_handler(struct event_context *ev_ctx, struct timed_event *te,
|
||||
static void finished_handler(struct tevent_context *ev_ctx, struct tevent_timer *te,
|
||||
struct timeval tval, void *private)
|
||||
{
|
||||
int *finished = (int *)private;
|
||||
(*finished) = 1;
|
||||
}
|
||||
|
||||
static void count_handler(struct event_context *ev_ctx, struct signal_event *te,
|
||||
static void count_handler(struct tevent_context *ev_ctx, struct signal_event *te,
|
||||
int signum, int count, void *info, void *private)
|
||||
{
|
||||
int *countp = (int *)private;
|
||||
@ -57,11 +57,11 @@ static void count_handler(struct event_context *ev_ctx, struct signal_event *te,
|
||||
static bool test_event_context(struct torture_context *test,
|
||||
const void *test_data)
|
||||
{
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
int fd[2] = { -1, -1 };
|
||||
const char *backend = (const char *)test_data;
|
||||
int alarm_count=0, info_count=0;
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
struct signal_event *se1, *se2, *se3;
|
||||
int finished=0;
|
||||
struct timeval t;
|
||||
|
@ -42,7 +42,7 @@
|
||||
|
||||
To setup a set of events you first need to create a event_context
|
||||
structure using the function event_context_init(); This returns a
|
||||
'struct event_context' that you use in all subsequent calls.
|
||||
'struct tevent_context' that you use in all subsequent calls.
|
||||
|
||||
After that you can add/remove events that you are interested in
|
||||
using event_add_*() and talloc_free()
|
||||
@ -145,13 +145,13 @@ const char **event_backend_list(TALLOC_CTX *mem_ctx)
|
||||
|
||||
NOTE: use event_context_init() inside of samba!
|
||||
*/
|
||||
static struct event_context *event_context_init_ops(TALLOC_CTX *mem_ctx,
|
||||
static struct tevent_context *event_context_init_ops(TALLOC_CTX *mem_ctx,
|
||||
const struct event_ops *ops)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
int ret;
|
||||
|
||||
ev = talloc_zero(mem_ctx, struct event_context);
|
||||
ev = talloc_zero(mem_ctx, struct tevent_context);
|
||||
if (!ev) return NULL;
|
||||
|
||||
ev->ops = ops;
|
||||
@ -170,7 +170,7 @@ static struct event_context *event_context_init_ops(TALLOC_CTX *mem_ctx,
|
||||
call, and all subsequent calls pass this event_context as the first
|
||||
element. Event handlers also receive this as their first argument.
|
||||
*/
|
||||
struct event_context *event_context_init_byname(TALLOC_CTX *mem_ctx, const char *name)
|
||||
struct tevent_context *event_context_init_byname(TALLOC_CTX *mem_ctx, const char *name)
|
||||
{
|
||||
struct event_ops_list *e;
|
||||
|
||||
@ -197,7 +197,7 @@ struct event_context *event_context_init_byname(TALLOC_CTX *mem_ctx, const char
|
||||
call, and all subsequent calls pass this event_context as the first
|
||||
element. Event handlers also receive this as their first argument.
|
||||
*/
|
||||
struct event_context *event_context_init(TALLOC_CTX *mem_ctx)
|
||||
struct tevent_context *event_context_init(TALLOC_CTX *mem_ctx)
|
||||
{
|
||||
return event_context_init_byname(mem_ctx, NULL);
|
||||
}
|
||||
@ -209,7 +209,7 @@ struct event_context *event_context_init(TALLOC_CTX *mem_ctx)
|
||||
if flags contains EVENT_FD_AUTOCLOSE then the fd will be closed when
|
||||
the returned fd_event context is freed
|
||||
*/
|
||||
struct fd_event *event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
struct tevent_fd *event_add_fd(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
int fd, uint16_t flags, event_fd_handler_t handler,
|
||||
void *private_data)
|
||||
{
|
||||
@ -219,7 +219,7 @@ struct fd_event *event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
/*
|
||||
add a disk aio event
|
||||
*/
|
||||
struct aio_event *event_add_aio(struct event_context *ev,
|
||||
struct aio_event *event_add_aio(struct tevent_context *ev,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
struct iocb *iocb,
|
||||
event_aio_handler_t handler,
|
||||
@ -232,7 +232,7 @@ struct aio_event *event_add_aio(struct event_context *ev,
|
||||
/*
|
||||
return the fd event flags
|
||||
*/
|
||||
uint16_t event_get_fd_flags(struct fd_event *fde)
|
||||
uint16_t event_get_fd_flags(struct tevent_fd *fde)
|
||||
{
|
||||
if (!fde) return 0;
|
||||
return fde->event_ctx->ops->get_fd_flags(fde);
|
||||
@ -241,7 +241,7 @@ uint16_t event_get_fd_flags(struct fd_event *fde)
|
||||
/*
|
||||
set the fd event flags
|
||||
*/
|
||||
void event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
void event_set_fd_flags(struct tevent_fd *fde, uint16_t flags)
|
||||
{
|
||||
if (!fde) return;
|
||||
fde->event_ctx->ops->set_fd_flags(fde, flags);
|
||||
@ -251,7 +251,7 @@ void event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
add a timed event
|
||||
return NULL on failure
|
||||
*/
|
||||
struct timed_event *event_add_timed(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
struct tevent_timer *event_add_timed(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
struct timeval next_event,
|
||||
event_timed_handler_t handler,
|
||||
void *private_data)
|
||||
@ -266,7 +266,7 @@ struct timed_event *event_add_timed(struct event_context *ev, TALLOC_CTX *mem_ct
|
||||
|
||||
return NULL on failure
|
||||
*/
|
||||
struct signal_event *event_add_signal(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
struct signal_event *event_add_signal(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
int signum,
|
||||
int sa_flags,
|
||||
event_signal_handler_t handler,
|
||||
@ -278,7 +278,7 @@ struct signal_event *event_add_signal(struct event_context *ev, TALLOC_CTX *mem_
|
||||
/*
|
||||
do a single event loop using the events defined in ev
|
||||
*/
|
||||
int event_loop_once(struct event_context *ev)
|
||||
int event_loop_once(struct tevent_context *ev)
|
||||
{
|
||||
return ev->ops->loop_once(ev);
|
||||
}
|
||||
@ -286,7 +286,7 @@ int event_loop_once(struct event_context *ev)
|
||||
/*
|
||||
return on failure or (with 0) if all fd events are removed
|
||||
*/
|
||||
int event_loop_wait(struct event_context *ev)
|
||||
int event_loop_wait(struct tevent_context *ev)
|
||||
{
|
||||
return ev->ops->loop_wait(ev);
|
||||
}
|
||||
@ -300,9 +300,9 @@ int event_loop_wait(struct event_context *ev)
|
||||
where you would prefer to use the existing event context if possible
|
||||
(which is most situations)
|
||||
*/
|
||||
struct event_context *event_context_find(TALLOC_CTX *mem_ctx)
|
||||
struct tevent_context *event_context_find(TALLOC_CTX *mem_ctx)
|
||||
{
|
||||
struct event_context *ev = talloc_find_parent_bytype(mem_ctx, struct event_context);
|
||||
struct tevent_context *ev = talloc_find_parent_bytype(mem_ctx, struct tevent_context);
|
||||
if (ev == NULL) {
|
||||
ev = event_context_init(mem_ctx);
|
||||
}
|
||||
|
@ -25,16 +25,13 @@
|
||||
#include <stdint.h>
|
||||
#include <talloc.h>
|
||||
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
struct tevent_ops;
|
||||
struct fd_event;
|
||||
struct tevent_fd;
|
||||
struct tevent_timer;
|
||||
struct tevent_aio;
|
||||
struct tevent_signal;
|
||||
|
||||
#define tevent_context event_context
|
||||
#define tevent_fd fd_event
|
||||
|
||||
/* event handler types */
|
||||
typedef void (*tevent_fd_handler_t)(struct tevent_context *,
|
||||
struct tevent_fd *,
|
||||
@ -107,9 +104,9 @@ void tevent_fd_set_flags(struct tevent_fd *fde, uint16_t flags);
|
||||
|
||||
#ifdef TEVENT_COMPAT_DEFINES
|
||||
|
||||
/*TODO:#define event_context tevent_context*/
|
||||
#define event_context tevent_context
|
||||
#define event_ops tevent_ops
|
||||
/*TODO:#define fd_event tevent_fd*/
|
||||
#define fd_event tevent_fd
|
||||
#define timed_event tevent_timer
|
||||
#define aio_event tevent_aio
|
||||
#define signal_event tevent_signal
|
||||
|
@ -45,10 +45,10 @@
|
||||
|
||||
struct aio_event_context {
|
||||
/* a pointer back to the generic event_context */
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
|
||||
/* list of filedescriptor events */
|
||||
struct fd_event *fd_events;
|
||||
struct tevent_fd *fd_events;
|
||||
|
||||
/* number of registered fd event handlers */
|
||||
int num_fd_events;
|
||||
@ -67,7 +67,7 @@ struct aio_event_context {
|
||||
};
|
||||
|
||||
struct aio_event {
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
struct iocb iocb;
|
||||
void *private_data;
|
||||
event_aio_handler_t handler;
|
||||
@ -95,7 +95,7 @@ static int aio_ctx_destructor(struct aio_event_context *aio_ev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void epoll_add_event(struct aio_event_context *aio_ev, struct fd_event *fde);
|
||||
static void epoll_add_event(struct aio_event_context *aio_ev, struct tevent_fd *fde);
|
||||
|
||||
/*
|
||||
reopen the epoll handle when our pid changes
|
||||
@ -104,7 +104,7 @@ static void epoll_add_event(struct aio_event_context *aio_ev, struct fd_event *f
|
||||
*/
|
||||
static void epoll_check_reopen(struct aio_event_context *aio_ev)
|
||||
{
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
if (aio_ev->pid == getpid()) {
|
||||
return;
|
||||
@ -129,7 +129,7 @@ static void epoll_check_reopen(struct aio_event_context *aio_ev)
|
||||
/*
|
||||
add the epoll event to the given fd_event
|
||||
*/
|
||||
static void epoll_add_event(struct aio_event_context *aio_ev, struct fd_event *fde)
|
||||
static void epoll_add_event(struct aio_event_context *aio_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
if (aio_ev->epoll_fd == -1) return;
|
||||
@ -154,7 +154,7 @@ static void epoll_add_event(struct aio_event_context *aio_ev, struct fd_event *f
|
||||
/*
|
||||
delete the epoll event for given fd_event
|
||||
*/
|
||||
static void epoll_del_event(struct aio_event_context *aio_ev, struct fd_event *fde)
|
||||
static void epoll_del_event(struct aio_event_context *aio_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
|
||||
@ -178,7 +178,7 @@ static void epoll_del_event(struct aio_event_context *aio_ev, struct fd_event *f
|
||||
/*
|
||||
change the epoll event to the given fd_event
|
||||
*/
|
||||
static void epoll_mod_event(struct aio_event_context *aio_ev, struct fd_event *fde)
|
||||
static void epoll_mod_event(struct aio_event_context *aio_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
if (aio_ev->epoll_fd == -1) return;
|
||||
@ -196,7 +196,7 @@ static void epoll_mod_event(struct aio_event_context *aio_ev, struct fd_event *f
|
||||
}
|
||||
}
|
||||
|
||||
static void epoll_change_event(struct aio_event_context *aio_ev, struct fd_event *fde)
|
||||
static void epoll_change_event(struct aio_event_context *aio_ev, struct tevent_fd *fde)
|
||||
{
|
||||
bool got_error = (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR);
|
||||
bool want_read = (fde->flags & EVENT_FD_READ);
|
||||
@ -308,7 +308,7 @@ static int aio_event_loop(struct aio_event_context *aio_ev, struct timeval *tval
|
||||
}
|
||||
case IOCB_CMD_EPOLL_WAIT: {
|
||||
struct epoll_event *ep = (struct epoll_event *)finished->u.c.buf;
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
uint16_t flags = 0;
|
||||
int j;
|
||||
|
||||
@ -316,7 +316,7 @@ static int aio_event_loop(struct aio_event_context *aio_ev, struct timeval *tval
|
||||
|
||||
for (j=0; j<event->res; j++, ep++) {
|
||||
fde = talloc_get_type(ep->data.ptr,
|
||||
struct fd_event);
|
||||
struct tevent_fd);
|
||||
if (fde == NULL) {
|
||||
return -1;
|
||||
}
|
||||
@ -348,7 +348,7 @@ static int aio_event_loop(struct aio_event_context *aio_ev, struct timeval *tval
|
||||
/*
|
||||
create a aio_event_context structure.
|
||||
*/
|
||||
static int aio_event_context_init(struct event_context *ev)
|
||||
static int aio_event_context_init(struct tevent_context *ev)
|
||||
{
|
||||
struct aio_event_context *aio_ev;
|
||||
|
||||
@ -385,9 +385,9 @@ static int aio_event_context_init(struct event_context *ev)
|
||||
/*
|
||||
destroy an fd_event
|
||||
*/
|
||||
static int aio_event_fd_destructor(struct fd_event *fde)
|
||||
static int aio_event_fd_destructor(struct tevent_fd *fde)
|
||||
{
|
||||
struct event_context *ev = fde->event_ctx;
|
||||
struct tevent_context *ev = fde->event_ctx;
|
||||
struct aio_event_context *aio_ev = talloc_get_type(ev->additional_data,
|
||||
struct aio_event_context);
|
||||
|
||||
@ -410,18 +410,18 @@ static int aio_event_fd_destructor(struct fd_event *fde)
|
||||
add a fd based event
|
||||
return NULL on failure (memory allocation error)
|
||||
*/
|
||||
static struct fd_event *aio_event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
static struct tevent_fd *aio_event_add_fd(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
int fd, uint16_t flags,
|
||||
event_fd_handler_t handler,
|
||||
void *private_data)
|
||||
{
|
||||
struct aio_event_context *aio_ev = talloc_get_type(ev->additional_data,
|
||||
struct aio_event_context);
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
epoll_check_reopen(aio_ev);
|
||||
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event);
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct tevent_fd);
|
||||
if (!fde) return NULL;
|
||||
|
||||
fde->event_ctx = ev;
|
||||
@ -445,7 +445,7 @@ static struct fd_event *aio_event_add_fd(struct event_context *ev, TALLOC_CTX *m
|
||||
/*
|
||||
return the fd event flags
|
||||
*/
|
||||
static uint16_t aio_event_get_fd_flags(struct fd_event *fde)
|
||||
static uint16_t aio_event_get_fd_flags(struct tevent_fd *fde)
|
||||
{
|
||||
return fde->flags;
|
||||
}
|
||||
@ -453,9 +453,9 @@ static uint16_t aio_event_get_fd_flags(struct fd_event *fde)
|
||||
/*
|
||||
set the fd event flags
|
||||
*/
|
||||
static void aio_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
static void aio_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
struct aio_event_context *aio_ev;
|
||||
|
||||
if (fde->flags == flags) return;
|
||||
@ -473,7 +473,7 @@ static void aio_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
/*
|
||||
do a single event loop using the events defined in ev
|
||||
*/
|
||||
static int aio_event_loop_once(struct event_context *ev)
|
||||
static int aio_event_loop_once(struct tevent_context *ev)
|
||||
{
|
||||
struct aio_event_context *aio_ev = talloc_get_type(ev->additional_data,
|
||||
struct aio_event_context);
|
||||
@ -492,7 +492,7 @@ static int aio_event_loop_once(struct event_context *ev)
|
||||
/*
|
||||
return on failure or (with 0) if all fd events are removed
|
||||
*/
|
||||
static int aio_event_loop_wait(struct event_context *ev)
|
||||
static int aio_event_loop_wait(struct tevent_context *ev)
|
||||
{
|
||||
struct aio_event_context *aio_ev = talloc_get_type(ev->additional_data,
|
||||
struct aio_event_context);
|
||||
@ -510,7 +510,7 @@ static int aio_event_loop_wait(struct event_context *ev)
|
||||
*/
|
||||
static int aio_destructor(struct aio_event *ae)
|
||||
{
|
||||
struct event_context *ev = ae->event_ctx;
|
||||
struct tevent_context *ev = ae->event_ctx;
|
||||
struct aio_event_context *aio_ev = talloc_get_type(ev->additional_data,
|
||||
struct aio_event_context);
|
||||
struct io_event result;
|
||||
@ -520,7 +520,7 @@ static int aio_destructor(struct aio_event *ae)
|
||||
}
|
||||
|
||||
/* submit an aio disk IO event */
|
||||
static struct aio_event *aio_event_add_aio(struct event_context *ev,
|
||||
static struct aio_event *aio_event_add_aio(struct tevent_context *ev,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
struct iocb *iocb,
|
||||
event_aio_handler_t handler,
|
||||
|
@ -30,7 +30,7 @@
|
||||
/*
|
||||
this allows the user to choose their own debug function
|
||||
*/
|
||||
int ev_set_debug(struct event_context *ev,
|
||||
int ev_set_debug(struct tevent_context *ev,
|
||||
void (*debug)(void *context, enum ev_debug_level level,
|
||||
const char *fmt, va_list ap),
|
||||
void *context)
|
||||
@ -57,7 +57,7 @@ void ev_debug_stderr(void *context, enum ev_debug_level level,
|
||||
convenience function to setup debug messages on stderr
|
||||
messages of level EV_DEBUG_WARNING and higher are printed
|
||||
*/
|
||||
int ev_set_debug_stderr(struct event_context *ev)
|
||||
int ev_set_debug_stderr(struct tevent_context *ev)
|
||||
{
|
||||
return ev_set_debug(ev, ev_debug_stderr, ev);
|
||||
}
|
||||
@ -70,7 +70,7 @@ int ev_set_debug_stderr(struct event_context *ev)
|
||||
* Applications using the library must decide where to
|
||||
* redirect debugging messages
|
||||
*/
|
||||
void ev_debug(struct event_context *ev, enum ev_debug_level level, const char *fmt, ...)
|
||||
void ev_debug(struct tevent_context *ev, enum ev_debug_level level, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
if (ev->debug_ops.debug == NULL) {
|
||||
|
@ -30,10 +30,10 @@
|
||||
|
||||
struct epoll_event_context {
|
||||
/* a pointer back to the generic event_context */
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
|
||||
/* list of filedescriptor events */
|
||||
struct fd_event *fd_events;
|
||||
struct tevent_fd *fd_events;
|
||||
|
||||
/* number of registered fd event handlers */
|
||||
int num_fd_events;
|
||||
@ -98,7 +98,7 @@ static int epoll_init_ctx(struct epoll_event_context *epoll_ev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void epoll_add_event(struct epoll_event_context *epoll_ev, struct fd_event *fde);
|
||||
static void epoll_add_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde);
|
||||
|
||||
/*
|
||||
reopen the epoll handle when our pid changes
|
||||
@ -107,7 +107,7 @@ static void epoll_add_event(struct epoll_event_context *epoll_ev, struct fd_even
|
||||
*/
|
||||
static void epoll_check_reopen(struct epoll_event_context *epoll_ev)
|
||||
{
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
if (epoll_ev->pid == getpid()) {
|
||||
return;
|
||||
@ -133,7 +133,7 @@ static void epoll_check_reopen(struct epoll_event_context *epoll_ev)
|
||||
/*
|
||||
add the epoll event to the given fd_event
|
||||
*/
|
||||
static void epoll_add_event(struct epoll_event_context *epoll_ev, struct fd_event *fde)
|
||||
static void epoll_add_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
|
||||
@ -161,7 +161,7 @@ static void epoll_add_event(struct epoll_event_context *epoll_ev, struct fd_even
|
||||
/*
|
||||
delete the epoll event for given fd_event
|
||||
*/
|
||||
static void epoll_del_event(struct epoll_event_context *epoll_ev, struct fd_event *fde)
|
||||
static void epoll_del_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
|
||||
@ -186,7 +186,7 @@ static void epoll_del_event(struct epoll_event_context *epoll_ev, struct fd_even
|
||||
/*
|
||||
change the epoll event to the given fd_event
|
||||
*/
|
||||
static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct fd_event *fde)
|
||||
static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
if (epoll_ev->epoll_fd == -1) return;
|
||||
@ -206,7 +206,7 @@ static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct fd_even
|
||||
}
|
||||
}
|
||||
|
||||
static void epoll_change_event(struct epoll_event_context *epoll_ev, struct fd_event *fde)
|
||||
static void epoll_change_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde)
|
||||
{
|
||||
bool got_error = (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR);
|
||||
bool want_read = (fde->flags & EVENT_FD_READ);
|
||||
@ -282,8 +282,8 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval
|
||||
}
|
||||
|
||||
for (i=0;i<ret;i++) {
|
||||
struct fd_event *fde = talloc_get_type(events[i].data.ptr,
|
||||
struct fd_event);
|
||||
struct tevent_fd *fde = talloc_get_type(events[i].data.ptr,
|
||||
struct tevent_fd);
|
||||
uint16_t flags = 0;
|
||||
|
||||
if (fde == NULL) {
|
||||
@ -320,7 +320,7 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval
|
||||
/*
|
||||
create a epoll_event_context structure.
|
||||
*/
|
||||
static int epoll_event_context_init(struct event_context *ev)
|
||||
static int epoll_event_context_init(struct tevent_context *ev)
|
||||
{
|
||||
int ret;
|
||||
struct epoll_event_context *epoll_ev;
|
||||
@ -343,9 +343,9 @@ static int epoll_event_context_init(struct event_context *ev)
|
||||
/*
|
||||
destroy an fd_event
|
||||
*/
|
||||
static int epoll_event_fd_destructor(struct fd_event *fde)
|
||||
static int epoll_event_fd_destructor(struct tevent_fd *fde)
|
||||
{
|
||||
struct event_context *ev = fde->event_ctx;
|
||||
struct tevent_context *ev = fde->event_ctx;
|
||||
struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data,
|
||||
struct epoll_event_context);
|
||||
|
||||
@ -370,18 +370,18 @@ static int epoll_event_fd_destructor(struct fd_event *fde)
|
||||
add a fd based event
|
||||
return NULL on failure (memory allocation error)
|
||||
*/
|
||||
static struct fd_event *epoll_event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
static struct tevent_fd *epoll_event_add_fd(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
int fd, uint16_t flags,
|
||||
event_fd_handler_t handler,
|
||||
void *private_data)
|
||||
{
|
||||
struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data,
|
||||
struct epoll_event_context);
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
epoll_check_reopen(epoll_ev);
|
||||
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event);
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct tevent_fd);
|
||||
if (!fde) return NULL;
|
||||
|
||||
fde->event_ctx = ev;
|
||||
@ -405,7 +405,7 @@ static struct fd_event *epoll_event_add_fd(struct event_context *ev, TALLOC_CTX
|
||||
/*
|
||||
return the fd event flags
|
||||
*/
|
||||
static uint16_t epoll_event_get_fd_flags(struct fd_event *fde)
|
||||
static uint16_t epoll_event_get_fd_flags(struct tevent_fd *fde)
|
||||
{
|
||||
return fde->flags;
|
||||
}
|
||||
@ -413,9 +413,9 @@ static uint16_t epoll_event_get_fd_flags(struct fd_event *fde)
|
||||
/*
|
||||
set the fd event flags
|
||||
*/
|
||||
static void epoll_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
static void epoll_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
struct epoll_event_context *epoll_ev;
|
||||
|
||||
if (fde->flags == flags) return;
|
||||
@ -433,7 +433,7 @@ static void epoll_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
/*
|
||||
do a single event loop using the events defined in ev
|
||||
*/
|
||||
static int epoll_event_loop_once(struct event_context *ev)
|
||||
static int epoll_event_loop_once(struct tevent_context *ev)
|
||||
{
|
||||
struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data,
|
||||
struct epoll_event_context);
|
||||
@ -452,7 +452,7 @@ static int epoll_event_loop_once(struct event_context *ev)
|
||||
/*
|
||||
return on failure or (with 0) if all fd events are removed
|
||||
*/
|
||||
static int epoll_event_loop_wait(struct event_context *ev)
|
||||
static int epoll_event_loop_wait(struct tevent_context *ev)
|
||||
{
|
||||
struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data,
|
||||
struct epoll_event_context);
|
||||
|
@ -106,7 +106,7 @@ int ev_set_debug(struct tevent_context *ev,
|
||||
const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0),
|
||||
void *context);
|
||||
int ev_set_debug_stderr(struct tevent_context *ev);
|
||||
void ev_debug(struct event_context *ev, enum ev_debug_level level, const char *fmt, ...);
|
||||
void ev_debug(struct tevent_context *ev, enum ev_debug_level level, const char *fmt, ...);
|
||||
|
||||
/* aio event is private to the aio backend */
|
||||
struct tevent_aio;
|
||||
|
@ -33,7 +33,7 @@
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
*/
|
||||
|
||||
static int oop_event_context_destructor(struct event_context *ev)
|
||||
static int oop_event_context_destructor(struct tevent_context *ev)
|
||||
{
|
||||
oop_source_sys *oop_sys = ev->additional_data;
|
||||
|
||||
@ -45,7 +45,7 @@ static int oop_event_context_destructor(struct event_context *ev)
|
||||
/*
|
||||
create a oop_event_context structure.
|
||||
*/
|
||||
static int oop_event_context_init(struct event_context *ev, void *private_data)
|
||||
static int oop_event_context_init(struct tevent_context *ev, void *private_data)
|
||||
{
|
||||
oop_source_sys *oop_sys = private_data;
|
||||
|
||||
@ -65,7 +65,7 @@ static int oop_event_context_init(struct event_context *ev, void *private_data)
|
||||
|
||||
static void *oop_event_fd_handler(oop_source *oop, int fd, oop_event oop_type, void *ptr)
|
||||
{
|
||||
struct fd_event *fde = ptr;
|
||||
struct tevent_fd *fde = ptr;
|
||||
|
||||
if (fd != fde->fd) return OOP_ERROR;
|
||||
|
||||
@ -88,9 +88,9 @@ static void *oop_event_fd_handler(oop_source *oop, int fd, oop_event oop_type, v
|
||||
/*
|
||||
destroy an fd_event
|
||||
*/
|
||||
static int oop_event_fd_destructor(struct fd_event *fde)
|
||||
static int oop_event_fd_destructor(struct tevent_fd *fde)
|
||||
{
|
||||
struct event_context *ev = fde->event_ctx;
|
||||
struct tevent_context *ev = fde->event_ctx;
|
||||
oop_source_sys *oop_sys = ev->additional_data;
|
||||
oop_source *oop = oop_sys_source(oop_sys);
|
||||
|
||||
@ -111,16 +111,16 @@ static int oop_event_fd_destructor(struct fd_event *fde)
|
||||
add a fd based event
|
||||
return NULL on failure (memory allocation error)
|
||||
*/
|
||||
static struct fd_event *oop_event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
static struct tevent_fd *oop_event_add_fd(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
int fd, uint16_t flags,
|
||||
event_fd_handler_t handler,
|
||||
void *private_data)
|
||||
{
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
oop_source_sys *oop_sys = ev->additional_data;
|
||||
oop_source *oop = oop_sys_source(oop_sys);
|
||||
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event);
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct tevent_fd);
|
||||
if (!fde) return NULL;
|
||||
|
||||
fde->event_ctx = ev;
|
||||
@ -144,7 +144,7 @@ static struct fd_event *oop_event_add_fd(struct event_context *ev, TALLOC_CTX *m
|
||||
/*
|
||||
return the fd event flags
|
||||
*/
|
||||
static uint16_t oop_event_get_fd_flags(struct fd_event *fde)
|
||||
static uint16_t oop_event_get_fd_flags(struct tevent_fd *fde)
|
||||
{
|
||||
return fde->flags;
|
||||
}
|
||||
@ -152,7 +152,7 @@ static uint16_t oop_event_get_fd_flags(struct fd_event *fde)
|
||||
/*
|
||||
set the fd event flags
|
||||
*/
|
||||
static void oop_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
static void oop_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags)
|
||||
{
|
||||
oop_source_sys *oop_sys;
|
||||
oop_source *oop;
|
||||
@ -175,16 +175,16 @@ static void oop_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
fde->flags = flags;
|
||||
}
|
||||
|
||||
static int oop_event_timed_destructor(struct timed_event *te);
|
||||
static int oop_event_timed_destructor(struct tevent_timer *te);
|
||||
|
||||
static int oop_event_timed_deny_destructor(struct timed_event *te)
|
||||
static int oop_event_timed_deny_destructor(struct tevent_timer *te)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void *oop_event_timed_handler(oop_source *oop, struct timeval t, void *ptr)
|
||||
{
|
||||
struct timed_event *te = ptr;
|
||||
struct tevent_timer *te = ptr;
|
||||
|
||||
/* deny the handler to free the event */
|
||||
talloc_set_destructor(te, oop_event_timed_deny_destructor);
|
||||
@ -199,9 +199,9 @@ static void *oop_event_timed_handler(oop_source *oop, struct timeval t, void *pt
|
||||
/*
|
||||
destroy a timed event
|
||||
*/
|
||||
static int oop_event_timed_destructor(struct timed_event *te)
|
||||
static int oop_event_timed_destructor(struct tevent_timer *te)
|
||||
{
|
||||
struct event_context *ev = te->event_ctx;
|
||||
struct tevent_context *ev = te->event_ctx;
|
||||
oop_source_sys *oop_sys = ev->additional_data;
|
||||
oop_source *oop = oop_sys_source(oop_sys);
|
||||
|
||||
@ -214,16 +214,16 @@ static int oop_event_timed_destructor(struct timed_event *te)
|
||||
add a timed event
|
||||
return NULL on failure (memory allocation error)
|
||||
*/
|
||||
static struct timed_event *oop_event_add_timed(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
static struct tevent_timer *oop_event_add_timed(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
struct timeval next_event,
|
||||
event_timed_handler_t handler,
|
||||
void *private_data)
|
||||
{
|
||||
oop_source_sys *oop_sys = ev->additional_data;
|
||||
oop_source *oop = oop_sys_source(oop_sys);
|
||||
struct timed_event *te;
|
||||
struct tevent_timer *te;
|
||||
|
||||
te = talloc(mem_ctx?mem_ctx:ev, struct timed_event);
|
||||
te = talloc(mem_ctx?mem_ctx:ev, struct tevent_timer);
|
||||
if (te == NULL) return NULL;
|
||||
|
||||
te->event_ctx = ev;
|
||||
@ -242,7 +242,7 @@ static struct timed_event *oop_event_add_timed(struct event_context *ev, TALLOC_
|
||||
/*
|
||||
do a single event loop using the events defined in ev
|
||||
*/
|
||||
static int oop_event_loop_once(struct event_context *ev)
|
||||
static int oop_event_loop_once(struct tevent_context *ev)
|
||||
{
|
||||
void *oop_ret;
|
||||
oop_source_sys *oop_sys = ev->additional_data;
|
||||
@ -258,7 +258,7 @@ static int oop_event_loop_once(struct event_context *ev)
|
||||
/*
|
||||
return on failure or (with 0) if all fd events are removed
|
||||
*/
|
||||
static int oop_event_loop_wait(struct event_context *ev)
|
||||
static int oop_event_loop_wait(struct tevent_context *ev)
|
||||
{
|
||||
void *oop_ret;
|
||||
oop_source_sys *oop_sys = ev->additional_data;
|
||||
|
@ -32,13 +32,13 @@
|
||||
|
||||
struct select_event_context {
|
||||
/* a pointer back to the generic event_context */
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
|
||||
/* list of filedescriptor events */
|
||||
struct fd_event *fd_events;
|
||||
struct tevent_fd *fd_events;
|
||||
|
||||
/* list of timed events */
|
||||
struct timed_event *timed_events;
|
||||
struct tevent_timer *timed_events;
|
||||
|
||||
/* the maximum file descriptor number in fd_events */
|
||||
int maxfd;
|
||||
@ -54,7 +54,7 @@ struct select_event_context {
|
||||
/*
|
||||
create a select_event_context structure.
|
||||
*/
|
||||
static int select_event_context_init(struct event_context *ev)
|
||||
static int select_event_context_init(struct tevent_context *ev)
|
||||
{
|
||||
struct select_event_context *select_ev;
|
||||
|
||||
@ -71,7 +71,7 @@ static int select_event_context_init(struct event_context *ev)
|
||||
*/
|
||||
static void calc_maxfd(struct select_event_context *select_ev)
|
||||
{
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
select_ev->maxfd = 0;
|
||||
for (fde = select_ev->fd_events; fde; fde = fde->next) {
|
||||
@ -90,9 +90,9 @@ static void calc_maxfd(struct select_event_context *select_ev)
|
||||
/*
|
||||
destroy an fd_event
|
||||
*/
|
||||
static int select_event_fd_destructor(struct fd_event *fde)
|
||||
static int select_event_fd_destructor(struct tevent_fd *fde)
|
||||
{
|
||||
struct event_context *ev = fde->event_ctx;
|
||||
struct tevent_context *ev = fde->event_ctx;
|
||||
struct select_event_context *select_ev = talloc_get_type(ev->additional_data,
|
||||
struct select_event_context);
|
||||
|
||||
@ -115,16 +115,16 @@ static int select_event_fd_destructor(struct fd_event *fde)
|
||||
add a fd based event
|
||||
return NULL on failure (memory allocation error)
|
||||
*/
|
||||
static struct fd_event *select_event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
static struct tevent_fd *select_event_add_fd(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
int fd, uint16_t flags,
|
||||
event_fd_handler_t handler,
|
||||
void *private_data)
|
||||
{
|
||||
struct select_event_context *select_ev = talloc_get_type(ev->additional_data,
|
||||
struct select_event_context);
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event);
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct tevent_fd);
|
||||
if (!fde) return NULL;
|
||||
|
||||
fde->event_ctx = ev;
|
||||
@ -148,7 +148,7 @@ static struct fd_event *select_event_add_fd(struct event_context *ev, TALLOC_CTX
|
||||
/*
|
||||
return the fd event flags
|
||||
*/
|
||||
static uint16_t select_event_get_fd_flags(struct fd_event *fde)
|
||||
static uint16_t select_event_get_fd_flags(struct tevent_fd *fde)
|
||||
{
|
||||
return fde->flags;
|
||||
}
|
||||
@ -156,9 +156,9 @@ static uint16_t select_event_get_fd_flags(struct fd_event *fde)
|
||||
/*
|
||||
set the fd event flags
|
||||
*/
|
||||
static void select_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
static void select_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
struct select_event_context *select_ev;
|
||||
|
||||
if (fde->flags == flags) return;
|
||||
@ -175,7 +175,7 @@ static void select_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
static int select_event_loop_select(struct select_event_context *select_ev, struct timeval *tvalp)
|
||||
{
|
||||
fd_set r_fds, w_fds;
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
int selrtn;
|
||||
uint32_t destruction_count = ++select_ev->destruction_count;
|
||||
|
||||
@ -252,7 +252,7 @@ static int select_event_loop_select(struct select_event_context *select_ev, stru
|
||||
/*
|
||||
do a single event loop using the events defined in ev
|
||||
*/
|
||||
static int select_event_loop_once(struct event_context *ev)
|
||||
static int select_event_loop_once(struct tevent_context *ev)
|
||||
{
|
||||
struct select_event_context *select_ev = talloc_get_type(ev->additional_data,
|
||||
struct select_event_context);
|
||||
@ -269,7 +269,7 @@ static int select_event_loop_once(struct event_context *ev)
|
||||
/*
|
||||
return on failure or (with 0) if all fd events are removed
|
||||
*/
|
||||
static int select_event_loop_wait(struct event_context *ev)
|
||||
static int select_event_loop_wait(struct tevent_context *ev)
|
||||
{
|
||||
struct select_event_context *select_ev = talloc_get_type(ev->additional_data,
|
||||
struct select_event_context);
|
||||
|
@ -129,7 +129,7 @@ static int signal_event_destructor(struct signal_event *se)
|
||||
/*
|
||||
this is part of the pipe hack needed to avoid the signal race condition
|
||||
*/
|
||||
static void signal_pipe_handler(struct event_context *ev, struct fd_event *fde,
|
||||
static void signal_pipe_handler(struct tevent_context *ev, struct tevent_fd *fde,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
char c[16];
|
||||
@ -141,7 +141,7 @@ static void signal_pipe_handler(struct event_context *ev, struct fd_event *fde,
|
||||
add a signal event
|
||||
return NULL on failure (memory allocation error)
|
||||
*/
|
||||
struct signal_event *common_event_add_signal(struct event_context *ev,
|
||||
struct signal_event *common_event_add_signal(struct tevent_context *ev,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
int signum,
|
||||
int sa_flags,
|
||||
@ -233,7 +233,7 @@ struct signal_event *common_event_add_signal(struct event_context *ev,
|
||||
check if a signal is pending
|
||||
return != 0 if a signal was pending
|
||||
*/
|
||||
int common_event_check_signal(struct event_context *ev)
|
||||
int common_event_check_signal(struct tevent_context *ev)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
@ -37,10 +37,10 @@
|
||||
|
||||
struct std_event_context {
|
||||
/* a pointer back to the generic event_context */
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
|
||||
/* list of filedescriptor events */
|
||||
struct fd_event *fd_events;
|
||||
struct tevent_fd *fd_events;
|
||||
|
||||
/* the maximum file descriptor number in fd_events */
|
||||
int maxfd;
|
||||
@ -112,7 +112,7 @@ static void epoll_init_ctx(struct std_event_context *std_ev)
|
||||
talloc_set_destructor(std_ev, epoll_ctx_destructor);
|
||||
}
|
||||
|
||||
static void epoll_add_event(struct std_event_context *std_ev, struct fd_event *fde);
|
||||
static void epoll_add_event(struct std_event_context *std_ev, struct tevent_fd *fde);
|
||||
|
||||
/*
|
||||
reopen the epoll handle when our pid changes
|
||||
@ -121,7 +121,7 @@ static void epoll_add_event(struct std_event_context *std_ev, struct fd_event *f
|
||||
*/
|
||||
static void epoll_check_reopen(struct std_event_context *std_ev)
|
||||
{
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
if (std_ev->pid == getpid()) {
|
||||
return;
|
||||
@ -147,7 +147,7 @@ static void epoll_check_reopen(struct std_event_context *std_ev)
|
||||
/*
|
||||
add the epoll event to the given fd_event
|
||||
*/
|
||||
static void epoll_add_event(struct std_event_context *std_ev, struct fd_event *fde)
|
||||
static void epoll_add_event(struct std_event_context *std_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
if (std_ev->epoll_fd == -1) return;
|
||||
@ -174,7 +174,7 @@ static void epoll_add_event(struct std_event_context *std_ev, struct fd_event *f
|
||||
/*
|
||||
delete the epoll event for given fd_event
|
||||
*/
|
||||
static void epoll_del_event(struct std_event_context *std_ev, struct fd_event *fde)
|
||||
static void epoll_del_event(struct std_event_context *std_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
if (std_ev->epoll_fd == -1) return;
|
||||
@ -194,7 +194,7 @@ static void epoll_del_event(struct std_event_context *std_ev, struct fd_event *f
|
||||
/*
|
||||
change the epoll event to the given fd_event
|
||||
*/
|
||||
static void epoll_mod_event(struct std_event_context *std_ev, struct fd_event *fde)
|
||||
static void epoll_mod_event(struct std_event_context *std_ev, struct tevent_fd *fde)
|
||||
{
|
||||
struct epoll_event event;
|
||||
if (std_ev->epoll_fd == -1) return;
|
||||
@ -214,7 +214,7 @@ static void epoll_mod_event(struct std_event_context *std_ev, struct fd_event *f
|
||||
}
|
||||
}
|
||||
|
||||
static void epoll_change_event(struct std_event_context *std_ev, struct fd_event *fde)
|
||||
static void epoll_change_event(struct std_event_context *std_ev, struct tevent_fd *fde)
|
||||
{
|
||||
bool got_error = (fde->additional_flags & EPOLL_ADDITIONAL_FD_FLAG_GOT_ERROR);
|
||||
bool want_read = (fde->flags & EVENT_FD_READ);
|
||||
@ -290,8 +290,8 @@ static int epoll_event_loop(struct std_event_context *std_ev, struct timeval *tv
|
||||
}
|
||||
|
||||
for (i=0;i<ret;i++) {
|
||||
struct fd_event *fde = talloc_get_type(events[i].data.ptr,
|
||||
struct fd_event);
|
||||
struct tevent_fd *fde = talloc_get_type(events[i].data.ptr,
|
||||
struct tevent_fd);
|
||||
uint16_t flags = 0;
|
||||
|
||||
if (fde == NULL) {
|
||||
@ -336,7 +336,7 @@ static int epoll_event_loop(struct std_event_context *std_ev, struct timeval *tv
|
||||
/*
|
||||
create a std_event_context structure.
|
||||
*/
|
||||
static int std_event_context_init(struct event_context *ev)
|
||||
static int std_event_context_init(struct tevent_context *ev)
|
||||
{
|
||||
struct std_event_context *std_ev;
|
||||
|
||||
@ -356,7 +356,7 @@ static int std_event_context_init(struct event_context *ev)
|
||||
*/
|
||||
static void calc_maxfd(struct std_event_context *std_ev)
|
||||
{
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
std_ev->maxfd = 0;
|
||||
for (fde = std_ev->fd_events; fde; fde = fde->next) {
|
||||
@ -375,9 +375,9 @@ static void calc_maxfd(struct std_event_context *std_ev)
|
||||
/*
|
||||
destroy an fd_event
|
||||
*/
|
||||
static int std_event_fd_destructor(struct fd_event *fde)
|
||||
static int std_event_fd_destructor(struct tevent_fd *fde)
|
||||
{
|
||||
struct event_context *ev = fde->event_ctx;
|
||||
struct tevent_context *ev = fde->event_ctx;
|
||||
struct std_event_context *std_ev = talloc_get_type(ev->additional_data,
|
||||
struct std_event_context);
|
||||
|
||||
@ -404,18 +404,18 @@ static int std_event_fd_destructor(struct fd_event *fde)
|
||||
add a fd based event
|
||||
return NULL on failure (memory allocation error)
|
||||
*/
|
||||
static struct fd_event *std_event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
static struct tevent_fd *std_event_add_fd(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
int fd, uint16_t flags,
|
||||
event_fd_handler_t handler,
|
||||
void *private_data)
|
||||
{
|
||||
struct std_event_context *std_ev = talloc_get_type(ev->additional_data,
|
||||
struct std_event_context);
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
epoll_check_reopen(std_ev);
|
||||
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct fd_event);
|
||||
fde = talloc(mem_ctx?mem_ctx:ev, struct tevent_fd);
|
||||
if (!fde) return NULL;
|
||||
|
||||
fde->event_ctx = ev;
|
||||
@ -442,7 +442,7 @@ static struct fd_event *std_event_add_fd(struct event_context *ev, TALLOC_CTX *m
|
||||
/*
|
||||
return the fd event flags
|
||||
*/
|
||||
static uint16_t std_event_get_fd_flags(struct fd_event *fde)
|
||||
static uint16_t std_event_get_fd_flags(struct tevent_fd *fde)
|
||||
{
|
||||
return fde->flags;
|
||||
}
|
||||
@ -450,9 +450,9 @@ static uint16_t std_event_get_fd_flags(struct fd_event *fde)
|
||||
/*
|
||||
set the fd event flags
|
||||
*/
|
||||
static void std_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
static void std_event_set_fd_flags(struct tevent_fd *fde, uint16_t flags)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
struct std_event_context *std_ev;
|
||||
|
||||
if (fde->flags == flags) return;
|
||||
@ -473,7 +473,7 @@ static void std_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
|
||||
static int std_event_loop_select(struct std_event_context *std_ev, struct timeval *tvalp)
|
||||
{
|
||||
fd_set r_fds, w_fds;
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
int selrtn;
|
||||
uint32_t destruction_count = ++std_ev->destruction_count;
|
||||
|
||||
@ -550,7 +550,7 @@ static int std_event_loop_select(struct std_event_context *std_ev, struct timeva
|
||||
/*
|
||||
do a single event loop using the events defined in ev
|
||||
*/
|
||||
static int std_event_loop_once(struct event_context *ev)
|
||||
static int std_event_loop_once(struct tevent_context *ev)
|
||||
{
|
||||
struct std_event_context *std_ev = talloc_get_type(ev->additional_data,
|
||||
struct std_event_context);
|
||||
@ -573,7 +573,7 @@ static int std_event_loop_once(struct event_context *ev)
|
||||
/*
|
||||
return on failure or (with 0) if all fd events are removed
|
||||
*/
|
||||
static int std_event_loop_wait(struct event_context *ev)
|
||||
static int std_event_loop_wait(struct tevent_context *ev)
|
||||
{
|
||||
struct std_event_context *std_ev = talloc_get_type(ev->additional_data,
|
||||
struct std_event_context);
|
||||
|
@ -109,15 +109,15 @@ bool ev_timeval_is_zero(const struct timeval *tv)
|
||||
/*
|
||||
destroy a timed event
|
||||
*/
|
||||
static int common_event_timed_destructor(struct timed_event *te)
|
||||
static int common_event_timed_destructor(struct tevent_timer *te)
|
||||
{
|
||||
struct event_context *ev = talloc_get_type(te->event_ctx,
|
||||
struct event_context);
|
||||
struct tevent_context *ev = talloc_get_type(te->event_ctx,
|
||||
struct tevent_context);
|
||||
DLIST_REMOVE(ev->timer_events, te);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int common_event_timed_deny_destructor(struct timed_event *te)
|
||||
static int common_event_timed_deny_destructor(struct tevent_timer *te)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
@ -126,14 +126,14 @@ static int common_event_timed_deny_destructor(struct timed_event *te)
|
||||
add a timed event
|
||||
return NULL on failure (memory allocation error)
|
||||
*/
|
||||
struct timed_event *common_event_add_timed(struct event_context *ev, TALLOC_CTX *mem_ctx,
|
||||
struct tevent_timer *common_event_add_timed(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
|
||||
struct timeval next_event,
|
||||
event_timed_handler_t handler,
|
||||
void *private_data)
|
||||
{
|
||||
struct timed_event *te, *last_te, *cur_te;
|
||||
struct tevent_timer *te, *last_te, *cur_te;
|
||||
|
||||
te = talloc(mem_ctx?mem_ctx:ev, struct timed_event);
|
||||
te = talloc(mem_ctx?mem_ctx:ev, struct tevent_timer);
|
||||
if (te == NULL) return NULL;
|
||||
|
||||
te->event_ctx = ev;
|
||||
@ -166,10 +166,10 @@ struct timed_event *common_event_add_timed(struct event_context *ev, TALLOC_CTX
|
||||
return the delay untill the next timed event,
|
||||
or zero if a timed event was triggered
|
||||
*/
|
||||
struct timeval common_event_loop_timer_delay(struct event_context *ev)
|
||||
struct timeval common_event_loop_timer_delay(struct tevent_context *ev)
|
||||
{
|
||||
struct timeval current_time = ev_timeval_zero();
|
||||
struct timed_event *te = ev->timer_events;
|
||||
struct tevent_timer *te = ev->timer_events;
|
||||
|
||||
if (!te) {
|
||||
/* have a default tick time of 30 seconds. This guarantees
|
||||
|
@ -40,7 +40,7 @@ struct torture_results *torture_results_init(TALLOC_CTX *mem_ctx, const struct t
|
||||
/**
|
||||
* Initialize a torture context
|
||||
*/
|
||||
struct torture_context *torture_context_init(struct event_context *event_ctx,
|
||||
struct torture_context *torture_context_init(struct tevent_context *event_ctx,
|
||||
struct torture_results *results)
|
||||
{
|
||||
struct torture_context *torture = talloc_zero(event_ctx,
|
||||
|
@ -90,7 +90,7 @@ struct torture_context
|
||||
int level;
|
||||
|
||||
/** Event context */
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
|
||||
/** Loadparm context (will go away in favor of torture_setting_ at some point) */
|
||||
struct loadparm_context *lp_ctx;
|
||||
@ -427,7 +427,7 @@ bool torture_suite_init_tcase(struct torture_suite *suite,
|
||||
struct torture_tcase *tcase,
|
||||
const char *name);
|
||||
|
||||
struct torture_context *torture_context_init(struct event_context *event_ctx, struct torture_results *results);
|
||||
struct torture_context *torture_context_init(struct tevent_context *event_ctx, struct torture_results *results);
|
||||
|
||||
struct torture_results *torture_results_init(TALLOC_CTX *mem_ctx, const struct torture_ui_ops *ui_ops);
|
||||
|
||||
|
@ -60,7 +60,7 @@ struct nbt_name_request {
|
||||
bool received_wack;
|
||||
|
||||
/* the timeout event */
|
||||
struct timed_event *te;
|
||||
struct tevent_timer *te;
|
||||
|
||||
/* the name transaction id */
|
||||
uint16_t name_trn_id;
|
||||
@ -94,14 +94,14 @@ struct nbt_name_request {
|
||||
*/
|
||||
struct nbt_name_socket {
|
||||
struct socket_context *sock;
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
struct smb_iconv_convenience *iconv_convenience;
|
||||
|
||||
/* a queue of requests pending to be sent */
|
||||
struct nbt_name_request *send_queue;
|
||||
|
||||
/* the fd event */
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
/* mapping from name_trn_id to pending event */
|
||||
struct idr_context *idr;
|
||||
@ -277,7 +277,7 @@ struct nbt_name_release {
|
||||
};
|
||||
|
||||
struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience);
|
||||
struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nbtsock,
|
||||
struct nbt_name_query *io);
|
||||
|
@ -114,7 +114,7 @@ failed:
|
||||
/*
|
||||
handle a request timeout
|
||||
*/
|
||||
static void nbt_name_socket_timeout(struct event_context *ev, struct timed_event *te,
|
||||
static void nbt_name_socket_timeout(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *private)
|
||||
{
|
||||
struct nbt_name_request *req = talloc_get_type(private,
|
||||
@ -291,7 +291,7 @@ done:
|
||||
/*
|
||||
handle fd events on a nbt_name_socket
|
||||
*/
|
||||
static void nbt_name_socket_handler(struct event_context *ev, struct fd_event *fde,
|
||||
static void nbt_name_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
struct nbt_name_socket *nbtsock = talloc_get_type(private,
|
||||
@ -310,7 +310,7 @@ static void nbt_name_socket_handler(struct event_context *ev, struct fd_event *f
|
||||
then operations will use that event context
|
||||
*/
|
||||
_PUBLIC_ struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience)
|
||||
{
|
||||
struct nbt_name_socket *nbtsock;
|
||||
|
@ -40,7 +40,7 @@ static void py_nbt_node_dealloc(PyObject *obj)
|
||||
|
||||
static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *kwargs)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
nbt_node_Object *ret = PyObject_New(nbt_node_Object, &nbt_node_Type);
|
||||
|
||||
ret->mem_ctx = talloc_new(NULL);
|
||||
|
@ -181,7 +181,7 @@ static NTSTATUS do_node_query(struct nbt_name_socket *nbtsock,
|
||||
}
|
||||
|
||||
|
||||
static bool process_one(struct loadparm_context *lp_ctx, struct event_context *ev,
|
||||
static bool process_one(struct loadparm_context *lp_ctx, struct tevent_context *ev,
|
||||
struct interface *ifaces, const char *name, int nbt_port)
|
||||
{
|
||||
TALLOC_CTX *tmp_ctx = talloc_new(NULL);
|
||||
@ -272,7 +272,7 @@ int main(int argc, const char *argv[])
|
||||
{
|
||||
bool ret = true;
|
||||
struct interface *ifaces;
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
poptContext pc;
|
||||
int opt;
|
||||
enum {
|
||||
|
@ -168,7 +168,7 @@ struct auth_context {
|
||||
struct auth_method_context *methods;
|
||||
|
||||
/* the event context to use for calls that can block */
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
|
||||
/* the messaging context which can be used by backends */
|
||||
struct messaging_context *msg_ctx;
|
||||
@ -219,13 +219,13 @@ NTSTATUS auth_system_session_info(TALLOC_CTX *parent_ctx,
|
||||
NTSTATUS auth_nt_status_squash(NTSTATUS nt_status);
|
||||
|
||||
NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **methods,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct messaging_context *msg,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_context **auth_ctx);
|
||||
|
||||
NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct messaging_context *msg,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_context **auth_ctx);
|
||||
@ -237,7 +237,7 @@ NTSTATUS auth_check_password(struct auth_context *auth_ctx,
|
||||
NTSTATUS auth_init(void);
|
||||
NTSTATUS auth_register(const struct auth_operations *ops);
|
||||
NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct messaging_context *msg,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *nt4_domain,
|
||||
|
@ -26,7 +26,7 @@
|
||||
#include "librpc/gen_ndr/misc.h"
|
||||
|
||||
struct ccache_container;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
/* In order of priority */
|
||||
enum credentials_obtained {
|
||||
@ -155,15 +155,15 @@ NTSTATUS cli_credentials_get_ntlm_response(struct cli_credentials *cred, TALLOC_
|
||||
const char *cli_credentials_get_realm(struct cli_credentials *cred);
|
||||
const char *cli_credentials_get_username(struct cli_credentials *cred);
|
||||
int cli_credentials_get_krb5_context(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct smb_krb5_context **smb_krb5_context);
|
||||
int cli_credentials_get_ccache(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct ccache_container **ccc);
|
||||
int cli_credentials_get_keytab(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct keytab_container **_ktc);
|
||||
const char *cli_credentials_get_domain(struct cli_credentials *cred);
|
||||
@ -174,11 +174,11 @@ void cli_credentials_set_conf(struct cli_credentials *cred,
|
||||
struct loadparm_context *lp_ctx);
|
||||
const char *cli_credentials_get_principal(struct cli_credentials *cred, TALLOC_CTX *mem_ctx);
|
||||
int cli_credentials_get_server_gss_creds(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct gssapi_creds_container **_gcc);
|
||||
int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct gssapi_creds_container **_gcc);
|
||||
void cli_credentials_set_kerberos_state(struct cli_credentials *creds,
|
||||
@ -205,7 +205,7 @@ void cli_credentials_set_netlogon_creds(struct cli_credentials *cred,
|
||||
NTSTATUS cli_credentials_set_krb5_context(struct cli_credentials *cred,
|
||||
struct smb_krb5_context *smb_krb5_context);
|
||||
NTSTATUS cli_credentials_set_stored_principal(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *serviceprincipal);
|
||||
NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred,
|
||||
@ -231,17 +231,17 @@ bool cli_credentials_set_ntlm_response(struct cli_credentials *cred,
|
||||
const DATA_BLOB *nt_response,
|
||||
enum credentials_obtained obtained);
|
||||
int cli_credentials_set_keytab_name(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *keytab_name,
|
||||
enum credentials_obtained obtained);
|
||||
int cli_credentials_update_keytab(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx);
|
||||
void cli_credentials_set_gensec_features(struct cli_credentials *creds, uint32_t gensec_features);
|
||||
uint32_t cli_credentials_get_gensec_features(struct cli_credentials *creds);
|
||||
int cli_credentials_set_ccache(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *name,
|
||||
enum credentials_obtained obtained);
|
||||
@ -253,7 +253,7 @@ void cli_credentials_invalidate_ccache(struct cli_credentials *cred,
|
||||
void cli_credentials_set_salt_principal(struct cli_credentials *cred, const char *principal);
|
||||
enum credentials_use_kerberos cli_credentials_get_kerberos_state(struct cli_credentials *creds);
|
||||
NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct ldb_context *ldb,
|
||||
const char *base,
|
||||
|
@ -172,7 +172,7 @@ _PUBLIC_ bool cli_credentials_parse_file(struct cli_credentials *cred, const cha
|
||||
* @retval NTSTATUS error detailing any failure
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct ldb_context *ldb,
|
||||
const char *base,
|
||||
@ -364,7 +364,7 @@ _PUBLIC_ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cr
|
||||
* @retval NTSTATUS error detailing any failure
|
||||
*/
|
||||
NTSTATUS cli_credentials_set_krbtgt(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx)
|
||||
{
|
||||
NTSTATUS status;
|
||||
@ -392,7 +392,7 @@ NTSTATUS cli_credentials_set_krbtgt(struct cli_credentials *cred,
|
||||
* @retval NTSTATUS error detailing any failure
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS cli_credentials_set_stored_principal(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *serviceprincipal)
|
||||
{
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include "param/param.h"
|
||||
|
||||
_PUBLIC_ int cli_credentials_get_krb5_context(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct smb_krb5_context **smb_krb5_context)
|
||||
{
|
||||
@ -128,7 +128,7 @@ static int free_dccache(struct ccache_container *ccc) {
|
||||
}
|
||||
|
||||
_PUBLIC_ int cli_credentials_set_ccache(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *name,
|
||||
enum credentials_obtained obtained)
|
||||
@ -204,7 +204,7 @@ _PUBLIC_ int cli_credentials_set_ccache(struct cli_credentials *cred,
|
||||
|
||||
|
||||
static int cli_credentials_new_ccache(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct ccache_container **_ccc)
|
||||
{
|
||||
@ -255,7 +255,7 @@ static int cli_credentials_new_ccache(struct cli_credentials *cred,
|
||||
}
|
||||
|
||||
_PUBLIC_ int cli_credentials_get_ccache(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct ccache_container **ccc)
|
||||
{
|
||||
@ -351,7 +351,7 @@ static int free_gssapi_creds(struct gssapi_creds_container *gcc)
|
||||
}
|
||||
|
||||
_PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct gssapi_creds_container **_gcc)
|
||||
{
|
||||
@ -457,7 +457,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
|
||||
*/
|
||||
|
||||
int cli_credentials_set_client_gss_creds(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
gss_cred_id_t gssapi_cred,
|
||||
enum credentials_obtained obtained)
|
||||
@ -512,7 +512,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
|
||||
* it will be generated from the password.
|
||||
*/
|
||||
_PUBLIC_ int cli_credentials_get_keytab(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct keytab_container **_ktc)
|
||||
{
|
||||
@ -567,7 +567,7 @@ _PUBLIC_ int cli_credentials_get_keytab(struct cli_credentials *cred,
|
||||
* FILE:/etc/krb5.keytab), open it and attach it */
|
||||
|
||||
_PUBLIC_ int cli_credentials_set_keytab_name(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *keytab_name,
|
||||
enum credentials_obtained obtained)
|
||||
@ -607,7 +607,7 @@ _PUBLIC_ int cli_credentials_set_keytab_name(struct cli_credentials *cred,
|
||||
}
|
||||
|
||||
_PUBLIC_ int cli_credentials_update_keytab(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
@ -644,7 +644,7 @@ _PUBLIC_ int cli_credentials_update_keytab(struct cli_credentials *cred,
|
||||
/* Get server gss credentials (in gsskrb5, this means the keytab) */
|
||||
|
||||
_PUBLIC_ int cli_credentials_get_server_gss_creds(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct gssapi_creds_container **_gcc)
|
||||
{
|
||||
|
@ -32,7 +32,7 @@ struct gssapi_creds_container {
|
||||
|
||||
/* Manually prototyped here to avoid needing gss headers in most callers */
|
||||
int cli_credentials_set_client_gss_creds(struct cli_credentials *cred,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
gss_cred_id_t gssapi_cred,
|
||||
enum credentials_obtained obtained);
|
||||
|
@ -506,7 +506,7 @@ const char **gensec_security_oids(struct gensec_security *gensec_security,
|
||||
@note The mem_ctx is only a parent and may be NULL.
|
||||
*/
|
||||
static NTSTATUS gensec_start(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct gensec_settings *settings,
|
||||
struct messaging_context *msg,
|
||||
struct gensec_security **gensec_security)
|
||||
@ -573,7 +573,7 @@ _PUBLIC_ NTSTATUS gensec_subcontext_start(TALLOC_CTX *mem_ctx,
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx,
|
||||
struct gensec_security **gensec_security,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct gensec_settings *settings)
|
||||
{
|
||||
NTSTATUS status;
|
||||
@ -599,7 +599,7 @@ _PUBLIC_ NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx,
|
||||
@note The mem_ctx is only a parent and may be NULL.
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS gensec_server_start(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct gensec_settings *settings,
|
||||
struct messaging_context *msg,
|
||||
struct gensec_security **gensec_security)
|
||||
@ -985,7 +985,7 @@ _PUBLIC_ NTSTATUS gensec_update(struct gensec_security *gensec_security, TALLOC_
|
||||
return gensec_security->ops->update(gensec_security, out_mem_ctx, in, out);
|
||||
}
|
||||
|
||||
static void gensec_update_async_timed_handler(struct event_context *ev, struct timed_event *te,
|
||||
static void gensec_update_async_timed_handler(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *ptr)
|
||||
{
|
||||
struct gensec_update_request *req = talloc_get_type(ptr, struct gensec_update_request);
|
||||
@ -1008,7 +1008,7 @@ _PUBLIC_ void gensec_update_send(struct gensec_security *gensec_security, const
|
||||
void *private_data)
|
||||
{
|
||||
struct gensec_update_request *req = NULL;
|
||||
struct timed_event *te = NULL;
|
||||
struct tevent_timer *te = NULL;
|
||||
|
||||
req = talloc(gensec_security, struct gensec_update_request);
|
||||
if (!req) goto failed;
|
||||
|
@ -68,7 +68,7 @@ enum gensec_role
|
||||
struct auth_session_info;
|
||||
struct cli_credentials;
|
||||
struct gensec_settings;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
struct gensec_update_request {
|
||||
struct gensec_security *gensec_security;
|
||||
@ -168,7 +168,7 @@ struct gensec_security {
|
||||
enum gensec_role gensec_role;
|
||||
bool subcontext;
|
||||
uint32_t want_features;
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
struct messaging_context *msg_ctx; /* only valid as server */
|
||||
struct socket_address *my_addr, *peer_addr;
|
||||
struct gensec_settings *settings;
|
||||
@ -189,7 +189,7 @@ struct socket_context;
|
||||
NTSTATUS gensec_socket_init(struct gensec_security *gensec_security,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
struct socket_context *current_socket,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
void (*recv_handler)(void *, uint16_t),
|
||||
void *recv_private,
|
||||
struct socket_context **new_socket);
|
||||
@ -220,7 +220,7 @@ NTSTATUS gensec_subcontext_start(TALLOC_CTX *mem_ctx,
|
||||
struct gensec_security **gensec_security);
|
||||
NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx,
|
||||
struct gensec_security **gensec_security,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct gensec_settings *settings);
|
||||
NTSTATUS gensec_start_mech_by_sasl_list(struct gensec_security *gensec_security,
|
||||
const char **sasl_names);
|
||||
@ -272,7 +272,7 @@ NTSTATUS gensec_start_mech_by_authtype(struct gensec_security *gensec_security,
|
||||
uint8_t auth_type, uint8_t auth_level);
|
||||
const char *gensec_get_name_by_authtype(struct gensec_security *gensec_security, uint8_t authtype);
|
||||
NTSTATUS gensec_server_start(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct gensec_settings *settings,
|
||||
struct messaging_context *msg,
|
||||
struct gensec_security **gensec_security);
|
||||
|
@ -34,7 +34,7 @@
|
||||
/**
|
||||
connect to the schannel ldb
|
||||
*/
|
||||
struct ldb_context *schannel_db_connect(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx,
|
||||
struct ldb_context *schannel_db_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx)
|
||||
{
|
||||
char *path;
|
||||
@ -140,7 +140,7 @@ NTSTATUS schannel_store_session_key_ldb(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
NTSTATUS schannel_store_session_key(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct creds_CredentialState *creds)
|
||||
{
|
||||
@ -272,7 +272,7 @@ NTSTATUS schannel_fetch_session_key_ldb(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
NTSTATUS schannel_fetch_session_key(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *computer_name,
|
||||
const char *domain,
|
||||
|
@ -31,7 +31,7 @@ static const struct socket_ops gensec_socket_ops;
|
||||
struct gensec_socket {
|
||||
struct gensec_security *gensec_security;
|
||||
struct socket_context *socket;
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
struct packet_context *packet;
|
||||
DATA_BLOB read_buffer; /* SASL packets are turned into liniarlised data here, for reading */
|
||||
size_t orig_send_len;
|
||||
@ -197,8 +197,8 @@ static void gensec_socket_error_handler(void *private, NTSTATUS status)
|
||||
}
|
||||
}
|
||||
|
||||
static void gensec_socket_trigger_read(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void gensec_socket_trigger_read(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t, void *private)
|
||||
{
|
||||
struct gensec_socket *gensec_socket = talloc_get_type(private, struct gensec_socket);
|
||||
@ -413,7 +413,7 @@ static NTSTATUS gensec_socket_send(struct socket_context *sock,
|
||||
NTSTATUS gensec_socket_init(struct gensec_security *gensec_security,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
struct socket_context *current_socket,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
void (*recv_handler)(void *, uint16_t),
|
||||
void *recv_private,
|
||||
struct socket_context **new_socket)
|
||||
|
@ -37,7 +37,7 @@ struct smb_krb5_socket {
|
||||
struct socket_context *sock;
|
||||
|
||||
/* the fd event */
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
NTSTATUS status;
|
||||
DATA_BLOB request, reply;
|
||||
@ -130,8 +130,8 @@ static NTSTATUS smb_krb5_full_packet(void *private, DATA_BLOB data)
|
||||
/*
|
||||
handle request timeouts
|
||||
*/
|
||||
static void smb_krb5_request_timeout(struct event_context *event_ctx,
|
||||
struct timed_event *te, struct timeval t,
|
||||
static void smb_krb5_request_timeout(struct tevent_context *event_ctx,
|
||||
struct tevent_timer *te, struct timeval t,
|
||||
void *private)
|
||||
{
|
||||
struct smb_krb5_socket *smb_krb5 = talloc_get_type(private, struct smb_krb5_socket);
|
||||
@ -169,7 +169,7 @@ static void smb_krb5_socket_send(struct smb_krb5_socket *smb_krb5)
|
||||
/*
|
||||
handle fd events on a smb_krb5_socket
|
||||
*/
|
||||
static void smb_krb5_socket_handler(struct event_context *ev, struct fd_event *fde,
|
||||
static void smb_krb5_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
struct smb_krb5_socket *smb_krb5 = talloc_get_type(private, struct smb_krb5_socket);
|
||||
@ -217,7 +217,7 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
|
||||
struct addrinfo *ai, *a;
|
||||
struct smb_krb5_socket *smb_krb5;
|
||||
|
||||
struct event_context *ev = talloc_get_type(data, struct event_context);
|
||||
struct tevent_context *ev = talloc_get_type(data, struct tevent_context);
|
||||
|
||||
DATA_BLOB send_blob = data_blob_const(send_buf->data, send_buf->length);
|
||||
|
||||
@ -361,7 +361,7 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
|
||||
}
|
||||
|
||||
krb5_error_code smb_krb5_init_context(void *parent_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct smb_krb5_context **smb_krb5_context)
|
||||
{
|
||||
|
@ -22,9 +22,9 @@ struct smb_krb5_context {
|
||||
krb5_log_facility *logf;
|
||||
};
|
||||
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
struct loadparm_context;
|
||||
krb5_error_code smb_krb5_init_context(void *parent_ctx, struct event_context *ev,
|
||||
krb5_error_code smb_krb5_init_context(void *parent_ctx, struct tevent_context *ev,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct smb_krb5_context **smb_krb5_context);
|
||||
void smb_krb5_free_context(struct smb_krb5_context *smb_krb5_context);
|
||||
|
@ -185,7 +185,7 @@ struct auth_check_password_request {
|
||||
} callback;
|
||||
};
|
||||
|
||||
static void auth_check_password_async_timed_handler(struct event_context *ev, struct timed_event *te,
|
||||
static void auth_check_password_async_timed_handler(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *ptr)
|
||||
{
|
||||
struct auth_check_password_request *req = talloc_get_type(ptr, struct auth_check_password_request);
|
||||
@ -271,7 +271,7 @@ _PUBLIC_ void auth_check_password_send(struct auth_context *auth_ctx,
|
||||
nt_status = NT_STATUS_NO_SUCH_USER; /* If all the modules say 'not for me', then this is reasonable */
|
||||
for (method = auth_ctx->methods; method; method = method->next) {
|
||||
NTSTATUS result;
|
||||
struct timed_event *te = NULL;
|
||||
struct tevent_timer *te = NULL;
|
||||
|
||||
/* check if the module wants to chek the password */
|
||||
result = method->ops->want_check(method, req, user_info);
|
||||
@ -351,7 +351,7 @@ _PUBLIC_ NTSTATUS auth_check_password_recv(struct auth_check_password_request *r
|
||||
- Allow the caller to specify the methods to use
|
||||
***************************************************************************/
|
||||
_PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **methods,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct messaging_context *msg,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_context **auth_ctx)
|
||||
@ -414,7 +414,7 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **
|
||||
- Uses default auth_methods, depending on server role and smb.conf settings
|
||||
***************************************************************************/
|
||||
_PUBLIC_ NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct messaging_context *msg,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_context **auth_ctx)
|
||||
|
@ -32,7 +32,7 @@
|
||||
when the caller doesn't need a session_info
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct messaging_context *msg,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *nt4_domain,
|
||||
|
@ -431,7 +431,7 @@ NTSTATUS sam_get_results_principal(struct ldb_context *sam_ctx,
|
||||
|
||||
/* Used in the gensec_gssapi and gensec_krb5 server-side code, where the PAC isn't available */
|
||||
NTSTATUS sam_get_server_info_principal(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *principal,
|
||||
struct auth_serversupplied_info **server_info)
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include "auth/session_proto.h"
|
||||
|
||||
_PUBLIC_ struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx)
|
||||
{
|
||||
NTSTATUS nt_status;
|
||||
@ -44,7 +44,7 @@ _PUBLIC_ struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_session_info **_session_info)
|
||||
{
|
||||
@ -153,7 +153,7 @@ _PUBLIC_ NTSTATUS auth_anonymous_server_info(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_serversupplied_info *server_info,
|
||||
struct auth_session_info **_session_info)
|
||||
|
@ -30,7 +30,7 @@ struct auth_session_info {
|
||||
|
||||
#include "librpc/gen_ndr/netlogon.h"
|
||||
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
/* Create a security token for a session SYSTEM (the most
|
||||
* trusted/prvilaged account), including the local machine account as
|
||||
@ -48,7 +48,7 @@ NTSTATUS auth_anonymous_server_info(TALLOC_CTX *mem_ctx,
|
||||
const char *netbios_name,
|
||||
struct auth_serversupplied_info **_server_info) ;
|
||||
NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_serversupplied_info *server_info,
|
||||
struct auth_session_info **_session_info) ;
|
||||
@ -59,12 +59,12 @@ NTSTATUS make_server_info_netlogon_validation(TALLOC_CTX *mem_ctx,
|
||||
union netr_Validation *validation,
|
||||
struct auth_serversupplied_info **_server_info);
|
||||
NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_session_info **_session_info);
|
||||
|
||||
struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx);
|
||||
|
||||
|
||||
|
@ -355,7 +355,7 @@ static void print_transfer_stats(void)
|
||||
}
|
||||
|
||||
static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
const char * which, const char **ports,
|
||||
struct smbcli_options *smb_options,
|
||||
const char *socket_options,
|
||||
@ -408,7 +408,7 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
|
||||
return(handle);
|
||||
}
|
||||
|
||||
static int copy_files(struct event_context *ev, struct loadparm_context *lp_ctx)
|
||||
static int copy_files(struct tevent_context *ev, struct loadparm_context *lp_ctx)
|
||||
{
|
||||
uint8_t * iobuf; /* IO buffer. */
|
||||
uint64_t iomax; /* Size of the IO buffer. */
|
||||
@ -549,7 +549,7 @@ int main(int argc, const char ** argv)
|
||||
{
|
||||
int i;
|
||||
const char ** dd_args;
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
|
||||
poptContext pctx;
|
||||
struct poptOption poptions[] = {
|
||||
|
@ -90,10 +90,10 @@ struct dd_iohandle
|
||||
|
||||
struct smbcli_options;
|
||||
struct smbcli_session_options;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
const char * path,
|
||||
const char **ports,
|
||||
uint64_t io_size, int options,
|
||||
|
@ -221,7 +221,7 @@ static bool smb_write_func(void * handle, uint8_t * buf, uint64_t wanted,
|
||||
}
|
||||
|
||||
static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
const char * host,
|
||||
const char **ports,
|
||||
const char * share,
|
||||
@ -303,7 +303,7 @@ static int open_smb_file(struct smbcli_state * cli,
|
||||
}
|
||||
|
||||
static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
const char * host,
|
||||
const char **ports,
|
||||
const char * share,
|
||||
@ -354,7 +354,7 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
const char * path,
|
||||
const char **ports,
|
||||
uint64_t io_size,
|
||||
|
@ -2557,7 +2557,7 @@ static void display_share_result(struct srvsvc_NetShareCtr1 *ctr1)
|
||||
try and browse available shares on a host
|
||||
****************************************************************************/
|
||||
static bool browse_host(struct loadparm_context *lp_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
const char *query_host)
|
||||
{
|
||||
struct dcerpc_pipe *p;
|
||||
@ -3041,7 +3041,7 @@ static int process_stdin(struct smbclient_context *ctx)
|
||||
return a connection to a server
|
||||
*******************************************************/
|
||||
static bool do_connect(struct smbclient_context *ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct resolve_context *resolve_ctx,
|
||||
const char *specified_server, const char **ports,
|
||||
const char *specified_share,
|
||||
@ -3088,7 +3088,7 @@ static bool do_connect(struct smbclient_context *ctx,
|
||||
handle a -L query
|
||||
****************************************************************************/
|
||||
static int do_host_query(struct loadparm_context *lp_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
const char *query_host,
|
||||
const char *workgroup)
|
||||
{
|
||||
@ -3104,7 +3104,7 @@ handle a message operation
|
||||
static int do_message_op(const char *netbios_name, const char *desthost,
|
||||
const char **destports, const char *destip,
|
||||
int name_type,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct smbcli_options *options,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
@ -3160,7 +3160,7 @@ static int do_message_op(const char *netbios_name, const char *desthost,
|
||||
int rc = 0;
|
||||
int name_type = 0x20;
|
||||
TALLOC_CTX *mem_ctx;
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
struct smbclient_context *ctx;
|
||||
const char *cmdstr = NULL;
|
||||
struct smbcli_options smb_options;
|
||||
|
@ -49,7 +49,7 @@ struct sidmap_context {
|
||||
/*
|
||||
open a sidmap context - use talloc_free to close
|
||||
*/
|
||||
struct sidmap_context *sidmap_open(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx,
|
||||
struct sidmap_context *sidmap_open(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx)
|
||||
{
|
||||
struct sidmap_context *sidmap;
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
static void dreplsrv_periodic_run(struct dreplsrv_service *service);
|
||||
|
||||
static void dreplsrv_periodic_handler_te(struct event_context *ev, struct timed_event *te,
|
||||
static void dreplsrv_periodic_handler_te(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *ptr)
|
||||
{
|
||||
struct dreplsrv_service *service = talloc_get_type(ptr, struct dreplsrv_service);
|
||||
@ -54,7 +54,7 @@ static void dreplsrv_periodic_handler_te(struct event_context *ev, struct timed_
|
||||
WERROR dreplsrv_periodic_schedule(struct dreplsrv_service *service, uint32_t next_interval)
|
||||
{
|
||||
TALLOC_CTX *tmp_mem;
|
||||
struct timed_event *new_te;
|
||||
struct tevent_timer *new_te;
|
||||
struct timeval next_time;
|
||||
|
||||
/* prevent looping */
|
||||
|
@ -147,7 +147,7 @@ struct dreplsrv_service {
|
||||
struct timeval next_event;
|
||||
|
||||
/* here we have a reference to the timed event the schedules the periodic stuff */
|
||||
struct timed_event *te;
|
||||
struct tevent_timer *te;
|
||||
} periodic;
|
||||
|
||||
/*
|
||||
|
@ -1232,7 +1232,7 @@ NTSTATUS crack_service_principal_name(struct ldb_context *sam_ctx,
|
||||
}
|
||||
|
||||
NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
uint32_t format_offered,
|
||||
const char *name,
|
||||
@ -1295,7 +1295,7 @@ NTSTATUS crack_name_to_nt4_name(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
NTSTATUS crack_auto_name_to_nt4_name(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *name,
|
||||
const char **nt4_domain,
|
||||
|
@ -197,7 +197,7 @@ done:
|
||||
|
||||
static int samldb_search_template(struct samldb_ctx *ac)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
struct loadparm_context *lparm_ctx;
|
||||
struct ldb_context *templates_ldb;
|
||||
char *templates_ldb_path;
|
||||
|
@ -70,7 +70,7 @@ char *samdb_relative_path(struct ldb_context *ldb,
|
||||
}
|
||||
|
||||
struct cli_credentials *samdb_credentials(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx)
|
||||
{
|
||||
struct cli_credentials *cred = cli_credentials_init(mem_ctx);
|
||||
@ -97,7 +97,7 @@ struct cli_credentials *samdb_credentials(TALLOC_CTX *mem_ctx,
|
||||
return an opaque context pointer on success, or NULL on failure
|
||||
*/
|
||||
struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_session_info *session_info)
|
||||
{
|
||||
@ -126,7 +126,7 @@ int samdb_copy_template(struct ldb_context *ldb,
|
||||
struct ldb_context *templates_ldb;
|
||||
char *templates_ldb_path;
|
||||
struct ldb_dn *basedn;
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
struct loadparm_context *lp_ctx;
|
||||
|
||||
templates_ldb = talloc_get_type(ldb_get_opaque(ldb, "templates_ldb"), struct ldb_context);
|
||||
@ -223,7 +223,7 @@ int samdb_copy_template(struct ldb_context *ldb,
|
||||
Create the SID list for this user.
|
||||
****************************************************************************/
|
||||
NTSTATUS security_token_create(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct dom_sid *user_sid,
|
||||
struct dom_sid *group_sid,
|
||||
|
@ -27,7 +27,7 @@ struct dsdb_control_current_partition;
|
||||
struct dsdb_extended_replicated_object;
|
||||
struct dsdb_extended_replicated_objects;
|
||||
struct loadparm_context;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
#include "librpc/gen_ndr/security.h"
|
||||
#include "lib/ldb/include/ldb.h"
|
||||
|
@ -73,7 +73,7 @@ static NTSTATUS samdb_privilege_setup_sid(void *samctx, TALLOC_CTX *mem_ctx,
|
||||
setup the privilege mask for this security token based on our
|
||||
local SAM
|
||||
*/
|
||||
NTSTATUS samdb_privilege_setup(struct event_context *ev_ctx,
|
||||
NTSTATUS samdb_privilege_setup(struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx, struct security_token *token)
|
||||
{
|
||||
void *samctx;
|
||||
|
@ -1485,7 +1485,7 @@ static krb5_error_code LDB_destroy(krb5_context context, HDB *db)
|
||||
* code */
|
||||
|
||||
NTSTATUS kdc_hdb_samba4_create(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
krb5_context context, struct HDB **db, const char *arg)
|
||||
{
|
||||
|
@ -44,7 +44,7 @@
|
||||
/* Disgusting hack to get a mem_ctx and lp_ctx into the hdb plugin, when
|
||||
* used as a keytab */
|
||||
TALLOC_CTX *kdc_mem_ctx;
|
||||
struct event_context *kdc_ev_ctx;
|
||||
struct tevent_context *kdc_ev_ctx;
|
||||
struct loadparm_context *kdc_lp_ctx;
|
||||
|
||||
/* hold all the info needed to send a reply */
|
||||
@ -66,7 +66,7 @@ typedef bool (*kdc_process_fn_t)(struct kdc_server *kdc,
|
||||
struct kdc_socket {
|
||||
struct socket_context *sock;
|
||||
struct kdc_server *kdc;
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
/* a queue of outgoing replies that have been deferred */
|
||||
struct kdc_reply *send_queue;
|
||||
@ -199,7 +199,7 @@ static void kdc_recv_handler(struct kdc_socket *kdc_socket)
|
||||
/*
|
||||
handle fd events on a KDC socket
|
||||
*/
|
||||
static void kdc_socket_handler(struct event_context *ev, struct fd_event *fde,
|
||||
static void kdc_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
struct kdc_socket *kdc_socket = talloc_get_type(private, struct kdc_socket);
|
||||
|
@ -31,7 +31,7 @@ struct kdc_server;
|
||||
struct socket_address;
|
||||
|
||||
extern TALLOC_CTX *kdc_mem_ctx;
|
||||
extern struct event_context *kdc_ev_ctx;
|
||||
extern struct tevent_context *kdc_ev_ctx;
|
||||
extern struct loadparm_context *kdc_lp_ctx;
|
||||
|
||||
bool kpasswdd_process(struct kdc_server *kdc,
|
||||
|
@ -47,7 +47,7 @@
|
||||
struct kpasswd_socket {
|
||||
struct socket_context *sock;
|
||||
struct kdc_server *kdc;
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
/* a queue of outgoing replies that have been deferred */
|
||||
struct kdc_reply *send_queue;
|
||||
|
@ -167,8 +167,8 @@ static NTSTATUS ldapsrv_decode(void *private, DATA_BLOB blob)
|
||||
/*
|
||||
Idle timeout handler
|
||||
*/
|
||||
static void ldapsrv_conn_idle_timeout(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void ldapsrv_conn_idle_timeout(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t,
|
||||
void *private)
|
||||
{
|
||||
@ -214,8 +214,8 @@ static void ldapsrv_send(struct stream_connection *c, uint16_t flags)
|
||||
packet_queue_run(conn->packet);
|
||||
}
|
||||
|
||||
static void ldapsrv_conn_init_timeout(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void ldapsrv_conn_init_timeout(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t,
|
||||
void *private)
|
||||
{
|
||||
@ -440,7 +440,7 @@ static const struct stream_server_ops ldap_stream_ops = {
|
||||
/*
|
||||
add a socket address to the list of events, one event per port
|
||||
*/
|
||||
static NTSTATUS add_socket(struct event_context *event_context,
|
||||
static NTSTATUS add_socket(struct tevent_context *event_context,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const struct model_ops *model_ops,
|
||||
const char *address, struct ldapsrv_service *ldap_service)
|
||||
|
@ -47,8 +47,8 @@ struct ldapsrv_connection {
|
||||
int max_page_size;
|
||||
int search_timeout;
|
||||
|
||||
struct timed_event *ite;
|
||||
struct timed_event *te;
|
||||
struct tevent_timer *ite;
|
||||
struct tevent_timer *te;
|
||||
} limits;
|
||||
};
|
||||
|
||||
|
@ -23,12 +23,12 @@
|
||||
#include "librpc/gen_ndr/misc.h"
|
||||
|
||||
struct com_context;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
struct com_context
|
||||
{
|
||||
struct dcom_client_context *dcom;
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
struct com_extension {
|
||||
uint32_t id;
|
||||
void *data;
|
||||
@ -42,7 +42,7 @@ NTSTATUS com_register_running_class(struct GUID *clsid, const char *progid, stru
|
||||
|
||||
struct dcom_interface_p *dcom_get_local_iface_p(struct GUID *ipid);
|
||||
|
||||
WERROR com_init_ctx(struct com_context **ctx, struct event_context *event_ctx);
|
||||
WERROR com_init_ctx(struct com_context **ctx, struct tevent_context *event_ctx);
|
||||
WERROR com_create_object(struct com_context *ctx, struct GUID *clsid, int num_ifaces, struct GUID *iid, struct IUnknown **ip, WERROR *results);
|
||||
WERROR com_get_class_object(struct com_context *ctx, struct GUID *clsid, struct GUID *iid, struct IUnknown **ip);
|
||||
NTSTATUS com_init(void);
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "lib/events/events.h"
|
||||
#include "librpc/gen_ndr/com_dcom.h"
|
||||
|
||||
WERROR com_init_ctx(struct com_context **ctx, struct event_context *event_ctx)
|
||||
WERROR com_init_ctx(struct com_context **ctx, struct tevent_context *event_ctx)
|
||||
{
|
||||
*ctx = talloc(NULL, struct com_context);
|
||||
if (event_ctx == NULL) {
|
||||
|
@ -2,6 +2,6 @@
|
||||
#define __LIB_EVENTS_H__
|
||||
#define TEVENT_COMPAT_DEFINES 1
|
||||
#include <../lib/tevent/tevent.h>
|
||||
struct event_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
|
||||
struct event_context *event_context_find(TALLOC_CTX *mem_ctx);
|
||||
struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
|
||||
struct tevent_context *event_context_find(TALLOC_CTX *mem_ctx);
|
||||
#endif /* __LIB_EVENTS_H__ */
|
||||
|
@ -59,9 +59,9 @@ static void ev_wrap_debug(void *context, enum ev_debug_level level,
|
||||
|
||||
This samba4 specific call sets the samba4 debug handler.
|
||||
*/
|
||||
struct event_context *s4_event_context_init(TALLOC_CTX *mem_ctx)
|
||||
struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
|
||||
ev = event_context_init_byname(mem_ctx, NULL);
|
||||
if (ev) {
|
||||
|
@ -39,7 +39,7 @@
|
||||
The mem_ctx is required
|
||||
The event_ctx is required
|
||||
*/
|
||||
struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx)
|
||||
struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx)
|
||||
{
|
||||
struct ldb_context *ldb;
|
||||
int ret;
|
||||
@ -393,7 +393,7 @@ static int ldb_autotransaction_request(struct ldb_context *ldb,
|
||||
|
||||
int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
|
||||
if (!handle) {
|
||||
return LDB_ERR_UNAVAILABLE;
|
||||
@ -474,12 +474,12 @@ void ldb_set_create_perms(struct ldb_context *ldb, unsigned int perms)
|
||||
ldb->create_perms = perms;
|
||||
}
|
||||
|
||||
void ldb_set_event_context(struct ldb_context *ldb, struct event_context *ev)
|
||||
void ldb_set_event_context(struct ldb_context *ldb, struct tevent_context *ev)
|
||||
{
|
||||
ldb->ev_ctx = ev;
|
||||
}
|
||||
|
||||
struct event_context * ldb_get_event_context(struct ldb_context *ldb)
|
||||
struct tevent_context * ldb_get_event_context(struct ldb_context *ldb)
|
||||
{
|
||||
return ldb->ev_ctx;
|
||||
}
|
||||
|
@ -181,7 +181,7 @@ enum ldb_scope {LDB_SCOPE_DEFAULT=-1,
|
||||
LDB_SCOPE_SUBTREE=2};
|
||||
|
||||
struct ldb_context;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
/* debugging uses one of the following levels */
|
||||
enum ldb_debug_level {LDB_DEBUG_FATAL, LDB_DEBUG_ERROR,
|
||||
@ -795,9 +795,9 @@ int ldb_set_timeout(struct ldb_context *ldb, struct ldb_request *req, int timeou
|
||||
int ldb_set_timeout_from_prev_req(struct ldb_context *ldb, struct ldb_request *oldreq, struct ldb_request *newreq);
|
||||
void ldb_set_create_perms(struct ldb_context *ldb, unsigned int perms);
|
||||
void ldb_set_modules_dir(struct ldb_context *ldb, const char *path);
|
||||
struct event_context;
|
||||
void ldb_set_event_context(struct ldb_context *ldb, struct event_context *ev);
|
||||
struct event_context * ldb_get_event_context(struct ldb_context *ldb);
|
||||
struct tevent_context;
|
||||
void ldb_set_event_context(struct ldb_context *ldb, struct tevent_context *ev);
|
||||
struct tevent_context * ldb_get_event_context(struct ldb_context *ldb);
|
||||
|
||||
/**
|
||||
Initialise ldbs' global information
|
||||
@ -819,7 +819,7 @@ int ldb_global_init(void);
|
||||
\return pointer to ldb_context that should be free'd (using talloc_free())
|
||||
at the end of the program.
|
||||
*/
|
||||
struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx);
|
||||
struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx);
|
||||
|
||||
/**
|
||||
Connect to a database.
|
||||
|
@ -123,7 +123,7 @@ struct ldb_context {
|
||||
|
||||
char *modules_dir;
|
||||
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
};
|
||||
|
||||
#ifndef ARRAY_SIZE
|
||||
|
@ -52,7 +52,7 @@
|
||||
|
||||
struct ildb_private {
|
||||
struct ldap_connection *ldap;
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
};
|
||||
|
||||
struct ildb_context {
|
||||
@ -92,8 +92,8 @@ static void ildb_request_done(struct ildb_context *ctx,
|
||||
ctx->req->callback(ctx->req, ares);
|
||||
}
|
||||
|
||||
static void ildb_auto_done_callback(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void ildb_auto_done_callback(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t,
|
||||
void *private_data)
|
||||
{
|
||||
@ -182,7 +182,7 @@ static int ildb_map_error(struct ldb_module *module, NTSTATUS status)
|
||||
return LDB_ERR_OPERATIONS_ERROR;
|
||||
}
|
||||
|
||||
static void ildb_request_timeout(struct event_context *ev, struct timed_event *te,
|
||||
static void ildb_request_timeout(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *private_data)
|
||||
{
|
||||
struct ildb_context *ac = talloc_get_type(private_data, struct ildb_context);
|
||||
@ -661,7 +661,7 @@ static int ildb_handle_request(struct ldb_module *module, struct ldb_request *re
|
||||
{
|
||||
struct ildb_private *ildb;
|
||||
struct ildb_context *ac;
|
||||
struct timed_event *te;
|
||||
struct tevent_timer *te;
|
||||
int ret;
|
||||
|
||||
ildb = talloc_get_type(module->private_data, struct ildb_private);
|
||||
|
@ -619,8 +619,8 @@ free_and_return:
|
||||
return lret;
|
||||
}
|
||||
|
||||
static void lldb_timeout(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void lldb_timeout(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t,
|
||||
void *private_data)
|
||||
{
|
||||
@ -630,13 +630,13 @@ static void lldb_timeout(struct event_context *ev,
|
||||
lldb_request_done(ac->req, NULL, LDB_ERR_TIME_LIMIT_EXCEEDED);
|
||||
}
|
||||
|
||||
static void lldb_callback(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void lldb_callback(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t,
|
||||
void *private_data)
|
||||
{
|
||||
struct lldb_context *ac;
|
||||
struct timed_event *lte;
|
||||
struct tevent_timer *lte;
|
||||
struct timeval tv;
|
||||
LDAPMessage *result;
|
||||
int lret;
|
||||
@ -701,8 +701,8 @@ static bool lldb_dn_is_special(struct ldb_request *req)
|
||||
return false;
|
||||
}
|
||||
|
||||
static void lldb_auto_done_callback(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void lldb_auto_done_callback(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t,
|
||||
void *private_data)
|
||||
{
|
||||
@ -716,8 +716,8 @@ static int lldb_handle_request(struct ldb_module *module, struct ldb_request *re
|
||||
{
|
||||
struct lldb_private *lldb;
|
||||
struct lldb_context *ac;
|
||||
struct event_context *ev;
|
||||
struct timed_event *te;
|
||||
struct tevent_context *ev;
|
||||
struct tevent_timer *te;
|
||||
struct timeval tv;
|
||||
int ret;
|
||||
|
||||
|
@ -999,8 +999,8 @@ static void ltdb_request_done(struct ldb_request *req, int error)
|
||||
req->callback(req, ares);
|
||||
}
|
||||
|
||||
static void ltdb_timeout(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void ltdb_timeout(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t,
|
||||
void *private_data)
|
||||
{
|
||||
@ -1051,8 +1051,8 @@ static void ltdb_handle_extended(struct ltdb_context *ctx)
|
||||
ltdb_request_extended_done(ctx->req, ext, ret);
|
||||
}
|
||||
|
||||
static void ltdb_callback(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void ltdb_callback(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval t,
|
||||
void *private_data)
|
||||
{
|
||||
@ -1095,9 +1095,9 @@ static void ltdb_callback(struct event_context *ev,
|
||||
static int ltdb_handle_request(struct ldb_module *module,
|
||||
struct ldb_request *req)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
struct ltdb_context *ac;
|
||||
struct timed_event *te;
|
||||
struct tevent_timer *te;
|
||||
struct timeval tv;
|
||||
|
||||
if (check_critical_controls(req->controls)) {
|
||||
|
@ -51,7 +51,7 @@ struct ltdb_context {
|
||||
struct ldb_dn *base;
|
||||
enum ldb_scope scope;
|
||||
const char * const *attrs;
|
||||
struct timed_event *timeout_event;
|
||||
struct tevent_timer *timeout_event;
|
||||
};
|
||||
|
||||
/* special record types */
|
||||
|
@ -95,7 +95,7 @@ static int ldb_wrap_destructor(struct ldb_context *ldb)
|
||||
TODO: We need an error_string parameter
|
||||
*/
|
||||
struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *url,
|
||||
struct auth_session_info *session_info,
|
||||
|
@ -27,12 +27,12 @@ struct ldb_message;
|
||||
struct ldb_dn;
|
||||
struct cli_credentials;
|
||||
struct loadparm_context;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
char *wrap_casefold(void *context, void *mem_ctx, const char *s, size_t n);
|
||||
|
||||
struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *url,
|
||||
struct auth_session_info *session_info,
|
||||
|
@ -37,7 +37,7 @@ struct irpc_message {
|
||||
struct messaging_context *msg_ctx;
|
||||
struct irpc_list *irpc;
|
||||
void *data;
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
};
|
||||
|
||||
/* don't allow calls to take too long */
|
||||
@ -97,11 +97,11 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
|
||||
const char *dir,
|
||||
struct server_id server_id,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
struct event_context *ev);
|
||||
struct tevent_context *ev);
|
||||
struct messaging_context *messaging_client_init(TALLOC_CTX *mem_ctx,
|
||||
const char *dir,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
struct event_context *ev);
|
||||
struct tevent_context *ev);
|
||||
NTSTATUS messaging_send_ptr(struct messaging_context *msg, struct server_id server,
|
||||
uint32_t msg_type, void *ptr);
|
||||
void messaging_deregister(struct messaging_context *msg, uint32_t msg_type, void *private);
|
||||
|
@ -52,10 +52,10 @@ struct messaging_context {
|
||||
struct idr_context *idr;
|
||||
const char **names;
|
||||
struct timeval start_time;
|
||||
struct timed_event *retry_te;
|
||||
struct tevent_timer *retry_te;
|
||||
struct {
|
||||
struct event_context *ev;
|
||||
struct fd_event *fde;
|
||||
struct tevent_context *ev;
|
||||
struct tevent_fd *fde;
|
||||
} event;
|
||||
};
|
||||
|
||||
@ -216,7 +216,7 @@ static NTSTATUS try_send(struct messaging_rec *rec)
|
||||
/*
|
||||
retry backed off messages
|
||||
*/
|
||||
static void msg_retry_timer(struct event_context *ev, struct timed_event *te,
|
||||
static void msg_retry_timer(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *private)
|
||||
{
|
||||
struct messaging_context *msg = talloc_get_type(private,
|
||||
@ -338,7 +338,7 @@ static void messaging_recv_handler(struct messaging_context *msg)
|
||||
/*
|
||||
handle a socket event
|
||||
*/
|
||||
static void messaging_handler(struct event_context *ev, struct fd_event *fde,
|
||||
static void messaging_handler(struct tevent_context *ev, struct tevent_fd *fde,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
struct messaging_context *msg = talloc_get_type(private,
|
||||
@ -536,7 +536,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
|
||||
const char *dir,
|
||||
struct server_id server_id,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
struct event_context *ev)
|
||||
struct tevent_context *ev)
|
||||
{
|
||||
struct messaging_context *msg;
|
||||
NTSTATUS status;
|
||||
@ -615,7 +615,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
|
||||
struct messaging_context *messaging_client_init(TALLOC_CTX *mem_ctx,
|
||||
const char *dir,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
struct event_context *ev)
|
||||
struct tevent_context *ev)
|
||||
{
|
||||
struct server_id id;
|
||||
ZERO_STRUCT(id);
|
||||
@ -843,7 +843,7 @@ static int irpc_destructor(struct irpc_request *irpc)
|
||||
/*
|
||||
timeout a irpc request
|
||||
*/
|
||||
static void irpc_timeout(struct event_context *ev, struct timed_event *te,
|
||||
static void irpc_timeout(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *private)
|
||||
{
|
||||
struct irpc_request *irpc = talloc_get_type(private, struct irpc_request);
|
||||
|
@ -65,7 +65,7 @@ typedef struct {
|
||||
|
||||
PyObject *py_messaging_connect(PyTypeObject *self, PyObject *args, PyObject *kwargs)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
const char *kwnames[] = { "own_id", "messaging_path", NULL };
|
||||
PyObject *own_id = Py_None;
|
||||
const char *messaging_path = NULL;
|
||||
@ -317,7 +317,7 @@ typedef struct {
|
||||
|
||||
PyObject *py_irpc_connect(PyTypeObject *self, PyObject *args, PyObject *kwargs)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
const char *kwnames[] = { "server", "own_id", "messaging_path", NULL };
|
||||
char *server;
|
||||
const char *messaging_path = NULL;
|
||||
|
@ -34,7 +34,7 @@ static bool test_debug;
|
||||
struct irpc_test_data
|
||||
{
|
||||
struct messaging_context *msg_ctx1, *msg_ctx2;
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
};
|
||||
|
||||
/*
|
||||
@ -53,7 +53,7 @@ static NTSTATUS irpc_AddOne(struct irpc_message *irpc, struct echo_AddOne *r)
|
||||
/*
|
||||
a deferred reply to echodata
|
||||
*/
|
||||
static void deferred_echodata(struct event_context *ev, struct timed_event *te,
|
||||
static void deferred_echodata(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *private)
|
||||
{
|
||||
struct irpc_message *irpc = talloc_get_type(private, struct irpc_message);
|
||||
|
@ -58,7 +58,7 @@ static void exit_message(struct messaging_context *msg, void *private,
|
||||
*/
|
||||
static bool test_ping_speed(struct torture_context *tctx)
|
||||
{
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
struct messaging_context *msg_client_ctx;
|
||||
struct messaging_context *msg_server_ctx;
|
||||
int ping_count = 0;
|
||||
|
@ -28,7 +28,7 @@
|
||||
_PUBLIC_ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *location,
|
||||
struct auth_session_info *session_info,
|
||||
struct cli_credentials *credentials,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct hive_key **root)
|
||||
{
|
||||
|
@ -429,7 +429,7 @@ static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, const struct hive_key *h,
|
||||
WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
|
||||
struct auth_session_info *session_info,
|
||||
struct cli_credentials *credentials,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct hive_key **k)
|
||||
{
|
||||
|
@ -149,12 +149,12 @@ struct hive_operations {
|
||||
|
||||
struct cli_credentials;
|
||||
struct auth_session_info;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *location,
|
||||
struct auth_session_info *session_info,
|
||||
struct cli_credentials *credentials,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct hive_key **root);
|
||||
WERROR hive_key_get_info(TALLOC_CTX *mem_ctx, const struct hive_key *key,
|
||||
@ -207,7 +207,7 @@ WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx,
|
||||
WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
|
||||
struct auth_session_info *session_info,
|
||||
struct cli_credentials *credentials,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct hive_key **k);
|
||||
|
||||
@ -357,7 +357,7 @@ struct registry_context {
|
||||
};
|
||||
|
||||
struct auth_session_info;
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
struct loadparm_context;
|
||||
|
||||
/**
|
||||
@ -368,7 +368,7 @@ WERROR reg_open_local(TALLOC_CTX *mem_ctx,
|
||||
|
||||
WERROR reg_open_samba(TALLOC_CTX *mem_ctx,
|
||||
struct registry_context **ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_session_info *session_info,
|
||||
struct cli_credentials *credentials);
|
||||
@ -380,7 +380,7 @@ WERROR reg_open_remote(struct registry_context **ctx,
|
||||
struct auth_session_info *session_info,
|
||||
struct cli_credentials *credentials,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *location, struct event_context *ev);
|
||||
const char *location, struct tevent_context *ev);
|
||||
|
||||
WERROR reg_open_wine(struct registry_context **ctx, const char *path);
|
||||
|
||||
|
@ -480,7 +480,7 @@ _PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx,
|
||||
struct auth_session_info *session_info,
|
||||
struct cli_credentials *credentials,
|
||||
struct loadparm_context *lp_ctx,
|
||||
const char *location, struct event_context *ev)
|
||||
const char *location, struct tevent_context *ev)
|
||||
{
|
||||
NTSTATUS status;
|
||||
struct dcerpc_pipe *p;
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
static WERROR mount_samba_hive(struct registry_context *ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_session_info *auth_info,
|
||||
struct cli_credentials *creds,
|
||||
@ -56,7 +56,7 @@ static WERROR mount_samba_hive(struct registry_context *ctx,
|
||||
|
||||
_PUBLIC_ WERROR reg_open_samba(TALLOC_CTX *mem_ctx,
|
||||
struct registry_context **ctx,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct auth_session_info *session_info,
|
||||
struct cli_credentials *credentials)
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "lib/registry/tools/common.h"
|
||||
|
||||
struct registry_context *reg_common_open_remote(const char *remote,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct cli_credentials *creds)
|
||||
{
|
||||
@ -43,7 +43,7 @@ struct registry_context *reg_common_open_remote(const char *remote,
|
||||
}
|
||||
|
||||
struct registry_key *reg_common_open_file(const char *path,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct cli_credentials *creds)
|
||||
{
|
||||
@ -70,7 +70,7 @@ struct registry_key *reg_common_open_file(const char *path,
|
||||
}
|
||||
|
||||
struct registry_context *reg_common_open_local(struct cli_credentials *creds,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx)
|
||||
{
|
||||
WERROR error;
|
||||
|
@ -29,7 +29,7 @@
|
||||
enum reg_backend { REG_UNKNOWN, REG_LOCAL, REG_REMOTE, REG_NULL };
|
||||
|
||||
static struct registry_context *open_backend(poptContext pc,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
enum reg_backend backend,
|
||||
const char *remote_host)
|
||||
@ -83,7 +83,7 @@ int main(int argc, const char **argv)
|
||||
};
|
||||
TALLOC_CTX *ctx;
|
||||
void *callback_data;
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
struct reg_diff_callbacks *callbacks;
|
||||
|
||||
ctx = talloc_init("regdiff");
|
||||
|
@ -34,7 +34,7 @@ int main(int argc, char **argv)
|
||||
struct registry_context *h;
|
||||
const char *file = NULL;
|
||||
const char *remote = NULL;
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
struct poptOption long_options[] = {
|
||||
POPT_AUTOHELP
|
||||
{"remote", 'R', POPT_ARG_STRING, &remote, 0, "connect to specified remote server", NULL},
|
||||
|
@ -493,7 +493,7 @@ int main(int argc, char **argv)
|
||||
poptContext pc;
|
||||
const char *remote = NULL;
|
||||
struct regshell_context *ctx;
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
bool ret = true;
|
||||
struct poptOption long_options[] = {
|
||||
POPT_AUTOHELP
|
||||
|
@ -104,7 +104,7 @@ int main(int argc, char **argv)
|
||||
poptContext pc;
|
||||
struct registry_context *h = NULL;
|
||||
struct registry_key *start_key = NULL;
|
||||
struct event_context *ev_ctx;
|
||||
struct tevent_context *ev_ctx;
|
||||
WERROR error;
|
||||
bool fullpath = false, no_values = false;
|
||||
struct poptOption long_options[] = {
|
||||
|
@ -34,8 +34,8 @@ struct connect_state {
|
||||
uint32_t flags;
|
||||
};
|
||||
|
||||
static void socket_connect_handler(struct event_context *ev,
|
||||
struct fd_event *fde,
|
||||
static void socket_connect_handler(struct tevent_context *ev,
|
||||
struct tevent_fd *fde,
|
||||
uint16_t flags, void *private);
|
||||
|
||||
/*
|
||||
@ -43,7 +43,7 @@ static void socket_connect_handler(struct event_context *ev,
|
||||
*/
|
||||
static void socket_send_connect(struct composite_context *result)
|
||||
{
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
struct connect_state *state = talloc_get_type(result->private_data,
|
||||
struct connect_state);
|
||||
|
||||
@ -73,7 +73,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
|
||||
struct socket_address *my_address,
|
||||
struct socket_address *server_address,
|
||||
uint32_t flags,
|
||||
struct event_context *event_ctx)
|
||||
struct tevent_context *event_ctx)
|
||||
{
|
||||
struct composite_context *result;
|
||||
struct connect_state *state;
|
||||
@ -116,8 +116,8 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
|
||||
/*
|
||||
handle write events on connect completion
|
||||
*/
|
||||
static void socket_connect_handler(struct event_context *ev,
|
||||
struct fd_event *fde,
|
||||
static void socket_connect_handler(struct tevent_context *ev,
|
||||
struct tevent_fd *fde,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
struct composite_context *result =
|
||||
@ -149,7 +149,7 @@ NTSTATUS socket_connect_ev(struct socket_context *sock,
|
||||
struct socket_address *my_address,
|
||||
struct socket_address *server_address,
|
||||
uint32_t flags,
|
||||
struct event_context *ev)
|
||||
struct tevent_context *ev)
|
||||
{
|
||||
struct composite_context *ctx;
|
||||
ctx = socket_connect_send(sock, my_address,
|
||||
|
@ -53,8 +53,8 @@ struct connect_one_state {
|
||||
};
|
||||
|
||||
static void continue_resolve_name(struct composite_context *creq);
|
||||
static void connect_multi_timer(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void connect_multi_timer(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval tv, void *p);
|
||||
static void connect_multi_next_socket(struct composite_context *result);
|
||||
static void continue_one(struct composite_context *creq);
|
||||
@ -68,7 +68,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send(
|
||||
int num_server_ports,
|
||||
uint16_t *server_ports,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct event_context *event_ctx)
|
||||
struct tevent_context *event_ctx)
|
||||
{
|
||||
struct composite_context *result;
|
||||
struct connect_multi_state *multi;
|
||||
@ -179,8 +179,8 @@ static void connect_multi_next_socket(struct composite_context *result)
|
||||
/*
|
||||
a timer has gone off telling us that we should try the next port
|
||||
*/
|
||||
static void connect_multi_timer(struct event_context *ev,
|
||||
struct timed_event *te,
|
||||
static void connect_multi_timer(struct tevent_context *ev,
|
||||
struct tevent_timer *te,
|
||||
struct timeval tv, void *p)
|
||||
{
|
||||
struct composite_context *result = talloc_get_type(p, struct composite_context);
|
||||
@ -265,7 +265,7 @@ NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx,
|
||||
const char *server_address,
|
||||
int num_server_ports, uint16_t *server_ports,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct socket_context **result,
|
||||
uint16_t *result_port)
|
||||
{
|
||||
|
@ -20,7 +20,7 @@
|
||||
#ifndef _SAMBA_SOCKET_H
|
||||
#define _SAMBA_SOCKET_H
|
||||
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
struct socket_context;
|
||||
|
||||
enum socket_type {
|
||||
@ -178,20 +178,20 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
|
||||
struct socket_address *my_address,
|
||||
struct socket_address *server_address,
|
||||
uint32_t flags,
|
||||
struct event_context *event_ctx);
|
||||
struct tevent_context *event_ctx);
|
||||
NTSTATUS socket_connect_recv(struct composite_context *ctx);
|
||||
NTSTATUS socket_connect_ev(struct socket_context *sock,
|
||||
struct socket_address *my_address,
|
||||
struct socket_address *server_address,
|
||||
uint32_t flags,
|
||||
struct event_context *ev);
|
||||
struct tevent_context *ev);
|
||||
|
||||
struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,
|
||||
const char *server_address,
|
||||
int num_server_ports,
|
||||
uint16_t *server_ports,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct event_context *event_ctx);
|
||||
struct tevent_context *event_ctx);
|
||||
NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
struct socket_context **result,
|
||||
@ -199,7 +199,7 @@ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
|
||||
NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address,
|
||||
int num_server_ports, uint16_t *server_ports,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct socket_context **result,
|
||||
uint16_t *port);
|
||||
void set_socket_options(int fd, const char *options);
|
||||
|
@ -124,7 +124,7 @@ static bool test_tcp(struct torture_context *tctx)
|
||||
DATA_BLOB blob, blob2;
|
||||
size_t sent, nread;
|
||||
TALLOC_CTX *mem_ctx = tctx;
|
||||
struct event_context *ev = tctx->ev;
|
||||
struct tevent_context *ev = tctx->ev;
|
||||
struct interface *ifaces;
|
||||
|
||||
status = socket_create("ip", SOCKET_TYPE_STREAM, &sock1, 0);
|
||||
|
@ -35,10 +35,10 @@ struct packet_context {
|
||||
uint32_t num_read;
|
||||
uint32_t initial_read;
|
||||
struct socket_context *sock;
|
||||
struct event_context *ev;
|
||||
struct tevent_context *ev;
|
||||
size_t packet_size;
|
||||
void *private;
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
bool serialise;
|
||||
int processing;
|
||||
bool recv_disable;
|
||||
@ -136,7 +136,7 @@ _PUBLIC_ void packet_set_socket(struct packet_context *pc, struct socket_context
|
||||
time on a socket. This can matter for code that relies on not
|
||||
getting more than one packet per event
|
||||
*/
|
||||
_PUBLIC_ void packet_set_event_context(struct packet_context *pc, struct event_context *ev)
|
||||
_PUBLIC_ void packet_set_event_context(struct packet_context *pc, struct tevent_context *ev)
|
||||
{
|
||||
pc->ev = ev;
|
||||
}
|
||||
@ -144,7 +144,7 @@ _PUBLIC_ void packet_set_event_context(struct packet_context *pc, struct event_c
|
||||
/*
|
||||
tell the packet layer the fde for the socket
|
||||
*/
|
||||
_PUBLIC_ void packet_set_fde(struct packet_context *pc, struct fd_event *fde)
|
||||
_PUBLIC_ void packet_set_fde(struct packet_context *pc, struct tevent_fd *fde)
|
||||
{
|
||||
pc->fde = fde;
|
||||
}
|
||||
@ -209,7 +209,7 @@ static void packet_eof(struct packet_context *pc)
|
||||
/*
|
||||
used to put packets on event boundaries
|
||||
*/
|
||||
static void packet_next_event(struct event_context *ev, struct timed_event *te,
|
||||
static void packet_next_event(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *private)
|
||||
{
|
||||
struct packet_context *pc = talloc_get_type(private, struct packet_context);
|
||||
|
@ -21,8 +21,8 @@
|
||||
*/
|
||||
|
||||
struct packet_context;
|
||||
struct event_context;
|
||||
struct fd_event;
|
||||
struct tevent_context;
|
||||
struct tevent_fd;
|
||||
|
||||
typedef NTSTATUS (*packet_full_request_fn_t)(void *private,
|
||||
DATA_BLOB blob, size_t *packet_size);
|
||||
@ -40,8 +40,8 @@ void packet_set_error_handler(struct packet_context *pc, packet_error_handler_fn
|
||||
void packet_set_private(struct packet_context *pc, void *private);
|
||||
void packet_set_full_request(struct packet_context *pc, packet_full_request_fn_t callback);
|
||||
void packet_set_socket(struct packet_context *pc, struct socket_context *sock);
|
||||
void packet_set_event_context(struct packet_context *pc, struct event_context *ev);
|
||||
void packet_set_fde(struct packet_context *pc, struct fd_event *fde);
|
||||
void packet_set_event_context(struct packet_context *pc, struct tevent_context *ev);
|
||||
void packet_set_fde(struct packet_context *pc, struct tevent_fd *fde);
|
||||
void packet_set_serialise(struct packet_context *pc);
|
||||
void packet_set_initial_read(struct packet_context *pc, uint32_t initial_read);
|
||||
void packet_set_nofree(struct packet_context *pc);
|
||||
|
@ -47,7 +47,7 @@ struct tls_params {
|
||||
/* hold per connection tls data */
|
||||
struct tls_context {
|
||||
struct socket_context *socket;
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
bool tls_enabled;
|
||||
#if ENABLE_GNUTLS
|
||||
gnutls_session session;
|
||||
@ -455,7 +455,7 @@ init_failed:
|
||||
*/
|
||||
struct socket_context *tls_init_server(struct tls_params *params,
|
||||
struct socket_context *socket_ctx,
|
||||
struct fd_event *fde,
|
||||
struct tevent_fd *fde,
|
||||
const char *plain_chars)
|
||||
{
|
||||
struct tls_context *tls;
|
||||
@ -535,7 +535,7 @@ failed:
|
||||
setup for a new client connection
|
||||
*/
|
||||
struct socket_context *tls_init_client(struct socket_context *socket_ctx,
|
||||
struct fd_event *fde,
|
||||
struct tevent_fd *fde,
|
||||
const char *ca_path)
|
||||
{
|
||||
struct tls_context *tls;
|
||||
@ -663,7 +663,7 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx, struct loadparm_context *
|
||||
*/
|
||||
struct socket_context *tls_init_server(struct tls_params *params,
|
||||
struct socket_context *socket,
|
||||
struct fd_event *fde,
|
||||
struct tevent_fd *fde,
|
||||
const char *plain_chars)
|
||||
{
|
||||
return NULL;
|
||||
@ -674,7 +674,7 @@ struct socket_context *tls_init_server(struct tls_params *params,
|
||||
setup for a new client connection
|
||||
*/
|
||||
struct socket_context *tls_init_client(struct socket_context *socket,
|
||||
struct fd_event *fde,
|
||||
struct tevent_fd *fde,
|
||||
const char *ca_path)
|
||||
{
|
||||
return NULL;
|
||||
|
@ -42,14 +42,14 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx, struct loadparm_context *
|
||||
*/
|
||||
struct socket_context *tls_init_server(struct tls_params *parms,
|
||||
struct socket_context *sock,
|
||||
struct fd_event *fde,
|
||||
struct tevent_fd *fde,
|
||||
const char *plain_chars);
|
||||
|
||||
/*
|
||||
call tls_init_client() on each new client connection
|
||||
*/
|
||||
struct socket_context *tls_init_client(struct socket_context *sock,
|
||||
struct fd_event *fde,
|
||||
struct tevent_fd *fde,
|
||||
const char *cafile);
|
||||
|
||||
/*
|
||||
|
@ -144,8 +144,8 @@ static void cldap_socket_recv(struct cldap_socket *cldap)
|
||||
/*
|
||||
handle request timeouts
|
||||
*/
|
||||
static void cldap_request_timeout(struct event_context *event_ctx,
|
||||
struct timed_event *te, struct timeval t,
|
||||
static void cldap_request_timeout(struct tevent_context *event_ctx,
|
||||
struct tevent_timer *te, struct timeval t,
|
||||
void *private)
|
||||
{
|
||||
struct cldap_request *req = talloc_get_type(private, struct cldap_request);
|
||||
@ -223,7 +223,7 @@ static void cldap_socket_send(struct cldap_socket *cldap)
|
||||
/*
|
||||
handle fd events on a cldap_socket
|
||||
*/
|
||||
static void cldap_socket_handler(struct event_context *ev, struct fd_event *fde,
|
||||
static void cldap_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
struct cldap_socket *cldap = talloc_get_type(private, struct cldap_socket);
|
||||
@ -240,7 +240,7 @@ static void cldap_socket_handler(struct event_context *ev, struct fd_event *fde,
|
||||
then operations will use that event context
|
||||
*/
|
||||
struct cldap_socket *cldap_socket_init(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience)
|
||||
{
|
||||
struct cldap_socket *cldap;
|
||||
|
@ -52,7 +52,7 @@ struct cldap_request {
|
||||
/* the ldap message_id */
|
||||
int message_id;
|
||||
|
||||
struct timed_event *te;
|
||||
struct tevent_timer *te;
|
||||
|
||||
/* the encoded request */
|
||||
DATA_BLOB encoded;
|
||||
@ -72,11 +72,11 @@ struct cldap_request {
|
||||
*/
|
||||
struct cldap_socket {
|
||||
struct socket_context *sock;
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
struct smb_iconv_convenience *iconv_convenience;
|
||||
|
||||
/* the fd event */
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
/* a queue of outgoing requests */
|
||||
struct cldap_request *send_queue;
|
||||
@ -112,7 +112,7 @@ struct cldap_search {
|
||||
};
|
||||
|
||||
struct cldap_socket *cldap_socket_init(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience);
|
||||
NTSTATUS cldap_set_incoming_handler(struct cldap_socket *cldap,
|
||||
void (*handler)(struct cldap_socket *, struct ldap_message *,
|
||||
|
@ -32,7 +32,7 @@
|
||||
*/
|
||||
bool smbcli_socket_connect(struct smbcli_state *cli, const char *server,
|
||||
const char **ports,
|
||||
struct event_context *ev_ctx,
|
||||
struct tevent_context *ev_ctx,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct smbcli_options *options,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
@ -151,7 +151,7 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
|
||||
const char *socket_options,
|
||||
struct cli_credentials *credentials,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct event_context *ev,
|
||||
struct tevent_context *ev,
|
||||
struct smbcli_options *options,
|
||||
struct smbcli_session_options *session_options,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
|
@ -35,7 +35,7 @@
|
||||
and initialize it
|
||||
*/
|
||||
_PUBLIC_ struct composite_context *composite_create(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *ev)
|
||||
struct tevent_context *ev)
|
||||
{
|
||||
struct composite_context *c;
|
||||
|
||||
@ -93,7 +93,7 @@ _PUBLIC_ NTSTATUS composite_wait_free(struct composite_context *c)
|
||||
and allows the caller to ignore the fact that the composite
|
||||
function completed early
|
||||
*/
|
||||
static void composite_trigger(struct event_context *ev, struct timed_event *te,
|
||||
static void composite_trigger(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *ptr)
|
||||
{
|
||||
struct composite_context *c = talloc_get_type(ptr, struct composite_context);
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include "libcli/raw/interfaces.h"
|
||||
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
|
||||
/*
|
||||
this defines the structures associated with "composite"
|
||||
@ -56,7 +56,7 @@ struct composite_context {
|
||||
NTSTATUS status;
|
||||
|
||||
/* the event context we are using */
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
|
||||
/* information on what to do on completion */
|
||||
struct {
|
||||
@ -73,7 +73,7 @@ struct smb2_request;
|
||||
struct rpc_request;
|
||||
struct nbt_name_request;
|
||||
|
||||
struct composite_context *composite_create(TALLOC_CTX *mem_ctx, struct event_context *ev);
|
||||
struct composite_context *composite_create(TALLOC_CTX *mem_ctx, struct tevent_context *ev);
|
||||
bool composite_nomem(const void *p, struct composite_context *ctx);
|
||||
void composite_continue(struct composite_context *ctx,
|
||||
struct composite_context *new_ctx,
|
||||
|
@ -139,7 +139,7 @@ static void dgm_socket_send(struct nbt_dgram_socket *dgmsock)
|
||||
/*
|
||||
handle fd events on a nbt_dgram_socket
|
||||
*/
|
||||
static void dgm_socket_handler(struct event_context *ev, struct fd_event *fde,
|
||||
static void dgm_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
|
||||
uint16_t flags, void *private)
|
||||
{
|
||||
struct nbt_dgram_socket *dgmsock = talloc_get_type(private,
|
||||
@ -157,7 +157,7 @@ static void dgm_socket_handler(struct event_context *ev, struct fd_event *fde,
|
||||
then operations will use that event context
|
||||
*/
|
||||
struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience)
|
||||
{
|
||||
struct nbt_dgram_socket *dgmsock;
|
||||
|
@ -39,11 +39,11 @@ struct nbt_dgram_request {
|
||||
*/
|
||||
struct nbt_dgram_socket {
|
||||
struct socket_context *sock;
|
||||
struct event_context *event_ctx;
|
||||
struct tevent_context *event_ctx;
|
||||
struct smb_iconv_convenience *iconv_convenience;
|
||||
|
||||
/* the fd event */
|
||||
struct fd_event *fde;
|
||||
struct tevent_fd *fde;
|
||||
|
||||
/* a queue of outgoing requests */
|
||||
struct nbt_dgram_request *send_queue;
|
||||
@ -93,7 +93,7 @@ NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock,
|
||||
struct socket_address *),
|
||||
void *private);
|
||||
struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct smb_iconv_convenience *);
|
||||
|
||||
const char *dgram_mailslot_name(struct nbt_dgram_packet *packet);
|
||||
|
@ -70,7 +70,7 @@ struct composite_context *finddcs_send(TALLOC_CTX *mem_ctx,
|
||||
struct dom_sid *domain_sid,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct messaging_context *msg_ctx)
|
||||
{
|
||||
struct composite_context *c, *creq;
|
||||
@ -260,7 +260,7 @@ NTSTATUS finddcs(TALLOC_CTX *mem_ctx,
|
||||
struct dom_sid *domain_sid,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
struct resolve_context *resolve_ctx,
|
||||
struct event_context *event_ctx,
|
||||
struct tevent_context *event_ctx,
|
||||
struct messaging_context *msg_ctx,
|
||||
int *num_dcs, struct nbt_dc_name **dcs)
|
||||
{
|
||||
|
@ -249,7 +249,7 @@ struct ldap_message {
|
||||
bool *controls_decoded;
|
||||
};
|
||||
|
||||
struct event_context;
|
||||
struct tevent_context;
|
||||
struct cli_credentials;
|
||||
struct dom_sid;
|
||||
struct asn1_data;
|
||||
|
@ -43,7 +43,7 @@
|
||||
*/
|
||||
_PUBLIC_ struct ldap_connection *ldap4_new_connection(TALLOC_CTX *mem_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct event_context *ev)
|
||||
struct tevent_context *ev)
|
||||
{
|
||||
struct ldap_connection *conn;
|
||||
|
||||
@ -224,7 +224,7 @@ void ldap_read_io_handler(void *private_data, uint16_t flags)
|
||||
/*
|
||||
handle ldap socket events
|
||||
*/
|
||||
static void ldap_io_handler(struct event_context *ev, struct fd_event *fde,
|
||||
static void ldap_io_handler(struct tevent_context *ev, struct tevent_fd *fde,
|
||||
uint16_t flags, void *private_data)
|
||||
{
|
||||
struct ldap_connection *conn = talloc_get_type(private_data,
|
||||
@ -544,7 +544,7 @@ static int ldap_request_destructor(struct ldap_request *req)
|
||||
/*
|
||||
called on timeout of a ldap request
|
||||
*/
|
||||
static void ldap_request_timeout(struct event_context *ev, struct timed_event *te,
|
||||
static void ldap_request_timeout(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *private_data)
|
||||
{
|
||||
struct ldap_request *req = talloc_get_type(private_data, struct ldap_request);
|
||||
@ -562,7 +562,7 @@ static void ldap_request_timeout(struct event_context *ev, struct timed_event *t
|
||||
/*
|
||||
called on completion of a one-way ldap request
|
||||
*/
|
||||
static void ldap_request_complete(struct event_context *ev, struct timed_event *te,
|
||||
static void ldap_request_complete(struct tevent_context *ev, struct tevent_timer *te,
|
||||
struct timeval t, void *private_data)
|
||||
{
|
||||
struct ldap_request *req = talloc_get_type(private_data, struct ldap_request);
|
||||
|
@ -44,7 +44,7 @@ struct ldap_request {
|
||||
void *private_data;
|
||||
} async;
|
||||
|
||||
struct timed_event *time_event;
|
||||
struct tevent_timer *time_event;
|
||||
};
|
||||
|
||||
|
||||
@ -88,8 +88,8 @@ struct ldap_connection {
|
||||
char *last_error;
|
||||
|
||||
struct {
|
||||
struct event_context *event_ctx;
|
||||
struct fd_event *fde;
|
||||
struct tevent_context *event_ctx;
|
||||
struct tevent_fd *fde;
|
||||
} event;
|
||||
|
||||
struct packet_context *packet;
|
||||
@ -97,7 +97,7 @@ struct ldap_connection {
|
||||
|
||||
struct ldap_connection *ldap4_new_connection(TALLOC_CTX *mem_ctx,
|
||||
struct loadparm_context *lp_ctx,
|
||||
struct event_context *ev);
|
||||
struct tevent_context *ev);
|
||||
|
||||
NTSTATUS ldap_connect(struct ldap_connection *conn, const char *url);
|
||||
struct composite_context *ldap_connect_send(struct ldap_connection *conn,
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user