r5121: added periodic name refresh requests for all our registered names, reporting any

name conflicts
(This used to be commit 69e6a1cd4bac665debb10601d1a3ddc0ae86e779)

4 files changed, 161 insertions, 6 deletions

diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h
index 35eff9961c..114d6d3b92 100644
--- a/source4/libcli/nbt/libnbt.h
+++ b/source4/libcli/nbt/libnbt.h
@@ -169,3 +169,23 @@ struct nbt_name_register_bcast {
 		uint32_t ttl;
 	} in;
 };
+
+
+/* a name refresh request */
+struct nbt_name_refresh {
+	struct {
+		struct nbt_name name;
+		const char *dest_addr;
+		const char *address;
+		uint16_t nb_flags;
+		BOOL broadcast;
+		uint32_t ttl;
+		int timeout; /* in seconds */
+	} in;
+	struct {
+		const char *reply_from;
+		struct nbt_name name;
+		const char *reply_addr;
+		uint8_t rcode;
+	} out;
+};
diff --git a/source4/libcli/nbt/namequery.c b/source4/libcli/nbt/namequery.c
index f6744e9f14..36fbfc8dd0 100644
--- a/source4/libcli/nbt/namequery.c
+++ b/source4/libcli/nbt/namequery.c
@@ -56,8 +56,7 @@ struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nbtsock,
 				    timeval_current_ofs(io->in.timeout, 0), False);
 	if (req == NULL) goto failed;
 
-	talloc_steal(req, packet);
-
+	talloc_free(packet);
 	return req;
 
 failed:
@@ -157,8 +156,7 @@ struct nbt_name_request *nbt_name_status_send(struct nbt_name_socket *nbtsock,
 				    timeval_current_ofs(io->in.timeout, 0), False);
 	if (req == NULL) goto failed;
 
-	talloc_steal(req, packet);
-
+	talloc_free(packet);
 	return req;
 
 failed:
diff --git a/source4/libcli/nbt/namerefresh.c b/source4/libcli/nbt/namerefresh.c
new file mode 100644
index 0000000000..47fcae4f7c
--- /dev/null
+++ b/source4/libcli/nbt/namerefresh.c
@@ -0,0 +1,138 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   send out a name refresh request
+
+   Copyright (C) Andrew Tridgell 2005
+   
+   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
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.
+*/
+
+#include "includes.h"
+#include "libcli/nbt/libnbt.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/composite/composite.h"
+#include "system/network.h"
+
+/*
+  send a nbt name refresh request
+*/
+struct nbt_name_request *nbt_name_refresh_send(struct nbt_name_socket *nbtsock,
+					       struct nbt_name_refresh *io)
+{
+	struct nbt_name_request *req;
+	struct nbt_name_packet *packet;
+
+	packet = talloc_zero(nbtsock, struct nbt_name_packet);
+	if (packet == NULL) return NULL;
+
+	packet->qdcount = 1;
+	packet->arcount = 1;
+	packet->operation = NBT_OPCODE_REFRESH;
+	if (io->in.broadcast) {
+		packet->operation |= NBT_FLAG_BROADCAST;
+	}
+
+	packet->questions = talloc_array(packet, struct nbt_name_question, 1);
+	if (packet->questions == NULL) goto failed;
+
+	packet->questions[0].name           = io->in.name;
+	packet->questions[0].question_type  = NBT_QTYPE_NETBIOS;
+	packet->questions[0].question_class = NBT_QCLASS_IP;
+
+	packet->additional = talloc_array(packet, struct nbt_res_rec, 1);
+	if (packet->additional == NULL) goto failed;
+
+	packet->additional[0].name                   = io->in.name;
+	packet->additional[0].rr_type                = NBT_QTYPE_NETBIOS;
+	packet->additional[0].rr_class               = NBT_QCLASS_IP;
+	packet->additional[0].ttl                    = io->in.ttl;
+	packet->additional[0].rdata.netbios.length   = 6;
+	packet->additional[0].rdata.netbios.addresses = talloc_array(packet->additional,
+								     struct nbt_rdata_address, 1);
+	if (packet->additional[0].rdata.netbios.addresses == NULL) goto failed;
+	packet->additional[0].rdata.netbios.addresses[0].nb_flags = io->in.nb_flags;
+	packet->additional[0].rdata.netbios.addresses[0].ipaddr   = htonl(inet_addr(io->in.address));
+	
+	req = nbt_name_request_send(nbtsock, io->in.dest_addr, lp_nbt_port(), packet,
+				    timeval_current_ofs(io->in.timeout, 0), False);
+	if (req == NULL) goto failed;
+
+	talloc_free(packet);
+	return req;
+
+failed:
+	talloc_free(packet);
+	return NULL;	
+}
+
+/*
+  wait for a refresh reply
+*/
+NTSTATUS nbt_name_refresh_recv(struct nbt_name_request *req, 
+				TALLOC_CTX *mem_ctx, struct nbt_name_refresh *io)
+{
+	NTSTATUS status;
+	struct nbt_name_packet *packet;
+	const char *addr;
+	struct in_addr in;
+
+	status = nbt_name_request_recv(req);
+	if (!NT_STATUS_IS_OK(status) ||
+	    req->num_replies == 0) {
+		talloc_free(req);
+		return status;
+	}
+	
+	packet = req->replies[0].packet;
+	io->out.reply_from = talloc_steal(mem_ctx, req->replies[0].reply_addr);
+
+	if (packet->ancount != 1 ||
+	    packet->answers[0].rr_type != NBT_QTYPE_NETBIOS ||
+	    packet->answers[0].rr_class != NBT_QCLASS_IP) {
+		talloc_free(req);
+		return NT_STATUS_INVALID_NETWORK_RESPONSE;
+	}
+
+	io->out.rcode = packet->operation & NBT_RCODE;
+	io->out.name = packet->answers[0].name;
+	if (packet->answers[0].rdata.netbios.length < 6) {
+		talloc_free(req);
+		return NT_STATUS_INVALID_NETWORK_RESPONSE;
+	}
+	in.s_addr = htonl(packet->answers[0].rdata.netbios.addresses[0].ipaddr);
+	addr = inet_ntoa(in);
+	if (addr == NULL) {
+		talloc_free(req);
+		return NT_STATUS_NO_MEMORY;
+	}
+	io->out.reply_addr = talloc_strdup(mem_ctx, addr);
+	talloc_steal(mem_ctx, io->out.name.name);
+	talloc_steal(mem_ctx, io->out.name.scope);
+	    
+	talloc_free(req);
+
+	return NT_STATUS_OK;
+}
+
+/*
+  synchronous name refresh request
+*/
+NTSTATUS nbt_name_refresh(struct nbt_name_socket *nbtsock, 
+			   TALLOC_CTX *mem_ctx, struct nbt_name_refresh *io)
+{
+	struct nbt_name_request *req = nbt_name_refresh_send(nbtsock, io);
+	return nbt_name_refresh_recv(req, mem_ctx, io);
+}
diff --git a/source4/libcli/nbt/nameregister.c b/source4/libcli/nbt/nameregister.c
index 6d4938cd19..703210cb48 100644
--- a/source4/libcli/nbt/nameregister.c
+++ b/source4/libcli/nbt/nameregister.c
@@ -73,8 +73,7 @@ struct nbt_name_request *nbt_name_register_send(struct nbt_name_socket *nbtsock,
 				    timeval_current_ofs(io->in.timeout, 0), False);
 	if (req == NULL) goto failed;
 
-	talloc_steal(req, packet);
-
+	talloc_free(packet);
 	return req;
 
 failed: