summaryrefslogtreecommitdiff
path: root/source4/lib/socket
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib/socket')
-rw-r--r--source4/lib/socket/connect.c14
-rw-r--r--source4/lib/socket/connect_multi.c12
-rw-r--r--source4/lib/socket/socket.h10
-rw-r--r--source4/lib/socket/testsuite.c2
4 files changed, 19 insertions, 19 deletions
diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index d74a7b4833..be15aa987b 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 14c475d0c3..8fcfc0a8ea 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 4741a67990..7a27e3070b 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 0fae880ca0..cba283f558 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);
generated by cgit (git 2.34.1) at 2024-06-28 01:46:06 +0000