X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=source4%2Flibcli%2Fresolve%2Fnbtlist.c;h=64d72bcc51aa4f2a93d8ed94b040c7c6b2eace30;hp=e8ea22a0dce80378cee68533c0b5d06b9141a9f8;hb=f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d;hpb=e31d922592b3bb037daff487f0b68c719e7584d4

diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index e8ea22a0dce..64d72bcc51a 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -27,17 +26,24 @@
 #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"
+#include "../libcli/nbt/libnbt.h"
+#include "param/param.h"
+#include "libcli/resolve/resolve.h"
 
 struct nbtlist_state {
+	uint16_t flags;
+	uint16_t port;
 	struct nbt_name name;
 	struct nbt_name_socket *nbtsock;
 	int num_queries;
 	struct nbt_name_request **queries;
 	struct nbt_name_query *io_queries;
-	const char *reply_addr;
+	struct socket_address **addrs;
+	char **names;
+	struct interface *ifaces;
 };
 
 /*
@@ -45,7 +51,7 @@ struct nbtlist_state {
 */
 static void nbtlist_handler(struct nbt_name_request *req)
 {
-	struct composite_context *c = talloc_get_type(req->async.private, 
+	struct composite_context *c = talloc_get_type(req->async.private_data,
 						      struct composite_context);
 	struct nbtlist_state *state = talloc_get_type(c->private_data, struct nbtlist_state);
 	struct nbt_name_query *q;
@@ -69,25 +75,30 @@ 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(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]);
+	state->names = talloc_array(state, char *, q->out.num_addrs + 1);
+	if (composite_nomem(state->names, c)) return;
+
+	for (i=0;i<q->out.num_addrs;i++) {
+		state->addrs[i] = socket_address_from_strings(state->addrs,
+							      "ipv4",
+							      q->out.reply_addrs[i],
+							      state->port);
+		if (composite_nomem(state->addrs[i], c)) return;
+
+		state->names[i] = talloc_strdup(state->names, state->name.name);
+		if (composite_nomem(state->names[i], c)) return;
 	}
+	state->addrs[i] = NULL;
+	state->names[i] = NULL;
 
 	composite_done(c);
 }
@@ -96,26 +107,41 @@ static void nbtlist_handler(struct nbt_name_request *req)
   nbtlist name resolution method - async send
  */
 struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
-						    struct event_context *event_ctx,
+						    struct tevent_context *event_ctx,
+						    uint32_t flags,
+						    uint16_t port,
 						    struct nbt_name *name, 
 						    const char **address_list,
-						    BOOL broadcast,
-						    BOOL wins_lookup)
+						    struct interface *ifaces,
+						    uint16_t nbt_port,
+						    int nbt_timeout,
+						    bool broadcast,
+						    bool wins_lookup)
 {
 	struct composite_context *c;
 	struct nbtlist_state *state;
 	int i;
 
-	c = composite_create(event_ctx, event_ctx);
+	c = composite_create(mem_ctx, event_ctx);
 	if (c == NULL) return NULL;
 
-	c->event_ctx = talloc_reference(c, event_ctx);
-	if (composite_nomem(c->event_ctx, c)) return c;
+	if (flags & RESOLVE_NAME_FLAG_FORCE_DNS) {
+		composite_error(c, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+		return c;
+	}
+
+	if (strlen(name->name) > 15) {
+		composite_error(c, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+		return c;
+	}
 
 	state = talloc(c, struct nbtlist_state);
 	if (composite_nomem(state, c)) return c;
 	c->private_data = state;
 
+	state->flags = flags;
+	state->port = port;
+
 	c->status = nbt_name_dup(state, name, &state->name);
 	if (!composite_is_ok(c)) return c;
 
@@ -126,6 +152,8 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
 		if (composite_nomem(state->name.scope, c)) return c;
 	}
 
+	state->ifaces = talloc_reference(state, ifaces);
+
 	/*
 	 * we can't push long names on the wire,
 	 * so bail out here to give a useful error message
@@ -151,18 +179,19 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
 	for (i=0;i<state->num_queries;i++) {
 		state->io_queries[i].in.name        = state->name;
 		state->io_queries[i].in.dest_addr   = talloc_strdup(state->io_queries, address_list[i]);
+		state->io_queries[i].in.dest_port   = nbt_port;
 		if (composite_nomem(state->io_queries[i].in.dest_addr, c)) return c;
 
 		state->io_queries[i].in.broadcast   = broadcast;
 		state->io_queries[i].in.wins_lookup = wins_lookup;
-		state->io_queries[i].in.timeout     = lp_parm_int(-1, "nbt", "timeout", 1);
+		state->io_queries[i].in.timeout     = nbt_timeout;
 		state->io_queries[i].in.retries     = 2;
 
 		state->queries[i] = nbt_name_query_send(state->nbtsock, &state->io_queries[i]);
 		if (composite_nomem(state->queries[i], c)) return c;
 
 		state->queries[i]->async.fn      = nbtlist_handler;
-		state->queries[i]->async.private = c;
+		state->queries[i]->async.private_data = c;
 	}
 
 	return c;
@@ -172,7 +201,9 @@ 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,
+				   char ***names)
 {
 	NTSTATUS status;
 
@@ -180,24 +211,13 @@ 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);
+		if (names) {
+			*names = talloc_steal(mem_ctx, state->names);
+		}
 	}
 
 	talloc_free(c);
 	return status;
 }
 
-/*
-  nbt list of addresses name resolution method - sync call
- */
-NTSTATUS resolve_name_nbtlist(struct nbt_name *name, 
-			      TALLOC_CTX *mem_ctx,
-			      const char **address_list,
-			      BOOL broadcast, BOOL wins_lookup,
-			      const char **reply_addr)
-{
-	struct composite_context *c = resolve_name_nbtlist_send(mem_ctx, NULL, name, address_list, 
-							        broadcast, wins_lookup);
-	return resolve_name_nbtlist_recv(c, mem_ctx, reply_addr);
-}
-