mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

handle negative cache rdatasets in _towire()

Browse Source
This commit is contained in:
Bob Halley
1999-09-22 00:26:40 +00:00
parent 11fcc67616
commit 8dfa9caeec
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/dns/rdataset.c
View File

@@ -22,6 +22,7 @@
#include <isc/assertions.h> #include <isc/assertions.h>
#include <dns/ncache.h>
#include <dns/rdata.h> #include <dns/rdata.h>
#include <dns/rdataclass.h> #include <dns/rdataclass.h>
#include <dns/rdatatype.h> #include <dns/rdatatype.h>
@@ -261,8 +262,7 @@ dns_rdataset_towire(dns_rdataset_t *rdataset,
isc_region_t r; isc_region_t r;
dns_result_t result; dns_result_t result;
unsigned int count; unsigned int count;
isc_buffer_t st; isc_buffer_t savedbuffer, rdlen;
isc_buffer_t rdlen;
unsigned int headlen; unsigned int headlen;
isc_boolean_t question = ISC_FALSE; isc_boolean_t question = ISC_FALSE;
@@ -278,6 +278,11 @@ dns_rdataset_towire(dns_rdataset_t *rdataset,
question = ISC_TRUE; question = ISC_TRUE;
result = dns_rdataset_first(rdataset); result = dns_rdataset_first(rdataset);
INSIST(result == DNS_R_NOMORE); INSIST(result == DNS_R_NOMORE);
} else if (rdataset->type == 0) {
/*
* This is a negative caching rdataset.
*/
return (dns_ncache_towire(rdataset, cctx, target, countp));
} else { } else {
result = dns_rdataset_first(rdataset); result = dns_rdataset_first(rdataset);
if (result == DNS_R_NOMORE) if (result == DNS_R_NOMORE)
@@ -286,6 +291,8 @@ dns_rdataset_towire(dns_rdataset_t *rdataset,
return (result); return (result);
} }
savedbuffer = *target;
count = 0; count = 0;
do { do {
/* /*
@@ -295,24 +302,17 @@ dns_rdataset_towire(dns_rdataset_t *rdataset,
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL); dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL);
else else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14); dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
st = *target;
result = dns_name_towire(owner_name, cctx, target); result = dns_name_towire(owner_name, cctx, target);
if (result != DNS_R_SUCCESS) { if (result != DNS_R_SUCCESS)
dns_compress_rollback(cctx, st.used); goto rollback;
*countp += count;
*target = st;
return (result);
}
headlen = sizeof(dns_rdataclass_t) + sizeof(dns_rdatatype_t); headlen = sizeof(dns_rdataclass_t) + sizeof(dns_rdatatype_t);
if (!question) if (!question)
headlen += sizeof(dns_ttl_t) headlen += sizeof(dns_ttl_t)
+ 2; /* XXX 2 for rdata len */ + 2; /* XXX 2 for rdata len */
isc_buffer_available(target, &r); isc_buffer_available(target, &r);
if (r.length < headlen) { if (r.length < headlen) {
dns_compress_rollback(cctx, st.used); result = ISC_R_NOSPACE;
*countp += count; goto rollback;
*target = st;
return (DNS_R_NOSPACE);
} }
isc_buffer_putuint16(target, rdataset->type); isc_buffer_putuint16(target, rdataset->type);
isc_buffer_putuint16(target, rdataset->rdclass); isc_buffer_putuint16(target, rdataset->rdclass);
@@ -331,20 +331,12 @@ dns_rdataset_towire(dns_rdataset_t *rdataset,
dns_rdataset_current(rdataset, &rdata); dns_rdataset_current(rdataset, &rdata);
result = dns_compress_localinit(cctx, owner_name, result = dns_compress_localinit(cctx, owner_name,
target); target);
if (result != DNS_R_SUCCESS) { if (result != DNS_R_SUCCESS)
dns_compress_rollback(cctx, st.used); goto rollback;
*countp += count;
*target = st;
return (result);
}
result = dns_rdata_towire(&rdata, cctx, target); result = dns_rdata_towire(&rdata, cctx, target);
dns_compress_localinvalidate(cctx); dns_compress_localinvalidate(cctx);
if (result != DNS_R_SUCCESS) { if (result != DNS_R_SUCCESS)
dns_compress_rollback(cctx, st.used); goto rollback;
*countp += count;
*target = st;
return (result);
}
isc_buffer_putuint16(&rdlen, isc_buffer_putuint16(&rdlen,
target->used - rdlen.used - 2); target->used - rdlen.used - 2);
} }
@@ -360,6 +352,13 @@ dns_rdataset_towire(dns_rdataset_t *rdataset,
*countp += count; *countp += count;
return (DNS_R_SUCCESS); return (DNS_R_SUCCESS);
rollback:
dns_compress_rollback(cctx, savedbuffer.used);
*countp = 0;
*target = savedbuffer;
return (result);
} }
dns_result_t dns_result_t