diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-12-29 20:24:57 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-12-29 20:46:40 +0100 |
| commit | 183c379fe58ca60f5ef2d1f2033d035d4117ac8f (patch) | |
| tree | d68d3895f1e79b96c3af2c80cac6a403a1a180d4 /source4 | |
| parent | af29b82536ef678e6a1817aa11be8c363253b305 (diff) | |
| download | samba-183c379fe58ca60f5ef2d1f2033d035d4117ac8f.tar.gz | |
s4:lib/tevent: rename structs
list=""
list="$list event_context:tevent_context"
list="$list fd_event:tevent_fd"
list="$list timed_event:tevent_timer"
for s in $list; do
o=`echo $s | cut -d ':' -f1`
n=`echo $s | cut -d ':' -f2`
r=`git grep "struct $o" |cut -d ':' -f1 |sort -u`
files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4`
for f in $files; do
cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp
mv $f.tmp $f
done
done
metze
Diffstat (limited to 'source4')
192 files changed, 521 insertions, 521 deletions
diff --git a/source4/auth/auth.h b/source4/auth/auth.h index 360da50f70a..e184776140e 100644 --- a/source4/auth/auth.h +++ b/source4/auth/auth.h @@ -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, diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h index 52b10c633c3..a4fe3f2c305 100644 --- a/source4/auth/credentials/credentials.h +++ b/source4/auth/credentials/credentials.h @@ -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, diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index 17c555d25b8..3fe38d5cd16 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -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) { diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c index 1a2d5faddd2..bc3d05f529f 100644 --- a/source4/auth/credentials/credentials_krb5.c +++ b/source4/auth/credentials/credentials_krb5.c @@ -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) { diff --git a/source4/auth/credentials/credentials_krb5.h b/source4/auth/credentials/credentials_krb5.h index f672b0ad9ad..0d0e9f330fc 100644 --- a/source4/auth/credentials/credentials_krb5.h +++ b/source4/auth/credentials/credentials_krb5.h @@ -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); diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c index 7a8da71a7d1..7169b074e3c 100644 --- a/source4/auth/gensec/gensec.c +++ b/source4/auth/gensec/gensec.c @@ -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; diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h index 87c9b4d1697..c627bda0244 100644 --- a/source4/auth/gensec/gensec.h +++ b/source4/auth/gensec/gensec.h @@ -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); diff --git a/source4/auth/gensec/schannel_state.c b/source4/auth/gensec/schannel_state.c index c73313f9c89..d86b1f2b9c6 100644 --- a/source4/auth/gensec/schannel_state.c +++ b/source4/auth/gensec/schannel_state.c @@ -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, diff --git a/source4/auth/gensec/socket.c b/source4/auth/gensec/socket.c index 319730e2cab..a338797ecfe 100644 --- a/source4/auth/gensec/socket.c +++ b/source4/auth/gensec/socket.c @@ -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) diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index ac12a498c68..2f0a2317a0a 100644 --- a/source4/auth/kerberos/krb5_init_context.c +++ b/source4/auth/kerberos/krb5_init_context.c @@ -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) { diff --git a/source4/auth/kerberos/krb5_init_context.h b/source4/auth/kerberos/krb5_init_context.h index 162a19a4abc..3f1425ea92a 100644 --- a/source4/auth/kerberos/krb5_init_context.h +++ b/source4/auth/kerberos/krb5_init_context.h @@ -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); diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index bf6dc846e74..d00c81206af 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -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) diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c index e7039c36575..ccf677bf516 100644 --- a/source4/auth/ntlm/auth_simple.c +++ b/source4/auth/ntlm/auth_simple.c @@ -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, diff --git a/source4/auth/sam.c b/source4/auth/sam.c index 4b848cffe0a..0017db260cb 100644 --- a/source4/auth/sam.c +++ b/source4/auth/sam.c @@ -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) diff --git a/source4/auth/session.c b/source4/auth/session.c index d75f1793e19..885b2b96c2e 100644 --- a/source4/auth/session.c +++ b/source4/auth/session.c @@ -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) diff --git a/source4/auth/session.h b/source4/auth/session.h index fd298b44010..bdb63ec4a2b 100644 --- a/source4/auth/session.h +++ b/source4/auth/session.h @@ -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); diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c index 8d0b87d722b..302d470afdb 100644 --- a/source4/client/cifsdd.c +++ b/source4/client/cifsdd.c @@ -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[] = { diff --git a/source4/client/cifsdd.h b/source4/client/cifsdd.h index 28fe6778f48..e39c046fe8e 100644 --- a/source4/client/cifsdd.h +++ b/source4/client/cifsdd.h @@ -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, diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c index 06631ee3acc..ab18dd08d13 100644 --- a/source4/client/cifsddio.c +++ b/source4/client/cifsddio.c @@ -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, diff --git a/source4/client/client.c b/source4/client/client.c index a600b5fb0c6..13b7053396a 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -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; diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c index 31b56ea52f0..5c20149384c 100644 --- a/source4/dsdb/common/sidmap.c +++ b/source4/dsdb/common/sidmap.c @@ -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; diff --git a/source4/dsdb/repl/drepl_periodic.c b/source4/dsdb/repl/drepl_periodic.c index 7205c8b0f19..4a6de8d700b 100644 --- a/source4/dsdb/repl/drepl_periodic.c +++ b/source4/dsdb/repl/drepl_periodic.c @@ -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 */ diff --git a/source4/dsdb/repl/drepl_service.h b/source4/dsdb/repl/drepl_service.h index 0847a016f73..a9eea30719d 100644 --- a/source4/dsdb/repl/drepl_service.h +++ b/source4/dsdb/repl/drepl_service.h @@ -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; /* diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index 916dc943be9..9bcb007358e 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -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, diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 7ecc41d2c36..5ab577c33da 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -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; diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index f75ea3c4f7c..98ca6d03a13 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -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, diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index efc467865cd..49dc14d74c8 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -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" diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c index d4ef79aac1f..e9c6f4c5271 100644 --- a/source4/dsdb/samdb/samdb_privilege.c +++ b/source4/dsdb/samdb/samdb_privilege.c @@ -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; diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c index ff267261ed4..937839d67dd 100644 --- a/source4/kdc/hdb-samba4.c +++ b/source4/kdc/hdb-samba4.c @@ -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) { diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 81ac94c482d..c11c4a6eeed 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -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); diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h index 2ea75099d98..417f327a57e 100644 --- a/source4/kdc/kdc.h +++ b/source4/kdc/kdc.h @@ -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, diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c index 2fa07d0531c..27968620e06 100644 --- a/source4/kdc/kpasswdd.c +++ b/source4/kdc/kpasswdd.c @@ -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; diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index f08f24595a4..ed8e6d3a2c7 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -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) diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h index 4f7a5b9be90..efa802d1738 100644 --- a/source4/ldap_server/ldap_server.h +++ b/source4/ldap_server/ldap_server.h @@ -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; }; diff --git a/source4/lib/com/com.h b/source4/lib/com/com.h index 5d594ad41b7..82d10daf4fd 100644 --- a/source4/lib/com/com.h +++ b/source4/lib/com/com.h @@ -23,12 +23,12 @@ #include "librpc/gen_ndr/misc.h" struct com_context; -struct event_context; +struct tevent_context; struct com_context { struct dcom_client_context *dcom; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct com_extension { uint32_t id; void *data; @@ -42,7 +42,7 @@ NTSTATUS com_register_running_class(struct GUID *clsid, const char *progid, stru struct dcom_interface_p *dcom_get_local_iface_p(struct GUID *ipid); -WERROR com_init_ctx(struct com_context **ctx, struct event_context *event_ctx); +WERROR com_init_ctx(struct com_context **ctx, struct tevent_context *event_ctx); WERROR com_create_object(struct com_context *ctx, struct GUID *clsid, int num_ifaces, struct GUID *iid, struct IUnknown **ip, WERROR *results); WERROR com_get_class_object(struct com_context *ctx, struct GUID *clsid, struct GUID *iid, struct IUnknown **ip); NTSTATUS com_init(void); diff --git a/source4/lib/com/main.c b/source4/lib/com/main.c index daed8c11e5a..062d1360ac8 100644 --- a/source4/lib/com/main.c +++ b/source4/lib/com/main.c @@ -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) { diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h index 803cba84566..698ff2919ba 100644 --- a/source4/lib/events/events.h +++ b/source4/lib/events/events.h @@ -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__ */ diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c index 22e05252639..b3de7e667a5 100644 --- a/source4/lib/events/tevent_s4.c +++ b/source4/lib/events/tevent_s4.c @@ -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) { diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index c013565da0b..44433624482 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -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; } diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index e2ec869872a..28c54f5a3cc 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -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. diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h index c0652882796..cf4017ef148 100644 --- a/source4/lib/ldb/include/ldb_private.h +++ b/source4/lib/ldb/include/ldb_private.h @@ -123,7 +123,7 @@ struct ldb_context { char *modules_dir; - struct event_context *ev_ctx; + struct tevent_context *ev_ctx; }; #ifndef ARRAY_SIZE diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index a95859276fd..9e31bc62bbb 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -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); diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c index 9f8b3e9f35f..8e053818e55 100644 --- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c +++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c @@ -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; diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c index ea460def65a..76469e356b7 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c @@ -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)) { diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h index 7b9a76501fc..b373d37b7ef 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h @@ -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 */ diff --git a/source4/lib/ldb_wrap.c b/source4/lib/ldb_wrap.c index 617371333f0..15cf11f942d 100644 --- a/source4/lib/ldb_wrap.c +++ b/source4/lib/ldb_wrap.c @@ -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, diff --git a/source4/lib/ldb_wrap.h b/source4/lib/ldb_wrap.h index f2982302abb..f44ff8c5992 100644 --- a/source4/lib/ldb_wrap.h +++ b/source4/lib/ldb_wrap.h @@ -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, diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h index 3527f106487..fa91a147c67 100644 --- a/source4/lib/messaging/irpc.h +++ b/source4/lib/messaging/irpc.h @@ -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); diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index ff9ef8afc5c..decad7b5a8c 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -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); diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index 9f04bf0c6d1..9cc14b4381d 100644 --- a/source4/lib/messaging/pymessaging.c +++ b/source4/lib/messaging/pymessaging.c @@ -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; diff --git a/source4/lib/messaging/tests/irpc.c b/source4/lib/messaging/tests/irpc.c index d9b0548643d..d45bcb6bf70 100644 --- a/source4/lib/messaging/tests/irpc.c +++ b/source4/lib/messaging/tests/irpc.c @@ -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); diff --git a/source4/lib/messaging/tests/messaging.c b/source4/lib/messaging/tests/messaging.c index f66b3a5b438..838de55d83d 100644 --- a/source4/lib/messaging/tests/messaging.c +++ b/source4/lib/messaging/tests/messaging.c @@ -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; diff --git a/source4/lib/registry/hive.c b/source4/lib/registry/hive.c index 5105040f306..8bf7c9f8d15 100644 --- a/source4/lib/registry/hive.c +++ b/source4/lib/registry/hive.c @@ -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) { diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c index 87268ce5e7e..1d238f4e230 100644 --- a/source4/lib/registry/ldb.c +++ b/source4/lib/registry/ldb.c @@ -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) { diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index f9db39f4ae1..a97d9f61842 100644 --- a/source4/lib/registry/registry.h +++ b/source4/lib/registry/registry.h @@ -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); diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c index 117951ed03b..8096c8fbfe6 100644 --- a/source4/lib/registry/rpc.c +++ b/source4/lib/registry/rpc.c @@ -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; diff --git a/source4/lib/registry/samba.c b/source4/lib/registry/samba.c index 84a8112f179..fc59bdfdfab 100644 --- a/source4/lib/registry/samba.c +++ b/source4/lib/registry/samba.c @@ -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) diff --git a/source4/lib/registry/tools/common.c b/source4/lib/registry/tools/common.c index f770f6a3caf..c9f1248bf8e 100644 --- a/source4/lib/registry/tools/common.c +++ b/source4/lib/registry/tools/common.c @@ -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; diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c index fcf7c262378..945b4729034 100644 --- a/source4/lib/registry/tools/regdiff.c +++ b/source4/lib/registry/tools/regdiff.c @@ -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"); diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c index 03d29a598b3..3f550e517e8 100644 --- a/source4/lib/registry/tools/regpatch.c +++ b/source4/lib/registry/tools/regpatch.c @@ -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}, diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index 5c308bfbda8..8939f212693 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -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 diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c index 6d55a3eb84e..cca009a0e2c 100644 --- a/source4/lib/registry/tools/regtree.c +++ b/source4/lib/registry/tools/regtree.c @@ -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[] = { diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c index d74a7b48330..be15aa987bb 100644 --- a/source4/lib/socket/connect.c +++ b/source4/lib/socket/connect.c @@ -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, diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 14c475d0c3d..8fcfc0a8ea7 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -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) { diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h index 4741a679902..7a27e3070b7 100644 --- a/source4/lib/socket/socket.h +++ b/source4/lib/socket/socket.h @@ -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); diff --git a/source4/lib/socket/testsuite.c b/source4/lib/socket/testsuite.c index 0fae880ca02..cba283f558f 100644 --- a/source4/lib/socket/testsuite.c +++ b/source4/lib/socket/testsuite.c @@ -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); diff --git a/source4/lib/stream/packet.c b/source4/lib/stream/packet.c index 72a7e6485c7..7882059faff 100644 --- a/source4/lib/stream/packet.c +++ b/source4/lib/stream/packet.c @@ -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); diff --git a/source4/lib/stream/packet.h b/source4/lib/stream/packet.h index f7b10cd8780..c9bd9d4767a 100644 --- a/source4/lib/stream/packet.h +++ b/source4/lib/stream/packet.h @@ -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); diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c index d16df255482..99a15059ad3 100644 --- a/source4/lib/tls/tls.c +++ b/source4/lib/tls/tls.c @@ -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; diff --git a/source4/lib/tls/tls.h b/source4/lib/tls/tls.h index e6aa8f0e1af..c5bd5c87cc1 100644 --- a/source4/lib/tls/tls.h +++ b/source4/lib/tls/tls.h @@ -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); /* diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c index 129a80f9acc..556f9bcec3f 100644 --- a/source4/libcli/cldap/cldap.c +++ b/source4/libcli/cldap/cldap.c @@ -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; diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h index c78e395faaa..17e88716c51 100644 --- a/source4/libcli/cldap/cldap.h +++ b/source4/libcli/cldap/cldap.h @@ -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 *, diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c index dda05c8d739..14935dadbab 100644 --- a/source4/libcli/cliconnect.c +++ b/source4/libcli/cliconnect.c @@ -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, diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c index 104397fa487..aff8f79481e 100644 --- a/source4/libcli/composite/composite.c +++ b/source4/libcli/composite/composite.c @@ -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); diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h index 25799d6a94c..a99a762c5fa 100644 --- a/source4/libcli/composite/composite.h +++ b/source4/libcli/composite/composite.h @@ -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, diff --git a/source4/libcli/dgram/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c index 9d006230816..5c878f19fa0 100644 --- a/source4/libcli/dgram/dgramsocket.c +++ b/source4/libcli/dgram/dgramsocket.c @@ -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; diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h index 2f8feb53459..8060d8cf532 100644 --- a/source4/libcli/dgram/libdgram.h +++ b/source4/libcli/dgram/libdgram.h @@ -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); diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c index 5352a3a90a9..6e531391a64 100644 --- a/source4/libcli/finddcs.c +++ b/source4/libcli/finddcs.c @@ -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) { diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h index 09cf5e4c6f1..5538c9dc06f 100644 --- a/source4/libcli/ldap/ldap.h +++ b/source4/libcli/ldap/ldap.h @@ -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; diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index 082f6fa3e44..18784135cc5 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -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); diff --git a/source4/libcli/ldap/ldap_client.h b/source4/libcli/ldap/ldap_client.h index 13b0bf725cf..084de2e6dc3 100644 --- a/source4/libcli/ldap/ldap_client.h +++ b/source4/libcli/ldap/ldap_client.h @@ -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, diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h index a4bd727f4c7..e729e12721e 100644 --- a/source4/libcli/libcli.h +++ b/source4/libcli/libcli.h @@ -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 { diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c index 1fbbfe35813..b9e83218ddd 100644 --- a/source4/libcli/raw/clisocket.c +++ b/source4/libcli/raw/clisocket.c @@ -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; diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c index 502ecc18253..22e2552edca 100644 --- a/source4/libcli/raw/clitransport.c +++ b/source4/libcli/raw/clitransport.c @@ -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); diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c index 984aa702472..a083396f350 100644 --- a/source4/libcli/raw/clitree.c +++ b/source4/libcli/raw/clitree.c @@ -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, diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index 7757d10099c..0ab6f5650c6 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -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); diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c index 866ce7a1529..da58eb86656 100644 --- a/source4/libcli/resolve/bcast.c +++ b/source4/libcli/resolve/bcast.c @@ -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) diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c index 17e7aad290b..be93538c7d7 100644 --- a/source4/libcli/resolve/dns_ex.c +++ b/source4/libcli/resolve/dns_ex.c @@ -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, diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c index b7eaf4bef5c..755a4e8304a 100644 --- a/source4/libcli/resolve/host.c +++ b/source4/libcli/resolve/host.c @@ -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) diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c index 734fd5a5bc3..73085b87cbc 100644 --- a/source4/libcli/resolve/nbtlist.c +++ b/source4/libcli/resolve/nbtlist.c @@ -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, diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c index 752678abb85..6a3d5daeccd 100644 --- a/source4/libcli/resolve/resolve.c +++ b/source4/libcli/resolve/resolve.c @@ -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); diff --git a/source4/libcli/resolve/resolve.h b/source4/libcli/resolve/resolve.h index b55ab83f2a1..8ace5740a95 100644 --- a/source4/libcli/resolve/resolve.h +++ b/source4/libcli/resolve/resolve.h @@ -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, diff --git a/source4/libcli/resolve/testsuite.c b/source4/libcli/resolve/testsuite.c index f1d1fbc85c3..fdbb430a9fb 100644 --- a/source4/libcli/resolve/testsuite.c +++ b/source4/libcli/resolve/testsuite.c @@ -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; diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c index 1940688ecbc..03eaf8786fd 100644 --- a/source4/libcli/resolve/wins.c +++ b/source4/libcli/resolve/wins.c @@ -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, diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index c7613841b88..11bec42737d 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -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) diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h index ec246b209df..b89770fbe6f 100644 --- a/source4/libcli/smb2/smb2_calls.h +++ b/source4/libcli/smb2/smb2_calls.h @@ -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" diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c index 6d7531f4b5b..94ea2586ef0 100644 --- a/source4/libcli/smb2/transport.c +++ b/source4/libcli/smb2/transport.c @@ -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); diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c index 980a4186196..e0f4919f0b2 100644 --- a/source4/libcli/smb_composite/connect.c +++ b/source4/libcli/smb_composite/connect.c @@ -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); diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c index a19898efaee..210a2940b9b 100644 --- a/source4/libcli/smb_composite/fetchfile.c +++ b/source4/libcli/smb_composite/fetchfile.c @@ -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; diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c index 1b2d314824b..b881e32f7b9 100644 --- a/source4/libcli/wbclient/wbclient.c +++ b/source4/libcli/wbclient/wbclient.c @@ -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; diff --git a/source4/libcli/wbclient/wbclient.h b/source4/libcli/wbclient/wbclient.h index 099abaa511e..416dc783241 100644 --- a/source4/libcli/wbclient/wbclient.h +++ b/source4/libcli/wbclient/wbclient.h @@ -24,13 +24,13 @@ 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, diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c index 930616d2113..c063a4bc6dd 100644 --- a/source4/libcli/wrepl/winsrepl.c +++ b/source4/libcli/wrepl/winsrepl.c @@ -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); diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index f33e63119d5..532496d387c 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -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; diff --git a/source4/libnet/libnet.c b/source4/libnet/libnet.c index c966898ceea..b10fb65df60 100644 --- a/source4/libnet/libnet.c +++ b/source4/libnet/libnet.c @@ -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; diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h index b65a13ce370..543a131806b 100644 --- a/source4/libnet/libnet.h +++ b/source4/libnet/libnet.h @@ -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; }; diff --git a/source4/libnet/libnet_samdump_keytab.c b/source4/libnet/libnet_samdump_keytab.c index 62d93904ef4..2218d20f6ba 100644 --- a/source4/libnet/libnet_samdump_keytab.c +++ b/source4/libnet/libnet_samdump_keytab.c @@ -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; }; diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 7b686ba0072..4140de06860 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -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, diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c index 887c3f466c6..4770cff82d3 100644 --- a/source4/libnet/py_net.c +++ b/source4/libnet/py_net.c @@ -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 }; diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 16ea51e6ff4..a5b17f0405d 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -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; } diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 6b9d61dd0fe..87fc1e7ea79 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -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, diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 32485f5653f..9b8503c04b9 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -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; diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index 3cc84213395..689249288f6 100644 --- a/source4/librpc/rpc/dcerpc_sock.c +++ b/source4/librpc/rpc/dcerpc_sock.c @@ -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, diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 1847b20ee73..d57cc57e47e 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -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; diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c index 53a083e7403..a15c3eaac0f 100644 --- a/source4/librpc/rpc/pyrpc.c +++ b/source4/librpc/rpc/pyrpc.c @@ -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; diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c index 1192cba3376..a2840ab5c03 100644 --- a/source4/nbt_server/register.c +++ b/source4/nbt_server/register.c @@ -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, struct timeval t, void *private_data) { struct nbtd_iface_name *iname = talloc_get_type(private_data, struct nbtd_iface_name); diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c index 133592f1fd4..2546a26279d 100644 --- a/source4/nbt_server/wins/winsclient.c +++ b/source4/nbt_server/wins/winsclient.c @@ -39,13 +39,13 @@ static struct nbt_name_socket *wins_socket(struct nbtd_interface *iface) } -static void nbtd_wins_refresh(struct event_context *ev, struct timed_event *te, +static void nbtd_wins_refresh(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data); /* retry a WINS name registration */ -static void nbtd_wins_register_retry(struct event_context *ev, struct timed_event *te, +static void nbtd_wins_register_retry(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct nbtd_iface_name *iname = talloc_get_type(private_data, struct nbtd_iface_name); @@ -129,7 +129,7 @@ static void nbtd_wins_refresh_handler(struct composite_context *c) /* refresh a WINS name registration */ -static void nbtd_wins_refresh(struct event_context *ev, struct timed_event *te, +static void nbtd_wins_refresh(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct nbtd_iface_name *iname = talloc_get_type(private_data, struct nbtd_iface_name); diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c index 283cd1219ab..945914ccdfb 100644 --- a/source4/nbt_server/wins/winsdb.c +++ b/source4/nbt_server/wins/winsdb.c @@ -937,7 +937,7 @@ failed: return NBT_RCODE_SVR; } -static bool winsdb_check_or_add_module_list(struct event_context *ev_ctx, +static bool winsdb_check_or_add_module_list(struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct winsdb_handle *h) { int trans; @@ -1003,7 +1003,7 @@ failed: } struct winsdb_handle *winsdb_connect(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *owner, enum winsdb_handle_caller caller) diff --git a/source4/nbt_server/wins/winsdb.h b/source4/nbt_server/wins/winsdb.h index 52906be77f5..194bcc027ed 100644 --- a/source4/nbt_server/wins/winsdb.h +++ b/source4/nbt_server/wins/winsdb.h @@ -77,5 +77,5 @@ enum wins_hook_action { }; struct ldb_message; -struct event_context; +struct tevent_context; #include "nbt_server/wins/winsdb_proto.h" diff --git a/source4/nbt_server/wins/winsserver.h b/source4/nbt_server/wins/winsserver.h index edb924c1e3f..9f035572376 100644 --- a/source4/nbt_server/wins/winsserver.h +++ b/source4/nbt_server/wins/winsserver.h @@ -52,7 +52,7 @@ struct wins_challenge_io { struct { struct nbtd_server *nbtd_server; uint16_t nbt_port; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct nbt_name *name; uint32_t num_addresses; const char **addresses; diff --git a/source4/nbt_server/wins/winswack.c b/source4/nbt_server/wins/winswack.c index 7e0c73a8100..c499889f9e4 100644 --- a/source4/nbt_server/wins/winswack.c +++ b/source4/nbt_server/wins/winswack.c @@ -134,7 +134,7 @@ failed: struct wins_release_demand_io { struct { struct nbtd_server *nbtd_server; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct nbt_name *name; uint16_t nb_flags; uint32_t num_addresses; diff --git a/source4/ntptr/ntptr.h b/source4/ntptr/ntptr.h index 7138a2fdfba..24c467fe651 100644 --- a/source4/ntptr/ntptr.h +++ b/source4/ntptr/ntptr.h @@ -220,7 +220,7 @@ struct ntptr_ops { struct ntptr_context { const struct ntptr_ops *ops; void *private_data; - struct event_context *ev_ctx; + struct tevent_context *ev_ctx; struct loadparm_context *lp_ctx; }; diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c index a7004be90ba..287a4b6777a 100644 --- a/source4/ntptr/ntptr_base.c +++ b/source4/ntptr/ntptr_base.c @@ -119,7 +119,7 @@ const struct ntptr_critical_sizes *ntptr_interface_version(void) /* create a ntptr_context with a specified NTPTR backend */ -NTSTATUS ntptr_init_context(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, +NTSTATUS ntptr_init_context(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *providor, struct ntptr_context **_ntptr) { diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c index e67dd01158d..134897e906e 100644 --- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c +++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c @@ -42,7 +42,7 @@ connect to the SPOOLSS database return a ldb_context pointer on success, or NULL on failure */ -static struct ldb_context *sptr_db_connect(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, struct loadparm_context *lp_ctx) +static struct ldb_context *sptr_db_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, lp_spoolss_url(lp_ctx), system_session(mem_ctx, lp_ctx), NULL, 0, NULL); diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c index dbe4722d37e..135458a00fd 100644 --- a/source4/ntvfs/common/notify.c +++ b/source4/ntvfs/common/notify.c @@ -84,7 +84,7 @@ static int notify_destructor(struct notify_context *notify) struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, struct messaging_context *messaging_ctx, struct loadparm_context *lp_ctx, - struct event_context *ev, + struct tevent_context *ev, struct share_config *scfg) { struct notify_context *notify; diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c index 07a8b6d1d6e..04ea70030ef 100644 --- a/source4/ntvfs/ipc/ipc_rap.c +++ b/source4/ntvfs/ipc/ipc_rap.c @@ -100,13 +100,13 @@ struct rap_call { struct ndr_pull *ndr_pull_param; struct ndr_pull *ndr_pull_data; - struct event_context *event_ctx; + struct tevent_context *event_ctx; }; #define RAPNDR_FLAGS (LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); static struct rap_call *new_rap_srv_call(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct smb_trans2 *trans) { @@ -433,7 +433,7 @@ static const struct {NULL, -1, api_Unsupported} }; -NTSTATUS ipc_rap_call(TALLOC_CTX *mem_ctx, struct event_context *event_ctx, struct loadparm_context *lp_ctx, +NTSTATUS ipc_rap_call(TALLOC_CTX *mem_ctx, struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, struct smb_trans2 *trans) { int i; diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c index 077ecaf79f6..df065eb5e2f 100644 --- a/source4/ntvfs/ipc/rap_server.c +++ b/source4/ntvfs/ipc/rap_server.c @@ -31,7 +31,7 @@ * idea. */ NTSTATUS rap_netshareenum(TALLOC_CTX *mem_ctx, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, struct rap_NetShareEnum *r) { diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index 8433a431b0e..5e86030efae 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -200,7 +200,7 @@ struct ntvfs_context { struct server_id server_id; struct loadparm_context *lp_ctx; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct messaging_context *msg_ctx; struct { diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index c2501aaba9f..b581588d9d9 100644 --- a/source4/ntvfs/ntvfs_base.c +++ b/source4/ntvfs/ntvfs_base.c @@ -153,7 +153,7 @@ bool ntvfs_interface_differs(const struct ntvfs_critical_sizes *const iface) NTSTATUS ntvfs_init_connection(TALLOC_CTX *mem_ctx, struct share_config *scfg, enum ntvfs_type type, enum protocol_types protocol, uint64_t ntvfs_client_caps, - struct event_context *ev, struct messaging_context *msg, + struct tevent_context *ev, struct messaging_context *msg, struct loadparm_context *lp_ctx, struct server_id server_id, struct ntvfs_context **_ctx) { diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c index 719b7fa5fc7..8224d36b7dd 100644 --- a/source4/ntvfs/posix/pvfs_notify.c +++ b/source4/ntvfs/posix/pvfs_notify.c @@ -46,7 +46,7 @@ struct pvfs_notify_buffer { /* send a notify on the next event run. */ -static void pvfs_notify_send_next(struct event_context *ev, struct timed_event *te, +static void pvfs_notify_send_next(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *ptr) { struct ntvfs_request *req = talloc_get_type(ptr, struct ntvfs_request); diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c index b8468457318..22aa297210b 100644 --- a/source4/ntvfs/posix/pvfs_search.c +++ b/source4/ntvfs/posix/pvfs_search.c @@ -46,7 +46,7 @@ static int pvfs_search_destructor(struct pvfs_search_state *search) /* called when a search timer goes off */ -static void pvfs_search_timer(struct event_context *ev, struct timed_event *te, +static void pvfs_search_timer(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *ptr) { struct pvfs_search_state *search = talloc_get_type(ptr, struct pvfs_search_state); @@ -58,7 +58,7 @@ static void pvfs_search_timer(struct event_context *ev, struct timed_event *te, */ static void pvfs_search_setup_timer(struct pvfs_search_state *search) { - struct event_context *ev = search->pvfs->ntvfs->ctx->event_ctx; + struct tevent_context *ev = search->pvfs->ntvfs->ctx->event_ctx; if (search->handle == INVALID_SEARCH_HANDLE) return; talloc_free(search->te); search->te = event_add_timed(ev, search, diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c index c22a0c8792d..d396b94da14 100644 --- a/source4/ntvfs/posix/pvfs_wait.c +++ b/source4/ntvfs/posix/pvfs_wait.c @@ -34,7 +34,7 @@ struct pvfs_wait { void *private_data; int msg_type; struct messaging_context *msg_ctx; - struct event_context *ev; + struct tevent_context *ev; struct ntvfs_request *req; enum pvfs_wait_notice reason; }; @@ -93,8 +93,8 @@ static void pvfs_wait_dispatch(struct messaging_context *msg, /* receive a timeout on a message wait */ -static void pvfs_wait_timeout(struct event_context *ev, - struct timed_event *te, struct timeval t, +static void pvfs_wait_timeout(struct tevent_context *ev, + struct tevent_timer *te, struct timeval t, void *private_data) { struct pvfs_wait *pwait = talloc_get_type(private_data, diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c index 2da0e4bb3af..ba505e61d7c 100644 --- a/source4/ntvfs/posix/pvfs_write.c +++ b/source4/ntvfs/posix/pvfs_write.c @@ -24,8 +24,8 @@ #include "librpc/gen_ndr/security.h" #include "lib/events/events.h" -static void pvfs_write_time_update_handler(struct event_context *ev, - struct timed_event *te, +static void pvfs_write_time_update_handler(struct tevent_context *ev, + struct tevent_timer *te, struct timeval tv, void *private_data) { diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h index 1a54b57d631..342d28325ee 100644 --- a/source4/ntvfs/posix/vfs_posix.h +++ b/source4/ntvfs/posix/vfs_posix.h @@ -174,7 +174,7 @@ struct pvfs_file_handle { struct { bool update_triggered; - struct timed_event *update_event; + struct tevent_timer *update_event; bool update_on_close; NTTIME close_time; bool update_forced; @@ -225,7 +225,7 @@ struct pvfs_search_state { time_t last_used; uint_t num_ea_names; struct ea_name *ea_names; - struct timed_event *te; + struct tevent_timer *te; }; /* flags to pvfs_resolve_name() */ diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c index c47a1216c88..f7aa91dd0e1 100644 --- a/source4/ntvfs/sysdep/inotify.c +++ b/source4/ntvfs/sysdep/inotify.c @@ -198,7 +198,7 @@ static void inotify_dispatch(struct inotify_private *in, /* called when the kernel has some events for us */ -static void inotify_handler(struct event_context *ev, struct fd_event *fde, +static void inotify_handler(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *private_data) { struct inotify_private *in = talloc_get_type(private_data, diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c index 64e993f395c..12fd83e8e0e 100644 --- a/source4/ntvfs/sysdep/sys_lease.c +++ b/source4/ntvfs/sysdep/sys_lease.c @@ -39,7 +39,7 @@ static uint32_t num_backends; */ _PUBLIC_ struct sys_lease_context *sys_lease_context_create(struct share_config *scfg, TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct messaging_context *msg, sys_lease_send_break_fn break_send) { diff --git a/source4/ntvfs/sysdep/sys_lease.h b/source4/ntvfs/sysdep/sys_lease.h index 6cda6398b29..422797b0b89 100644 --- a/source4/ntvfs/sysdep/sys_lease.h +++ b/source4/ntvfs/sysdep/sys_lease.h @@ -22,7 +22,7 @@ struct sys_lease_context; struct opendb_entry; struct messaging_context; -struct event_context; +struct tevent_context; typedef NTSTATUS (*sys_lease_send_break_fn)(struct messaging_context *, struct opendb_entry *, @@ -40,7 +40,7 @@ struct sys_lease_ops { }; struct sys_lease_context { - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct messaging_context *msg_ctx; sys_lease_send_break_fn break_send; void *private_data; /* for use of backend */ @@ -52,7 +52,7 @@ NTSTATUS sys_lease_init(void); struct sys_lease_context *sys_lease_context_create(struct share_config *scfg, TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct messaging_context *msg_ctx, sys_lease_send_break_fn break_send); diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index 117d16d20a6..57e921b2067 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -40,7 +40,7 @@ static uint32_t num_backends; */ _PUBLIC_ struct sys_notify_context *sys_notify_context_create(struct share_config *scfg, TALLOC_CTX *mem_ctx, - struct event_context *ev) + struct tevent_context *ev) { struct sys_notify_context *ctx; const char *bname; diff --git a/source4/ntvfs/sysdep/sys_notify.h b/source4/ntvfs/sysdep/sys_notify.h index 63d4282e7ce..d912a9bdaf6 100644 --- a/source4/ntvfs/sysdep/sys_notify.h +++ b/source4/ntvfs/sysdep/sys_notify.h @@ -32,7 +32,7 @@ typedef NTSTATUS (*notify_watch_t)(struct sys_notify_context *ctx, void *handle_p); struct sys_notify_context { - struct event_context *ev; + struct tevent_context *ev; void *private_data; /* for use of backend */ const char *name; notify_watch_t notify_watch; @@ -46,7 +46,7 @@ struct sys_notify_backend { NTSTATUS sys_notify_register(struct sys_notify_backend *backend); struct sys_notify_context *sys_notify_context_create(struct share_config *scfg, TALLOC_CTX *mem_ctx, - struct event_context *ev); + struct tevent_context *ev); NTSTATUS sys_notify_watch(struct sys_notify_context *ctx, struct notify_entry *e, sys_notify_callback_t callback, void *private_data, void *handle); diff --git a/source4/param/secrets.c b/source4/param/secrets.c index 576df0a4fe4..6c6f7c28f0a 100644 --- a/source4/param/secrets.c +++ b/source4/param/secrets.c @@ -86,7 +86,7 @@ struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_c connect to the secrets ldb */ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { char *path; @@ -129,7 +129,7 @@ struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, * @return pointer to a SID object if the SID could be obtained, NULL otherwise */ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain) { diff --git a/source4/param/secrets.h b/source4/param/secrets.h index 558a7969676..743cf684a97 100644 --- a/source4/param/secrets.h +++ b/source4/param/secrets.h @@ -37,10 +37,10 @@ * @note Not called by systems with a working /dev/urandom. */ struct loadparm_context; -struct event_context; +struct tevent_context; struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); -struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, struct loadparm_context *lp_ctx); -struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain); +struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx); +struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain); #endif /* _SECRETS_H */ diff --git a/source4/param/share.c b/source4/param/share.c index 47aea55751b..13d591ec1b4 100644 --- a/source4/param/share.c +++ b/source4/param/share.c @@ -126,7 +126,7 @@ NTSTATUS share_register(const struct share_ops *ops) } NTSTATUS share_get_context_by_name(TALLOC_CTX *mem_ctx, const char *backend_name, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, struct share_context **ctx) { diff --git a/source4/param/share.h b/source4/param/share.h index 2a85fd4fbbf..755d19e3379 100644 --- a/source4/param/share.h +++ b/source4/param/share.h @@ -47,11 +47,11 @@ struct share_info { void *value; }; -struct event_context; +struct tevent_context; struct share_ops { const char *name; - NTSTATUS (*init)(TALLOC_CTX *, const struct share_ops*, struct event_context *ev_ctx, + NTSTATUS (*init)(TALLOC_CTX *, const struct share_ops*, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct share_context **); const char *(*string_option)(struct share_config *, const char *, const char *); diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c index bac1aac2d78..d732372f450 100644 --- a/source4/param/share_classic.c +++ b/source4/param/share_classic.c @@ -25,7 +25,7 @@ static NTSTATUS sclassic_init(TALLOC_CTX *mem_ctx, const struct share_ops *ops, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, struct share_context **ctx) { diff --git a/source4/param/share_ldb.c b/source4/param/share_ldb.c index 29664c71773..0944ba30fca 100644 --- a/source4/param/share_ldb.c +++ b/source4/param/share_ldb.c @@ -28,7 +28,7 @@ #include "param/param.h" static NTSTATUS sldb_init(TALLOC_CTX *mem_ctx, const struct share_ops *ops, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct share_context **ctx) { diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c index 59cdd642bbb..a7384f117de 100644 --- a/source4/rpc_server/common/server_info.c +++ b/source4/rpc_server/common/server_info.c @@ -62,7 +62,7 @@ const char *dcesrv_common_get_server_name(TALLOC_CTX *mem_ctx, struct dcesrv_con /* This hardcoded value should go into a ldb database! */ -uint32_t dcesrv_common_get_server_type(TALLOC_CTX *mem_ctx, struct event_context *event_ctx, struct dcesrv_context *dce_ctx) +uint32_t dcesrv_common_get_server_type(TALLOC_CTX *mem_ctx, struct tevent_context *event_ctx, struct dcesrv_context *dce_ctx) { int default_server_announce = 0; default_server_announce |= SV_TYPE_WORKSTATION; diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index d27a8b90de7..e4be2e31235 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -295,7 +295,7 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx, TALLOC_CTX *mem_ctx, const struct dcesrv_endpoint *ep, struct auth_session_info *session_info, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct messaging_context *msg_ctx, struct server_id server_id, uint32_t state_flags, @@ -346,7 +346,7 @@ _PUBLIC_ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx, TALLOC_CTX *mem_ctx, const struct dcerpc_binding *ep_description, struct auth_session_info *session_info, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct messaging_context *msg_ctx, struct server_id server_id, uint32_t state_flags, diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h index 28f4308433e..51ad546ab41 100644 --- a/source4/rpc_server/dcerpc_server.h +++ b/source4/rpc_server/dcerpc_server.h @@ -108,7 +108,7 @@ struct dcesrv_call_state { struct timeval time; /* the backend can use this event context for async replies */ - struct event_context *event_ctx; + struct tevent_context *event_ctx; /* the message_context that will be used for async replies */ struct messaging_context *msg_ctx; @@ -199,7 +199,7 @@ struct dcesrv_connection { struct dcesrv_auth auth_state; /* the event_context that will be used for this connection */ - struct event_context *event_ctx; + struct tevent_context *event_ctx; /* the message_context that will be used for this connection */ struct messaging_context *msg_ctx; @@ -301,7 +301,7 @@ NTSTATUS dcesrv_endpoint_search_connect(struct dcesrv_context *dce_ctx, TALLOC_CTX *mem_ctx, const struct dcerpc_binding *ep_description, struct auth_session_info *session_info, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct messaging_context *msg_ctx, struct server_id server_id, uint32_t state_flags, @@ -314,7 +314,7 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx, TALLOC_CTX *mem_ctx, const struct dcesrv_endpoint *ep, struct auth_session_info *session_info, - struct event_context *event_ctx, + struct tevent_context *event_ctx, struct messaging_context *msg_ctx, struct server_id server_id, uint32_t state_flags, diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c index f188ef0a0d7..7bb117477c3 100644 --- a/source4/rpc_server/echo/rpc_echo.c +++ b/source4/rpc_server/echo/rpc_echo.c @@ -156,7 +156,7 @@ struct echo_TestSleep_private { struct echo_TestSleep *r; }; -static void echo_TestSleep_handler(struct event_context *ev, struct timed_event *te, +static void echo_TestSleep_handler(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private) { struct echo_TestSleep_private *p = talloc_get_type(private, diff --git a/source4/rpc_server/lsa/lsa_lookup.c b/source4/rpc_server/lsa/lsa_lookup.c index a56e7764a98..dc47d3783ae 100644 --- a/source4/rpc_server/lsa/lsa_lookup.c +++ b/source4/rpc_server/lsa/lsa_lookup.c @@ -236,7 +236,7 @@ static NTSTATUS lookup_well_known_sids(TALLOC_CTX *mem_ctx, /* lookup a SID for 1 name */ -static NTSTATUS dcesrv_lsa_lookup_name(struct event_context *ev_ctx, +static NTSTATUS dcesrv_lsa_lookup_name(struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct lsa_policy_state *state, TALLOC_CTX *mem_ctx, const char *name, const char **authority_name, diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index a2367c8a9b0..fc7fded63b5 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -287,7 +287,7 @@ static NTSTATUS dcesrv_netr_ServerAuthenticate2(struct dcesrv_call_state *dce_ca the caller needs some of that information. */ -static NTSTATUS dcesrv_netr_creds_server_step_check(struct event_context *event_ctx, +static NTSTATUS dcesrv_netr_creds_server_step_check(struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, const char *computer_name, TALLOC_CTX *mem_ctx, diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c index 6c19b2346ba..ec10c748f0f 100644 --- a/source4/rpc_server/service_rpc.c +++ b/source4/rpc_server/service_rpc.c @@ -227,7 +227,7 @@ static const struct stream_server_ops dcesrv_stream_ops = { static NTSTATUS dcesrv_add_ep_unix(struct dcesrv_context *dce_ctx, struct loadparm_context *lp_ctx, struct dcesrv_endpoint *e, - struct event_context *event_ctx, const struct model_ops *model_ops) + struct tevent_context *event_ctx, const struct model_ops *model_ops) { struct dcesrv_socket_context *dcesrv_sock; uint16_t port = 1; @@ -256,7 +256,7 @@ static NTSTATUS dcesrv_add_ep_unix(struct dcesrv_context *dce_ctx, static NTSTATUS dcesrv_add_ep_ncalrpc(struct dcesrv_context *dce_ctx, struct loadparm_context *lp_ctx, struct dcesrv_endpoint *e, - struct event_context *event_ctx, const struct model_ops *model_ops) + struct tevent_context *event_ctx, const struct model_ops *model_ops) { struct dcesrv_socket_context *dcesrv_sock; uint16_t port = 1; @@ -295,7 +295,7 @@ static NTSTATUS dcesrv_add_ep_ncalrpc(struct dcesrv_context *dce_ctx, static NTSTATUS dcesrv_add_ep_np(struct dcesrv_context *dce_ctx, struct loadparm_context *lp_ctx, struct dcesrv_endpoint *e, - struct event_context *event_ctx, const struct model_ops *model_ops) + struct tevent_context *event_ctx, const struct model_ops *model_ops) { struct dcesrv_socket_context *dcesrv_sock; NTSTATUS status; @@ -328,7 +328,7 @@ static NTSTATUS dcesrv_add_ep_np(struct dcesrv_context *dce_ctx, add a socket address to the list of events, one event per dcerpc endpoint */ static NTSTATUS add_socket_rpc_tcp_iface(struct dcesrv_context *dce_ctx, struct dcesrv_endpoint *e, - struct event_context *event_ctx, const struct model_ops *model_ops, + struct tevent_context *event_ctx, const struct model_ops *model_ops, const char *address) { struct dcesrv_socket_context *dcesrv_sock; @@ -366,7 +366,7 @@ static NTSTATUS add_socket_rpc_tcp_iface(struct dcesrv_context *dce_ctx, struct static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx, struct loadparm_context *lp_ctx, struct dcesrv_endpoint *e, - struct event_context *event_ctx, const struct model_ops *model_ops) + struct tevent_context *event_ctx, const struct model_ops *model_ops) { NTSTATUS status; @@ -397,7 +397,7 @@ static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx, static NTSTATUS dcesrv_add_ep(struct dcesrv_context *dce_ctx, struct loadparm_context *lp_ctx, struct dcesrv_endpoint *e, - struct event_context *event_ctx, const struct model_ops *model_ops) + struct tevent_context *event_ctx, const struct model_ops *model_ops) { switch (e->ep_description->transport) { case NCACN_UNIX_STREAM: diff --git a/source4/smb_server/smb_samba3.c b/source4/smb_server/smb_samba3.c index ea589a0579f..c3675c1ba58 100644 --- a/source4/smb_server/smb_samba3.c +++ b/source4/smb_server/smb_samba3.c @@ -95,7 +95,7 @@ static const struct stream_server_ops samba3_smb_stream_ops = { /* setup a listening socket on all the SMB ports for a particular address */ -static NTSTATUS samba3_add_socket(struct event_context *event_context, +static NTSTATUS samba3_add_socket(struct tevent_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops, const char *address) diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 6eccb836d6b..e9531d8b39a 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -174,7 +174,7 @@ static const struct stream_server_ops smb_stream_ops = { /* setup a listening socket on all the SMB ports for a particular address */ -_PUBLIC_ NTSTATUS smbsrv_add_socket(struct event_context *event_context, +_PUBLIC_ NTSTATUS smbsrv_add_socket(struct tevent_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops, const char *address) diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h index d66286da2e1..d238e03a750 100644 --- a/source4/smb_server/smb_server.h +++ b/source4/smb_server/smb_server.h @@ -24,7 +24,7 @@ #include "lib/socket/socket.h" #include "../lib/util/dlinklist.h" -struct event_context; +struct tevent_context; /* this header declares the core context structures associated with smb @@ -394,7 +394,7 @@ struct smbsrv_connection { struct model_ops; struct loadparm_context; -NTSTATUS smbsrv_add_socket(struct event_context *event_context, +NTSTATUS smbsrv_add_socket(struct tevent_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops, const char *address); diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index d6346a06f9b..0ae544e037b 100644 --- a/source4/smbd/process_model.c +++ b/source4/smbd/process_model.c @@ -28,7 +28,7 @@ static const struct model_ops *process_model_byname(const char *name); /* setup the events for the chosen process model */ -_PUBLIC_ const struct model_ops *process_model_startup(struct event_context *ev, const char *model) +_PUBLIC_ const struct model_ops *process_model_startup(struct tevent_context *ev, const char *model) { const struct model_ops *ops; diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h index 6afb66ff202..29f57d9df6d 100644 --- a/source4/smbd/process_model.h +++ b/source4/smbd/process_model.h @@ -41,33 +41,33 @@ struct model_ops { const char *name; /* called at startup when the model is selected */ - void (*model_init)(struct event_context *); + void (*model_init)(struct tevent_context *); /* function to accept new connection */ - void (*accept_connection)(struct event_context *, + void (*accept_connection)(struct tevent_context *, struct loadparm_context *, struct socket_context *, - void (*)(struct event_context *, + void (*)(struct tevent_context *, struct loadparm_context *, struct socket_context *, struct server_id , void *), void *); /* function to create a task */ - void (*new_task)(struct event_context *, + void (*new_task)(struct tevent_context *, struct loadparm_context *lp_ctx, const char *service_name, - void (*)(struct event_context *, + void (*)(struct tevent_context *, struct loadparm_context *, struct server_id, void *), void *); /* function to terminate a connection or task */ - void (*terminate)(struct event_context *, struct loadparm_context *lp_ctx, + void (*terminate)(struct tevent_context *, struct loadparm_context *lp_ctx, const char *reason); /* function to set a title for the connection or task */ - void (*set_title)(struct event_context *, const char *title); + void (*set_title)(struct tevent_context *, const char *title); }; /* this structure is used by modules to determine the size of some critical types */ @@ -78,7 +78,7 @@ struct process_model_critical_sizes { extern const struct model_ops single_ops; -const struct model_ops *process_model_startup(struct event_context *ev, const char *model); +const struct model_ops *process_model_startup(struct tevent_context *ev, const char *model); NTSTATUS register_process_model(const void *_ops); NTSTATUS process_model_init(struct loadparm_context *lp_ctx); diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c index 1b369613ffd..ad8172d3a7d 100644 --- a/source4/smbd/process_prefork.c +++ b/source4/smbd/process_prefork.c @@ -49,7 +49,7 @@ static int none_setproctitle(const char *fmt, ...) /* called when the process model is selected */ -static void prefork_model_init(struct event_context *ev) +static void prefork_model_init(struct tevent_context *ev) { signal(SIGCHLD, SIG_IGN); } @@ -68,10 +68,10 @@ static void prefork_reload_after_fork(void) /* called when a listening socket becomes readable. */ -static void prefork_accept_connection(struct event_context *ev, +static void prefork_accept_connection(struct tevent_context *ev, struct loadparm_context *lp_ctx, struct socket_context *listen_socket, - void (*new_conn)(struct event_context *, + void (*new_conn)(struct tevent_context *, struct loadparm_context *, struct socket_context *, struct server_id , void *), void *private) @@ -94,16 +94,16 @@ static void prefork_accept_connection(struct event_context *ev, /* called to create a new server task */ -static void prefork_new_task(struct event_context *ev, +static void prefork_new_task(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *service_name, - void (*new_task_fn)(struct event_context *, struct loadparm_context *lp_ctx, struct server_id , void *), + void (*new_task_fn)(struct tevent_context *, struct loadparm_context *lp_ctx, struct server_id , void *), void *private) { pid_t pid; int i, num_children; - struct event_context *ev2, *ev_parent; + struct tevent_context *ev2, *ev_parent; pid = fork(); @@ -189,13 +189,13 @@ static void prefork_new_task(struct event_context *ev, /* called when a task goes down */ -_NORETURN_ static void prefork_terminate(struct event_context *ev, struct loadparm_context *lp_ctx, const char *reason) +_NORETURN_ static void prefork_terminate(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *reason) { DEBUG(2,("prefork_terminate: reason[%s]\n",reason)); } /* called to set a title of a task or connection */ -static void prefork_set_title(struct event_context *ev, const char *title) +static void prefork_set_title(struct tevent_context *ev, const char *title) { if (title) { setproctitle("%s", title); diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index 26afff99301..bb82c384d66 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -29,17 +29,17 @@ /* called when the process model is selected */ -static void single_model_init(struct event_context *ev) +static void single_model_init(struct tevent_context *ev) { } /* called when a listening socket becomes readable. */ -static void single_accept_connection(struct event_context *ev, +static void single_accept_connection(struct tevent_context *ev, struct loadparm_context *lp_ctx, struct socket_context *listen_socket, - void (*new_conn)(struct event_context *, + void (*new_conn)(struct tevent_context *, struct loadparm_context *, struct socket_context *, struct server_id , void *), @@ -78,10 +78,10 @@ static void single_accept_connection(struct event_context *ev, /* called to startup a new task */ -static void single_new_task(struct event_context *ev, +static void single_new_task(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *service_name, - void (*new_task)(struct event_context *, struct loadparm_context *, struct server_id, void *), + void (*new_task)(struct tevent_context *, struct loadparm_context *, struct server_id, void *), void *private) { static uint32_t taskid = 0; @@ -95,13 +95,13 @@ static void single_new_task(struct event_context *ev, /* called when a task goes down */ -static void single_terminate(struct event_context *ev, struct loadparm_context *lp_ctx, const char *reason) +static void single_terminate(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *reason) { DEBUG(2,("single_terminate: reason[%s]\n",reason)); } /* called to set a title of a task or connection */ -static void single_set_title(struct event_context *ev, const char *title) +static void single_set_title(struct tevent_context *ev, const char *title) { } diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index 0a864dabb2a..b20adbfd160 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -47,7 +47,7 @@ static int none_setproctitle(const char *fmt, ...) /* called when the process model is selected */ -static void standard_model_init(struct event_context *ev) +static void standard_model_init(struct tevent_context *ev) { signal(SIGCHLD, SIG_IGN); } @@ -55,10 +55,10 @@ static void standard_model_init(struct event_context *ev) /* called when a listening socket becomes readable. */ -static void standard_accept_connection(struct event_context *ev, +static void standard_accept_connection(struct tevent_context *ev, struct loadparm_context *lp_ctx, struct socket_context *sock, - void (*new_conn)(struct event_context *, + void (*new_conn)(struct tevent_context *, struct loadparm_context *, struct socket_context *, struct server_id , void *), void *private) @@ -66,7 +66,7 @@ static void standard_accept_connection(struct event_context *ev, NTSTATUS status; struct socket_context *sock2; pid_t pid; - struct event_context *ev2; + struct tevent_context *ev2; struct socket_address *c, *s; /* accept an incoming connection. */ @@ -142,14 +142,14 @@ static void standard_accept_connection(struct event_context *ev, /* called to create a new server task */ -static void standard_new_task(struct event_context *ev, +static void standard_new_task(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *service_name, - void (*new_task)(struct event_context *, struct loadparm_context *lp_ctx, struct server_id , void *), + void (*new_task)(struct tevent_context *, struct loadparm_context *lp_ctx, struct server_id , void *), void *private) { pid_t pid; - struct event_context *ev2; + struct tevent_context *ev2; pid = fork(); @@ -196,7 +196,7 @@ static void standard_new_task(struct event_context *ev, /* called when a task goes down */ -_NORETURN_ static void standard_terminate(struct event_context *ev, struct loadparm_context *lp_ctx, +_NORETURN_ static void standard_terminate(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *reason) { DEBUG(2,("standard_terminate: reason[%s]\n",reason)); @@ -212,7 +212,7 @@ _NORETURN_ static void standard_terminate(struct event_context *ev, struct loadp } /* called to set a title of a task or connection */ -static void standard_set_title(struct event_context *ev, const char *title) +static void standard_set_title(struct tevent_context *ev, const char *title) { if (title) { setproctitle("%s", title); diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index 597cf587f13..3c3b6b287fb 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -37,10 +37,10 @@ static pthread_key_t title_key; struct new_conn_state { - struct event_context *ev; + struct tevent_context *ev; struct socket_context *sock; struct loadparm_context *lp_ctx; - void (*new_conn)(struct event_context *, struct loadparm_context *lp_ctx, struct socket_context *, uint32_t , void *); + void (*new_conn)(struct tevent_context *, struct loadparm_context *lp_ctx, struct socket_context *, uint32_t , void *); void *private; }; @@ -61,10 +61,10 @@ static void *thread_connection_fn(void *thread_parm) /* called when a listening socket becomes readable */ -static void thread_accept_connection(struct event_context *ev, +static void thread_accept_connection(struct tevent_context *ev, struct loadparm_context *lp_ctx, struct socket_context *sock, - void (*new_conn)(struct event_context *, + void (*new_conn)(struct tevent_context *, struct loadparm_context *, struct socket_context *, uint32_t , void *), @@ -75,7 +75,7 @@ static void thread_accept_connection(struct event_context *ev, pthread_t thread_id; pthread_attr_t thread_attr; struct new_conn_state *state; - struct event_context *ev2; + struct tevent_context *ev2; ev2 = s4_event_context_init(ev); if (ev2 == NULL) return; @@ -121,9 +121,9 @@ static void thread_accept_connection(struct event_context *ev, struct new_task_state { - struct event_context *ev; + struct tevent_context *ev; struct loadparm_context *lp_ctx; - void (*new_task)(struct event_context *, struct loadparm_context *, + void (*new_task)(struct tevent_context *, struct loadparm_context *, uint32_t , void *); void *private; }; @@ -146,10 +146,10 @@ static void *thread_task_fn(void *thread_parm) /* called when a new task is needed */ -static void thread_new_task(struct event_context *ev, +static void thread_new_task(struct tevent_context *ev, struct loadparm_context *lp_ctx, const char *service_name, - void (*new_task)(struct event_context *, + void (*new_task)(struct tevent_context *, struct loadparm_context *, uint32_t , void *), void *private) @@ -158,7 +158,7 @@ static void thread_new_task(struct event_context *ev, pthread_t thread_id; pthread_attr_t thread_attr; struct new_task_state *state; - struct event_context *ev2; + struct tevent_context *ev2; ev2 = s4_event_context_init(ev); if (ev2 == NULL) return; @@ -188,7 +188,7 @@ static void thread_new_task(struct event_context *ev, } /* called when a task goes down */ -static void thread_terminate(struct event_context *event_ctx, struct loadparm_context *lp_ctx, const char *reason) +static void thread_terminate(struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, const char *reason) { DEBUG(10,("thread_terminate: reason[%s]\n",reason)); @@ -199,7 +199,7 @@ static void thread_terminate(struct event_context *event_ctx, struct loadparm_co } /* called to set a title of a task or connection */ -static void thread_set_title(struct event_context *ev, const char *title) +static void thread_set_title(struct tevent_context *ev, const char *title) { char *old_title; char *new_title; @@ -509,7 +509,7 @@ static void thread_fault_handler(int sig) /* called when the process model is selected */ -static void thread_model_init(struct event_context *event_context) +static void thread_model_init(struct tevent_context *event_context) { struct mutex_ops m_ops; struct debug_ops d_ops; diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 394df0bb82c..c1683a48dcf 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -148,7 +148,7 @@ static void setup_signals(void) /* handle io on stdin */ -static void server_stdin_handler(struct event_context *event_ctx, struct fd_event *fde, +static void server_stdin_handler(struct tevent_context *event_ctx, struct tevent_fd *fde, uint16_t flags, void *private) { const char *binary_name = (const char *)private; @@ -167,8 +167,8 @@ static void server_stdin_handler(struct event_context *event_ctx, struct fd_even /* die if the user selected maximum runtime is exceeded */ -_NORETURN_ static void max_runtime_handler(struct event_context *ev, - struct timed_event *te, +_NORETURN_ static void max_runtime_handler(struct tevent_context *ev, + struct tevent_timer *te, struct timeval t, void *private) { const char *binary_name = (const char *)private; @@ -201,7 +201,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ extern NTSTATUS server_service_samba3_smb_init(void); init_module_fn static_init[] = { STATIC_service_MODULES }; init_module_fn *shared_init; - struct event_context *event_ctx; + struct tevent_context *event_ctx; uint16_t stdin_event_flags; NTSTATUS status; const char *model = "standard"; diff --git a/source4/smbd/service.c b/source4/smbd/service.c index 52db2801e99..7b53e9fa4e3 100644 --- a/source4/smbd/service.c +++ b/source4/smbd/service.c @@ -53,7 +53,7 @@ NTSTATUS register_server_service(const char *name, initialise a server service */ static NTSTATUS server_service_init(const char *name, - struct event_context *event_context, + struct tevent_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops) { @@ -71,7 +71,7 @@ static NTSTATUS server_service_init(const char *name, /* startup all of our server services */ -NTSTATUS server_service_startup(struct event_context *event_ctx, +NTSTATUS server_service_startup(struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, const char *model, const char **server_services) { diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c index ad7ba76b0de..94fd501ffea 100644 --- a/source4/smbd/service_named_pipe.c +++ b/source4/smbd/service_named_pipe.c @@ -300,7 +300,7 @@ static const struct stream_server_ops named_pipe_stream_ops = { .send_handler = named_pipe_send, }; -NTSTATUS stream_setup_named_pipe(struct event_context *event_context, +NTSTATUS stream_setup_named_pipe(struct tevent_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops, const struct stream_server_ops *stream_ops, diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index ce5b6519a11..ef98919f937 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -44,7 +44,7 @@ struct stream_socket { const struct stream_server_ops *ops; struct loadparm_context *lp_ctx; - struct event_context *event_ctx; + struct tevent_context *event_ctx; const struct model_ops *model_ops; struct socket_context *sock; void *private; @@ -56,7 +56,7 @@ struct stream_socket { */ void stream_terminate_connection(struct stream_connection *srv_conn, const char *reason) { - struct event_context *event_ctx = srv_conn->event.ctx; + struct tevent_context *event_ctx = srv_conn->event.ctx; const struct model_ops *model_ops = srv_conn->model_ops; if (!reason) reason = "unknown reason"; @@ -100,7 +100,7 @@ static void stream_io_handler(struct stream_connection *conn, uint16_t flags) } } -static void stream_io_handler_fde(struct event_context *ev, struct fd_event *fde, +static void stream_io_handler_fde(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *private) { struct stream_connection *conn = talloc_get_type(private, @@ -120,7 +120,7 @@ void stream_io_handler_callback(void *private, uint16_t flags) used for protocols, where a client connection needs to switched into a server connection */ -NTSTATUS stream_new_connection_merge(struct event_context *ev, +NTSTATUS stream_new_connection_merge(struct tevent_context *ev, struct loadparm_context *lp_ctx, const struct model_ops *model_ops, struct socket_context *sock, @@ -155,7 +155,7 @@ NTSTATUS stream_new_connection_merge(struct event_context *ev, called when a new socket connection has been established. This is called in the process context of the new process (if appropriate) */ -static void stream_new_connection(struct event_context *ev, +static void stream_new_connection(struct tevent_context *ev, struct loadparm_context *lp_ctx, struct socket_context *sock, struct server_id server_id, void *private) @@ -224,7 +224,7 @@ static void stream_new_connection(struct event_context *ev, /* called when someone opens a connection to one of our listening ports */ -static void stream_accept_handler(struct event_context *ev, struct fd_event *fde, +static void stream_accept_handler(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *private) { struct stream_socket *stream_socket = talloc_get_type(private, struct stream_socket); @@ -245,7 +245,7 @@ static void stream_accept_handler(struct event_context *ev, struct fd_event *fde a string for the port. Should leave allocating a port nr to the socket implementation - JRV20070903 */ -NTSTATUS stream_setup_socket(struct event_context *event_context, +NTSTATUS stream_setup_socket(struct tevent_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops, const struct stream_server_ops *stream_ops, diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h index 805c140a837..078887bf145 100644 --- a/source4/smbd/service_stream.h +++ b/source4/smbd/service_stream.h @@ -42,8 +42,8 @@ struct stream_connection { void *private; struct { - struct event_context *ctx; - struct fd_event *fde; + struct tevent_context *ctx; + struct tevent_fd *fde; } event; struct socket_context *socket; diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index 9a2903e281e..34ce755b931 100644 --- a/source4/smbd/service_task.c +++ b/source4/smbd/service_task.c @@ -32,7 +32,7 @@ */ void task_server_terminate(struct task_server *task, const char *reason) { - struct event_context *event_ctx = task->event_ctx; + struct tevent_context *event_ctx = task->event_ctx; const struct model_ops *model_ops = task->model_ops; DEBUG(0,("task_server_terminate: [%s]\n", reason)); model_ops->terminate(event_ctx, task->lp_ctx, reason); @@ -52,7 +52,7 @@ struct task_state { called by the process model code when the new task starts up. This then calls the server specific startup code */ -static void task_server_callback(struct event_context *event_ctx, +static void task_server_callback(struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, struct server_id server_id, void *private) { @@ -83,7 +83,7 @@ static void task_server_callback(struct event_context *event_ctx, /* startup a task based server */ -NTSTATUS task_server_startup(struct event_context *event_ctx, +NTSTATUS task_server_startup(struct tevent_context *event_ctx, struct loadparm_context *lp_ctx, const char *service_name, const struct model_ops *model_ops, diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h index c49962f05f8..f5788da021b 100644 --- a/source4/smbd/service_task.h +++ b/source4/smbd/service_task.h @@ -25,7 +25,7 @@ #include "librpc/gen_ndr/server_id.h" struct task_server { - struct event_context *event_ctx; + struct tevent_context *event_ctx; const struct model_ops *model_ops; struct messaging_context *msg_ctx; struct loadparm_context *lp_ctx; diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index f11b90f4488..23844a2c85b 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -808,7 +808,7 @@ static struct composite_context *torture_connect_async( struct torture_context *tctx, struct smb_composite_connect *smb, TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, const char *host, const char *share, const char *workgroup) @@ -839,7 +839,7 @@ bool run_benchrw(struct torture_context *tctx) struct smbcli_request *req; struct benchrw_state **state; int i , num_unc_names; - struct event_context *ev ; + struct tevent_context *ev ; struct composite_context *req1; struct params lpparams; union smb_mkdir parms; diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 02eecd7f408..0677d9ac8e2 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -183,7 +183,7 @@ static bool connect_servers_fast(void) /***************************************************** connect to the servers *******************************************************/ -static bool connect_servers(struct event_context *ev, +static bool connect_servers(struct tevent_context *ev, struct loadparm_context *lp_ctx) { int i, j; @@ -2889,7 +2889,7 @@ static struct { run the test with the current set of op_parms parameters return the number of operations that completed successfully */ -static int run_test(struct event_context *ev, struct loadparm_context *lp_ctx) +static int run_test(struct tevent_context *ev, struct loadparm_context *lp_ctx) { int op, i; @@ -2970,7 +2970,7 @@ static int run_test(struct event_context *ev, struct loadparm_context *lp_ctx) perform a backtracking analysis of the minimal set of operations to generate an error */ -static void backtrack_analyze(struct event_context *ev, +static void backtrack_analyze(struct tevent_context *ev, struct loadparm_context *lp_ctx) { int chunk, ret; @@ -3038,7 +3038,7 @@ static void backtrack_analyze(struct event_context *ev, /* start the main gentest process */ -static bool start_gentest(struct event_context *ev, +static bool start_gentest(struct tevent_context *ev, struct loadparm_context *lp_ctx) { int op; @@ -3130,7 +3130,7 @@ static bool split_unc_name(const char *unc, char **server, char **share) int i, username_count=0; bool ret; char *ignore_file=NULL; - struct event_context *ev; + struct tevent_context *ev; struct loadparm_context *lp_ctx; poptContext pc; int argc_new; diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 18c4156cc34..0a937e9638a 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -107,7 +107,7 @@ static struct record *recorded; /***************************************************** return a connection to a server *******************************************************/ -static struct smbcli_state *connect_one(struct event_context *ev, +static struct smbcli_state *connect_one(struct tevent_context *ev, struct loadparm_context *lp_ctx, TALLOC_CTX *mem_ctx, char *share, int snum, int conn) @@ -183,7 +183,7 @@ static struct smbcli_state *connect_one(struct event_context *ev, } -static void reconnect(struct event_context *ev, +static void reconnect(struct tevent_context *ev, struct loadparm_context *lp_ctx, TALLOC_CTX *mem_ctx, struct smbcli_state *cli[NSERVERS][NCONNECTIONS], int fnum[NSERVERS][NCONNECTIONS][NFILES], @@ -405,7 +405,7 @@ static int retest(struct smbcli_state *cli[NSERVERS][NCONNECTIONS], we then do random locking ops in tamdem on the 4 fnums from each server and ensure that the results match */ -static int test_locks(struct event_context *ev, +static int test_locks(struct tevent_context *ev, struct loadparm_context *lp_ctx, TALLOC_CTX *mem_ctx, char *share[NSERVERS]) @@ -555,7 +555,7 @@ static void usage(poptContext pc) int opt; int seed, server; int username_count=0; - struct event_context *ev; + struct tevent_context *ev; struct loadparm_context *lp_ctx; poptContext pc; int argc_new, i; diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c index cb435c7b551..40b00858815 100644 --- a/source4/torture/locktest2.c +++ b/source4/torture/locktest2.c @@ -145,7 +145,7 @@ static struct smbcli_state *connect_one(TALLOC_CTX *mem_ctx, struct smb_options *options, struct smb_options *session_options, struct gensec_settings *gensec_settings, - struct event_context *ev) + struct tevent_context *ev) { struct smbcli_state *c; char *server_n; @@ -194,7 +194,7 @@ static void reconnect(TALLOC_CTX *mem_ctx, struct smbcli_options *options, struct smbcli_session_options *session_options, struct gensec_settings *gensec_settings, - struct event_context *ev, + struct tevent_context *ev, char *share1, char *share2) { int server, conn, f, fstype; @@ -365,7 +365,7 @@ static void test_locks(TALLOC_CTX *mem_ctx, char *share1, char *share2, struct smbcli_options *options, struct smbcli_session_options *session_options, struct gensec_settings *gensec_settings, - struct event_context *ev) + struct tevent_context *ev) { struct smbcli_state *cli[NSERVERS][NCONNECTIONS]; char *nfs[NSERVERS]; @@ -486,7 +486,7 @@ static void usage(void) char *p; int seed; struct loadparm_context *lp_ctx; - struct event_context *ev; + struct tevent_context *ev; mem_ctx = talloc_autofree_context(); diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 9ff790c2b00..7b0251d1590 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -73,7 +73,7 @@ static char *reg_test(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char return a connection to a server *******************************************************/ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx, - struct event_context *ev, + struct tevent_context *ev, TALLOC_CTX *mem_ctx, char *share, const char **ports, const char *socket_options, @@ -298,7 +298,7 @@ static void usage(poptContext pc) struct smbcli_state *cli; int opt; int seed; - struct event_context *ev; + struct tevent_context *ev; struct loadparm_context *lp_ctx; struct smbcli_options options; struct smbcli_session_options session_options; diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index 79ae41dafb9..49564dc1ad5 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -133,7 +133,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct int i; size_t len = random() % 10000; extern int torture_numops; - struct event_context *event_ctx; + struct tevent_context *event_ctx; int *count = talloc_zero(tctx, int); bool ret = true; @@ -225,7 +225,7 @@ static bool test_appendacl(struct smbcli_state *cli, struct torture_context *tct struct smb_composite_appendacl **io; struct smb_composite_appendacl **io_orig; struct composite_context **c; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct security_descriptor *test_sd; struct security_ace *ace; @@ -342,7 +342,7 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx) int i; extern int torture_numops; - struct event_context *event_ctx; + struct tevent_context *event_ctx; int *count = talloc_zero(tctx, int); bool ret = true; diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c index dce21ebe71d..4077ae97e6b 100644 --- a/source4/torture/raw/lockbench.c +++ b/source4/torture/raw/lockbench.c @@ -45,7 +45,7 @@ enum lock_stage {LOCK_INITIAL, LOCK_LOCK, LOCK_UNLOCK}; struct benchlock_state { struct torture_context *tctx; - struct event_context *ev; + struct tevent_context *ev; struct smbcli_tree *tree; TALLOC_CTX *mem_ctx; int client_num; @@ -57,7 +57,7 @@ struct benchlock_state { int lastcount; struct smbcli_request *req; struct smb_composite_connect reconnect; - struct timed_event *te; + struct tevent_timer *te; /* these are used for reconnections */ const char **dest_ports; @@ -116,11 +116,11 @@ static void lock_send(struct benchlock_state *state) state->req->async.fn = lock_completion; } -static void reopen_connection(struct event_context *ev, struct timed_event *te, +static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data); -static void reopen_file(struct event_context *ev, struct timed_event *te, +static void reopen_file(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct benchlock_state *state = (struct benchlock_state *)private_data; @@ -171,7 +171,7 @@ static void reopen_connection_complete(struct composite_context *ctx) /* reopen a connection */ -static void reopen_connection(struct event_context *ev, struct timed_event *te, +static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct benchlock_state *state = (struct benchlock_state *)private_data; @@ -277,7 +277,7 @@ static void echo_completion(struct smbcli_request *req) } } -static void report_rate(struct event_context *ev, struct timed_event *te, +static void report_rate(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct benchlock_state *state = talloc_get_type(private_data, diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c index 34d87f1623f..2d97efa0492 100644 --- a/source4/torture/raw/offline.c +++ b/source4/torture/raw/offline.c @@ -54,7 +54,7 @@ static double worst_latencies[OP_ENDOFLIST]; struct offline_state { struct torture_context *tctx; - struct event_context *ev; + struct tevent_context *ev; struct smbcli_tree *tree; TALLOC_CTX *mem_ctx; int client; @@ -330,7 +330,7 @@ static void echo_completion(struct smbcli_request *req) } } -static void report_rate(struct event_context *ev, struct timed_event *te, +static void report_rate(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct offline_state *state = talloc_get_type(private_data, diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c index 2440649e7f8..a9ce4aec0d9 100644 --- a/source4/torture/raw/openbench.c +++ b/source4/torture/raw/openbench.c @@ -41,12 +41,12 @@ static int open_failed; static int close_failed; static char **fnames; static int num_connected; -static struct timed_event *report_te; +static struct tevent_timer *report_te; struct benchopen_state { struct torture_context *tctx; TALLOC_CTX *mem_ctx; - struct event_context *ev; + struct tevent_context *ev; struct smbcli_state *cli; struct smbcli_tree *tree; int client_num; @@ -64,7 +64,7 @@ struct benchopen_state { struct smbcli_request *req_open; struct smbcli_request *req_close; struct smb_composite_connect reconnect; - struct timed_event *te; + struct tevent_timer *te; /* these are used for reconnections */ const char **dest_ports; @@ -74,7 +74,7 @@ struct benchopen_state { }; static void next_open(struct benchopen_state *state); -static void reopen_connection(struct event_context *ev, struct timed_event *te, +static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data); @@ -113,7 +113,7 @@ static void reopen_connection_complete(struct composite_context *ctx) /* reopen a connection */ -static void reopen_connection(struct event_context *ev, struct timed_event *te, +static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct benchopen_state *state = (struct benchopen_state *)private_data; @@ -328,7 +328,7 @@ static void echo_completion(struct smbcli_request *req) } } -static void report_rate(struct event_context *ev, struct timed_event *te, +static void report_rate(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct benchopen_state *state = talloc_get_type(private_data, diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index f0afee26ccf..d31d841e13e 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -3036,8 +3036,8 @@ static bool oplock_handler_hold(struct smbcli_transport *transport, bool torture_hold_oplock(struct torture_context *torture, struct smbcli_state *cli) { - struct event_context *ev = - (struct event_context *)cli->transport->socket->event.ctx; + struct tevent_context *ev = + (struct tevent_context *)cli->transport->socket->event.ctx; int i; printf("Setting up open files with oplocks in %s\n", BASEDIR); diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c index 5c027d32990..840ce5485ce 100644 --- a/source4/torture/rpc/echo.c +++ b/source4/torture/rpc/echo.c @@ -234,7 +234,7 @@ static bool test_sleep(struct torture_context *tctx, struct timeval snd[ASYNC_COUNT]; struct timeval rcv[ASYNC_COUNT]; struct timeval diff[ASYNC_COUNT]; - struct event_context *ctx; + struct tevent_context *ctx; int total_done = 0; if (torture_setting_bool(tctx, "quick", false)) { diff --git a/source4/torture/util.h b/source4/torture/util.h index 3609cca7d98..6a8ae36baf0 100644 --- a/source4/torture/util.h +++ b/source4/torture/util.h @@ -56,7 +56,7 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx, struct torture_context *tctx, const char *hostname, const char *sharename, - struct event_context *ev); + struct tevent_context *ev); _PUBLIC_ bool torture_get_conn_index(int conn_index, TALLOC_CTX *mem_ctx, struct torture_context *tctx, @@ -64,7 +64,7 @@ _PUBLIC_ bool torture_get_conn_index(int conn_index, _PUBLIC_ bool torture_open_connection_ev(struct smbcli_state **c, int conn_index, struct torture_context *tctx, - struct event_context *ev); + struct tevent_context *ev); _PUBLIC_ bool torture_open_connection(struct smbcli_state **c, struct torture_context *tctx, int conn_index); _PUBLIC_ bool torture_close_connection(struct smbcli_state *c); _PUBLIC_ bool check_error(const char *location, struct smbcli_state *c, diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c index ae051b9735f..f88a641059b 100644 --- a/source4/torture/util_smb.c +++ b/source4/torture/util_smb.c @@ -470,7 +470,7 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx, struct torture_context *tctx, const char *hostname, const char *sharename, - struct event_context *ev) + struct tevent_context *ev) { NTSTATUS status; @@ -539,7 +539,7 @@ _PUBLIC_ bool torture_get_conn_index(int conn_index, _PUBLIC_ bool torture_open_connection_ev(struct smbcli_state **c, int conn_index, struct torture_context *tctx, - struct event_context *ev) + struct tevent_context *ev) { char *host, *share; bool ret; diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c index 4d1b202ccb2..ba5296fd97d 100644 --- a/source4/utils/net/net.c +++ b/source4/utils/net/net.c @@ -144,7 +144,7 @@ static int binary_net(int argc, const char **argv) int rc; int argc_new; const char **argv_new; - struct event_context *ev; + struct tevent_context *ev; struct net_context *ctx = NULL; poptContext pc; struct poptOption long_options[] = { diff --git a/source4/utils/net/net.h b/source4/utils/net/net.h index 309bee277c3..16223a15bb9 100644 --- a/source4/utils/net/net.h +++ b/source4/utils/net/net.h @@ -24,7 +24,7 @@ struct net_context { struct cli_credentials *credentials; struct loadparm_context *lp_ctx; - struct event_context *event_ctx; + struct tevent_context *event_ctx; }; struct net_functable { diff --git a/source4/utils/net/net_machinepw.c b/source4/utils/net/net_machinepw.c index 710d889c19c..4e3165dbfd1 100644 --- a/source4/utils/net/net_machinepw.c +++ b/source4/utils/net/net_machinepw.c @@ -37,7 +37,7 @@ int net_machinepw(struct net_context *ctx, int argc, const char **argv) { struct ldb_context *secrets; TALLOC_CTX *mem_ctx; - struct event_context *ev; + struct tevent_context *ev; struct ldb_message **msgs; int num_records; const char *attrs[] = { "secret", NULL }; diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index 4964694790a..074ab698cfd 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -392,7 +392,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, const char *set_password; }; struct gensec_ntlm_state *state; - struct event_context *ev; + struct tevent_context *ev; struct messaging_context *msg; NTSTATUS nt_status; diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index 74eea9e60b4..c79fa8c7530 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -48,8 +48,8 @@ static int websrv_destructor(struct websrv_context *web) called when a connection times out. This prevents a stuck connection from hanging around forever */ -static void websrv_timeout(struct event_context *event_context, - struct timed_event *te, +static void websrv_timeout(struct tevent_context *event_context, + struct tevent_timer *te, struct timeval t, void *private) { struct websrv_context *web = talloc_get_type(private, struct websrv_context); diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c index 56ade3e8b1d..f7be59136ce 100644 --- a/source4/winbind/idmap.c +++ b/source4/winbind/idmap.c @@ -156,7 +156,7 @@ static struct dom_sid *idmap_msg_get_dom_sid(TALLOC_CTX *mem_ctx, * \return allocated idmap_context on success, NULL on error */ struct idmap_context *idmap_init(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { struct idmap_context *idmap_ctx; diff --git a/source4/winbind/idmap.h b/source4/winbind/idmap.h index 13dbe0b9214..7429466bed6 100644 --- a/source4/winbind/idmap.h +++ b/source4/winbind/idmap.h @@ -31,7 +31,7 @@ struct idmap_context { struct dom_sid *unix_users_sid; }; -struct event_context; +struct tevent_context; #include "winbind/idmap_proto.h" diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c index 5913f8d1bfe..b2579fd6df1 100644 --- a/source4/winbind/wb_pam_auth.c +++ b/source4/winbind/wb_pam_auth.c @@ -34,7 +34,7 @@ /* Oh, there is so much to keep an eye on when authenticating a user. Oh my! */ struct pam_auth_crap_state { struct composite_context *ctx; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct loadparm_context *lp_ctx; struct winbind_SamLogon *req; diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h index 97d7d8151e3..be79872e658 100644 --- a/source4/winbind/wb_server.h +++ b/source4/winbind/wb_server.h @@ -149,7 +149,7 @@ struct wbsrv_samba3_call { struct wbsrv_connection *wbconn; /* the backend should use this event context */ - struct event_context *event_ctx; + struct tevent_context *event_ctx; /* here the backend can store stuff like composite_context's ... */ void *private_data; diff --git a/source4/wrepl_server/wrepl_periodic.c b/source4/wrepl_server/wrepl_periodic.c index 4559a7f7866..4771544428e 100644 --- a/source4/wrepl_server/wrepl_periodic.c +++ b/source4/wrepl_server/wrepl_periodic.c @@ -45,7 +45,7 @@ static NTSTATUS wreplsrv_periodic_run(struct wreplsrv_service *service) return NT_STATUS_OK; } -static void wreplsrv_periodic_handler_te(struct event_context *ev, struct timed_event *te, +static void wreplsrv_periodic_handler_te(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *ptr) { struct wreplsrv_service *service = talloc_get_type(ptr, struct wreplsrv_service); @@ -68,7 +68,7 @@ static void wreplsrv_periodic_handler_te(struct event_context *ev, struct timed_ NTSTATUS wreplsrv_periodic_schedule(struct wreplsrv_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 */ diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c index d0b02d0abe3..393712c76a5 100644 --- a/source4/wrepl_server/wrepl_server.c +++ b/source4/wrepl_server/wrepl_server.c @@ -35,7 +35,7 @@ #include "lib/socket/netif.h" static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, private_path(mem_ctx, diff --git a/source4/wrepl_server/wrepl_server.h b/source4/wrepl_server/wrepl_server.h index a001c6b3ae5..7ee5a806240 100644 --- a/source4/wrepl_server/wrepl_server.h +++ b/source4/wrepl_server/wrepl_server.h @@ -154,7 +154,7 @@ struct wreplsrv_partner { struct wreplsrv_pull_cycle_io *cycle_io; /* the current timed_event to the next pull cycle */ - struct timed_event *te; + struct tevent_timer *te; } pull; /* push specific options */ @@ -289,7 +289,7 @@ struct wreplsrv_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; /* some stuff for scavenging processing */ |