server side of getrrsetbyname()

bin/named/Makefile.in

@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.56 2000/10/24 04:25:13 bwelling Exp $
+# $Id: Makefile.in,v 1.57 2000/11/02 01:53:22 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -52,7 +52,7 @@ OBJS =		client.@O@ interfacemgr.@O@ listenlist.@O@ \
 		log.@O@ logconf.@O@ main.@O@ notify.@O@ omapi.@O@ \
 		omapiconf.@O@ query.@O@ server.@O@ update.@O@ xfrout.@O@ \
 		lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
-		lwdgnba.@O@ lwdnoop.@O@ lwsearch.@O@
+		lwdgnba.@O@ lwdgrbn.@O@ lwdnoop.@O@ lwsearch.@O@
 
 UOBJS =		unix/os.@O@
 
@@ -60,7 +60,7 @@ SRCS =		client.c interfacemgr.c listenlist.c \
 		log.c logconf.c main.c notify.c omapi.c \
 		omapiconf.c query.c server.c update.c xfrout.c \
 		lwresd.c lwdclient.c lwderror.c lwdgabn.c \
-		lwdgnba.c lwdnoop.c lwsearch.c
+		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
 
 @BIND9_MAKE_RULES@
 

bin/named/include/named/lwdclient.h

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdclient.h,v 1.9 2000/10/31 22:39:28 bwelling Exp $ */
+/* $Id: lwdclient.h,v 1.10 2000/11/02 01:53:25 bwelling Exp $ */
 
 #ifndef NAMED_LWDCLIENT_H
 #define NAMED_LWDCLIENT_H 1
@@ -82,6 +82,15 @@ struct ns_lwdclient {
 	isc_netaddr_t		na;
 	dns_adbaddrinfo_t      *addrinfo;
 
+	/*
+	 * grbn (get rrset by name) state info.
+	 *
+	 * Note: this also uses target_name and searchctx.
+	 */
+	lwres_grbnresponse_t	grbn;
+	dns_lookup_t	       *lookup;
+	dns_rdatatype_t		rdtype;
+
 	/*
 	 * Alias and address info.  This is copied up to the gabn/gnba
 	 * structures eventually.
@@ -211,6 +220,7 @@ ns_lwdclient_sendreply(ns_lwdclient_t *client, isc_region_t *r);
  */
 void ns_lwdclient_processgabn(ns_lwdclient_t *, lwres_buffer_t *);
 void ns_lwdclient_processgnba(ns_lwdclient_t *, lwres_buffer_t *);
+void ns_lwdclient_processgrbn(ns_lwdclient_t *, lwres_buffer_t *);
 void ns_lwdclient_processnoop(ns_lwdclient_t *, lwres_buffer_t *);
 
 void ns_lwdclient_errorpktsend(ns_lwdclient_t *, isc_uint32_t);

bin/named/lwdclient.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdclient.c,v 1.10 2000/10/31 22:39:25 bwelling Exp $ */
+/* $Id: lwdclient.c,v 1.11 2000/11/02 01:53:23 bwelling Exp $ */
 
 #include <config.h>
 
@@ -190,6 +190,9 @@ process_request(ns_lwdclient_t *client) {
 	case LWRES_OPCODE_GETNAMEBYADDR:
 		ns_lwdclient_processgnba(client, &b);
 		return;
+	case LWRES_OPCODE_GETRDATABYNAME:
+		ns_lwdclient_processgrbn(client, &b);
+		return;
 	case LWRES_OPCODE_NOOP:
 		ns_lwdclient_processnoop(client, &b);
 		return;
@@ -440,6 +443,8 @@ ns_lwdclient_initialize(ns_lwdclient_t *client, ns_lwdclientmgr_t *cmgr) {
 	client->byaddr = NULL;
 	client->addrinfo = NULL;
 
+	client->lookup = NULL;
+
 	client->pktinfo_valid = ISC_FALSE;
 
 	ISC_LIST_APPEND(cmgr->idle, client, link);

bin/named/lwdgrbn.c

@@ -0,0 +1,344 @@
+#include <config.h>
+
+#include <isc/mem.h>
+#include <isc/socket.h>
+#include <isc/string.h>		/* Required for HP/UX (and others?) */
+#include <isc/util.h>
+
+#include <dns/lookup.h>
+#include <dns/rdata.h>
+#include <dns/rdataset.h>
+#include <dns/result.h>
+#include <dns/view.h>
+
+#include <named/types.h>
+#include <named/lwdclient.h>
+#include <named/lwresd.h>
+#include <named/lwsearch.h>
+
+static void start_lookup(ns_lwdclient_t *);
+
+static void
+lookup_done(isc_task_t *task, isc_event_t *event) {
+	ns_lwdclient_t *client;
+	ns_lwdclientmgr_t *cm;
+	dns_lookupevent_t *levent;
+	lwres_buffer_t lwb;
+	dns_name_t *name;
+	dns_rdataset_t *rdataset;
+	dns_rdataset_t *sigrdataset;
+	dns_rdata_t rdata;
+	isc_result_t result;
+	lwres_result_t lwresult;
+	isc_region_t r;
+	isc_buffer_t b;
+	lwres_grbnresponse_t *grbn;
+	int i;
+
+	UNUSED(task);
+
+	lwb.base = NULL;
+	client = event->ev_arg;
+	cm = client->clientmgr;
+	INSIST(client->lookup == (dns_lookup_t *)event->ev_sender);
+
+	levent = (dns_lookupevent_t *)event;
+	grbn = &client->grbn;
+
+	ns_lwdclient_log(50, "lookup event result = %s",
+			 isc_result_totext(levent->result));
+
+	result = levent->result;
+	if (result != ISC_R_SUCCESS) {
+		dns_lookup_destroy(&client->lookup);
+		isc_event_free(&event);
+		levent = NULL;
+
+		switch (result) {
+		case DNS_R_NXDOMAIN:
+		case DNS_R_NCACHENXDOMAIN:
+			result = ns_lwsearchctx_next(&client->searchctx);
+			if (result != ISC_R_SUCCESS)
+				lwresult = LWRES_R_NOTFOUND;
+			else {
+				start_lookup(client);
+				return;
+			}
+			break;
+		case DNS_R_NXRRSET:
+		case DNS_R_NCACHENXRRSET:
+			lwresult = LWRES_R_TYPENOTFOUND;
+			break;
+		default:
+			lwresult = LWRES_R_FAILURE;
+		}
+		ns_lwdclient_errorpktsend(client, lwresult);
+		return;
+	}
+
+	name = levent->name;
+	b = client->recv_buffer;
+
+	grbn->flags = 0;
+
+	rdataset = levent->rdataset;
+	grbn->nrdatas = dns_rdataset_count(rdataset);
+	grbn->rdatas = NULL;
+	grbn->rdatalen = NULL;
+
+	sigrdataset = levent->sigrdataset;
+	if (sigrdataset != NULL)
+		grbn->nsigs = dns_rdataset_count(sigrdataset);
+	else
+		grbn->nsigs = 0;
+
+	grbn->sigs = NULL;
+	grbn->siglen = NULL;
+
+	result = dns_name_totext(name, ISC_TRUE, &client->recv_buffer);
+	if (result != ISC_R_SUCCESS)
+			goto out;
+	grbn->realname = (char *)isc_buffer_used(&b);
+	grbn->realnamelen = isc_buffer_usedlength(&client->recv_buffer) -
+			    isc_buffer_usedlength(&b);
+	ns_lwdclient_log(50, "found name '%.*s'", grbn->realnamelen,
+			 grbn->realname);
+
+	grbn->rdclass = rdataset->rdclass;
+	grbn->rdtype = rdataset->type;
+	grbn->ttl = rdataset->ttl;
+
+	grbn->rdatas = isc_mem_get(cm->mctx,
+				   grbn->nrdatas * sizeof(unsigned char *));
+	if (grbn->rdatas == NULL)
+		goto out;
+	grbn->rdatalen = isc_mem_get(cm->mctx,
+				     grbn->nrdatas * sizeof(lwres_uint16_t));
+	if (grbn->rdatalen == NULL)
+		goto out;
+	dns_rdata_init(&rdata);
+	i = 0;
+	for (result = dns_rdataset_first(rdataset);
+	     result == ISC_R_SUCCESS;
+	     result = dns_rdataset_next(rdataset))
+	{
+		INSIST(i < grbn->nrdatas);
+		dns_rdataset_current(rdataset, &rdata);
+		dns_rdata_toregion(&rdata, &r);
+		grbn->rdatas[i] = r.base;
+		grbn->rdatalen[i] = r.length;
+		dns_rdata_reset(&rdata);
+		i++;
+	}
+	INSIST(i == grbn->nrdatas);
+
+	grbn->sigs = isc_mem_get(cm->mctx, grbn->nsigs *
+				 sizeof(unsigned char *));
+	if (grbn->sigs == NULL)
+		goto out;
+	grbn->siglen = isc_mem_get(cm->mctx, grbn->nsigs *
+				   sizeof(lwres_uint16_t));
+	if (grbn->siglen == NULL)
+		goto out;
+	
+	if (sigrdataset != NULL) {
+		dns_rdata_init(&rdata);
+		i = 0;
+		for (result = dns_rdataset_first(sigrdataset);
+		     result == ISC_R_SUCCESS;
+		     result = dns_rdataset_next(sigrdataset))
+		{
+			INSIST(i < grbn->nrdatas);
+			dns_rdataset_current(sigrdataset, &rdata);
+			dns_rdata_toregion(&rdata, &r);
+			grbn->sigs[i] = r.base;
+			grbn->siglen[i] = r.length;
+			dns_rdata_reset(&rdata);
+			i++;
+		}
+		INSIST(i == grbn->nsigs);
+	}
+
+	dns_lookup_destroy(&client->lookup);
+	isc_event_free(&event);
+
+	if (rdataset->trust == dns_trust_secure)
+		grbn->flags |= LWRDATA_VALIDATED;
+	if (rdataset->trust == dns_trust_ultimate)
+		grbn->flags |= LWRDATA_AUTHORITATIVE;
+
+	/*
+	 * Render the packet.
+	 */
+	client->pkt.recvlength = LWRES_RECVLENGTH;
+	client->pkt.authtype = 0; /* XXXMLG */
+	client->pkt.authlength = 0;
+	client->pkt.result = LWRES_R_SUCCESS;
+
+	lwresult = lwres_grbnresponse_render(cm->lwctx,
+					     grbn, &client->pkt, &lwb);
+	if (lwresult != LWRES_R_SUCCESS)
+		goto out;
+
+	isc_mem_put(cm->mctx, grbn->rdatas,
+		    grbn->nrdatas * sizeof(unsigned char *));
+	isc_mem_put(cm->mctx, grbn->rdatalen,
+		    grbn->nrdatas * sizeof(lwres_uint16_t));
+
+	isc_mem_put(cm->mctx, grbn->sigs,
+		    grbn->nsigs * sizeof(unsigned char *));
+	isc_mem_put(cm->mctx, grbn->siglen,
+		    grbn->nsigs * sizeof(lwres_uint16_t));
+
+	r.base = lwb.base;
+	r.length = lwb.used;
+	client->sendbuf = r.base;
+	client->sendlength = r.length;
+	result = ns_lwdclient_sendreply(client, &r);
+	if (result != ISC_R_SUCCESS)
+		goto out;
+
+	NS_LWDCLIENT_SETSEND(client);
+
+	return;
+
+ out:
+	if (grbn->rdatas != NULL)
+		isc_mem_put(cm->mctx, grbn->rdatas,
+			    grbn->nrdatas * sizeof(unsigned char *));
+	if (grbn->rdatalen != NULL)
+		isc_mem_put(cm->mctx, grbn->rdatalen,
+			    grbn->nrdatas * sizeof(lwres_uint16_t));
+
+	if (grbn->sigs != NULL)
+		isc_mem_put(cm->mctx, grbn->sigs,
+			    grbn->nsigs * sizeof(unsigned char *));
+	if (grbn->siglen != NULL)
+		isc_mem_put(cm->mctx, grbn->siglen,
+			    grbn->nsigs * sizeof(lwres_uint16_t));
+
+	if (client->lookup != NULL)
+		dns_lookup_destroy(&client->lookup);
+	if (lwb.base != NULL)
+		lwres_context_freemem(cm->lwctx, lwb.base, lwb.length);
+
+	if (event != NULL)
+		isc_event_free(&event);
+}
+
+static void
+start_lookup(ns_lwdclient_t *client) {
+	isc_result_t result;
+	ns_lwdclientmgr_t *cm;
+	dns_fixedname_t absname;
+
+	cm = client->clientmgr;
+
+	INSIST(client->lookup == NULL);
+
+	dns_fixedname_init(&absname);
+	result = ns_lwsearchctx_current(&client->searchctx,
+					dns_fixedname_name(&absname));
+	/*
+	 * This will return failure if relative name + suffix is too long.
+	 * In this case, just go on to the next entry in the search path.
+	 */
+	if (result != ISC_R_SUCCESS)
+		start_lookup(client);
+
+	result = dns_lookup_create(cm->mctx,
+				   dns_fixedname_name(&absname),
+				   client->rdtype, cm->view,
+				   client->options, cm->task, lookup_done,
+				   client, &client->lookup);
+	if (result != ISC_R_SUCCESS) {
+		ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE);
+		return;
+	}
+}
+
+static void
+init_grbn(ns_lwdclient_t *client) {
+	client->grbn.rdclass = 0;
+	client->grbn.rdtype = 0;
+	client->grbn.ttl = 0;
+	client->grbn.nrdatas = 0;
+	client->grbn.realname = NULL;
+	client->grbn.realnamelen = 0;
+	client->grbn.rdatas = 0;
+	client->grbn.rdatalen = 0;
+	client->grbn.base = NULL;
+	client->grbn.baselen = 0;
+	isc_buffer_init(&client->recv_buffer, client->buffer, LWRES_RECVLENGTH);
+}
+
+void
+ns_lwdclient_processgrbn(ns_lwdclient_t *client, lwres_buffer_t *b) {
+	lwres_grbnrequest_t *req;
+	isc_result_t result;
+	ns_lwdclientmgr_t *cm;
+	isc_buffer_t namebuf;
+
+	REQUIRE(NS_LWDCLIENT_ISRECVDONE(client));
+	INSIST(client->byaddr == NULL);
+
+	cm = client->clientmgr;
+	req = NULL;
+
+	result = lwres_grbnrequest_parse(cm->lwctx,
+					 b, &client->pkt, &req);
+	if (result != LWRES_R_SUCCESS)
+		goto out;
+	if (req->name == NULL)
+		goto out;
+
+	client->options = 0;
+	if (req->rdclass != cm->view->rdclass)
+		goto out;
+
+	client->rdtype = req->rdtype;
+
+	isc_buffer_init(&namebuf, req->name, req->namelen);
+	isc_buffer_add(&namebuf, req->namelen);
+
+	dns_fixedname_init(&client->query_name);
+	result = dns_name_fromtext(dns_fixedname_name(&client->query_name),
+				   &namebuf, NULL, ISC_FALSE, NULL);
+	if (result != ISC_R_SUCCESS)
+		goto out;
+	ns_lwsearchctx_init(&client->searchctx,
+			    cm->listener->manager->search,
+			    dns_fixedname_name(&client->query_name),
+			    cm->listener->manager->ndots);
+	ns_lwsearchctx_first(&client->searchctx);
+
+	ns_lwdclient_log(50, "client %p looking for type %d",
+			 client, client->rdtype);
+
+	/*
+	 * We no longer need to keep this around.
+	 */
+	lwres_grbnrequest_free(cm->lwctx, &req);
+
+	/*
+	 * Initialize the real name and alias arrays in the reply we're
+	 * going to build up.
+	 */
+	init_grbn(client);
+
+	/*
+	 * Start the find.
+	 */
+	start_lookup(client);
+
+	return;
+
+	/*
+	 * We're screwed.  Return an error packet to our caller.
+	 */
+ out:
+	if (req != NULL)
+		lwres_grbnrequest_free(cm->lwctx, &req);
+
+	ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE);
+}