From 4d55e959839e1bc8e43124648742056ac2c802e7 Mon Sep 17 00:00:00 2001

From: Evan Hunt <each@isc.org>

Date: Tue, 20 Jan 2015 16:10:30 -0800

Subject: [PATCH] add TCP pipelining support

4040.	[func]		Added server-side support for pipelined TCP

			queries. TCP connections are no longer closed after

			the first query received from a client. (The new

			"keep-response-order" option allows clients to be

			specified for which the old behavior will still be

			used.) [RT #37821]

(cherry picked from commit 761d135ed686601f36fe3d0d4aaa6bf41287bb0f)

Modified default value of keep-response-order ACL to any, for best backward

compatibility. Upstream default is none;

---

 bin/named/client.c                            | 123 ++++++-

 bin/named/config.c                            |   3 +-

 bin/named/include/named/client.h              |   1 +

 bin/named/include/named/server.h              |   1 +

 bin/named/named.conf.docbook                  |   1 +

 bin/named/server.c                            |   8 +

 bin/tests/named.conf                          |   3 +-

 bin/tests/system/Makefile.in                  |   4 +-

 .../checkconf/bad-keep-response-order.conf    |  21 ++

 bin/tests/system/checkconf/bad-many.conf      |   3 +-

 bin/tests/system/checkconf/good.conf          |   3 +

 bin/tests/system/conf.sh.in                   |   2 +-

 bin/tests/system/pipelined/Makefile.in        |  51 +++

 bin/tests/system/pipelined/clean.sh           |  19 +

 bin/tests/system/pipelined/input              |   8 +

 bin/tests/system/pipelined/inputb             |   8 +

 bin/tests/system/pipelined/ns1/named.conf     |  43 +++

 bin/tests/system/pipelined/ns1/root.db        |  30 ++

 bin/tests/system/pipelined/ns2/examplea.db    |  35 ++

 bin/tests/system/pipelined/ns2/named.conf     |  49 +++

 bin/tests/system/pipelined/ns3/exampleb.db    |  35 ++

 bin/tests/system/pipelined/ns3/named.args     |   1 +

 bin/tests/system/pipelined/ns3/named.conf     |  49 +++

 bin/tests/system/pipelined/ns4/named.conf     |  45 +++

 bin/tests/system/pipelined/pipequeries.c      | 346 ++++++++++++++++++

 bin/tests/system/pipelined/ref                |   8 +

 bin/tests/system/pipelined/refb               |   8 +

 bin/tests/system/pipelined/setup.sh           |  22 ++

 bin/tests/system/pipelined/tests.sh           |  41 +++

 configure                                     |   1 +

 configure.in                                  |   1 +

 doc/arm/Bv9ARM-book.xml                       |  19 +-

 doc/misc/options                              |   1 +

 lib/bind9/check.c                             |   4 +-

 lib/dns/dispatch.c                            |  22 +-

 lib/isccfg/namedconf.c                        |   1 +

 36 files changed, 985 insertions(+), 35 deletions(-)

 create mode 100644 bin/tests/system/checkconf/bad-keep-response-order.conf

 create mode 100644 bin/tests/system/pipelined/Makefile.in

 create mode 100644 bin/tests/system/pipelined/clean.sh

 create mode 100644 bin/tests/system/pipelined/input

 create mode 100644 bin/tests/system/pipelined/inputb

 create mode 100644 bin/tests/system/pipelined/ns1/named.conf

 create mode 100644 bin/tests/system/pipelined/ns1/root.db

 create mode 100644 bin/tests/system/pipelined/ns2/examplea.db

 create mode 100644 bin/tests/system/pipelined/ns2/named.conf

 create mode 100644 bin/tests/system/pipelined/ns3/exampleb.db

 create mode 100644 bin/tests/system/pipelined/ns3/named.args

 create mode 100644 bin/tests/system/pipelined/ns3/named.conf

 create mode 100644 bin/tests/system/pipelined/ns4/named.conf

 create mode 100644 bin/tests/system/pipelined/pipequeries.c

 create mode 100644 bin/tests/system/pipelined/ref

 create mode 100644 bin/tests/system/pipelined/refb

 create mode 100644 bin/tests/system/pipelined/setup.sh

 create mode 100644 bin/tests/system/pipelined/tests.sh

diff --git a/bin/named/client.c b/bin/named/client.c

index 9adf36b..f014b61 100644

--- a/bin/named/client.c

+++ b/bin/named/client.c

@@ -233,6 +233,8 @@ static void client_request(isc_task_t *task, isc_event_t *event);

 static void ns_client_dumpmessage(ns_client_t *client, const char *reason);

 static isc_result_t get_client(ns_clientmgr_t *manager, ns_interface_t *ifp,

 			       dns_dispatch_t *disp, isc_boolean_t tcp);

+static isc_result_t get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp,

+			       isc_socket_t *socket);

 void

 ns_client_recursing(ns_client_t *client) {

@@ -367,9 +369,13 @@ exit_check(ns_client_t *client) {

 		INSIST(client->recursionquota == NULL);

 		if (NS_CLIENTSTATE_READING == client->newstate) {

-			client_read(client);

-			client->newstate = NS_CLIENTSTATE_MAX;

-			return (ISC_TRUE); /* We're done. */

+			if (!client->pipelined) {

+				client_read(client);

+				client->newstate = NS_CLIENTSTATE_MAX;

+				return (ISC_TRUE); /* We're done. */

+			} else if (client->mortal) {

+				client->newstate = NS_CLIENTSTATE_INACTIVE;

+			}

 		}

 	}

@@ -406,6 +412,8 @@ exit_check(ns_client_t *client) {

 			client->timerset = ISC_FALSE;

 		}

+		client->pipelined = ISC_FALSE;

+

 		client->peeraddr_valid = ISC_FALSE;

 		client->state = NS_CLIENTSTATE_READY;

@@ -605,7 +613,11 @@ client_start(isc_task_t *task, isc_event_t *event) {

 		return;

 	if (TCP_CLIENT(client)) {

-		client_accept(client);

+		if (client->pipelined) {

+			client_read(client);

+		} else {

+			client_accept(client);

+		}

 	} else {

 		client_udprecv(client);

 	}

@@ -1638,6 +1650,24 @@ client_request(isc_task_t *task, isc_event_t *event) {

 		goto cleanup;

 	}

+	/*

+	 * Pipeline TCP query processing.

+	 */

+	if (client->message->opcode != dns_opcode_query)

+		client->pipelined = ISC_FALSE;

+	if (TCP_CLIENT(client) && client->pipelined) {

+		result = isc_quota_reserve(&ns_g_server->tcpquota);

+		if (result == ISC_R_SUCCESS)

+			result = ns_client_replace(client);

+		if (result != ISC_R_SUCCESS) {

+			ns_client_log(client, NS_LOGCATEGORY_CLIENT,

+				      NS_LOGMODULE_CLIENT, ISC_LOG_WARNING,

+				      "no more TCP clients(read): %s",

+				      isc_result_totext(result));

+			client->pipelined = ISC_FALSE;

+		}

+	}

+

 	dns_opcodestats_increment(ns_g_server->opcodestats,

 				  client->message->opcode);

 	switch (client->message->opcode) {

@@ -2138,6 +2168,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) {

 	client->signer = NULL;

 	dns_name_init(&client->signername, NULL);

 	client->mortal = ISC_FALSE;

+	client->pipelined = ISC_FALSE;

 	client->tcpquota = NULL;

 	client->recursionquota = NULL;

 	client->interface = NULL;

@@ -2326,6 +2357,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) {

 		 * telnetting to port 53 (once per CPU) will

 		 * deny service to legitimate TCP clients.

 		 */

+		client->pipelined = ISC_FALSE;

 		result = isc_quota_attach(&ns_g_server->tcpquota,

 					  &client->tcpquota);

 		if (result == ISC_R_SUCCESS)

@@ -2333,8 +2365,12 @@ client_newconn(isc_task_t *task, isc_event_t *event) {

 		if (result != ISC_R_SUCCESS) {

 			ns_client_log(client, NS_LOGCATEGORY_CLIENT,

 				      NS_LOGMODULE_CLIENT, ISC_LOG_WARNING,

-				      "no more TCP clients: %s",

+				      "no more TCP clients(accept): %s",

 				      isc_result_totext(result));

+		} else if (ns_g_server->keepresporder == NULL ||

+			   !allowed(&netaddr, NULL, NULL, 0, NULL,

+				    ns_g_server->keepresporder)) {

+			client->pipelined = ISC_TRUE;

 		}

 		client_read(client);

@@ -2432,14 +2468,21 @@ ns_client_shuttingdown(ns_client_t *client) {

 isc_result_t

 ns_client_replace(ns_client_t *client) {

 	isc_result_t result;

+	isc_boolean_t tcp;

 	CTRACE("replace");

 	REQUIRE(client != NULL);

 	REQUIRE(client->manager != NULL);

-	result = get_client(client->manager, client->interface,

-			    client->dispatch, TCP_CLIENT(client));

+	tcp = TCP_CLIENT(client);

+	if (tcp && client->pipelined) {

+		result = get_worker(client->manager, client->interface,

+				    client->tcpsocket);

+	} else {

+		result = get_client(client->manager, client->interface,

+				    client->dispatch, tcp);

+	}

 	if (result != ISC_R_SUCCESS)

 		return (result);

@@ -2644,6 +2687,72 @@ get_client(ns_clientmgr_t *manager, ns_interface_t *ifp,

 	return (ISC_R_SUCCESS);

 }

+static isc_result_t

+get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *socket)

+{

+	isc_result_t result = ISC_R_SUCCESS;

+	isc_event_t *ev;

+	ns_client_t *client;

+	MTRACE("get worker");

+

+	REQUIRE(manager != NULL);

+

+	if (manager->exiting)

+		return (ISC_R_SHUTTINGDOWN);

+

+	/*

+	 * Allocate a client.  First try to get a recycled one;

+	 * if that fails, make a new one.

+	 */

+	client = NULL;

+	if (!ns_g_clienttest)

+		ISC_QUEUE_POP(manager->inactive, ilink, client);

+

+	if (client != NULL)

+		MTRACE("recycle");

+	else {

+		MTRACE("create new");

+

+		LOCK(&manager->lock);

+		result = client_create(manager, &client);

+		UNLOCK(&manager->lock);

+		if (result != ISC_R_SUCCESS)

+			return (result);

+

+		LOCK(&manager->listlock);

+		ISC_LIST_APPEND(manager->clients, client, link);

+		UNLOCK(&manager->listlock);

+	}

+

+	client->manager = manager;

+	ns_interface_attach(ifp, &client->interface);

+	client->newstate = client->state = NS_CLIENTSTATE_WORKING;

+	INSIST(client->recursionquota == NULL);

+	client->tcpquota = &ns_g_server->tcpquota;

+

+	client->dscp = ifp->dscp;

+

+	client->attributes |= NS_CLIENTATTR_TCP;

+	client->pipelined = ISC_TRUE;

+

+	isc_socket_attach(ifp->tcpsocket, &client->tcplistener);

+	isc_socket_attach(socket, &client->tcpsocket);

+	isc_socket_setname(client->tcpsocket, "worker-tcp", NULL);

+	(void)isc_socket_getpeername(client->tcpsocket, &client->peeraddr);

+	client->peeraddr_valid = ISC_TRUE;

+

+	INSIST(client->tcpmsg_valid == ISC_FALSE);

+	dns_tcpmsg_init(client->mctx, client->tcpsocket, &client->tcpmsg);

+	client->tcpmsg_valid = ISC_TRUE;

+

+	INSIST(client->nctls == 0);

+	client->nctls++;

+	ev = &client->ctlevent;

+	isc_task_send(client->task, &ev;;

+

+	return (ISC_R_SUCCESS);

+}

+

 isc_result_t

 ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n,

 			   ns_interface_t *ifp, isc_boolean_t tcp)

diff --git a/bin/named/config.c b/bin/named/config.c

index 22d8a85..f0db926 100644

--- a/bin/named/config.c

+++ b/bin/named/config.c

@@ -72,6 +72,7 @@ options {\n\

 	heartbeat-interval 60;\n\

 	host-statistics no;\n\

 	interface-interval 60;\n\

+#	keep-response-order {any;};\n\

 	listen-on {any;};\n\

 	listen-on-v6 {none;};\n\

 	match-mapped-addresses no;\n\

@@ -101,7 +102,7 @@ options {\n\

 	server-id none;\n\

 	statistics-file \"named.stats\";\n\

 	statistics-interval 60;\n\

-	tcp-clients 100;\n\

+	tcp-clients 150;\n\

 	tcp-listen-queue 10;\n\

 #	tkey-dhkey <none>\n\

 #	tkey-gssapi-credential <none>\n\

diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h

index 98e79df..bf4d201 100644

--- a/bin/named/include/named/client.h

+++ b/bin/named/include/named/client.h

@@ -133,6 +133,7 @@ struct ns_client {

 	dns_name_t		signername;   /*%< [T]SIG key name */

 	dns_name_t *		signer;	      /*%< NULL if not valid sig */

 	isc_boolean_t		mortal;	      /*%< Die after handling request */

+	isc_boolean_t		pipelined;   /*%< TCP queries not in sequence */

 	isc_quota_t		*tcpquota;

 	isc_quota_t		*recursionquota;

 	ns_interface_t		*interface;

diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h

index 0107b51..5f36177 100644

--- a/bin/named/include/named/server.h

+++ b/bin/named/include/named/server.h

@@ -53,6 +53,7 @@ struct ns_server {

 	isc_quota_t		tcpquota;

 	isc_quota_t		recursionquota;

 	dns_acl_t		*blackholeacl;

+	dns_acl_t		*keepresporder;

 	char *			statsfile;	/*%< Statistics file name */

 	char *			dumpfile;	/*%< Dump file name */

 	char *			secrootsfile;	/*%< Secroots file name */

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook

index a8cd31e..4d502ac 100644

--- a/bin/named/named.conf.docbook

+++ b/bin/named/named.conf.docbook

@@ -209,6 +209,7 @@ options {

 	host-statistics-max <replaceable>number</replaceable>; // not implemented

 	hostname ( <replaceable>quoted_string</replaceable> | none );

 	interface-interval <replaceable>integer</replaceable>;

+	keep-response-order { <replaceable>address_match_element</replaceable>; ... };

 	listen-on <optional> port <replaceable>integer</replaceable> </optional> { <replaceable>address_match_element</replaceable>; ... };

 	listen-on-v6 <optional> port <replaceable>integer</replaceable> </optional> { <replaceable>address_match_element</replaceable>; ... };

 	match-mapped-addresses <replaceable>boolean</replaceable>;

diff --git a/bin/named/server.c b/bin/named/server.c

index e8f19d3..e30bf16 100644

--- a/bin/named/server.c

+++ b/bin/named/server.c

@@ -5207,6 +5207,10 @@ load_configuration(const char *filename, ns_server_t *server,

 		dns_dispatchmgr_setblackhole(ns_g_dispatchmgr,

 					     server->blackholeacl);

+	CHECK(configure_view_acl(NULL, config, "keep-response-order", NULL,

+				 ns_g_aclconfctx, ns_g_mctx,

+				 &server->keepresporder));

+

 	obj = NULL;

 	result = ns_config_get(maps, "match-mapped-addresses", &obj);

 	INSIST(result == ISC_R_SUCCESS);

@@ -6208,6 +6212,9 @@ shutdown_server(isc_task_t *task, isc_event_t *event) {

 		dns_name_free(&ns_g_sessionkeyname, server->mctx);

 	}

+	if (server->keepresporder != NULL)

+		dns_acl_detach(&server->keepresporder);

+

 	if (server->blackholeacl != NULL)

 		dns_acl_detach(&server->blackholeacl);

@@ -6259,6 +6266,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {

 	ISC_LIST_INIT(server->viewlist);

 	server->in_roothints = NULL;

 	server->blackholeacl = NULL;

+	server->keepresporder = NULL;

 	/* Must be first. */

 	CHECKFATAL(dst_lib_init2(ns_g_mctx, ns_g_entropy,

diff --git a/bin/tests/named.conf b/bin/tests/named.conf

index 722d262..5b40045 100644

--- a/bin/tests/named.conf

+++ b/bin/tests/named.conf

@@ -1,5 +1,5 @@

 /*

- * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")

+ * Copyright (C) 2004, 2007, 2011, 2014  Internet Systems Consortium, Inc. ("ISC")

  * Copyright (C) 1999-2001  Internet Software Consortium.

  *

  * Permission to use, copy, modify, and/or distribute this software for any

@@ -116,6 +116,7 @@ options {

 	allow-transfer { any; };

 	allow-recursion { !any; };

 	blackhole { 45/24; };

+	keep-response-order { 46/24; };

 	listen-on {

 		10/24;

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in

index afee71b..e7eaef7 100644

--- a/bin/tests/system/Makefile.in

+++ b/bin/tests/system/Makefile.in

@@ -21,8 +21,8 @@ top_srcdir =	@top_srcdir@

 @BIND9_MAKE_INCLUDES@

-SUBDIRS =	dlzexternal dyndb filter-aaaa geoip lwresd rpz rrl \

-		rsabigexponent tkey tsiggss

+SUBDIRS =	dlzexternal dyndb filter-aaaa geoip lwresd pipelined \

+		rpz rrl rsabigexponent tkey tsiggss

 CINCLUDES =	${ISC_INCLUDES} ${DNS_INCLUDES}

 CDEFINES =	@USE_GSSAPI@

diff --git a/bin/tests/system/checkconf/bad-keep-response-order.conf b/bin/tests/system/checkconf/bad-keep-response-order.conf

new file mode 100644

index 0000000..24c1f6c

--- /dev/null

+++ b/bin/tests/system/checkconf/bad-keep-response-order.conf

@@ -0,0 +1,21 @@

+/*

+ * Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")

+ *

+ * Permission to use, copy, modify, and/or distribute this software for any

+ * purpose with or without fee is hereby granted, provided that the above

+ * copyright notice and this permission notice appear in all copies.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+options {

+	keep-response-order {

+		does_not_exist;

+	};

+};

diff --git a/bin/tests/system/checkconf/bad-many.conf b/bin/tests/system/checkconf/bad-many.conf

index cfc4d02..09add87 100644

--- a/bin/tests/system/checkconf/bad-many.conf

+++ b/bin/tests/system/checkconf/bad-many.conf

@@ -1,5 +1,5 @@

 /*

- * Copyright (C) 2005, 2012  Internet Systems Consortium, Inc. ("ISC")

+ * Copyright (C) 2005, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")

  *

  * Permission to use, copy, modify, and/or distribute this software for any

  * purpose with or without fee is hereby granted, provided that the above

@@ -33,6 +33,7 @@ options {

 	host-statistics-max 100;

 	hostname none;

 	interface-interval 30;

+	keep-response-order { 10.0.0.10/24; };

 	listen-on port 90 { any; };

 	listen-on port 100 { 127.0.0.1; };

 	listen-on-v6 port 53 { none; };

diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf

index cf7c745..43b0638 100644

--- a/bin/tests/system/checkconf/good.conf

+++ b/bin/tests/system/checkconf/good.conf

@@ -44,6 +44,9 @@ options {

 	host-statistics-max 100;

 	hostname none;

 	interface-interval 30;

+	keep-response-order {

+		10.0.0.10/24;

+	};

 	listen-on port 90 {

 		"any";

 	};

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in

index 420320c..0d966b3 100644

--- a/bin/tests/system/conf.sh.in

+++ b/bin/tests/system/conf.sh.in

@@ -68,7 +68,7 @@ SUBDIRS="acl additional allow_query addzone autosign builtin

 	 cacheclean checkconf @CHECKDS@ checknames checkzone @COVERAGE@ @KEYMGR@

          database digdelv dlv dlvauto dlz dlzexternal dname dns64 dnssec dyndb

          ecdsa formerr forward glue gost ixfr inline limits logfileconfig

-         lwresd masterfile masterformat metadata notify nsupdate pending

+         lwresd masterfile masterformat metadata notify nsupdate pending pipelined

 	 @PKCS11_TEST@ redirect resolver rndc rpz rrl rrsetorder rsabigexponent

 	 smartsign sortlist spf staticstub stub tkey tsig tsiggss unknown

 	 upforwd verify views wildcard xfer xferquota zero zonechecks geoip filter-aaaa"

diff --git a/bin/tests/system/pipelined/Makefile.in b/bin/tests/system/pipelined/Makefile.in

new file mode 100644

index 0000000..4d16d78

--- /dev/null

+++ b/bin/tests/system/pipelined/Makefile.in

@@ -0,0 +1,51 @@

+# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")

+#

+# Permission to use, copy, modify, and/or distribute this software for any

+# purpose with or without fee is hereby granted, provided that the above

+# copyright notice and this permission notice appear in all copies.

+#

+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+# PERFORMANCE OF THIS SOFTWARE.

+

+srcdir =	@srcdir@

+VPATH =		@srcdir@

+top_srcdir =	@top_srcdir@

+

+@BIND9_VERSION@

+

+@BIND9_MAKE_INCLUDES@

+

+CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES}

+

+CDEFINES =

+CWARNINGS =

+

+DNSLIBS =	../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@

+ISCLIBS =	../../../../lib/isc/libisc.@A@

+

+DNSDEPLIBS =	../../../../lib/dns/libdns.@A@

+ISCDEPLIBS =	../../../../lib/isc/libisc.@A@

+

+DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}

+

+LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@

+

+TARGETS =	pipequeries@EXEEXT@

+

+SRCS =		pipequeries.c

+

+@BIND9_MAKE_RULES@

+

+all: pipequeries@EXEEXT@

+

+pipequeries@EXEEXT@: pipequeries.@O@ ${DEPLIBS}

+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ pipequeries.@O@ ${LIBS}

+

+clean distclean::

+	rm -f ${TARGETS}

+

diff --git a/bin/tests/system/pipelined/clean.sh b/bin/tests/system/pipelined/clean.sh

new file mode 100644

index 0000000..1cca633

--- /dev/null

+++ b/bin/tests/system/pipelined/clean.sh

@@ -0,0 +1,19 @@

+#!/bin/sh

+#

+# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")

+#

+# Permission to use, copy, modify, and/or distribute this software for any

+# purpose with or without fee is hereby granted, provided that the above

+# copyright notice and this permission notice appear in all copies.

+#

+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+# PERFORMANCE OF THIS SOFTWARE.

+

+rm -f */named.memstats

+rm -f */named.run

+rm -f raw* output*

diff --git a/bin/tests/system/pipelined/input b/bin/tests/system/pipelined/input

new file mode 100644

index 0000000..485cf81

--- /dev/null

+++ b/bin/tests/system/pipelined/input

@@ -0,0 +1,8 @@

+a.examplea

+a.exampleb

+b.examplea

+b.exampleb

+c.examplea

+c.exampleb

+d.examplea

+d.exampleb

diff --git a/bin/tests/system/pipelined/inputb b/bin/tests/system/pipelined/inputb

new file mode 100644

index 0000000..6ea367e

--- /dev/null

+++ b/bin/tests/system/pipelined/inputb

@@ -0,0 +1,8 @@

+e.examplea

+e.exampleb

+f.examplea

+f.exampleb

+g.examplea

+g.exampleb

+h.examplea

+h.exampleb

diff --git a/bin/tests/system/pipelined/ns1/named.conf b/bin/tests/system/pipelined/ns1/named.conf

new file mode 100644

index 0000000..1bbf401

--- /dev/null

+++ b/bin/tests/system/pipelined/ns1/named.conf

@@ -0,0 +1,43 @@

+/*

+ * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")

+ *

+ * Permission to use, copy, modify, and/or distribute this software for any

+ * purpose with or without fee is hereby granted, provided that the above

+ * copyright notice and this permission notice appear in all copies.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+controls { /* empty */ };

+

+options {

+	query-source address 10.53.0.1;

+	notify-source 10.53.0.1;

+	transfer-source 10.53.0.1;

+	port 5300;

+	pid-file "named.pid";

+	listen-on { 10.53.0.1; };

+	listen-on-v6 { none; };

+	recursion no;

+	notify yes;

+};

+

+key rndc_key {

+	secret "1234abcd8765";

+	algorithm hmac-sha256;

+};

+

+controls {

+	inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };

+};

+

+zone "." {

+	type master;

+	file "root.db";

+};

diff --git a/bin/tests/system/pipelined/ns1/root.db b/bin/tests/system/pipelined/ns1/root.db

new file mode 100644

index 0000000..b5186e5

--- /dev/null

+++ b/bin/tests/system/pipelined/ns1/root.db

@@ -0,0 +1,30 @@

+; Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")

+;

+; Permission to use, copy, modify, and/or distribute this software for any

+; purpose with or without fee is hereby granted, provided that the above

+; copyright notice and this permission notice appear in all copies.

+;

+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+; PERFORMANCE OF THIS SOFTWARE.

+

+$TTL 300

+. 			IN SOA	gson.nominum.com. a.root.servers.nil. (

+				2000042100   	; serial

+				600         	; refresh

+				600         	; retry

+				1200    	; expire

+				600       	; minimum

+				)

+.			NS	a.root-servers.nil.

+a.root-servers.nil.	A	10.53.0.1

+

+examplea.		NS	ns2.examplea.

+ns2.examplea.		A	10.53.0.2

+

+exampleb.		NS	ns3.exampleb.

+ns3.exampleb.		A	10.53.0.3

diff --git a/bin/tests/system/pipelined/ns2/examplea.db b/bin/tests/system/pipelined/ns2/examplea.db

new file mode 100644

index 0000000..678034a

--- /dev/null

+++ b/bin/tests/system/pipelined/ns2/examplea.db

@@ -0,0 +1,35 @@

+; Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")

+;

+; Permission to use, copy, modify, and/or distribute this software for any

+; purpose with or without fee is hereby granted, provided that the above

+; copyright notice and this permission notice appear in all copies.

+;

+; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH

+; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+; AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

+; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM

+; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+; PERFORMANCE OF THIS SOFTWARE.

+

+$ORIGIN .

+$TTL 300	; 5 minutes

+examplea		IN SOA	mname1. . (

+				1          ; serial

+				20         ; refresh (20 seconds)

+				20         ; retry (20 seconds)

+				1814400    ; expire (3 weeks)

+				3600       ; minimum (1 hour)

+				)

+examplea.		NS	ns2.examplea.

+ns2.examplea.		A	10.53.0.2

+

+$ORIGIN examplea.

+a			A	10.0.1.1

+b			A	10.0.1.2

+c			A	10.0.1.3

+d			A	10.0.1.4

+e			A	10.0.1.5

+f			A	10.0.1.6

+g			A	10.0.1.7

+h			A	10.0.1.8

diff --git a/bin/tests/system/pipelined/ns2/named.conf b/bin/tests/system/pipelined/ns2/named.conf

new file mode 100644

index 0000000..83a9ec7

--- /dev/null

+++ b/bin/tests/system/pipelined/ns2/named.conf

@@ -0,0 +1,49 @@

+/*

+ * Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")

+ *