upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 08:02:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

use the "recursion" and "allow-recursion" config options;

Browse source 
set RA correctly in responses
This commit is contained in:
Andreas Gustafsson 1999-12-10 23:58:04 +00:00
parent a44bd6a6ed
commit c295547c73
4 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bin/named/client.c
View file

@ -24,6 +24,7 @@
#include <isc/task.h>
#include <isc/timer.h>
#include <dns/aml.h>
#include <dns/dispatch.h>
#include <dns/events.h>
#include <dns/message.h>
@ -268,6 +269,9 @@ ns_client_send(ns_client_t *client) {
CTRACE("send");
if ((client->attributes & NS_CLIENTATTR_RA) != 0)
client->message->flags |= DNS_MESSAGEFLAG_RA;
data = isc_mempool_get(client->sendbufs);
if (data == NULL) {
CTRACE("no buffers available");
@ -475,6 +479,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
isc_buffer_t *buffer;
dns_view_t *view;
dns_rdataset_t *opt;
isc_boolean_t ra; /* Recursion available. */
REQUIRE(event != NULL);
client = event->arg;
@ -597,6 +602,33 @@ client_request(isc_task_t *task, isc_event_t *event) {
ns_client_error(client, DNS_R_REFUSED);
return;
}
/*
* Decide whether recursive service is available to this client.
* We do this here rather than in the query code so that we can
* set the RA bit correctly on all kinds of responses, not just
* responses to ordinary queries.
*/
if (client->view->resolver == NULL) {
ra = ISC_FALSE;
} else {
ra = ISC_TRUE;
(void) dns_c_ctx_getrecursion(ns_g_confctx, &ra);
if (ra == ISC_TRUE) {
dns_c_ipmatchlist_t *acl = NULL;
/* XXX ACL should be view specific. */
dns_c_ctx_getrecursionacl(ns_g_confctx, &acl);
/* XXX this will log too much too early */
result = dns_aml_checkrequest(client->signer,
ns_client_getsockaddr(client),
ns_g_confctx->acls, "recursion",
acl, NULL, ISC_TRUE);
if (result != DNS_R_SUCCESS)
ra = ISC_FALSE;
}
}
if (ra == ISC_TRUE)
client->attributes |= NS_CLIENTATTR_RA;
/*
* Dispatch the request.

1
bin/named/include/named/client.h
View file

@ -81,6 +81,7 @@ struct ns_client {
(c)->magic == NS_CLIENT_MAGIC)
#define NS_CLIENTATTR_TCP 0x01
#define NS_CLIENTATTR_RA 0x02 /* Client gets recusive service */
/*
* Note! These ns_client_ routines MUST be called ONLY from the client's

20
bin/named/query.c
View file

@ -2562,26 +2562,18 @@ ns_query_start(ns_client_t *client) {
client->query.attributes &=
~(NS_QUERYATTR_RECURSIONOK|NS_QUERYATTR_CACHEOK);
set_ra = ISC_FALSE;
} else if ((message->flags & DNS_MESSAGEFLAG_RD) == 0 ||
client->view->resolver == NULL) {
} else if ((client->attributes & NS_CLIENTATTR_RA) == 0 ||
(message->flags & DNS_MESSAGEFLAG_RD) == 0) {
/*
* If the client doesn't want recursion, or we don't have
* a resolver, turn recursion off.
* If the client isn't allowed to recurse (due to
* "recursion no", the allow-recursion ACL, or the
* lack of a resolver in this view), or if it
* doesn't want recursion, turn recursion off.
*/
client->query.attributes &= ~NS_QUERYATTR_RECURSIONOK;
set_ra = ISC_FALSE;
}
/*
* XXXRTH Deal with allow-query and allow-recursion here.
*/
/*
* RA flag.
*/
if (set_ra)
message->flags |= DNS_MESSAGEFLAG_RA;
/*
* Get the question name.
*/

4
bin/named/xfrout.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: xfrout.c,v 1.27 1999/12/10 18:14:49 gson Exp $ */
/* $Id: xfrout.c,v 1.28 1999/12/10 23:58:03 gson Exp $ */
#include <config.h>
@ -1132,6 +1132,8 @@ sendstream(xfrout_ctx_t *xfr)
msg->id = xfr->id;
msg->rcode = dns_rcode_noerror;
msg->flags = DNS_MESSAGEFLAG_QR | DNS_MESSAGEFLAG_AA;
if ((xfr->client->attributes & NS_CLIENTATTR_RA) != 0)
msg->flags |= DNS_MESSAGEFLAG_RA;
msg->tsigkey = xfr->tsigkey;
msg->querytsig = xfr->lasttsig;