s4:lib/tevent: rename structs

[gd/samba-autobuild/.git] / source4 / libcli / resolve / wins.c

diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c
index 3ec180f3322ca0c1f0698b9e95ca1899d85da6be..03eaf8786fd6a26bd573bae3b6be8a08b5fe4816 100644 (file)
--- a/source4/libcli/resolve/wins.c
+++ b/source4/libcli/resolve/wins.c
@@ -20,9 +20,10 @@
 */
 
 #include "includes.h"
-#include "libcli/nbt/libnbt.h"
+#include "../libcli/nbt/libnbt.h"
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
+#include "lib/socket/socket.h"
 #include "lib/socket/netif.h"
 
 struct resolve_wins_data {
@@ -37,49 +38,35 @@ 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,
                                struct nbt_name *name)
 {
        struct resolve_wins_data *wins_data = talloc_get_type(userdata, struct resolve_wins_data);
        if (wins_data->address_list == NULL) return NULL;
-       return resolve_name_nbtlist_send(mem_ctx, event_ctx, name, wins_data->address_list, wins_data->ifaces, wins_data->nbt_port, wins_data->nbt_timeout, false, true);
+       return resolve_name_nbtlist_send(mem_ctx, event_ctx, flags, port, name,
+                                        wins_data->address_list, wins_data->ifaces,
+                                        wins_data->nbt_port, wins_data->nbt_timeout,
+                                        false, true);
 }
 
 /*
   wins name resolution method - recv side
  */
 NTSTATUS resolve_name_wins_recv(struct composite_context *c, 
-                               TALLOC_CTX *mem_ctx, const char **reply_addr)
+                               TALLOC_CTX *mem_ctx,
+                               struct socket_address ***addrs,
+                               char ***names)
 {
-       return resolve_name_nbtlist_recv(c, mem_ctx, reply_addr);
-}
-
-/*
-  wins name resolution method - sync call
- */
-NTSTATUS resolve_name_wins(struct nbt_name *name, 
-                           TALLOC_CTX *mem_ctx,
-                           const char **address_list,
-                           struct interface *ifaces,
-                           uint16_t nbt_port,
-                           int nbt_timeout,
-                           const char **reply_addr)
-{
-       struct composite_context *c;
-       struct resolve_wins_data *wins_data = talloc(mem_ctx, struct resolve_wins_data);
-       wins_data->address_list = address_list;
-       wins_data->ifaces = ifaces;
-       wins_data->nbt_port = nbt_port;
-       wins_data->nbt_timeout = nbt_timeout;
-       c = resolve_name_wins_send(mem_ctx, NULL, wins_data, name);
-       return resolve_name_wins_recv(c, mem_ctx, reply_addr);
+       return resolve_name_nbtlist_recv(c, mem_ctx, addrs, names);
 }
 
 bool resolve_context_add_wins_method(struct resolve_context *ctx, const char **address_list, struct interface *ifaces, uint16_t nbt_port, int nbt_timeout)
 {
        struct resolve_wins_data *wins_data = talloc(ctx, struct resolve_wins_data);
-       wins_data->address_list = str_list_copy(wins_data, address_list);
+       wins_data->address_list = (const char **)str_list_copy(wins_data, address_list);
        wins_data->ifaces = talloc_reference(wins_data, ifaces);
        wins_data->nbt_port = nbt_port;
        wins_data->nbt_timeout = nbt_timeout;