s4:lib/tevent: rename structs
authorStefan Metzmacher <metze@samba.org>
Mon, 29 Dec 2008 19:24:57 +0000 (20:24 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 29 Dec 2008 19:46:40 +0000 (20:46 +0100)
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

211 files changed:
lib/tevent/pytevent.c
lib/tevent/testsuite.c
lib/tevent/tevent.c
lib/tevent/tevent.h
lib/tevent/tevent_aio.c
lib/tevent/tevent_debug.c
lib/tevent/tevent_epoll.c
lib/tevent/tevent_internal.h
lib/tevent/tevent_liboop.c
lib/tevent/tevent_select.c
lib/tevent/tevent_signal.c
lib/tevent/tevent_standard.c
lib/tevent/tevent_timed.c
lib/torture/torture.c
lib/torture/torture.h
libcli/nbt/libnbt.h
libcli/nbt/nbtsocket.c
libcli/nbt/pynbt.c
libcli/nbt/tools/nmblookup.c
source4/auth/auth.h
source4/auth/credentials/credentials.h
source4/auth/credentials/credentials_files.c
source4/auth/credentials/credentials_krb5.c
source4/auth/credentials/credentials_krb5.h
source4/auth/gensec/gensec.c
source4/auth/gensec/gensec.h
source4/auth/gensec/schannel_state.c
source4/auth/gensec/socket.c
source4/auth/kerberos/krb5_init_context.c
source4/auth/kerberos/krb5_init_context.h
source4/auth/ntlm/auth.c
source4/auth/ntlm/auth_simple.c
source4/auth/sam.c
source4/auth/session.c
source4/auth/session.h
source4/client/cifsdd.c
source4/client/cifsdd.h
source4/client/cifsddio.c
source4/client/client.c
source4/dsdb/common/sidmap.c
source4/dsdb/repl/drepl_periodic.c
source4/dsdb/repl/drepl_service.h
source4/dsdb/samdb/cracknames.c
source4/dsdb/samdb/ldb_modules/samldb.c
source4/dsdb/samdb/samdb.c
source4/dsdb/samdb/samdb.h
source4/dsdb/samdb/samdb_privilege.c
source4/kdc/hdb-samba4.c
source4/kdc/kdc.c
source4/kdc/kdc.h
source4/kdc/kpasswdd.c
source4/ldap_server/ldap_server.c
source4/ldap_server/ldap_server.h
source4/lib/com/com.h
source4/lib/com/main.c
source4/lib/events/events.h
source4/lib/events/tevent_s4.c
source4/lib/ldb/common/ldb.c
source4/lib/ldb/include/ldb.h
source4/lib/ldb/include/ldb_private.h
source4/lib/ldb/ldb_ildap/ldb_ildap.c
source4/lib/ldb/ldb_ldap/ldb_ldap.c
source4/lib/ldb/ldb_tdb/ldb_tdb.c
source4/lib/ldb/ldb_tdb/ldb_tdb.h
source4/lib/ldb_wrap.c
source4/lib/ldb_wrap.h
source4/lib/messaging/irpc.h
source4/lib/messaging/messaging.c
source4/lib/messaging/pymessaging.c
source4/lib/messaging/tests/irpc.c
source4/lib/messaging/tests/messaging.c
source4/lib/registry/hive.c
source4/lib/registry/ldb.c
source4/lib/registry/registry.h
source4/lib/registry/rpc.c
source4/lib/registry/samba.c
source4/lib/registry/tools/common.c
source4/lib/registry/tools/regdiff.c
source4/lib/registry/tools/regpatch.c
source4/lib/registry/tools/regshell.c
source4/lib/registry/tools/regtree.c
source4/lib/socket/connect.c
source4/lib/socket/connect_multi.c
source4/lib/socket/socket.h
source4/lib/socket/testsuite.c
source4/lib/stream/packet.c
source4/lib/stream/packet.h
source4/lib/tls/tls.c
source4/lib/tls/tls.h
source4/libcli/cldap/cldap.c
source4/libcli/cldap/cldap.h
source4/libcli/cliconnect.c
source4/libcli/composite/composite.c
source4/libcli/composite/composite.h
source4/libcli/dgram/dgramsocket.c
source4/libcli/dgram/libdgram.h
source4/libcli/finddcs.c
source4/libcli/ldap/ldap.h
source4/libcli/ldap/ldap_client.c
source4/libcli/ldap/ldap_client.h
source4/libcli/libcli.h
source4/libcli/raw/clisocket.c
source4/libcli/raw/clitransport.c
source4/libcli/raw/clitree.c
source4/libcli/raw/libcliraw.h
source4/libcli/resolve/bcast.c
source4/libcli/resolve/dns_ex.c
source4/libcli/resolve/host.c
source4/libcli/resolve/nbtlist.c
source4/libcli/resolve/resolve.c
source4/libcli/resolve/resolve.h
source4/libcli/resolve/testsuite.c
source4/libcli/resolve/wins.c
source4/libcli/smb2/connect.c
source4/libcli/smb2/smb2_calls.h
source4/libcli/smb2/transport.c
source4/libcli/smb_composite/connect.c
source4/libcli/smb_composite/fetchfile.c
source4/libcli/wbclient/wbclient.c
source4/libcli/wbclient/wbclient.h
source4/libcli/wrepl/winsrepl.c
source4/libcli/wrepl/winsrepl.h
source4/libnet/libnet.c
source4/libnet/libnet.h
source4/libnet/libnet_samdump_keytab.c
source4/libnet/libnet_vampire.c
source4/libnet/py_net.c
source4/librpc/rpc/dcerpc.c
source4/librpc/rpc/dcerpc.h
source4/librpc/rpc/dcerpc_connect.c
source4/librpc/rpc/dcerpc_sock.c
source4/librpc/rpc/dcerpc_util.c
source4/librpc/rpc/pyrpc.c
source4/nbt_server/register.c
source4/nbt_server/wins/winsclient.c
source4/nbt_server/wins/winsdb.c
source4/nbt_server/wins/winsdb.h
source4/nbt_server/wins/winsserver.h
source4/nbt_server/wins/winswack.c
source4/ntptr/ntptr.h
source4/ntptr/ntptr_base.c
source4/ntptr/simple_ldb/ntptr_simple_ldb.c
source4/ntvfs/common/notify.c
source4/ntvfs/ipc/ipc_rap.c
source4/ntvfs/ipc/rap_server.c
source4/ntvfs/ntvfs.h
source4/ntvfs/ntvfs_base.c
source4/ntvfs/posix/pvfs_notify.c
source4/ntvfs/posix/pvfs_search.c
source4/ntvfs/posix/pvfs_wait.c
source4/ntvfs/posix/pvfs_write.c
source4/ntvfs/posix/vfs_posix.h
source4/ntvfs/sysdep/inotify.c
source4/ntvfs/sysdep/sys_lease.c
source4/ntvfs/sysdep/sys_lease.h
source4/ntvfs/sysdep/sys_notify.c
source4/ntvfs/sysdep/sys_notify.h
source4/param/secrets.c
source4/param/secrets.h
source4/param/share.c
source4/param/share.h
source4/param/share_classic.c
source4/param/share_ldb.c
source4/rpc_server/common/server_info.c
source4/rpc_server/dcerpc_server.c
source4/rpc_server/dcerpc_server.h
source4/rpc_server/echo/rpc_echo.c
source4/rpc_server/lsa/lsa_lookup.c
source4/rpc_server/netlogon/dcerpc_netlogon.c
source4/rpc_server/service_rpc.c
source4/smb_server/smb_samba3.c
source4/smb_server/smb_server.c
source4/smb_server/smb_server.h
source4/smbd/process_model.c
source4/smbd/process_model.h
source4/smbd/process_prefork.c
source4/smbd/process_single.c
source4/smbd/process_standard.c
source4/smbd/process_thread.c
source4/smbd/server.c
source4/smbd/service.c
source4/smbd/service_named_pipe.c
source4/smbd/service_stream.c
source4/smbd/service_stream.h
source4/smbd/service_task.c
source4/smbd/service_task.h
source4/torture/basic/misc.c
source4/torture/gentest.c
source4/torture/locktest.c
source4/torture/locktest2.c
source4/torture/masktest.c
source4/torture/raw/composite.c
source4/torture/raw/lockbench.c
source4/torture/raw/offline.c
source4/torture/raw/openbench.c
source4/torture/raw/oplock.c
source4/torture/rpc/echo.c
source4/torture/util.h
source4/torture/util_smb.c
source4/utils/net/net.c
source4/utils/net/net.h
source4/utils/net/net_machinepw.c
source4/utils/ntlm_auth.c
source4/web_server/web_server.c
source4/winbind/idmap.c
source4/winbind/idmap.h
source4/winbind/wb_pam_auth.c
source4/winbind/wb_server.h
source4/wrepl_server/wrepl_periodic.c
source4/wrepl_server/wrepl_server.c
source4/wrepl_server/wrepl_server.h

index 54f679984523b28608a3e557b332ec901ae42df8..a969373738c71ac065d34c1553c63daf4363e6a4 100644 (file)
@@ -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;
index 7f2729ceff85f6bd06aefb45ad7ad60588a211b3..ec57c5ad2ebae78d2e44d4c4012a8c7f55a399c0 100644 (file)
@@ -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;
index 2ea5ad33e0eaf2a734e77fc0213827c56540d241..e45a690c33ae5aaacf7cd237f539e349299ed463 100644 (file)
@@ -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);
        }
index 002edd18366479c4ee8e28ba05dd4d724197b5d1..f626de9d12a82dbb4c890b631debf363ddcf5018 100644 (file)
 #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
index b3cd126a340db468f32650c6ac097a62c5aed836..746e96060b3d95bd77f879e482108739d4c264b9 100644 (file)
 
 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,
index a23ff097555908f71ad4650e5430f895eb9f0d1f..4fa58534b4519f0beda46a0adcd4882548d796fd 100644 (file)
@@ -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) {
index cff6e46e2c4db97c157f902f6af1dad4252ce212..1ce666462cdf0f41d7459503dd0002b42475a209 100644 (file)
 
 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);
index 42c860756d370ad6aa8ddf285878c9ff3e2489ae..2d6909da366dd1e9e6115993e44d9a6f512342bf 100644 (file)
@@ -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;
index 520bc5a996dd86a50c311d631e8c1ebb016e1430..5f658d7c1f9a35f93d0bd8abbbbf1cef4cf2a9d6 100644 (file)
@@ -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;
index efb3ff564c498465b209b6af33b3f9b5e3430065..3e72ce4943a603d653c3f552f379595bbc172e3f 100644 (file)
 
 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);
index 36907af6beda8d88c0da2f434180eff442cb6f57..bb50480dd7f0cd4ca378e9b3d9c90de2f1d58481 100644 (file)
@@ -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;
 
index ba474dbd26ac55d9a684e5a0f0703672cf311385..1c99408b8df74cc00474ecce9f0224b01f135033 100644 (file)
 
 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);
index a9b80948a17c5bc84f6d31becb7132c19f6d7891..ce3fc8eb0060187333f467d035635443f5ef675d 100644 (file)
@@ -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
index 9ad29ba9d0380d087354315d53b7cf1462370138..17adce94e57395b923ada59b7fcd25a89d31d26d 100644 (file)
@@ -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, 
index 73ea1eb64317c3ff3f47ff3554829b3dfbbfc293..91448c64224edcfa63e318d54d43db3e1bf29ab0 100644 (file)
@@ -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);
 
index 7d8ca49e9abd1f39f8ae910bafd2fe6eb822e660..0c4420cd405c9957351a1ace06633f18e1736dc0 100644 (file)
@@ -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);
index 65ed8725331c7ed70e4e46a082fc3361fbcf48b7..780e2bbc8212e1b6157ba033ae4703bedf7e8e8f 100644 (file)
@@ -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;
index 1d8924eac45a72924545f879cf0a053ccae45043..9afe7ea6c4fb67d0e4105652f2fe393c33384970 100644 (file)
@@ -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);
index 0d98cb99de4f6247112d40cd638124074e11bd65..96023f64c390379526fd7f4441dab2a2228c0e94 100644 (file)
@@ -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 {
index 360da50f70a23e798684336b1224f8a7547c8940..e184776140edb8fdffc15d5475716233d686a5f3 100644 (file)
@@ -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,
index 52b10c633c3899ac0afb26f0674c5218418657ba..a4fe3f2c305da1be58623e6f183c7070f50b1d26 100644 (file)
@@ -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,
index 17c555d25b8abd0cee15ad351726cdc57f92fe53..3fe38d5cd162e608421bbd41a9d29b49be1722c8 100644 (file)
@@ -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)
 {
index 1a2d5faddd2f6766062a3850dfc3610901269cf3..bc3d05f529fd0244f2b7ac602b7865018169cc99 100644 (file)
@@ -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) 
 {
index f672b0ad9ad4c9421e64dbe303c90d8eaaafa131..0d0e9f330fcbcabcb4e72c75da800e031178fd42 100644 (file)
@@ -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);
index 7a8da71a7d114ef5678231db529f2be9f0e02e83..7169b074e3c96ab493bd92d6ef943d9447d2e392 100644 (file)
@@ -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;
index 87c9b4d16979ec674c77eca09b9f0c583fc7b87f..c627bda0244cbe6329709d7779701b05a446d452 100644 (file)
@@ -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);
index c73313f9c8929e4c4e335a81a9709ed62ab4a912..d86b1f2b9c6dfc5500ccb089a25f066f326170b5 100644 (file)
@@ -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, 
index 319730e2cabf0ee6228253b445514ef1a1355acc..a338797ecfe27e7072857111841a10da363706a1 100644 (file)
@@ -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)
index ac12a498c684edee86a54987d61b6d77199ac024..2f0a2317a0a8ae0d0974c6736c3bb912307b2093 100644 (file)
@@ -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) 
 {
index 162a19a4abceed078522d20330976b4de967cc25..3f1425ea92aaa6824a1c34682325aa88f9e6cab0 100644 (file)
@@ -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);
index bf6dc846e74bf949771b31805486244a66e4b633..d00c81206afab91ad60d733334760ee2bd81435f 100644 (file)
@@ -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)
index e7039c36575fb529e3ede16318eb017636438f6c..ccf677bf5166da5cd393c53ae59ba7092dc69f2c 100644 (file)
@@ -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,
index 4b848cffe0a93d3cabaedbea968c9384d5a210f9..0017db260cb2c20bb86ab2c5d9e8549e4e4f771a 100644 (file)
@@ -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)
index d75f1793e199c29405ffe8e7f2fdd4a15b1ac901..885b2b96c2e404c410dd87217c099249c6e4efd9 100644 (file)
@@ -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) 
index fd298b44010f71ad7a095379e88e02cc6bc89065..bdb63ec4a2b04346f0007efdc05d249abed823e5 100644 (file)
@@ -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);
 
 
index 8d0b87d722b3296382710fad91c209b82027314d..302d470afdb747b0e88430afb58481c6ca657a4f 100644 (file)
@@ -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[] = {
index 28fe6778f4844a66c6fce616ce3829b6795923bc..e39c046fe8e1dbbd9fbc7c3e57f7f196d2022bbb 100644 (file)
@@ -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, 
index 06631ee3acc4d4b24f626211a48723299302e67e..ab18dd08d1324facb430b0a60183016a7fbf3af0 100644 (file)
@@ -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,
index a600b5fb0c6578462e8a650f4df3847a8e18555e..13b7053396a4642d0b121966be0b9118bf76946b 100644 (file)
@@ -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;
index 31b56ea52f0418a1b988f976acfb9ab526bf9264..5c20149384caf994b8aad38992a2b2caa24b7dec 100644 (file)
@@ -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;
index 7205c8b0f190991bb6f22b17cfebbbfe01d4f84a..4a6de8d700b6523a6fa3e2b4150c93fad66111f7 100644 (file)
@@ -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 */
index 0847a016f73d9308a8e49334c410ab9f2b8b0937..a9eea30719dd11f0391356a21d5d3ef30146bc8e 100644 (file)
@@ -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;
 
        /*
index 916dc943be9aff8b21a95513e16cec1f48036a08..9bcb007358ed1f1010ee6676b85bf66b146c0ea0 100644 (file)
@@ -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,
index 7ecc41d2c3682579bde84e6fed824342c36f1caf..5ab577c33dab66fa7cfc613d773a38a290b6f814 100644 (file)
@@ -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;
index f75ea3c4f7c3a0f20f67548b5930e16e2cfb459a..98ca6d03a13db9f55da90703019e003c4e79a37e 100644 (file)
@@ -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, 
index efc467865cd7670a7ff8a812e9f6acfb6168a369..49dc14d74c8c207e295429e27c36f7478cc17e4c 100644 (file)
@@ -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"
index d4ef79aac1fc6feed3ef8ecebcf0f14e4e0352cb..e9c6f4c5271391e534fcf215a3bd40b19a2ddbd2 100644 (file)
@@ -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;
index ff267261ed4d4246b833d9a5c9b675dd36e7c8ad..937839d67dd69f5e6595e09f6113d02ff5d5f93a 100644 (file)
@@ -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)
 {
index 81ac94c482dea39d8b6a090b2c808a892a02c300..c11c4a6eeed497953ef167501c301498bcb16a6f 100644 (file)
@@ -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);
index 2ea75099d980692db69e0e3b257f8b825dcfe6c0..417f327a57e19d718cf1b77896b4bd4a6b195d4f 100644 (file)
@@ -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,
index 2fa07d0531c4ba7231528faf41652a30b6b417d8..27968620e06fc26cf713b0617ef7d4cac020c566 100644 (file)
@@ -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;
index f08f24595a470e34dcf9a76c2da4f11d6348f224..ed8e6d3a2c783b50e011ba1562a69227089a201a 100644 (file)
@@ -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)
index 4f7a5b9be904e13b72fdab78c6e6b04fc862b531..efa802d1738cd7b85f87b0522862992bb3939bf7 100644 (file)
@@ -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;
 };
 
index 5d594ad41b7e28aea6824a686ed2b6b25ec02d8d..82d10daf4fd8a1a8de66c78183a254265ec0ac80 100644 (file)
 #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);
index daed8c11e5acd3797c4600076c2774b6a6d695dc..062d1360ac823b94cfcf18a94b7b3fb5cc90ad87 100644 (file)
@@ -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) {
index 803cba8456663a2784eb581cef21d6c399973e27..698ff2919ba43c803282d6fcddbda6e97790163c 100644 (file)
@@ -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__ */
index 22e052526399b98e8eb7e4806e5f9b58edf1e592..b3de7e667a52e7ecbaddeff0e22bd310e0909362 100644 (file)
@@ -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) {
index c013565da0b3816245844a206563f25f525fdf00..444336244828e4b4dd301eae49af21c54894e7f7 100644 (file)
@@ -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;
 }
index e2ec869872ab23fc771443300a16df62f8d60d21..28c54f5a3ccfa619a8569af5d34a0e0cc8ce48c7 100644 (file)
@@ -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.
index c0652882796796b4eda55e78cda0fb557bdc9caa..cf4017ef148b0c9e086607b3fb3d084e966b858d 100644 (file)
@@ -123,7 +123,7 @@ struct ldb_context {
 
        char *modules_dir;
 
-       struct event_context *ev_ctx;
+       struct tevent_context *ev_ctx;
 };
 
 #ifndef ARRAY_SIZE
index a95859276fd2cc6fc2f1e762d9777d5bd73f6745..9e31bc62bbb76981605175ef08f96916a8b8ea57 100644 (file)
@@ -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);
index 9f8b3e9f35fe3d14e88e8bcc7b36e17b23446232..8e053818e556bdce9c57f96c0500d5ebd2ab08e3 100644 (file)
@@ -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;
 
index ea460def65ac1cb528d7eaa969c611914fd4ad24..76469e356b759d0c237313f54884e112dc438691 100644 (file)
@@ -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)) {
index 7b9a76501fc4a4ac5e516025dbad1980881b522a..b373d37b7ef06945f39b56a850a2733e1ea90c51 100644 (file)
@@ -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 */
index 617371333f0f9fba1346f682932f7f362ea55963..15cf11f942db3735a193ddd9706d69bb58881ff3 100644 (file)
@@ -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,
index f2982302abb2ac9794b3d36a5215ba93e3377444..f44ff8c5992fe94a947f3355bc68c4e29221c0f2 100644 (file)
@@ -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,
index 3527f10648796a6c5dff2fbe0f1f89464f212bf4..fa91a147c676c2fc8f80145f630ba5f8e1d22f5a 100644 (file)
@@ -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);
index ff9ef8afc5c9cfa3f576f7cf967fbeca3681836b..decad7b5a8c8cde36e3891160fe2fdadf5074494 100644 (file)
@@ -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);
index 9f04bf0c6d1914d94a615fff66bf5ccaae937a62..9cc14b4381d91c2fecf0993c6ab9ca47bc46ab0a 100644 (file)
@@ -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;
index d9b0548643ddbda9c89c47cdcead5a538ea6eed5..d45bcb6bf7059d786cb5f1c7f747b845b4a84ebb 100644 (file)
@@ -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);
index f66b3a5b438728af4bc1c39222fbcb992740c66d..838de55d83db75618bde3068f7955987a015ee78 100644 (file)
@@ -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;
index 5105040f30618514e395cf4ad26e30d86b08486c..8bf7c9f8d15739acc4751733321281fb360cf141 100644 (file)
@@ -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)
 {
index 87268ce5e7e35030248cf05f4f96950ab1c9e214..1d238f4e23057bb7da9aad9053b71a7c8c741756 100644 (file)
@@ -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)
 {
index f9db39f4ae137f08cc5c036928d4ea9c0f6c448c..a97d9f61842d365378180d5d27b95ef609b39ec9 100644 (file)
@@ -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);
 
index 117951ed03b2cdc95e299759f0badf2c77f0676e..8096c8fbfe6382069a64ece6fd851d50af6699f5 100644 (file)
@@ -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;
index 84a8112f17952c45233203fd061e35c3bb2a0a9c..fc59bdfdfab515eefbababc313e42e583881f154 100644 (file)
@@ -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)
index f770f6a3cafd06a2244b5e91a910a246cc2778bb..c9f1248bf8e628506b3dda494861f421c2650a31 100644 (file)
@@ -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;
index fcf7c26237898edcb95830ed416988e5b5518113..945b4729034dd4f5c49d8cea710c4a28913e91a9 100644 (file)
@@ -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");
index 03d29a598b3a1488b2a85126a86d4e075129f95b..3f550e517e83f2851da5992663c4cbdf9f07aec6 100644 (file)
@@ -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},
index 5c308bfbda8a199488d461a3231f60112323d2e9..8939f2126937e1add775d36648cf1282fe06c76a 100644 (file)
@@ -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
index 6d55a3eb84eac8e62f43205775357ebe6ad7b8ec..cca009a0e2c95f7d853ab6f62ab90789d00342c9 100644 (file)
@@ -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[] = {
index d74a7b483308073a1745afb1acc0df2a16613197..be15aa987bbd1b6dcd775340f700968587d5e7b1 100644 (file)
@@ -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, 
index 14c475d0c3d35c15c4c65c829bde1043df305a35..8fcfc0a8ea702f74727649851bb64015552e068c 100644 (file)
@@ -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)
 {
index 4741a679902b8a2133ed41e5bccb210bc22121a6..7a27e3070b7efedab85a4d894d08c970dc21c728 100644 (file)
@@ -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);
index 0fae880ca0226439caf6311c2d7cfc01538a54b9..cba283f558ff0163becf1c6e9ea1e6db804c06f4 100644 (file)
@@ -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);
index 72a7e6485c708ed1bafd559638762fa7e8d8bc79..7882059faffb0fd237841d1574a672041b100df9 100644 (file)
@@ -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);
index f7b10cd87803a33381a779ce63ddfa546a5287b2..c9bd9d4767ae426ae88d1fb89f0d7d54d67af7b8 100644 (file)
@@ -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);
index d16df255482baa3cd20f3f67d7c36a4dc1c83d6b..99a15059ad3f517bc1b0c4047db45f0ab1dfef09 100644 (file)
@@ -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;
index e6aa8f0e1afdd97be5c9051d8bd2c89e2d237c1a..c5bd5c87cc13a0cd774a5e47da13daf1556489ac 100644 (file)
@@ -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);
 
 /*
index 129a80f9acc20fad61272e5e922c552a2556a053..556f9bcec3f987e5fdf8921704d61ad444d656ab 100644 (file)
@@ -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;
index c78e395faaa291f38d715ca41b0728c5842cf6a9..17e88716c5120e4c0cdf5346b17e9e816cdd3bef 100644 (file)
@@ -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 *, 
index dda05c8d739460423f389736801aee2616173b7a..14935dadbab16c155905cdb8633ef9d751bb7010 100644 (file)
@@ -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,
index 104397fa48726d176eee859f2856608a9f9d9d31..aff8f79481efe23d622b8a10323c7d30899dc182 100644 (file)
@@ -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);
index 25799d6a94c4b6c020cc602cccfdea0ffc1d84d7..a99a762c5faa14d0553d8efbd02269b68cb5dd41 100644 (file)
@@ -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,
index 9d00623081640f8cec98a5e5507baa4d24936f84..5c878f19fa011da4101cefb4908600af8320428d 100644 (file)
@@ -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;
index 2f8feb53459f127fc67713dc8e3c56360bd44c61..8060d8cf5320367c0ee3f1fb2b15eb4f97bd64d8 100644 (file)
@@ -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);
index 5352a3a90a902a3f17dab495887df6e79a72a5e8..6e531391a646ff2cb1d3c34e49ccb197f037c020 100644 (file)
@@ -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)
 {
index 09cf5e4c6f118b961a98fea2155855eccbadd6c1..5538c9dc06f00ad3d31689858080971b4603907d 100644 (file)
@@ -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;
index 082f6fa3e4402f60805bd097268eceb431abafc0..18784135cc58297b4ae4919247ba8a5bf0191026 100644 (file)
@@ -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);
index 13b0bf725cf84417f2da7c55dacfdc6b4cbfcaf5..084de2e6dc3cac59d7b27321494957ff42aa464b 100644 (file)
@@ -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,
index a4bd727f4c7419d19cb936ee07fa6019cec3da45..e729e12721e6c28aecb6dc9ba33266dfdbbcd452 100644 (file)
@@ -51,7 +51,7 @@ struct nbt_dc_name {
 };
 
 struct cli_credentials;
-struct event_context;
+struct tevent_context;
 
 /* passed to br lock code. */
 enum brl_type {
index 1fbbfe35813e16f74a94c48cf490393e2432ebd9..b9e83218ddd2572d101bf43269570441626c4d1c 100644 (file)
@@ -50,7 +50,7 @@ struct composite_context *smbcli_sock_connect_send(TALLOC_CTX *mem_ctx,
                                                   const char **ports,
                                                   const char *host_name,
                                                   struct resolve_context *resolve_ctx,
-                                                  struct event_context *event_ctx,
+                                                  struct tevent_context *event_ctx,
                                                   const char *socket_options)
 {
        struct composite_context *result, *ctx;
@@ -153,7 +153,7 @@ NTSTATUS smbcli_sock_connect(TALLOC_CTX *mem_ctx,
                             const char *host_addr, const char **ports,
                             const char *host_name,
                             struct resolve_context *resolve_ctx,
-                            struct event_context *event_ctx,
+                            struct tevent_context *event_ctx,
                                 const char *socket_options,
                             struct smbcli_socket **result)
 {
@@ -190,7 +190,7 @@ resolve a hostname and connect
 _PUBLIC_ struct smbcli_socket *smbcli_sock_connect_byname(const char *host, const char **ports,
                                                 TALLOC_CTX *mem_ctx,
                                                 struct resolve_context *resolve_ctx,
-                                                struct event_context *event_ctx,
+                                                struct tevent_context *event_ctx,
                                                 const char *socket_options)
 {
        int name_type = NBT_NAME_SERVER;
index 502ecc18253987843d92e3356337ab1e3a5432eb..22e2552edca1bf779499b16bc5ddbd065373d619 100644 (file)
@@ -33,8 +33,8 @@
 /*
   an event has happened on the socket
 */
-static void smbcli_transport_event_handler(struct event_context *ev, 
-                                          struct fd_event *fde, 
+static void smbcli_transport_event_handler(struct tevent_context *ev, 
+                                          struct tevent_fd *fde, 
                                           uint16_t flags, void *private)
 {
        struct smbcli_transport *transport = talloc_get_type(private,
@@ -307,8 +307,8 @@ again:
        return mid;
 }
 
-static void idle_handler(struct event_context *ev, 
-                        struct timed_event *te, struct timeval t, void *private)
+static void idle_handler(struct tevent_context *ev, 
+                        struct tevent_timer *te, struct timeval t, void *private)
 {
        struct smbcli_transport *transport = talloc_get_type(private,
                                                             struct smbcli_transport);
@@ -541,7 +541,7 @@ _PUBLIC_ bool smbcli_transport_process(struct smbcli_transport *transport)
 /*
   handle timeouts of individual smb requests
 */
-static void smbcli_timeout_handler(struct event_context *ev, struct timed_event *te, 
+static void smbcli_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
                                   struct timeval t, void *private)
 {
        struct smbcli_request *req = talloc_get_type(private, struct smbcli_request);
index 984aa702472a5b6cc8cc3a15f8aa7903d61f0c4a..a083396f3502ad0cfb2e689160284b2abdc744d4 100644 (file)
@@ -176,7 +176,7 @@ NTSTATUS smbcli_tree_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,
index 7757d10099c6a76df034f1f2bf723a66f120e2de..0ab6f5650c646632d1efc49201cfb5996fe04907 100644 (file)
@@ -81,9 +81,9 @@ struct smbcli_socket {
 
        /* the event handle for waiting for socket IO */
        struct {
-               struct event_context *ctx;
-               struct fd_event *fde;
-               struct timed_event *te;
+               struct tevent_context *ctx;
+               struct tevent_fd *fde;
+               struct tevent_timer *te;
        } event;
 };
 
@@ -377,7 +377,7 @@ NTSTATUS smb_raw_trans(struct smbcli_tree *tree,
 struct smbcli_socket *smbcli_sock_connect_byname(const char *host, const char **ports,
                                                 TALLOC_CTX *mem_ctx,
                                                 struct resolve_context *resolve_ctx,
-                                                struct event_context *event_ctx,
+                                                struct tevent_context *event_ctx,
                                                 const char *socket_options);
 void smbcli_sock_dead(struct smbcli_socket *sock);
 
index 866ce7a152949d47a64152f33c8b3615544b5976..da58eb86656642bcd2514020313bf664a8c30bdc 100644 (file)
@@ -36,7 +36,7 @@ struct resolve_bcast_data {
   broadcast name resolution method - async send
  */
 struct composite_context *resolve_name_bcast_send(TALLOC_CTX *mem_ctx, 
-                                                 struct event_context *event_ctx,
+                                                 struct tevent_context *event_ctx,
                                                  void *userdata, uint32_t flags,
                                                  uint16_t port,
                                                  struct nbt_name *name)
index 17e7aad290b279b9fa6b433f152cbc25dd5e7c9a..be93538c7d73d462ceda24ed3b9fd48eb79b4101 100644 (file)
@@ -48,8 +48,8 @@ struct dns_ex_state {
        char **names;
        pid_t child;
        int child_fd;
-       struct fd_event *fde;
-       struct event_context *event_ctx;
+       struct tevent_fd *fde;
+       struct tevent_context *event_ctx;
 };
 
 /*
@@ -328,7 +328,7 @@ done:
 /*
   handle a read event on the pipe
 */
-static void pipe_handler(struct event_context *ev, struct fd_event *fde, 
+static void pipe_handler(struct tevent_context *ev, struct tevent_fd *fde, 
                         uint16_t flags, void *private_data)
 {
        struct composite_context *c = talloc_get_type(private_data, struct composite_context);
@@ -436,7 +436,7 @@ static void pipe_handler(struct event_context *ev, struct fd_event *fde,
   getaddrinfo() or dns_lookup() name resolution method - async send
  */
 struct composite_context *resolve_name_dns_ex_send(TALLOC_CTX *mem_ctx,
-                                                  struct event_context *event_ctx,
+                                                  struct tevent_context *event_ctx,
                                                   void *privdata,
                                                   uint32_t flags,
                                                   uint16_t port,
index b7eaf4bef5c8fc6bfec8ffa9c5bc713d7b7263a4..755a4e8304a38c49b6056e52da878323a0cfc0c2 100644 (file)
@@ -33,7 +33,7 @@
   getaddrinfo() (with fallback to dns_lookup()) name resolution method - async send
  */
 struct composite_context *resolve_name_host_send(TALLOC_CTX *mem_ctx,
-                                                struct event_context *event_ctx,
+                                                struct tevent_context *event_ctx,
                                                 void *privdata, uint32_t flags,
                                                 uint16_t port,
                                                 struct nbt_name *name)
index 734fd5a5bc35e7a09571b69717bef47f425926c6..73085b87cbcec15afb46cf6eae2e6927a8f74bc7 100644 (file)
@@ -107,7 +107,7 @@ static void nbtlist_handler(struct nbt_name_request *req)
   nbtlist name resolution method - async send
  */
 struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
-                                                   struct event_context *event_ctx,
+                                                   struct tevent_context *event_ctx,
                                                    uint32_t flags,
                                                    uint16_t port,
                                                    struct nbt_name *name, 
index 752678abb853fde7c020bdd5fdbc13dd952096a8..6a3d5daeccdba8bec9e2fccf32dbc40203ada180 100644 (file)
@@ -139,7 +139,7 @@ struct composite_context *resolve_name_all_send(struct resolve_context *ctx,
                                                uint32_t flags,
                                                uint16_t port,
                                                struct nbt_name *name,
-                                               struct event_context *event_ctx)
+                                               struct tevent_context *event_ctx)
 {
        struct composite_context *c;
        struct resolve_state *state;
@@ -222,7 +222,7 @@ NTSTATUS resolve_name_all_recv(struct composite_context *c,
 
 struct composite_context *resolve_name_send(struct resolve_context *ctx,
                                            struct nbt_name *name,
-                                           struct event_context *event_ctx)
+                                           struct tevent_context *event_ctx)
 {
        return resolve_name_all_send(ctx, 0, 0, name, event_ctx);
 }
@@ -251,7 +251,7 @@ NTSTATUS resolve_name(struct resolve_context *ctx,
                          struct nbt_name *name,
                          TALLOC_CTX *mem_ctx,
                          const char **reply_addr,
-                         struct event_context *ev)
+                         struct tevent_context *ev)
 {
        struct composite_context *c = resolve_name_send(ctx, name, ev);
        return resolve_name_recv(c, mem_ctx, reply_addr);
index b55ab83f2a17b4543b1a841c7b6bb31500238cac..8ace5740a95ea805fe7ff094d3a2abe5f2e0d29f 100644 (file)
@@ -23,7 +23,7 @@
 #define __LIBCLI_RESOLVE_H__
 
 struct socket_address;
-struct event_context;
+struct tevent_context;
 
 #include "../libcli/nbt/libnbt.h"
 
@@ -37,7 +37,7 @@ struct event_context;
 #define RESOLVE_NAME_FLAG_OVERWRITE_PORT       0x00000008
 
 typedef struct composite_context *(*resolve_name_send_fn)(TALLOC_CTX *mem_ctx,
-                                                         struct event_context *,
+                                                         struct tevent_context *,
                                                          void *privdata,
                                                          uint32_t flags,
                                                          uint16_t port,
index f1d1fbc85c3ccdb83af4531fefc2581b16bf2fb2..fdbb430a9fbbce5d835994d29110fab1eb9b4f7e 100644 (file)
@@ -28,7 +28,7 @@
 static bool test_async_resolve(struct torture_context *tctx)
 {
        struct nbt_name n;
-       struct event_context *ev;
+       struct tevent_context *ev;
        int timelimit = torture_setting_int(tctx, "timelimit", 2);
        const char *host = torture_setting_string(tctx, "host", NULL);
        int count = 0;
index 1940688ecbc647fd2bac0f5c4bec61da48c4719f..03eaf8786fd6a26bd573bae3b6be8a08b5fe4816 100644 (file)
@@ -38,7 +38,7 @@ struct resolve_wins_data {
  */
 struct composite_context *resolve_name_wins_send(
                                TALLOC_CTX *mem_ctx, 
-                               struct event_context *event_ctx,
+                               struct tevent_context *event_ctx,
                                void *userdata,
                                uint32_t flags,
                                uint16_t port,
index c7613841b88fa131e7356684eb630803c432b936..11bec42737d183a507f6892151ebb1f625e09851 100644 (file)
@@ -235,7 +235,7 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx,
                                            const char *share,
                                            struct resolve_context *resolve_ctx,
                                            struct cli_credentials *credentials,
-                                           struct event_context *ev,
+                                           struct tevent_context *ev,
                                            struct smbcli_options *options,
                                                const char *socket_options,
                                                struct gensec_settings *gensec_settings)
@@ -297,7 +297,7 @@ NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx,
                      struct resolve_context *resolve_ctx,
                      struct cli_credentials *credentials,
                      struct smb2_tree **tree,
-                     struct event_context *ev,
+                     struct tevent_context *ev,
                      struct smbcli_options *options,
                          const char *socket_options,
                          struct gensec_settings *gensec_settings)
index ec246b209dff9818884f4af4085ede87cb0cf7d2..b89770fbe6f3ab46b9917128480b9405c32311dc 100644 (file)
@@ -105,7 +105,7 @@ struct smb2_setinfo {
 };
 
 struct cli_credentials;
-struct event_context;
+struct tevent_context;
 struct resolve_context;
 struct gensec_settings;
 #include "libcli/smb2/smb2_proto.h"
index 6d7531f4b5bd77b3bf14a8a5a61e7326a21caa58..94ea2586ef0cedf8dafe06ab8163aaa51c146899 100644 (file)
@@ -33,8 +33,8 @@
 /*
   an event has happened on the socket
 */
-static void smb2_transport_event_handler(struct event_context *ev, 
-                                        struct fd_event *fde, 
+static void smb2_transport_event_handler(struct tevent_context *ev, 
+                                        struct tevent_fd *fde, 
                                         uint16_t flags, void *private)
 {
        struct smb2_transport *transport = talloc_get_type(private,
@@ -301,7 +301,7 @@ error:
 /*
   handle timeouts of individual smb requests
 */
-static void smb2_timeout_handler(struct event_context *ev, struct timed_event *te, 
+static void smb2_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
                                 struct timeval t, void *private)
 {
        struct smb2_request *req = talloc_get_type(private, struct smb2_request);
@@ -380,8 +380,8 @@ void smb2_transport_send(struct smb2_request *req)
        talloc_set_destructor(req, smb2_request_destructor);
 }
 
-static void idle_handler(struct event_context *ev, 
-                        struct timed_event *te, struct timeval t, void *private)
+static void idle_handler(struct tevent_context *ev, 
+                        struct tevent_timer *te, struct timeval t, void *private)
 {
        struct smb2_transport *transport = talloc_get_type(private,
                                                           struct smb2_transport);
index 980a418619644f7ce51ce69eed7b9df9e5750b2f..e0f4919f0b24372b8bd0461d6bf651fdf15cf574 100644 (file)
@@ -455,7 +455,7 @@ static void composite_handler(struct composite_context *creq)
 struct composite_context *smb_composite_connect_send(struct smb_composite_connect *io,
                                                     TALLOC_CTX *mem_ctx,
                                                     struct resolve_context *resolve_ctx,
-                                                    struct event_context *event_ctx)
+                                                    struct tevent_context *event_ctx)
 {
        struct composite_context *c;
        struct connect_state *state;
@@ -513,7 +513,7 @@ NTSTATUS smb_composite_connect_recv(struct composite_context *c, TALLOC_CTX *mem
 */
 NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem_ctx,
                               struct resolve_context *resolve_ctx,
-                              struct event_context *ev)
+                              struct tevent_context *ev)
 {
        struct composite_context *c = smb_composite_connect_send(io, mem_ctx, resolve_ctx, ev);
        return smb_composite_connect_recv(c, mem_ctx);
index a19898efaee9ea4ad45111dfe413dcaf79aebdff..210a2940b9b71a63d5c900b554a792017c15b775 100644 (file)
@@ -120,7 +120,7 @@ static void fetchfile_composite_handler(struct composite_context *creq)
 }
 
 struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetchfile *io,
-                                                      struct event_context *event_ctx)
+                                                      struct tevent_context *event_ctx)
 {
        struct composite_context *c;
        struct fetchfile_state *state;
index 1b2d314824bd7463d5ad4f69a928b57054d950fc..b881e32f7b9f721202e9974d034abd6b0acc82f3 100644 (file)
@@ -50,7 +50,7 @@ static NTSTATUS get_server_id(struct messaging_context *msg_ctx,
  */
 struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx,
                             struct messaging_context *msg_ctx,
-                            struct event_context *event_ctx)
+                            struct tevent_context *event_ctx)
 {
        struct wbc_context *ctx;
        NTSTATUS status;
index 099abaa511e98328492646a47402a3a7415ff2b6..416dc783241040f3e9a88dc1abd7135cbfc65f51 100644 (file)
 
 struct wbc_context {
        struct messaging_context *msg_ctx;
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
        struct server_id *ids;
 };
 
 struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx,
                             struct messaging_context *msg_ctx,
-                            struct event_context *event_ctx);
+                            struct tevent_context *event_ctx);
 
 struct composite_context *wbc_sids_to_xids_send(struct wbc_context *wbc_ctx,
                                                TALLOC_CTX *mem_ctx,
index 930616d2113773c9cf85213d49e7831de4fc43e2..c063a4bc6dda170c1801cda8932e5047a5449240 100644 (file)
@@ -71,7 +71,7 @@ static void wrepl_socket_dead(struct wrepl_socket *wrepl_socket, NTSTATUS status
        }
 }
 
-static void wrepl_request_timeout_handler(struct event_context *ev, struct timed_event *te,
+static void wrepl_request_timeout_handler(struct tevent_context *ev, struct tevent_timer *te,
                                          struct timeval t, void *ptr)
 {
        struct wrepl_request *req = talloc_get_type(ptr, struct wrepl_request);
@@ -122,7 +122,7 @@ static NTSTATUS wrepl_finish_recv(void *private, DATA_BLOB packet_blob_in)
 /*
   handler for winrepl events
 */
-static void wrepl_handler(struct event_context *ev, struct fd_event *fde, 
+static void wrepl_handler(struct tevent_context *ev, struct tevent_fd *fde, 
                          uint16_t flags, void *private)
 {
        struct wrepl_socket *wrepl_socket = talloc_get_type(private, 
@@ -162,7 +162,7 @@ static int wrepl_socket_destructor(struct wrepl_socket *sock)
   operations will use that event context
 */
 struct wrepl_socket *wrepl_socket_init(TALLOC_CTX *mem_ctx, 
-                                      struct event_context *event_ctx,
+                                      struct tevent_context *event_ctx,
                                       struct smb_iconv_convenience *iconv_convenience)
 {
        struct wrepl_socket *wrepl_socket;
@@ -196,7 +196,7 @@ failed:
   initialise a wrepl_socket from an already existing connection
 */
 struct wrepl_socket *wrepl_socket_merge(TALLOC_CTX *mem_ctx, 
-                                       struct event_context *event_ctx,
+                                       struct tevent_context *event_ctx,
                                        struct socket_context *sock,
                                        struct packet_context *pack)
 {
@@ -381,7 +381,7 @@ NTSTATUS wrepl_connect(struct wrepl_socket *wrepl_socket,
 /* 
    callback from wrepl_request_trigger() 
 */
-static void wrepl_request_trigger_handler(struct event_context *ev, struct timed_event *te,
+static void wrepl_request_trigger_handler(struct tevent_context *ev, struct tevent_timer *te,
                                          struct timeval t, void *ptr)
 {
        struct wrepl_request *req = talloc_get_type(ptr, struct wrepl_request);
@@ -397,7 +397,7 @@ static void wrepl_request_trigger_handler(struct event_context *ev, struct timed
 */
 static struct wrepl_request *wrepl_request_finished(struct wrepl_request *req, NTSTATUS status)
 {
-       struct timed_event *te;
+       struct tevent_timer *te;
 
        if (req->state == WREPL_REQUEST_RECV) {
                DLIST_REMOVE(req->wrepl_socket->recv_queue, req);
index f33e63119d574b5a6a1affe557d7f9e96f20c09f..532496d387c5e3c7be6e6091c1332a145ca791b2 100644 (file)
@@ -30,8 +30,8 @@ struct wrepl_socket {
        struct packet_context *packet;
 
        struct {
-               struct event_context *ctx;
-               struct fd_event *fde;
+               struct tevent_context *ctx;
+               struct tevent_fd *fde;
        } event;
 
        /* a queue of replies waiting to be received */
@@ -76,7 +76,7 @@ struct wrepl_request {
        bool trigger;
        NTSTATUS status;
 
-       struct timed_event *te;
+       struct tevent_timer *te;
 
        struct wrepl_packet *packet;
 
index c966898ceea03a7ae5c3ac57a0a5823a07fbb324..b10fb65df605d9fe059a931bb42f9d443dc6ae36 100644 (file)
@@ -23,7 +23,7 @@
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
 
-struct libnet_context *libnet_context_init(struct event_context *ev,
+struct libnet_context *libnet_context_init(struct tevent_context *ev,
                                           struct loadparm_context *lp_ctx)
 {
        struct libnet_context *ctx;
index b65a13ce370e0ae83cfcf7b8c7e2145a1cb3ff92..543a131806b667a21b5dad8f6aec6adbe72a6e37 100644 (file)
@@ -49,7 +49,7 @@ struct libnet_context {
        /* name resolution methods */
        struct resolve_context *resolve_ctx;
 
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
 
        struct loadparm_context *lp_ctx;
 };
index 62d93904ef42a1257c0513d79b0090ef7deb6469..2218d20f6ba34a9200c70e1a592b48a2b00be886 100644 (file)
@@ -29,7 +29,7 @@
 #include "lib/events/events.h"
 
 static NTSTATUS samdump_keytab_handle_user(TALLOC_CTX *mem_ctx,
-                                          struct event_context *event_ctx,
+                                          struct tevent_context *event_ctx,
                                           struct loadparm_context *lp_ctx,
                                            const char *keytab_name,
                                            struct netr_DELTA_ENUM *delta) 
@@ -70,7 +70,7 @@ static NTSTATUS samdump_keytab_handle_user(TALLOC_CTX *mem_ctx,
 
 struct libnet_samdump_keytab_data {
        const char *keytab_name;
-       struct event_context *ev_ctx;
+       struct tevent_context *ev_ctx;
        struct loadparm_context *lp_ctx;
 };
 
index 7b686ba0072f8e9505043846a043decc651b016d..4140de068601322fbfdb13c462f08aae787880ae 100644 (file)
@@ -70,7 +70,7 @@ struct vampire_state {
        const char *targetdir;
 
        struct loadparm_context *lp_ctx;
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
 };
 
 static NTSTATUS vampire_prepare_db(void *private_data,
index 887c3f466c65b193a6f74125a72ce4158cd09be7..4770cff82d30ccabba14a8019a52f50aec76cfcd 100644 (file)
@@ -27,7 +27,7 @@
 /* FIXME: This prototype should be in param/pyparam.h */
 struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx);
 
-static struct libnet_context *py_net_ctx(PyObject *obj, struct event_context *ev)
+static struct libnet_context *py_net_ctx(PyObject *obj, struct tevent_context *ev)
 {
        /* FIXME: Use obj */
        return libnet_context_init(ev, py_default_loadparm_context(NULL));
@@ -39,7 +39,7 @@ static PyObject *py_net_join(PyObject *cls, PyObject *args, PyObject *kwargs)
        NTSTATUS status;
        PyObject *result;
        TALLOC_CTX *mem_ctx;
-       struct event_context *ev;
+       struct tevent_context *ev;
        struct libnet_context *libnet_ctx;
        const char *kwnames[] = { "domain_name", "netbios_name", "join_type", "level", NULL };
 
index 16ea51e6ff47205e47785acc9c3576c2aa63e7d8..a5b17f0405dab1fd86e533cbba1a2c40d49d12bd 100644 (file)
@@ -55,7 +55,7 @@ static int dcerpc_connection_destructor(struct dcerpc_connection *conn)
    the event context is optional
 */
 static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, 
-                                                struct event_context *ev,
+                                                struct tevent_context *ev,
                                                 struct smb_iconv_convenience *ic)
 {
        struct dcerpc_connection *c;
@@ -90,7 +90,7 @@ static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx,
 }
 
 /* initialise a dcerpc pipe. */
-_PUBLIC_ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct event_context *ev,
+_PUBLIC_ struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                                     struct smb_iconv_convenience *ic)
 {
        struct dcerpc_pipe *p;
@@ -652,7 +652,7 @@ static void dcerpc_bind_recv_handler(struct rpc_request *req,
 /*
   handle timeouts of individual dcerpc requests
 */
-static void dcerpc_timeout_handler(struct event_context *ev, struct timed_event *te, 
+static void dcerpc_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
                                   struct timeval t, void *private)
 {
        struct rpc_request *req = talloc_get_type(private, struct rpc_request);
@@ -1096,7 +1096,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
   return the event context for a dcerpc pipe
   used by callers who wish to operate asynchronously
 */
-_PUBLIC_ struct event_context *dcerpc_event_context(struct dcerpc_pipe *p)
+_PUBLIC_ struct tevent_context *dcerpc_event_context(struct dcerpc_pipe *p)
 {
        return p->conn->event_ctx;
 }
@@ -1113,7 +1113,7 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
        NTSTATUS status;
 
        while (req->state != RPC_REQUEST_DONE) {
-               struct event_context *ctx = dcerpc_event_context(req->p);
+               struct tevent_context *ctx = dcerpc_event_context(req->p);
                if (event_loop_once(ctx) != 0) {
                        return NT_STATUS_CONNECTION_DISCONNECTED;
                }
index 6b9d61dd0fe46a3726d04b377defd1719cce6c6a..87fc1e7ea793579b168f2145bf6ee3dbf23a5656 100644 (file)
@@ -59,7 +59,7 @@ struct dcerpc_connection {
        uint32_t flags;
        struct dcerpc_security security_state;
        const char *binding_string;
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
        struct smb_iconv_convenience *iconv_convenience;
 
        /** Directory in which to save ndrdump-parseable files */
@@ -249,7 +249,7 @@ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx,
                             const char *binding,
                             const struct ndr_interface_table *table,
                             struct cli_credentials *credentials,
-                            struct event_context *ev,
+                            struct tevent_context *ev,
                             struct loadparm_context *lp_ctx);
 NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req);
 struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
@@ -259,7 +259,7 @@ struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p,
                                                TALLOC_CTX *mem_ctx, 
                                                void *r);
 const char *dcerpc_server_name(struct dcerpc_pipe *p);
-struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                                     struct smb_iconv_convenience *ic);
 NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_pipe *p,
                              struct smbcli_tree *tree,
@@ -277,7 +277,7 @@ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent_ctx,
                                                     struct dcerpc_binding *binding,
                                                     const struct ndr_interface_table *table,
                                                     struct cli_credentials *credentials,
-                                                    struct event_context *ev,
+                                                    struct tevent_context *ev,
                                                     struct loadparm_context *lp_ctx);
 
 NTSTATUS dcerpc_pipe_connect_b_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
@@ -288,7 +288,7 @@ NTSTATUS dcerpc_pipe_connect_b(TALLOC_CTX *parent_ctx,
                               struct dcerpc_binding *binding,
                               const struct ndr_interface_table *table,
                               struct cli_credentials *credentials,
-                              struct event_context *ev,
+                              struct tevent_context *ev,
                               struct loadparm_context *lp_ctx);
 const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);
 
@@ -308,7 +308,7 @@ NTSTATUS dcerpc_bind_auth_schannel(TALLOC_CTX *tmp_ctx,
                                   struct cli_credentials *credentials,
                                   struct loadparm_context *lp_ctx,
                                   uint8_t auth_level);
-struct event_context *dcerpc_event_context(struct dcerpc_pipe *p);
+struct tevent_context *dcerpc_event_context(struct dcerpc_pipe *p);
 NTSTATUS dcerpc_init(struct loadparm_context *lp_ctx);
 struct smbcli_tree *dcerpc_smb_tree(struct dcerpc_connection *c);
 uint16_t dcerpc_smb_fnum(struct dcerpc_connection *c);
@@ -330,13 +330,13 @@ struct composite_context* dcerpc_pipe_connect_send(TALLOC_CTX *parent_ctx,
                                                   const char *binding,
                                                   const struct ndr_interface_table *table,
                                                   struct cli_credentials *credentials,
-                                                  struct event_context *ev, struct loadparm_context *lp_ctx);
+                                                  struct tevent_context *ev, struct loadparm_context *lp_ctx);
 NTSTATUS dcerpc_pipe_connect_recv(struct composite_context *c,
                                  TALLOC_CTX *mem_ctx,
                                  struct dcerpc_pipe **pp);
 
 NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding,
-                               const struct ndr_interface_table *table, struct event_context *ev,
+                               const struct ndr_interface_table *table, struct tevent_context *ev,
                                struct loadparm_context *lp_ctx);
 struct composite_context* dcerpc_secondary_auth_connection_send(struct dcerpc_pipe *p,
                                                                struct dcerpc_binding *binding,
index 32485f5653f30b8274db7383535974a7326be7c2..9b8503c04b97ea79ad083b2b4e1a83e60f2bc5ba 100644 (file)
@@ -708,7 +708,7 @@ static void continue_pipe_auth(struct composite_context *ctx)
 /*
   handle timeouts of a dcerpc connect
 */
-static void dcerpc_connect_timeout_handler(struct event_context *ev, struct timed_event *te, 
+static void dcerpc_connect_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
                                           struct timeval t, void *private)
 {
        struct composite_context *c = talloc_get_type(private, struct composite_context);
@@ -723,12 +723,12 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent
                                                     struct dcerpc_binding *binding,
                                                     const struct ndr_interface_table *table,
                                                     struct cli_credentials *credentials,
-                                                    struct event_context *ev,
+                                                    struct tevent_context *ev,
                                                     struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
        struct pipe_connect_state *s;
-       struct event_context *new_ev = NULL;
+       struct tevent_context *new_ev = NULL;
 
        /* composite context allocation and setup */
        c = composite_create(parent_ctx, ev);
@@ -820,7 +820,7 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_connect_b(TALLOC_CTX *parent_ctx,
                               struct dcerpc_binding *binding,
                               const struct ndr_interface_table *table,
                               struct cli_credentials *credentials,
-                              struct event_context *ev,
+                              struct tevent_context *ev,
                               struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
@@ -848,7 +848,7 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_send(TALLOC_CTX *parent_c
                                                   const char *binding,
                                                   const struct ndr_interface_table *table,
                                                   struct cli_credentials *credentials,
-                                                  struct event_context *ev, struct loadparm_context *lp_ctx)
+                                                  struct tevent_context *ev, struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
        struct pipe_conn_state *s;
@@ -935,7 +935,7 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx,
                             const char *binding,
                             const struct ndr_interface_table *table,
                             struct cli_credentials *credentials,
-                            struct event_context *ev,
+                            struct tevent_context *ev,
                             struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
index 3cc842133958ac19daed8b2a5c1511d7291d962e..689249288f637b69e8023a6ad98e30a8d66ec3fc 100644 (file)
@@ -32,7 +32,7 @@
 
 /* transport private information used by general socket pipe transports */
 struct sock_private {
-       struct fd_event *fde;
+       struct tevent_fd *fde;
        struct socket_context *sock;
        char *server_name;
 
@@ -126,7 +126,7 @@ static NTSTATUS sock_process_recv(void *private, DATA_BLOB blob)
 /*
   called when a IO is triggered by the events system
 */
-static void sock_io_handler(struct event_context *ev, struct fd_event *fde, 
+static void sock_io_handler(struct tevent_context *ev, struct tevent_fd *fde, 
                            uint16_t flags, void *private)
 {
        struct dcerpc_connection *p = talloc_get_type(private, 
index 1847b20ee7304042f4c59ad2963de74631d0f00b..d57cc57e47e83e63797dfb8ddd2c805c8496af0e 100644 (file)
@@ -202,7 +202,7 @@ static void continue_epm_map(struct rpc_request *req)
 struct composite_context *dcerpc_epm_map_binding_send(TALLOC_CTX *mem_ctx,
                                                      struct dcerpc_binding *binding,
                                                      const struct ndr_interface_table *table,
-                                                     struct event_context *ev,
+                                                     struct tevent_context *ev,
                                                      struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
@@ -303,7 +303,7 @@ NTSTATUS dcerpc_epm_map_binding_recv(struct composite_context *c)
   Get endpoint mapping for rpc connection
 */
 _PUBLIC_ NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding,
-                               const struct ndr_interface_table *table, struct event_context *ev,
+                               const struct ndr_interface_table *table, struct tevent_context *ev,
                                struct loadparm_context *lp_ctx)
 {
        struct composite_context *c;
index 53a083e7403e4f88ac71ecd44ef9596cda733e9e..a15c3eaac0fa8857f7ace89d5c8a7e65d0c5069e 100644 (file)
@@ -295,7 +295,7 @@ PyObject *py_dcerpc_interface_init_helper(PyTypeObject *type, PyObject *args, Py
        struct loadparm_context *lp_ctx = NULL;
        PyObject *py_lp_ctx = Py_None, *py_credentials = Py_None, *py_basis = Py_None;
        TALLOC_CTX *mem_ctx = NULL;
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
        NTSTATUS status;
 
        const char *kwnames[] = {
@@ -375,7 +375,7 @@ static PyObject *dcerpc_interface_new(PyTypeObject *self, PyObject *args, PyObje
        struct loadparm_context *lp_ctx = NULL;
        PyObject *py_lp_ctx = Py_None, *py_credentials = Py_None;
        TALLOC_CTX *mem_ctx = NULL;
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
        NTSTATUS status;
 
        PyObject *syntax, *py_basis = Py_None;
index 1192cba3376317ee784ca5fd037e2ed3afa28d71..a2840ab5c03c4ba9b17ee479ffb2254299f92340 100644 (file)
@@ -77,7 +77,7 @@ static void refresh_completion_handler(struct nbt_name_request *req)
 /*
   handle name refresh timer events
 */
-static void name_refresh_handler(struct event_context *ev, struct timed_event *te, 
+static void name_refresh_handler(struct tevent_context *ev, struct tevent_timer *te,