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

1999. [func] Implement "rrset-order fixed". [RT #13662]

Browse Source
This commit is contained in:
Mark Andrews
2006-03-03 00:43:35 +00:00
parent fb9395c8dd
commit d76ed813a5
48 changed files with 944 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
lib/dns/rdataslab.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdataslab.c,v 1.38 2005/04/29 00:22:51 marka Exp $ */
/* $Id: rdataslab.c,v 1.39 2006/03/03 00:43:35 marka Exp $ */
/*! \file */
@@ -33,25 +33,95 @@
#include <dns/rdataset.h>
#include <dns/rdataslab.h>
/*
* The rdataslab structure allows iteration to occur in both load order
* and DNSSEC order. The structure is as follows:
*
* header (reservelen bytes)
* record count (2 bytes)
* offset table (4 x record count bytes in load order)
* data records
* data length (2 bytes)
* order (2 bytes)
* data (data length bytes)
*
* Offsets are from the end of the header.
*
* Load order traversal is performed by walking the offset table to find
* the start of the record.
*
* DNSSEC order traversal is performed by walking the data records.
*
* The order is stored with record to allow for efficient reconstuction of
* of the offset table following a merge or subtraction.
*
* The iterator methods here currently only support DNSSEC order iteration.
*
* The iterator methods in rbtdb support both load order and DNSSEC order
* iteration.
*
* WARNING:
* rbtdb.c directly interacts with the slab's raw structures. If the
* structure changes then rbtdb.c also needs to be updated to reflect
* the changes. See the areas tagged with "RDATASLAB".
*/
struct xrdata {
dns_rdata_t rdata;
unsigned int order;
};
/*% Note: the "const void *" are just to make qsort happy. */
static int
compare_rdata(const void *p1, const void *p2) {
const dns_rdata_t *rdata1 = p1;
const dns_rdata_t *rdata2 = p2;
return (dns_rdata_compare(rdata1, rdata2));
const struct xrdata *x1 = p1;
const struct xrdata *x2 = p2;
return (dns_rdata_compare(&x1->rdata, &x2->rdata));
}
static void
fillin_offsets(unsigned char *offsetbase, unsigned int *offsettable,
unsigned length)
{
unsigned int i, j;
unsigned char *raw;
for (i = 0, j = 0; i < length; i++) {
if (offsettable[i] == 0)
continue;
/*
* Fill in offset table.
*/
raw = &offsetbase[j*4 + 2];
*raw++ = (offsettable[i] & 0xff000000) >> 24;
*raw++ = (offsettable[i] & 0xff0000) >> 16;
*raw++ = (offsettable[i] & 0xff00) >> 8;
*raw = offsettable[i] & 0xff;
/*
* Fill in table index.
*/
raw = offsetbase + offsettable[i] + 2;
*raw++ = (j & 0xff00) >> 8;
*raw = j++ & 0xff;
}
}
isc_result_t
dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
isc_region_t *region, unsigned int reservelen)
{
dns_rdata_t *rdatas;
struct xrdata *x;
unsigned char *rawbuf;
unsigned char *offsetbase;
unsigned int buflen;
isc_result_t result;
unsigned int nitems;
unsigned int nalloc;
unsigned int i;
unsigned int *offsettable;
buflen = reservelen + 2;
@@ -60,8 +130,11 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
if (nitems == 0)
return (ISC_R_FAILURE);
rdatas = isc_mem_get(mctx, nalloc * sizeof(dns_rdata_t));
if (rdatas == NULL)
if (nalloc > 0xffff)
return (ISC_R_NOSPACE);
x = isc_mem_get(mctx, nalloc * sizeof(struct xrdata));
if (x == NULL)
return (ISC_R_NOMEMORY);
/*
@@ -72,8 +145,9 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
goto free_rdatas;
for (i = 0; i < nalloc && result == ISC_R_SUCCESS; i++) {
INSIST(result == ISC_R_SUCCESS);
dns_rdata_init(&rdatas[i]);
dns_rdataset_current(rdataset, &rdatas[i]);
dns_rdata_init(&x[i].rdata);
dns_rdataset_current(rdataset, &x[i].rdata);
x[i].order = i;
result = dns_rdataset_next(rdataset);
}
if (result != ISC_R_NOMORE)
@@ -87,7 +161,10 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
goto free_rdatas;
}
qsort(rdatas, nalloc, sizeof(dns_rdata_t), compare_rdata);
/*
* Put into DNSSEC order.
*/
qsort(x, nalloc, sizeof(struct xrdata), compare_rdata);
/*
* Remove duplicates and compute the total storage required.
@@ -95,20 +172,27 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
* If an rdata is not a duplicate, accumulate the storage size
* required for the rdata. We do not store the class, type, etc,
* just the rdata, so our overhead is 2 bytes for the number of
* records, and 2 for each rdata length, and then the rdata itself.
* records, and 8 for each rdata, (length(2), offset(4) and order(2))
* and then the rdata itself.
*/
for (i = 1; i < nalloc; i++) {
if (compare_rdata(&rdatas[i-1], &rdatas[i]) == 0) {
rdatas[i-1].data = NULL;
rdatas[i-1].length = 0;
if (compare_rdata(&x[i-1].rdata, &x[i].rdata) == 0) {
x[i-1].rdata.data = NULL;
x[i-1].rdata.length = 0;
/*
* Preserve the least order so A, B, A -> A, B
* after duplicate removal.
*/
if (x[i-1].order < x[i].order)
x[i].order = x[i-1].order;
nitems--;
} else
buflen += (2 + rdatas[i-1].length);
buflen += (8 + x[i-1].rdata.length);
}
/*
* Don't forget the last item!
*/
buflen += (2 + rdatas[i-1].length);
buflen += (8 + x[i-1].rdata.length);
/*
* Ensure that singleton types are actually singletons.
@@ -131,26 +215,47 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
result = ISC_R_NOMEMORY;
goto free_rdatas;
}
/* Allocate temporary offset table. */
offsettable = isc_mem_get(mctx, nalloc * sizeof(unsigned int));
if (offsettable == NULL) {
isc_mem_put(mctx, rawbuf, buflen);
result = ISC_R_NOMEMORY;
goto free_rdatas;
}
memset(offsettable, 0, nalloc * sizeof(unsigned int));
region->base = rawbuf;
region->length = buflen;
rawbuf += reservelen;
offsetbase = rawbuf;
*rawbuf++ = (nitems & 0xff00) >> 8;
*rawbuf++ = (nitems & 0x00ff);
/* Skip load order table. Filled in later. */
rawbuf += nitems * 4;
for (i = 0; i < nalloc; i++) {
if (rdatas[i].data == NULL)
if (x[i].rdata.data == NULL)
continue;
*rawbuf++ = (rdatas[i].length & 0xff00) >> 8;
*rawbuf++ = (rdatas[i].length & 0x00ff);
memcpy(rawbuf, rdatas[i].data, rdatas[i].length);
rawbuf += rdatas[i].length;
offsettable[x[i].order] = rawbuf - offsetbase;
*rawbuf++ = (x[i].rdata.length & 0xff00) >> 8;
*rawbuf++ = (x[i].rdata.length & 0x00ff);
rawbuf += 2; /* filled in later */
memcpy(rawbuf, x[i].rdata.data, x[i].rdata.length);
rawbuf += x[i].rdata.length;
}
fillin_offsets(offsetbase, offsettable, nalloc);
isc_mem_put(mctx, offsettable, nalloc * sizeof(unsigned int));
result = ISC_R_SUCCESS;
free_rdatas:
isc_mem_put(mctx, rdatas, nalloc * sizeof(dns_rdata_t));
isc_mem_put(mctx, x, nalloc * sizeof(struct xrdata));
return (result);
}
@@ -169,7 +274,7 @@ rdataset_first(dns_rdataset_t *rdataset) {
rdataset->private5 = NULL;
return (ISC_R_NOMORE);
}
raw += 2;
raw += 2 + (4 * count);
/*
* The privateuint4 field is the number of rdata beyond the cursor
* position, so we decrement the total count by one before storing
@@ -195,7 +300,7 @@ rdataset_next(dns_rdataset_t *rdataset) {
rdataset->privateuint4 = count;
raw = rdataset->private5;
length = raw[0] * 256 + raw[1];
raw += length + 2;
raw += length + 4;
rdataset->private5 = raw;
return (ISC_R_SUCCESS);
@@ -209,7 +314,7 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
REQUIRE(raw != NULL);
r.length = raw[0] * 256 + raw[1];
raw += 2;
raw += 4;
r.base = raw;
dns_rdata_fromregion(rdata, rdataset->rdclass, rdataset->type, &r);
}
@@ -285,11 +390,12 @@ dns_rdataslab_size(unsigned char *slab, unsigned int reservelen) {
current = slab + reservelen;
count = *current++ * 256;
count += *current++;
current += (4 * count);
while (count > 0) {
count--;
length = *current++ * 256;
length += *current++;
current += length;
current += length + 2;
}
return ((unsigned int)(current - slab));
@@ -311,6 +417,7 @@ rdata_from_slab(unsigned char **current,
region.length = *tcurrent++ * 256;
region.length += *tcurrent++;
tcurrent += 2;
region.base = tcurrent;
tcurrent += region.length;
dns_rdata_fromregion(rdata, rdclass, type, &region);
@@ -330,15 +437,22 @@ rdata_in_slab(unsigned char *slab, unsigned int reservelen,
unsigned int count, i;
unsigned char *current;
dns_rdata_t trdata = DNS_RDATA_INIT;
int n;
current = slab + reservelen;
count = *current++ * 256;
count += *current++;
current += (4 * count);
for (i = 0; i < count; i++) {
rdata_from_slab(&current, rdclass, type, &trdata);
if (dns_rdata_compare(&trdata, rdata) == 0)
n = dns_rdata_compare(&trdata, rdata);
if (n == 0)
return (ISC_TRUE);
if (n > 0) /* In DNSSEC order. */
break;
dns_rdata_reset(&trdata);
}
return (ISC_FALSE);
@@ -359,6 +473,11 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
unsigned int oadded = 0;
unsigned int nadded = 0;
unsigned int nncount = 0;
unsigned int oncount;
unsigned int norder = 0;
unsigned int oorder = 0;
unsigned char *offsetbase;
unsigned int *offsettable;
/*
* XXX Need parameter to allow "delete rdatasets in nslab" merge,
@@ -371,12 +490,16 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
ocurrent = oslab + reservelen;
ocount = *ocurrent++ * 256;
ocount += *ocurrent++;
ocurrent += (4 * ocount);
ostart = ocurrent;
ncurrent = nslab + reservelen;
ncount = *ncurrent++ * 256;
ncount += *ncurrent++;
ncurrent += (4 * ncount);
INSIST(ocount > 0 && ncount > 0);
oncount = ncount;
/*
* Yes, this is inefficient!
*/
@@ -388,8 +511,8 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
for (count = 0; count < ocount; count++) {
length = *ocurrent++ * 256;
length += *ocurrent++;
olength += length + 2;
ocurrent += length;
olength += length + 8;
ocurrent += length + 2;
}
/*
@@ -405,6 +528,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
do {
nregion.length = *ncurrent++ * 256;
nregion.length += *ncurrent++;
ncurrent += 2;
nregion.base = ncurrent;
dns_rdata_init(&nrdata);
dns_rdata_fromregion(&nrdata, rdclass, type, &nregion);
@@ -413,7 +537,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
/*
* This rdata isn't in the old slab.
*/
tlength += nregion.length + 2;
tlength += nregion.length + 8;
tcount++;
nncount++;
added_something = ISC_TRUE;
@@ -441,6 +565,9 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
return (DNS_R_SINGLETON);
}
if (tcount > 0xffff)
return (ISC_R_NOSPACE);
/*
* Copy the reserved area from the new slab.
*/
@@ -449,6 +576,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
return (ISC_R_NOMEMORY);
memcpy(tstart, nslab, reservelen);
tcurrent = tstart + reservelen;
offsetbase = tcurrent;
/*
* Write the new count.
@@ -456,17 +584,36 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
*tcurrent++ = (tcount & 0xff00) >> 8;
*tcurrent++ = (tcount & 0x00ff);
/*
* Skip offset table.
*/
tcurrent += (tcount * 4);
offsettable = isc_mem_get(mctx,
(ocount + oncount) * sizeof(unsigned int));
if (offsettable == NULL) {
isc_mem_put(mctx, tstart, tlength);
return (ISC_R_NOMEMORY);
}
memset(offsettable, 0, (ocount + oncount) * sizeof(unsigned int));
/*
* Merge the two slabs.
*/
ocurrent = ostart;
INSIST(ocount != 0);
oorder = ocurrent[2] * 256 + ocurrent[3];
INSIST(oorder < ocount);
rdata_from_slab(&ocurrent, rdclass, type, &ordata);
ncurrent = nslab + reservelen + 2;
ncurrent += (4 * oncount);
if (ncount > 0) {
do {
dns_rdata_reset(&nrdata);
norder = ncurrent[2] * 256 + ncurrent[3];
INSIST(norder < oncount);
rdata_from_slab(&ncurrent, rdclass, type, &nrdata);
} while (rdata_in_slab(oslab, reservelen, rdclass,
type, &nrdata));
@@ -481,27 +628,35 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
else
fromold = ISC_TF(compare_rdata(&ordata, &nrdata) < 0);
if (fromold) {
offsettable[oorder] = tcurrent - offsetbase;
length = ordata.length;
*tcurrent++ = (length & 0xff00) >> 8;
*tcurrent++ = (length & 0x00ff);
tcurrent += 2; /* fill in later */
memcpy(tcurrent, ordata.data, length);
tcurrent += length;
oadded++;
if (oadded < ocount) {
dns_rdata_reset(&ordata);
oorder = ocurrent[2] * 256 + ocurrent[3];
INSIST(oorder < ocount);
rdata_from_slab(&ocurrent, rdclass, type,
&ordata);
}
} else {
offsettable[ocount + norder] = tcurrent - offsetbase;
length = nrdata.length;
*tcurrent++ = (length & 0xff00) >> 8;
*tcurrent++ = (length & 0x00ff);
tcurrent += 2; /* fill in later */
memcpy(tcurrent, nrdata.data, length);
tcurrent += length;
nadded++;
if (nadded < ncount) {
do {
dns_rdata_reset(&nrdata);
norder = ncurrent[2] * 256 + ncurrent[3];
INSIST(norder < oncount);
rdata_from_slab(&ncurrent, rdclass,
type, &nrdata);
} while (rdata_in_slab(oslab, reservelen,
@@ -511,6 +666,11 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
}
}
fillin_offsets(offsetbase, offsettable, ocount + oncount);
isc_mem_put(mctx, offsettable,
(ocount + oncount) * sizeof(unsigned int));
INSIST(tcurrent == tstart + tlength);
*tslabp = tstart;
@@ -525,9 +685,12 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
unsigned int flags, unsigned char **tslabp)
{
unsigned char *mcurrent, *sstart, *scurrent, *tstart, *tcurrent;
unsigned int mcount, scount, rcount ,count, tlength, tcount;
unsigned int mcount, scount, rcount ,count, tlength, tcount, i;
dns_rdata_t srdata = DNS_RDATA_INIT;
dns_rdata_t mrdata = DNS_RDATA_INIT;
unsigned char *offsetbase;
unsigned int *offsettable;
unsigned int order;
REQUIRE(tslabp != NULL && *tslabp == NULL);
REQUIRE(mslab != NULL && sslab != NULL);
@@ -538,7 +701,6 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
scurrent = sslab + reservelen;
scount = *scurrent++ * 256;
scount += *scurrent++;
sstart = scurrent;
INSIST(mcount > 0 && scount > 0);
/*
@@ -552,11 +714,15 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
tcount = 0;
rcount = 0;
mcurrent += 4 * mcount;
scurrent += 4 * scount;
sstart = scurrent;
/*
* Add in the length of rdata in the mslab that aren't in
* the sslab.
*/
do {
for (i = 0; i < mcount; i++) {
unsigned char *mrdatabegin = mcurrent;
rdata_from_slab(&mcurrent, rdclass, type, &mrdata);
scurrent = sstart;
@@ -575,9 +741,10 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
tcount++;
} else
rcount++;
mcount--;
dns_rdata_reset(&mrdata);
} while (mcount > 0);
}
tlength += (4 * tcount);
/*
* Check that all the records originally existed. The numeric
@@ -606,6 +773,14 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
return (ISC_R_NOMEMORY);
memcpy(tstart, mslab, reservelen);
tcurrent = tstart + reservelen;
offsetbase = tcurrent;
offsettable = isc_mem_get(mctx, mcount * sizeof(unsigned int));
if (offsettable == NULL) {
isc_mem_put(mctx, tstart, tlength);
return (ISC_R_NOMEMORY);
}
memset(offsettable, 0, mcount * sizeof(unsigned int));
/*
* Write the new count.
@@ -613,14 +788,19 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
*tcurrent++ = (tcount & 0xff00) >> 8;
*tcurrent++ = (tcount & 0x00ff);
tcurrent += (4 * tcount);
/*
* Copy the parts of mslab not in sslab.
*/
mcurrent = mslab + reservelen;
mcount = *mcurrent++ * 256;
mcount += *mcurrent++;
do {
mcurrent += (4 * mcount);
for (i = 0; i < mcount; i++) {
unsigned char *mrdatabegin = mcurrent;
order = mcurrent[2] * 256 + mcurrent[3];
INSIST(order < mcount);
rdata_from_slab(&mcurrent, rdclass, type, &mrdata);
scurrent = sstart;
for (count = 0; count < scount; count++) {
@@ -635,12 +815,16 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
* copied to the tslab.
*/
unsigned int length = mcurrent - mrdatabegin;
offsettable[order] = tcurrent - offsetbase;
memcpy(tcurrent, mrdatabegin, length);
tcurrent += length;
}
dns_rdata_reset(&mrdata);
mcount--;
} while (mcount > 0);
}
fillin_offsets(offsetbase, offsettable, mcount);
isc_mem_put(mctx, offsettable, mcount * sizeof(unsigned int));
INSIST(tcurrent == tstart + tlength);
@@ -668,6 +852,9 @@ dns_rdataslab_equal(unsigned char *slab1, unsigned char *slab2,
if (count1 != count2)
return (ISC_FALSE);
current1 += (4 * count1);
current2 += (4 * count2);
while (count1 > 0) {
length1 = *current1++ * 256;
length1 += *current1++;
@@ -675,6 +862,9 @@ dns_rdataslab_equal(unsigned char *slab1, unsigned char *slab2,
length2 = *current2++ * 256;
length2 += *current2++;
current1 += 2;
current2 += 2;
if (length1 != length2 ||
memcmp(current1, current2, length1) != 0)
return (ISC_FALSE);
@@ -708,6 +898,9 @@ dns_rdataslab_equalx(unsigned char *slab1, unsigned char *slab2,
if (count1 != count2)
return (ISC_FALSE);
current1 += (4 * count1);
current2 += (4 * count2);
while (count1-- > 0) {
rdata_from_slab(&current1, rdclass, type, &rdata1);
rdata_from_slab(&current2, rdclass, type, &rdata2);