s4:libcli/resolve: add resolve_name_all*() which return all addresses not only the...

metze

diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c
index ca78a2ce43985588b3c50ac87354f630a36dac13..0a71ebed99106fc11757c95178819775a3d7f843 100644 (file)
--- a/source4/libcli/resolve/bcast.c
+++ b/source4/libcli/resolve/bcast.c
@@ -73,9 +73,10 @@ struct composite_context *resolve_name_bcast_send(TALLOC_CTX *mem_ctx,
   broadcast name resolution method - recv side
  */
 NTSTATUS resolve_name_bcast_recv(struct composite_context *c, 
-                                TALLOC_CTX *mem_ctx, const char **reply_addr)
+                                TALLOC_CTX *mem_ctx,
+                                struct socket_address ***addrs)
 {
-       NTSTATUS status = resolve_name_nbtlist_recv(c, mem_ctx, reply_addr);
+       NTSTATUS status = resolve_name_nbtlist_recv(c, mem_ctx, addrs);
        if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
                /* this makes much more sense for a bcast name resolution
                   timeout */
@@ -92,7 +93,7 @@ NTSTATUS resolve_name_bcast(struct nbt_name *name,
                            struct interface *ifaces,
                            uint16_t nbt_port,
                            int nbt_timeout,
-                           const char **reply_addr)
+                           struct socket_address ***addrs)
 {
        struct resolve_bcast_data *data = talloc(mem_ctx, struct resolve_bcast_data);
        struct composite_context *c;
@@ -101,7 +102,7 @@ NTSTATUS resolve_name_bcast(struct nbt_name *name,
        data->nbt_timeout = nbt_timeout;
        
        c = resolve_name_bcast_send(mem_ctx, NULL, data, name);
-       return resolve_name_bcast_recv(c, mem_ctx, reply_addr);
+       return resolve_name_bcast_recv(c, mem_ctx, addrs);
 }
 
 bool resolve_context_add_bcast_method(struct resolve_context *ctx, struct interface *ifaces, uint16_t nbt_port, int nbt_timeout)

diff --git a/source4/libcli/resolve/host.c b/source4/libcli/resolve/host.c
index 7d779b06783bd2a6dd42f278f4bb61c39a9a19fb..7b1aef803e780f054b4698b14a65aa92b564dd4b 100644 (file)
--- a/source4/libcli/resolve/host.c
+++ b/source4/libcli/resolve/host.c
@@ -32,13 +32,14 @@
 #include "lib/events/events.h"
 #include "system/network.h"
 #include "system/filesys.h"
+#include "lib/socket/socket.h"
 #include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "libcli/resolve/resolve.h"
 
 struct host_state {
        struct nbt_name name;
-       const char *reply_addr;
+       struct socket_address **addrs;
        pid_t child;
        int child_fd;
        struct fd_event *fde;
@@ -95,7 +96,6 @@ static void pipe_handler(struct event_context *ev, struct fd_event *fde,
        struct host_state *state = talloc_get_type(c->private_data, struct host_state);
        char address[128];
        int ret;
-       pid_t child = state->child;
        int status;
 
        /* if we get any event from the child then we know that we
@@ -125,8 +125,15 @@ static void pipe_handler(struct event_context *ev, struct fd_event *fde,
                return;
        }
 
-       state->reply_addr = talloc_strdup(state, address);
-       if (composite_nomem(state->reply_addr, c)) return;
+       state->addrs = talloc_array(state, struct socket_address *, 2);
+       if (composite_nomem(state->addrs, c)) return;
+
+       state->addrs[0] = socket_address_from_strings(state->addrs,
+                                                     "ipv4",
+                                                     address,
+                                                     0);
+       if (composite_nomem(state->addrs[0], c)) return;
+       state->addrs[1] = NULL;
 
        composite_done(c);
 }
@@ -200,7 +207,8 @@ struct composite_context *resolve_name_host_send(TALLOC_CTX *mem_ctx,
   gethostbyname name resolution method - recv side
 */
 NTSTATUS resolve_name_host_recv(struct composite_context *c, 
-                               TALLOC_CTX *mem_ctx, const char **reply_addr)
+                               TALLOC_CTX *mem_ctx,
+                               struct socket_address ***addrs)
 {
        NTSTATUS status;
 
@@ -208,7 +216,7 @@ NTSTATUS resolve_name_host_recv(struct composite_context *c,
 
        if (NT_STATUS_IS_OK(status)) {
                struct host_state *state = talloc_get_type(c->private_data, struct host_state);
-               *reply_addr = talloc_steal(mem_ctx, state->reply_addr);
+               *addrs = talloc_steal(mem_ctx, state->addrs);
        }
 
        talloc_free(c);
@@ -220,10 +228,10 @@ NTSTATUS resolve_name_host_recv(struct composite_context *c,
  */
 NTSTATUS resolve_name_host(struct nbt_name *name, 
                            TALLOC_CTX *mem_ctx,
-                           const char **reply_addr)
+                           struct socket_address ***addrs)
 {
        struct composite_context *c = resolve_name_host_send(mem_ctx, NULL, NULL, name);
-       return resolve_name_host_recv(c, mem_ctx, reply_addr);
+       return resolve_name_host_recv(c, mem_ctx, addrs);
 }
 
 bool resolve_context_add_host_method(struct resolve_context *ctx)

diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index ec4cfb81b414fe5b2a368c4f896d18112c24a5a3..9c53fcb7ecdf5337eef77da3cddf8413a41a31a7 100644 (file)
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "system/network.h"
+#include "lib/socket/socket.h"
 #include "lib/socket/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "../libcli/nbt/libnbt.h"
@@ -38,7 +39,7 @@ struct nbtlist_state {
        int num_queries;
        struct nbt_name_request **queries;
        struct nbt_name_query *io_queries;
-       const char *reply_addr;
+       struct socket_address **addrs;
        struct interface *ifaces;
 };
 
@@ -71,25 +72,23 @@ static void nbtlist_handler(struct nbt_name_request *req)
        talloc_free(state->nbtsock);
        if (!composite_is_ok(c)) return;
 
-       if (state->io_queries[i].out.num_addrs < 1) {
+       if (q->out.num_addrs < 1) {
                composite_error(c, NT_STATUS_UNEXPECTED_NETWORK_ERROR);
                return;
        }
 
-       /* favor a local address if possible */
-       state->reply_addr = NULL;
-       for (i=0;i<q->out.num_addrs;i++) {
-               if (iface_is_local(state->ifaces, q->out.reply_addrs[i])) {
-                       state->reply_addr = talloc_steal(state, 
-                                                        q->out.reply_addrs[i]);
-                       break;
-               }
-       }
+       state->addrs = talloc_array(state, struct socket_address *,
+                                   q->out.num_addrs + 1);
+       if (composite_nomem(state->addrs, c)) return;
 
-       if (state->reply_addr == NULL) {
-               state->reply_addr = talloc_steal(state, 
-                                                q->out.reply_addrs[0]);
+       for (i=0;i<q->out.num_addrs;i++) {
+               state->addrs[i] = socket_address_from_strings(state->addrs,
+                                                             "ipv4",
+                                                             q->out.reply_addrs[i],
+                                                             0);
+               if (composite_nomem(state->addrs[i], c)) return;
        }
+       state->addrs[i] = NULL;
 
        composite_done(c);
 }
@@ -180,7 +179,8 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
   nbt list of addresses name resolution method - recv side
  */
 NTSTATUS resolve_name_nbtlist_recv(struct composite_context *c, 
-                                  TALLOC_CTX *mem_ctx, const char **reply_addr)
+                                  TALLOC_CTX *mem_ctx,
+                                  struct socket_address ***addrs)
 {
        NTSTATUS status;
 
@@ -188,7 +188,7 @@ NTSTATUS resolve_name_nbtlist_recv(struct composite_context *c,
 
        if (NT_STATUS_IS_OK(status)) {
                struct nbtlist_state *state = talloc_get_type(c->private_data, struct nbtlist_state);
-               *reply_addr = talloc_steal(mem_ctx, state->reply_addr);
+               *addrs = talloc_steal(mem_ctx, state->addrs);
        }
 
        talloc_free(c);
@@ -205,13 +205,13 @@ NTSTATUS resolve_name_nbtlist(struct nbt_name *name,
                              uint16_t nbt_port,
                              int nbt_timeout,
                              bool broadcast, bool wins_lookup,
-                             const char **reply_addr)
+                             struct socket_address ***addrs)
 {
        struct composite_context *c = resolve_name_nbtlist_send(mem_ctx, NULL, 
                                                                name, address_list, 
                                                                ifaces, nbt_port,
                                                                nbt_timeout,
                                                                broadcast, wins_lookup);
-       return resolve_name_nbtlist_recv(c, mem_ctx, reply_addr);
+       return resolve_name_nbtlist_recv(c, mem_ctx, addrs);
 }
 

diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index f57f231bc03ef633e9dec3f2f847898cd11b6a0e..7d1c48cbeecb223c74be56942881e21236685ef4 100644 (file)
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -26,6 +26,7 @@
 #include "libcli/resolve/resolve.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "system/network.h"
+#include "lib/socket/socket.h"
 #include "../lib/util/dlinklist.h"
 
 struct resolve_state {
@@ -33,7 +34,7 @@ struct resolve_state {
        struct resolve_method *method;
        struct nbt_name name;
        struct composite_context *creq;
-       const char *reply_addr;
+       struct socket_address **addrs;
 };
 
 static struct composite_context *setup_next_method(struct composite_context *c);
@@ -83,7 +84,7 @@ static void resolve_handler(struct composite_context *creq)
        struct resolve_state *state = talloc_get_type(c->private_data, struct resolve_state);
        const struct resolve_method *method = state->method;
 
-       c->status = method->recv_fn(creq, state, &state->reply_addr);
+       c->status = method->recv_fn(creq, state, &state->addrs);
        
        if (!NT_STATUS_IS_OK(c->status)) {
                state->method = state->method->next;
@@ -128,9 +129,9 @@ static struct composite_context *setup_next_method(struct composite_context *c)
 /*
   general name resolution - async send
  */
-struct composite_context *resolve_name_send(struct resolve_context *ctx,
-                                           struct nbt_name *name, 
-                                           struct event_context *event_ctx)
+struct composite_context *resolve_name_all_send(struct resolve_context *ctx,
+                                               struct nbt_name *name,
+                                               struct event_context *event_ctx)
 {
        struct composite_context *c;
        struct resolve_state *state;
@@ -157,8 +158,13 @@ struct composite_context *resolve_name_send(struct resolve_context *ctx,
        if (is_ipaddress(state->name.name) || 
            strcasecmp(state->name.name, "localhost") == 0) {
                struct in_addr ip = interpret_addr2(state->name.name);
-               state->reply_addr = talloc_strdup(state, inet_ntoa(ip));
-               if (composite_nomem(state->reply_addr, c)) return c;
+
+               state->addrs = talloc_array(state, struct socket_address *, 2);
+               if (composite_nomem(state->addrs, c)) return c;
+               state->addrs[0] = socket_address_from_strings(state->addrs, "ipv4",
+                                                             inet_ntoa(ip), 0);
+               if (composite_nomem(state->addrs[0], c)) return c;
+               state->addrs[1] = NULL;
                composite_done(c);
                return c;
        }
@@ -177,8 +183,9 @@ struct composite_context *resolve_name_send(struct resolve_context *ctx,
 /*
   general name resolution method - recv side
  */
-NTSTATUS resolve_name_recv(struct composite_context *c, 
-                          TALLOC_CTX *mem_ctx, const char **reply_addr)
+NTSTATUS resolve_name_all_recv(struct composite_context *c,
+                              TALLOC_CTX *mem_ctx,
+                              struct socket_address ***addrs)
 {
        NTSTATUS status;
 
@@ -186,7 +193,7 @@ NTSTATUS resolve_name_recv(struct composite_context *c,
 
        if (NT_STATUS_IS_OK(status)) {
                struct resolve_state *state = talloc_get_type(c->private_data, struct resolve_state);
-               *reply_addr = talloc_steal(mem_ctx, state->reply_addr);
+               *addrs = talloc_steal(mem_ctx, state->addrs);
        }
 
        talloc_free(c);
@@ -196,9 +203,50 @@ NTSTATUS resolve_name_recv(struct composite_context *c,
 /*
   general name resolution - sync call
  */
-NTSTATUS resolve_name(struct resolve_context *ctx, struct nbt_name *name, TALLOC_CTX *mem_ctx, const char **reply_addr, struct event_context *ev)
+NTSTATUS resolve_all_name(struct resolve_context *ctx,
+                     struct nbt_name *name,
+                     TALLOC_CTX *mem_ctx,
+                     struct socket_address ***addrs,
+                     struct event_context *ev)
+{
+       struct composite_context *c = resolve_name_all_send(ctx, name, ev);
+       return resolve_name_all_recv(c, mem_ctx, addrs);
+}
+
+struct composite_context *resolve_name_send(struct resolve_context *ctx,
+                                           struct nbt_name *name,
+                                           struct event_context *event_ctx)
+{
+       return resolve_name_all_send(ctx, name, event_ctx);
+}
+
+NTSTATUS resolve_name_recv(struct composite_context *c,
+                          TALLOC_CTX *mem_ctx,
+                          const char **reply_addr)
+{
+       NTSTATUS status;
+       struct socket_address **addrs = NULL;
+
+       status = resolve_name_all_recv(c, mem_ctx, &addrs);
+
+       if (NT_STATUS_IS_OK(status)) {
+               *reply_addr = talloc_steal(mem_ctx, addrs[0]->addr);
+               talloc_free(addrs);
+       }
+
+       return status;
+}
+
+/*
+  general name resolution - sync call
+ */
+NTSTATUS resolve_name(struct resolve_context *ctx,
+                         struct nbt_name *name,
+                         TALLOC_CTX *mem_ctx,
+                         const char **reply_addr,
+                         struct event_context *ev)
 {
-       struct composite_context *c = resolve_name_send(ctx, name, 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 22de146c994dcc80d5110c41700d99c69cf53814..01fc930fce85bcb7f7410bed68f6a9bd22d0df4c 100644 (file)
--- a/source4/libcli/resolve/resolve.h
+++ b/source4/libcli/resolve/resolve.h
@@ -22,9 +22,16 @@
 #ifndef __RESOLVE_H__
 #define __RESOLVE_H__
 
+struct socket_address;
+
 #include "../libcli/nbt/libnbt.h"
-typedef struct composite_context *(*resolve_name_send_fn)(TALLOC_CTX *mem_ctx, struct event_context *, void *privdata, struct nbt_name *);
-typedef NTSTATUS (*resolve_name_recv_fn)(struct composite_context *, TALLOC_CTX *, const char **);
+typedef struct composite_context *(*resolve_name_send_fn)(TALLOC_CTX *mem_ctx,
+                                                         struct event_context *,
+                                                         void *privdata,
+                                                         struct nbt_name *);
+typedef NTSTATUS (*resolve_name_recv_fn)(struct composite_context *creq,
+                                        TALLOC_CTX *mem_ctx,
+                                        struct socket_address ***addrs);
 #include "libcli/resolve/proto.h"
 struct interface;
 #include "libcli/resolve/lp_proto.h"

diff --git a/source4/libcli/resolve/testsuite.c b/source4/libcli/resolve/testsuite.c
index 73a8c841bbd5e320a2d561c9fdb0e563aaf26994..34de1158a54a020377abf95443a2d0fb99a701c8 100644 (file)
--- a/source4/libcli/resolve/testsuite.c
+++ b/source4/libcli/resolve/testsuite.c
@@ -43,7 +43,7 @@ static bool test_async_resolve(struct torture_context *tctx)
        torture_comment(tctx, "Testing async resolve of '%s' for %d seconds\n",
                        host, timelimit);
        while (timeval_elapsed(&tv) < timelimit) {
-               const char *s;
+               struct socket_address **s;
                struct composite_context *c = resolve_name_host_send(mem_ctx, ev, NULL, &n);
                torture_assert(tctx, c != NULL, "resolve_name_host_send");
                torture_assert_ntstatus_ok(tctx, resolve_name_host_recv(c, mem_ctx, &s),

diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c
index f787d52d3135614580d681d326cff85144cf2591..ae142f70548c6e141443c4bbbf892b6b7e342ee5 100644 (file)
--- a/source4/libcli/resolve/wins.c
+++ b/source4/libcli/resolve/wins.c
@@ -23,6 +23,7 @@
 #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 {
@@ -50,9 +51,10 @@ struct composite_context *resolve_name_wins_send(
   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)
 {
-       return resolve_name_nbtlist_recv(c, mem_ctx, reply_addr);
+       return resolve_name_nbtlist_recv(c, mem_ctx, addrs);
 }
 
 /*
@@ -64,7 +66,7 @@ NTSTATUS resolve_name_wins(struct nbt_name *name,
                            struct interface *ifaces,
                            uint16_t nbt_port,
                            int nbt_timeout,
-                           const char **reply_addr)
+                           struct socket_address ***addrs)
 {
        struct composite_context *c;
        struct resolve_wins_data *wins_data = talloc(mem_ctx, struct resolve_wins_data);
@@ -73,7 +75,7 @@ NTSTATUS resolve_name_wins(struct nbt_name *name,
        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_wins_recv(c, mem_ctx, addrs);
 }
 
 bool resolve_context_add_wins_method(struct resolve_context *ctx, const char **address_list, struct interface *ifaces, uint16_t nbt_port, int nbt_timeout)