1 --- query.c 2011-04-07 16:32:17.247618922 -0400
2 +++ query.c.mjo 2011-04-07 16:39:52.326465569 -0400
7 - if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_CNAME,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype) && !typematch(DNS_T_SOA,dtype)) {
10 + if (typematch(DNS_T_AAAA,dtype)) {
11 + byte_copy(key,2,DNS_T_AAAA);
12 + cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
13 + if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) {
15 + log_cachedanswer(d,DNS_T_AAAA);
16 + while (cachedlen >= 16) {
17 + for (k = 0;k < 256;k += 16)
18 + if (byte_equal(z->servers[z->level - 1] + k,16,V6any)) {
19 + byte_copy(z->servers[z->level - 1] + k,16,cached);
28 + log_cachedanswer(d,DNS_T_AAAA);
29 + if (!rqa(z)) goto DIE;
30 + while (cachedlen >= 16) {
31 + if (!response_rstart(d,DNS_T_AAAA,ttl)) goto DIE;
32 + if (!response_addbytes(cached,16)) goto DIE;
33 + response_rfinish(RESPONSE_ANSWER);
42 + if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_CNAME,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype) && !typematch(DNS_T_AAAA,dtype)) {
43 byte_copy(key,2,dtype);
44 cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
45 if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) {
47 dns_domain_free(&z->ns[z->level][j]);
50 - for (j = 0;j < 64;j += 4)
51 - if (byte_diff(z->servers[z->level] + j,4,"\0\0\0\0"))
52 + for (j = 0;j < 256;j += 16)
53 + if (byte_diff(z->servers[z->level] + j,16,V6any))
55 - if (j == 64) goto SERVFAIL;
56 + if (j == 256) goto SERVFAIL;
58 - dns_sortip(z->servers[z->level],64);
59 + dns_sortip6(z->servers[z->level],256);
60 dtype = z->level ? DNS_T_A : z->type;
61 if (qmerge_start(&z->qm,z->servers[z->level],flagforwardonly,z->name[z->level],dtype,z->localip,z->control[z->level]) == -1) goto DIE;
64 buf = z->qm->dt.packet;
65 len = z->qm->dt.packetlen;
67 - whichserver = z->qm->dt.servers + 4 * z->qm->dt.curserver;
68 + whichserver = z->qm->dt.servers + 16 * z->qm->dt.curserver;
69 control = z->control[z->level];
70 d = z->name[z->level];
71 dtype = z->level ? DNS_T_A : z->type;