mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

priority rendering

Browse Source
This commit is contained in:
Michael Graff
1999-12-22 03:22:59 +00:00
parent 491319c34c
commit 733b16eb0b
12 changed files with 153 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/named/client.c
View File

@@ -323,11 +323,11 @@ ns_client_send(ns_client_t *client) {
client->opt = NULL; client->opt = NULL;
} }
result = dns_message_rendersection(client->message, result = dns_message_rendersection(client->message,
DNS_SECTION_QUESTION, 0, 0); DNS_SECTION_QUESTION, 0);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto done; goto done;
result = dns_message_rendersection(client->message, result = dns_message_rendersection(client->message,
DNS_SECTION_ANSWER, 0, 0); DNS_SECTION_ANSWER, 0);
if (result == ISC_R_NOSPACE) { if (result == ISC_R_NOSPACE) {
client->message->flags |= DNS_MESSAGEFLAG_TC; client->message->flags |= DNS_MESSAGEFLAG_TC;
goto renderend; goto renderend;
@@ -335,7 +335,7 @@ ns_client_send(ns_client_t *client) {
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto done; goto done;
result = dns_message_rendersection(client->message, result = dns_message_rendersection(client->message,
DNS_SECTION_AUTHORITY, 0, 0); DNS_SECTION_AUTHORITY, 0);
if (result == ISC_R_NOSPACE) { if (result == ISC_R_NOSPACE) {
client->message->flags |= DNS_MESSAGEFLAG_TC; client->message->flags |= DNS_MESSAGEFLAG_TC;
goto renderend; goto renderend;
@@ -343,7 +343,7 @@ ns_client_send(ns_client_t *client) {
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto done; goto done;
result = dns_message_rendersection(client->message, result = dns_message_rendersection(client->message,
DNS_SECTION_ADDITIONAL, 0, 0); DNS_SECTION_ADDITIONAL, 0);
if (result != ISC_R_SUCCESS && result != ISC_R_NOSPACE) if (result != ISC_R_SUCCESS && result != ISC_R_NOSPACE)
goto done; goto done;
renderend: renderend:

8
bin/named/xfrout.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: xfrout.c,v 1.31 1999/12/21 00:33:17 marka Exp $ */ /* $Id: xfrout.c,v 1.32 1999/12/22 03:22:56 explorer Exp $ */
#include <config.h> #include <config.h>
@@ -1281,10 +1281,8 @@ sendstream(xfrout_ctx_t *xfr)
if ((xfr->client->attributes & NS_CLIENTATTR_TCP) != 0) { if ((xfr->client->attributes & NS_CLIENTATTR_TCP) != 0) {
CHECK(dns_message_renderbegin(msg, &xfr->txbuf)); CHECK(dns_message_renderbegin(msg, &xfr->txbuf));
CHECK(dns_message_rendersection(msg, DNS_SECTION_QUESTION, CHECK(dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0));
0, 0)); CHECK(dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0));
CHECK(dns_message_rendersection(msg, DNS_SECTION_ANSWER,
0, 0));
CHECK(dns_message_renderend(msg)); CHECK(dns_message_renderend(msg));
isc_buffer_used(&xfr->txbuf, &used); isc_buffer_used(&xfr->txbuf, &used);

8
bin/tests/dispatch_tcp_test.c
View File

@@ -212,16 +212,16 @@ start_response(void)
rdataset.attributes |= DNS_RDATASETATTR_QUESTION; rdataset.attributes |= DNS_RDATASETATTR_QUESTION;
result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0);
CHECKRESULT(result, "dns_message_rendersection(QUESTION)"); CHECKRESULT(result, "dns_message_rendersection(QUESTION)");
result = dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0);
CHECKRESULT(result, "dns_message_rendersection(ANSWER)"); CHECKRESULT(result, "dns_message_rendersection(ANSWER)");
result = dns_message_rendersection(msg, DNS_SECTION_ADDITIONAL, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_ADDITIONAL, 0);
CHECKRESULT(result, "dns_message_rendersection(ADDITIONAL)"); CHECKRESULT(result, "dns_message_rendersection(ADDITIONAL)");
result = dns_message_rendersection(msg, DNS_SECTION_AUTHORITY, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_AUTHORITY, 0);
CHECKRESULT(result, "dns_message_rendersection(AUTHORITY)"); CHECKRESULT(result, "dns_message_rendersection(AUTHORITY)");
printf("--- adding response\n"); printf("--- adding response\n");

8
bin/tests/dispatch_test.c
View File

@@ -188,16 +188,16 @@ start_response(clictx_t *cli, char *query, isc_task_t *task)
cli->rdataset.attributes |= DNS_RDATASETATTR_QUESTION; cli->rdataset.attributes |= DNS_RDATASETATTR_QUESTION;
result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0);
CHECKRESULT(result, "dns_message_rendersection(QUESTION)"); CHECKRESULT(result, "dns_message_rendersection(QUESTION)");
result = dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0);
CHECKRESULT(result, "dns_message_rendersection(ANSWER)"); CHECKRESULT(result, "dns_message_rendersection(ANSWER)");
result = dns_message_rendersection(msg, DNS_SECTION_ADDITIONAL, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_ADDITIONAL, 0);
CHECKRESULT(result, "dns_message_rendersection(ADDITIONAL)"); CHECKRESULT(result, "dns_message_rendersection(ADDITIONAL)");
result = dns_message_rendersection(msg, DNS_SECTION_AUTHORITY, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_AUTHORITY, 0);
CHECKRESULT(result, "dns_message_rendersection(AUTHORITY)"); CHECKRESULT(result, "dns_message_rendersection(AUTHORITY)");
printf("--- adding response\n"); printf("--- adding response\n");

3
bin/tests/sdig.c
View File

@@ -355,8 +355,7 @@ main(int argc, char *argv[]) {
check_result(result, "dns_message_renderbegin()"); check_result(result, "dns_message_renderbegin()");
if (edns0) if (edns0)
add_opt(message, (isc_uint16_t)bufsize); add_opt(message, (isc_uint16_t)bufsize);
result = dns_message_rendersection(message, DNS_SECTION_QUESTION, result = dns_message_rendersection(message, DNS_SECTION_QUESTION, 0);
0, 0);
check_result(result, "dns_message_rendersection()"); check_result(result, "dns_message_rendersection()");
result = dns_message_renderend(message); result = dns_message_renderend(message);
check_result(result, "dns_message_renderend()"); check_result(result, "dns_message_renderend()");

17
bin/tests/tkey_test.c
View File

@@ -189,13 +189,13 @@ buildquery(void) {
result = dns_message_renderbegin(query, &qbuffer); result = dns_message_renderbegin(query, &qbuffer);
CHECK("dns_message_renderbegin", result); CHECK("dns_message_renderbegin", result);
result = dns_message_rendersection(query, DNS_SECTION_QUESTION, 0, 0); result = dns_message_rendersection(query, DNS_SECTION_QUESTION, 0);
CHECK("dns_message_rendersection(question)", result); CHECK("dns_message_rendersection(question)", result);
result = dns_message_rendersection(query, DNS_SECTION_ANSWER, 0, 0); result = dns_message_rendersection(query, DNS_SECTION_ANSWER, 0);
CHECK("dns_message_rendersection(answer)", result); CHECK("dns_message_rendersection(answer)", result);
result = dns_message_rendersection(query, DNS_SECTION_AUTHORITY, 0, 0); result = dns_message_rendersection(query, DNS_SECTION_AUTHORITY, 0);
CHECK("dns_message_rendersection(auth)", result); CHECK("dns_message_rendersection(auth)", result);
result = dns_message_rendersection(query, DNS_SECTION_ADDITIONAL, 0, 0); result = dns_message_rendersection(query, DNS_SECTION_ADDITIONAL, 0);
CHECK("dns_message_rendersection(add)", result); CHECK("dns_message_rendersection(add)", result);
result = dns_message_renderend(query); result = dns_message_renderend(query);
CHECK("dns_message_renderend", result); CHECK("dns_message_renderend", result);
@@ -229,14 +229,13 @@ buildquery2(void) {
result = dns_message_renderbegin(query2, &qbuffer); result = dns_message_renderbegin(query2, &qbuffer);
CHECK("dns_message_renderbegin", result); CHECK("dns_message_renderbegin", result);
result = dns_message_rendersection(query2, DNS_SECTION_QUESTION, 0, 0); result = dns_message_rendersection(query2, DNS_SECTION_QUESTION, 0);
CHECK("dns_message_rendersection(question)", result); CHECK("dns_message_rendersection(question)", result);
result = dns_message_rendersection(query2, DNS_SECTION_ANSWER, 0, 0); result = dns_message_rendersection(query2, DNS_SECTION_ANSWER, 0);
CHECK("dns_message_rendersection(answer)", result); CHECK("dns_message_rendersection(answer)", result);
result = dns_message_rendersection(query2, DNS_SECTION_AUTHORITY, 0, 0); result = dns_message_rendersection(query2, DNS_SECTION_AUTHORITY, 0);
CHECK("dns_message_rendersection(auth)", result); CHECK("dns_message_rendersection(auth)", result);
result = dns_message_rendersection(query2, DNS_SECTION_ADDITIONAL, result = dns_message_rendersection(query2, DNS_SECTION_ADDITIONAL, 0);
0, 0);
CHECK("dns_message_rendersection(add)", result); CHECK("dns_message_rendersection(add)", result);
result = dns_message_renderend(query2); result = dns_message_renderend(query2);
CHECK("dns_message_renderend", result); CHECK("dns_message_renderend", result);

15
bin/tests/wire_test.c
View File

@@ -157,24 +157,19 @@ main(int argc, char *argv[]) {
result = dns_message_renderbegin(message, &source); result = dns_message_renderbegin(message, &source);
CHECKRESULT(result, "dns_message_renderbegin() failed"); CHECKRESULT(result, "dns_message_renderbegin() failed");
result = dns_message_rendersection(message, DNS_SECTION_QUESTION, result = dns_message_rendersection(message, DNS_SECTION_QUESTION, 0);
0, 0);
CHECKRESULT(result, "dns_message_rendersection(QUESTION) failed"); CHECKRESULT(result, "dns_message_rendersection(QUESTION) failed");
result = dns_message_rendersection(message, DNS_SECTION_ANSWER, result = dns_message_rendersection(message, DNS_SECTION_ANSWER, 0);
0, 0);
CHECKRESULT(result, "dns_message_rendersection(ANSWER) failed"); CHECKRESULT(result, "dns_message_rendersection(ANSWER) failed");
result = dns_message_rendersection(message, DNS_SECTION_AUTHORITY, result = dns_message_rendersection(message, DNS_SECTION_AUTHORITY, 0);
0, 0);
CHECKRESULT(result, "dns_message_rendersection(AUTHORITY) failed"); CHECKRESULT(result, "dns_message_rendersection(AUTHORITY) failed");
result = dns_message_rendersection(message, DNS_SECTION_ADDITIONAL, result = dns_message_rendersection(message, DNS_SECTION_ADDITIONAL, 0);
0, 0);
CHECKRESULT(result, "dns_message_rendersection(ADDITIONAL) failed"); CHECKRESULT(result, "dns_message_rendersection(ADDITIONAL) failed");
result = dns_message_rendersection(message, DNS_SECTION_TSIG, result = dns_message_rendersection(message, DNS_SECTION_TSIG, 0);
0, 0);
CHECKRESULT(result, "dns_message_rendersection(TSIG) failed"); CHECKRESULT(result, "dns_message_rendersection(TSIG) failed");
dns_message_renderend(message); dns_message_renderend(message);

7
lib/dns/include/dns/message.h
View File

@@ -138,6 +138,11 @@ typedef int dns_section_t;
#define DNS_MESSAGE_INTENTPARSE 1 /* parsing messages */ #define DNS_MESSAGE_INTENTPARSE 1 /* parsing messages */
#define DNS_MESSAGE_INTENTRENDER 2 /* rendering */ #define DNS_MESSAGE_INTENTRENDER 2 /* rendering */
/*
* Control behavior of rendering
*/
#define DNS_MESSAGERENDER_ORDERED 0x0001 /* don't change order */
typedef struct dns_msgblock dns_msgblock_t; typedef struct dns_msgblock dns_msgblock_t;
struct dns_message { struct dns_message {
@@ -394,7 +399,7 @@ dns_message_renderrelease(dns_message_t *msg, unsigned int space);
dns_result_t dns_result_t
dns_message_rendersection(dns_message_t *msg, dns_section_t section, dns_message_rendersection(dns_message_t *msg, dns_section_t section,
unsigned int priority, unsigned int options); unsigned int options);
/* /*
* Render all names, rdatalists, etc from the given section at the * Render all names, rdatalists, etc from the given section at the
* specified priority or higher. * specified priority or higher.

68
lib/dns/message.c
View File

@@ -1441,9 +1441,40 @@ dns_message_renderreserve(dns_message_t *msg, unsigned int space)
return (DNS_R_SUCCESS); return (DNS_R_SUCCESS);
} }
static inline isc_boolean_t
wrong_priority(dns_rdataset_t *rds, int pass)
{
int pass_needed;
/*
* If we are not rendering class IN, this ordering is bogus.
*/
if (rds->rdclass != dns_rdataclass_in)
return (ISC_FALSE);
switch (rds->type) {
case dns_rdatatype_a:
case dns_rdatatype_aaaa:
case dns_rdatatype_a6:
pass_needed = 3;
break;
case dns_rdatatype_sig:
case dns_rdatatype_key:
pass_needed = 2;
break;
default:
pass_needed = 1;
}
if (pass_needed >= pass)
return (ISC_FALSE);
return (ISC_TRUE);
}
dns_result_t dns_result_t
dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
unsigned int priority, unsigned int options) unsigned int options)
{ {
dns_namelist_t *section; dns_namelist_t *section;
dns_name_t *name, *next_name; dns_name_t *name, *next_name;
@@ -1451,9 +1482,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
unsigned int count, total; unsigned int count, total;
dns_result_t result; dns_result_t result;
isc_buffer_t st; /* for rollbacks */ isc_buffer_t st; /* for rollbacks */
int pass;
(void)priority; /* XXXMLG implement */
(void)options; /* XXXMLG implement */
REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(DNS_MESSAGE_VALID(msg));
REQUIRE(msg->buffer != NULL); REQUIRE(msg->buffer != NULL);
@@ -1461,9 +1490,11 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
section = &msg->sections[sectionid]; section = &msg->sections[sectionid];
name = ISC_LIST_HEAD(*section); if ((sectionid == DNS_SECTION_ADDITIONAL)
if (name == NULL) && (options & DNS_MESSAGERENDER_ORDERED) == 0)
return (DNS_R_SUCCESS); pass = 3;
else
pass = 1;
/* /*
* Shrink the space in the buffer by the reserved amount. * Shrink the space in the buffer by the reserved amount.
@@ -1471,6 +1502,12 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
msg->buffer->length -= msg->reserved; msg->buffer->length -= msg->reserved;
total = 0; total = 0;
do {
name = ISC_LIST_HEAD(*section);
if (name == NULL)
return (DNS_R_SUCCESS);
while (name != NULL) { while (name != NULL) {
next_name = ISC_LIST_NEXT(name, link); next_name = ISC_LIST_NEXT(name, link);
@@ -1478,10 +1515,13 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
while (rdataset != NULL) { while (rdataset != NULL) {
next_rdataset = ISC_LIST_NEXT(rdataset, link); next_rdataset = ISC_LIST_NEXT(rdataset, link);
if (rdataset->attributes & DNS_RDATASETATTR_RENDERED) { if (rdataset->attributes & DNS_RDATASETATTR_RENDERED)
rdataset = next_rdataset; goto next;
continue;
} if (((options & DNS_MESSAGERENDER_ORDERED) == 0)
&& (sectionid == DNS_SECTION_ADDITIONAL)
&& wrong_priority(rdataset, pass))
goto next;
st = *(msg->buffer); st = *(msg->buffer);
@@ -1526,11 +1566,13 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid,
rdataset->attributes |= DNS_RDATASETATTR_RENDERED; rdataset->attributes |= DNS_RDATASETATTR_RENDERED;
next:
rdataset = next_rdataset; rdataset = next_rdataset;
} }
name = next_name; name = next_name;
} }
} while (--pass != 0);
msg->buffer->length += msg->reserved; msg->buffer->length += msg->reserved;
msg->counts[sectionid] += total; msg->counts[sectionid] += total;
@@ -1622,7 +1664,7 @@ dns_message_renderend(dns_message_t *msg)
result = dns_tsig_sign(msg); result = dns_tsig_sign(msg);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
return (result); return (result);
result = dns_message_rendersection(msg, DNS_SECTION_TSIG, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_TSIG, 0);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
return (result); return (result);
} }
@@ -1631,7 +1673,7 @@ dns_message_renderend(dns_message_t *msg)
result = dns_dnssec_signmessage(msg, msg->sig0key); result = dns_dnssec_signmessage(msg, msg->sig0key);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
return (result); return (result);
result = dns_message_rendersection(msg, DNS_SECTION_SIG0, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_SIG0, 0);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
return (result); return (result);
} }

4
lib/dns/resolver.c
View File

@@ -750,7 +750,7 @@ resquery_send(resquery_t *query) {
goto cleanup_message; goto cleanup_message;
result = dns_message_rendersection(fctx->qmessage, result = dns_message_rendersection(fctx->qmessage,
DNS_SECTION_QUESTION, 0, 0); DNS_SECTION_QUESTION, 0);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup_message; goto cleanup_message;
@@ -785,7 +785,7 @@ resquery_send(resquery_t *query) {
*/ */
result = dns_message_rendersection(fctx->qmessage, result = dns_message_rendersection(fctx->qmessage,
DNS_SECTION_ADDITIONAL, 0, 0); DNS_SECTION_ADDITIONAL, 0);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup_message; goto cleanup_message;

12
lib/dns/xfrin.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: xfrin.c,v 1.33 1999/12/13 07:57:36 marka Exp $ */ /* $Id: xfrin.c,v 1.34 1999/12/22 03:22:59 explorer Exp $ */
#include <config.h> #include <config.h>
@@ -690,11 +690,11 @@ static dns_result_t
render(dns_message_t *msg, isc_buffer_t *buf) { render(dns_message_t *msg, isc_buffer_t *buf) {
dns_result_t result; dns_result_t result;
CHECK(dns_message_renderbegin(msg, buf)); CHECK(dns_message_renderbegin(msg, buf));
CHECK(dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0, 0)); CHECK(dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0));
CHECK(dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0, 0)); CHECK(dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0));
CHECK(dns_message_rendersection(msg, DNS_SECTION_AUTHORITY, 0, 0)); CHECK(dns_message_rendersection(msg, DNS_SECTION_AUTHORITY, 0));
CHECK(dns_message_rendersection(msg, DNS_SECTION_ADDITIONAL, 0, 0)); CHECK(dns_message_rendersection(msg, DNS_SECTION_ADDITIONAL, 0));
CHECK(dns_message_rendersection(msg, DNS_SECTION_TSIG, 0, 0)); CHECK(dns_message_rendersection(msg, DNS_SECTION_TSIG, 0));
CHECK(dns_message_renderend(msg)); CHECK(dns_message_renderend(msg));
result = DNS_R_SUCCESS; result = DNS_R_SUCCESS;
failure: failure:

10
lib/dns/zone.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: zone.c,v 1.49 1999/12/16 23:29:06 explorer Exp $ */ /* $Id: zone.c,v 1.50 1999/12/22 03:22:59 explorer Exp $ */
#include <config.h> #include <config.h>
@@ -2274,16 +2274,16 @@ dns_notify(dns_name_t *name, isc_sockaddr_t *addr, dns_rdatatype_t type,
result = dns_message_renderbegin(msg, &target); result = dns_message_renderbegin(msg, &target);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
goto cleanup; goto cleanup;
result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
goto cleanup; goto cleanup;
result = dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
goto cleanup; goto cleanup;
result = dns_message_rendersection(msg, DNS_SECTION_AUTHORITY, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_AUTHORITY, 0);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
goto cleanup; goto cleanup;
result = dns_message_rendersection(msg, DNS_SECTION_ADDITIONAL, 0, 0); result = dns_message_rendersection(msg, DNS_SECTION_ADDITIONAL, 0);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
goto cleanup; goto cleanup;