s4:lib/tevent: rename structs

[sfrench/samba-autobuild/.git] / source4 / lib / socket / connect_multi.c

diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c
index 2f736a4b05027f256d508cf20d97ee13d2da3279..8fcfc0a8ea702f74727649851bb64015552e068c 100644 (file)
--- a/source4/lib/socket/connect_multi.c
+++ b/source4/lib/socket/connect_multi.c
@@ -26,7 +26,6 @@
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
 #include "libcli/resolve/resolve.h"
-#include "param/param.h"
 
 #define MULTI_PORT_DELAY 2000 /* microseconds */
 
@@ -38,8 +37,6 @@ struct connect_multi_state {
        int num_ports;
        uint16_t *ports;
 
-       struct resolve_context *resolve_ctx;
-
        struct socket_context *sock;
        uint16_t result_port;
 
@@ -56,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);
@@ -71,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;
@@ -90,7 +87,6 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send(
        if (composite_nomem(multi->server_address, result)) goto failed;
 
        multi->num_ports = num_server_ports;
-       multi->resolve_ctx = talloc_reference(multi, resolve_ctx);
        multi->ports = talloc_array(multi, uint16_t, multi->num_ports);
        if (composite_nomem(multi->ports, result)) goto failed;
 
@@ -106,7 +102,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send(
                 */
                struct nbt_name name;
                struct composite_context *creq;
-               make_nbt_name_client(&name, server_address);
+               make_nbt_name_server(&name, server_address);
                creq = resolve_name_send(resolve_ctx, &name, result->event_ctx);
                if (composite_nomem(creq, result)) goto failed;
                composite_continue(result, creq, continue_resolve_name, result);
@@ -160,7 +156,7 @@ static void connect_multi_next_socket(struct composite_context *result)
        talloc_steal(state, state->sock);
 
        creq = socket_connect_send(state->sock, NULL, 
-                                  state->addr, 0, multi->resolve_ctx, 
+                                  state->addr, 0,
                                   result->event_ctx);
        if (composite_nomem(creq, result)) return;
        talloc_steal(state, creq);
@@ -183,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);
@@ -269,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)
 {