summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/include/messages.h4
-rw-r--r--source3/include/proto.h6
-rw-r--r--source3/lib/ctdbd_conn.c4
-rw-r--r--source3/lib/messages.c2
-rw-r--r--source3/lib/messages_ctdbd.c2
-rw-r--r--source3/lib/util.c2
-rw-r--r--source3/lib/util_sock.c10
7 files changed, 15 insertions, 15 deletions
diff --git a/source3/include/messages.h b/source3/include/messages.h
index 4b45901afd..12fc439969 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -77,7 +77,7 @@ struct messaging_rec;
struct messaging_context {
struct server_id id;
- struct event_context *event_ctx;
+ struct tevent_context *event_ctx;
struct messaging_callback *callbacks;
struct messaging_backend *local;
@@ -111,7 +111,7 @@ bool message_send_all(struct messaging_context *msg_ctx,
const void *buf, size_t len,
int *n_sent);
struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
- struct event_context *ev);
+ struct tevent_context *ev);
struct server_id messaging_server_id(const struct messaging_context *msg_ctx);
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 925039df76..77b949037b 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -392,7 +392,7 @@ ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off_t pos);
int set_blocking(int fd, bool set);
NTSTATUS init_before_fork(void);
NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
- struct event_context *ev_ctx,
+ struct tevent_context *ev_ctx,
bool parent_longlived);
void *malloc_(size_t size);
void *Realloc(void *p, size_t size, bool free_old_on_error);
@@ -607,13 +607,13 @@ int open_socket_in(int type,
NTSTATUS open_socket_out(const struct sockaddr_storage *pss, uint16_t port,
int timeout, int *pfd);
struct tevent_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
const struct sockaddr_storage *pss,
uint16_t port,
int timeout);
NTSTATUS open_socket_out_recv(struct tevent_req *req, int *pfd);
struct tevent_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
struct timeval wait_time,
const struct sockaddr_storage *pss,
uint16_t port,
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 5417c67268..4e66c176aa 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -279,7 +279,7 @@ struct deferred_msg_state {
* Timed event handler for the deferred message
*/
-static void deferred_message_dispatch(struct event_context *event_ctx,
+static void deferred_message_dispatch(struct tevent_context *event_ctx,
struct timed_event *te,
struct timeval now,
void *private_data)
@@ -685,7 +685,7 @@ static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t length,
* The ctdbd socket is readable asynchronuously
*/
-static void ctdbd_socket_handler(struct event_context *event_ctx,
+static void ctdbd_socket_handler(struct tevent_context *event_ctx,
struct fd_event *event,
uint16 flags,
void *private_data)
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index cd763e7265..b60ab79e36 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -184,7 +184,7 @@ bool message_send_all(struct messaging_context *msg_ctx,
}
struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
- struct event_context *ev)
+ struct tevent_context *ev)
{
struct messaging_context *ctx;
NTSTATUS status;
diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 949fb27280..234f8f9e1b 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -65,7 +65,7 @@ struct ctdbd_connection *messaging_ctdbd_connection(void)
if (global_ctdb_connection_pid == 0 &&
global_ctdbd_connection == NULL) {
- struct event_context *ev;
+ struct tevent_context *ev;
struct messaging_context *msg;
ev = samba_tevent_context_init(NULL);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index e0cae91a0d..d21c730f3b 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -428,7 +428,7 @@ static void reinit_after_fork_pipe_handler(struct tevent_context *ev,
NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
- struct event_context *ev_ctx,
+ struct tevent_context *ev_ctx,
bool parent_longlived)
{
NTSTATUS status = NT_STATUS_OK;
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 679af9ccb4..8f212e5d85 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -502,7 +502,7 @@ int open_socket_in(int type,
struct open_socket_out_state {
int fd;
- struct event_context *ev;
+ struct tevent_context *ev;
struct sockaddr_storage ss;
socklen_t salen;
uint16_t port;
@@ -524,7 +524,7 @@ static int open_socket_out_state_destructor(struct open_socket_out_state *s)
**************************************************************************/
struct tevent_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
const struct sockaddr_storage *pss,
uint16_t port,
int timeout)
@@ -691,7 +691,7 @@ NTSTATUS open_socket_out(const struct sockaddr_storage *pss, uint16_t port,
int timeout, int *pfd)
{
TALLOC_CTX *frame = talloc_stackframe();
- struct event_context *ev;
+ struct tevent_context *ev;
struct tevent_req *req;
NTSTATUS status = NT_STATUS_NO_MEMORY;
@@ -715,7 +715,7 @@ NTSTATUS open_socket_out(const struct sockaddr_storage *pss, uint16_t port,
}
struct open_socket_out_defer_state {
- struct event_context *ev;
+ struct tevent_context *ev;
struct sockaddr_storage ss;
uint16_t port;
int timeout;
@@ -726,7 +726,7 @@ static void open_socket_out_defer_waited(struct tevent_req *subreq);
static void open_socket_out_defer_connected(struct tevent_req *subreq);
struct tevent_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
struct timeval wait_time,
const struct sockaddr_storage *pss,
uint16_t port,
generated by cgit (git 2.34.1) at 2024-11-03 10:12:34 +0000