--- /dev/null
+--- query.c 2011-04-07 16:32:17.247618922 -0400
++++ query.c.mjo 2011-04-07 16:39:52.326465569 -0400
+@@ -532,7 +532,41 @@
+ }
+ }
+
+- 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)) {
++
++
++ if (typematch(DNS_T_AAAA,dtype)) {
++ byte_copy(key,2,DNS_T_AAAA);
++ cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
++ if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) {
++ if (z->level) {
++ log_cachedanswer(d,DNS_T_AAAA);
++ while (cachedlen >= 16) {
++ for (k = 0;k < 256;k += 16)
++ if (byte_equal(z->servers[z->level - 1] + k,16,V6any)) {
++ byte_copy(z->servers[z->level - 1] + k,16,cached);
++ break;
++ }
++ cached += 16;
++ cachedlen -= 16;
++ }
++ goto LOWERLEVEL;
++ }
++
++ log_cachedanswer(d,DNS_T_AAAA);
++ if (!rqa(z)) goto DIE;
++ while (cachedlen >= 16) {
++ if (!response_rstart(d,DNS_T_AAAA,ttl)) goto DIE;
++ if (!response_addbytes(cached,16)) goto DIE;
++ response_rfinish(RESPONSE_ANSWER);
++ cached += 16;
++ cachedlen -= 16;
++ }
++ cleanup(z);
++ return 1;
++ }
++ }
++
++ 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)) {
+ byte_copy(key,2,dtype);
+ cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
+ if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) {
+@@ -604,12 +638,12 @@
+ dns_domain_free(&z->ns[z->level][j]);
+ }
+
+- for (j = 0;j < 64;j += 4)
+- if (byte_diff(z->servers[z->level] + j,4,"\0\0\0\0"))
++ for (j = 0;j < 256;j += 16)
++ if (byte_diff(z->servers[z->level] + j,16,V6any))
+ break;
+- if (j == 64) goto SERVFAIL;
++ if (j == 256) goto SERVFAIL;
+
+- dns_sortip(z->servers[z->level],64);
++ dns_sortip6(z->servers[z->level],256);
+ dtype = z->level ? DNS_T_A : z->type;
+ if (qmerge_start(&z->qm,z->servers[z->level],flagforwardonly,z->name[z->level],dtype,z->localip,z->control[z->level]) == -1) goto DIE;
+ return 0;
+@@ -628,7 +662,7 @@
+ buf = z->qm->dt.packet;
+ len = z->qm->dt.packetlen;
+
+- whichserver = z->qm->dt.servers + 4 * z->qm->dt.curserver;
++ whichserver = z->dt.servers + 16 * z->dt.curserver;
+ control = z->control[z->level];
+ d = z->name[z->level];
+ dtype = z->level ? DNS_T_A : z->type;