Parsing code revamped, not compiled yet.

[adns.git] / src / reply.c

diff --git a/src/reply.c b/src/reply.c
index 14fc05786a0d794fe3e730c0b8645e108eb6dc08..0bcc3fae08186bd4dd4692fb3a9b284d64591aae 100644 (file)
--- a/src/reply.c
+++ b/src/reply.c
@@ -9,14 +9,15 @@ static void cname_recurse(adns_state ads, adns_query qu, adns_queryflags xflags)
 void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
                     int serv, struct timeval now) {
   int cbyte, rrstart, wantedrrs, rri, foundsoa, foundns;
 void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
                     int serv, struct timeval now) {
   int cbyte, rrstart, wantedrrs, rri, foundsoa, foundns;

-  int id, f1, f2, qdcount, ancount, nscount, arcount, flg_ra, flg_tc;
+  int id, f1, f2, qdcount, ancount, nscount, arcount, flg_ra, flg_rd, flg_tc, opcode;

   int rrtype, rrclass, rdlength, rdstart, ownermatched, ownerstart;
   int anstart, nsstart, arstart;
   int currentrrs;
   adns_query qu, nqu;
   dns_rcode rcode;
   adns_status st;
   int rrtype, rrclass, rdlength, rdstart, ownermatched, ownerstart;
   int anstart, nsstart, arstart;
   int currentrrs;
   adns_query qu, nqu;
   dns_rcode rcode;
   adns_status st;

-= 0;
+  vbuf vb;
+#error init and free vb properly

   
   if (dglen<DNS_HDRSIZE) {
     adns__diag(ads,serv,"received datagram too short for message header (%d)",dglen);
   
   if (dglen<DNS_HDRSIZE) {
     adns__diag(ads,serv,"received datagram too short for message header (%d)",dglen);


@@ -31,16 +32,19 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
   GET_W(cbyte,arcount);
   assert(cbyte == DNS_HDRSIZE);
 
   GET_W(cbyte,arcount);
   assert(cbyte == DNS_HDRSIZE);
 

+  flg_qr= f1&0x80;
+  opcode= (f1&0x78)>>3;

   flg_tc= f1&0x20;
   flg_tc= f1&0x20;

+  flg_rd= f1&0x01;

   flg_ra= f2&0x80;
   flg_ra= f2&0x80;

+  rcode= (f1&0x0f);

 
 

-  if (f1&0x80) {
+  if (flg_qr) {

     adns__diag(ads,serv,"server sent us a query, not a response");
     return;
   }
     adns__diag(ads,serv,"server sent us a query, not a response");
     return;
   }

-  if (f1&0x70) {
-    adns__diag(ads,serv,"server sent us unknown opcode %d (wanted 0=QUERY)",
-              (f1>>4)&0x70);
+  if (opcode) {
+    adns__diag(ads,serv,"server sent us unknown opcode %d (wanted 0=QUERY)",opcode);

     return;
   }
   if (!qdcount) {
     return;
   }
   if (!qdcount) {


@@ -69,34 +73,27 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
   LIST_UNLINK(ads->timew,qu);
   /* We're definitely going to do something with this query now */
   
   LIST_UNLINK(ads->timew,qu);
   /* We're definitely going to do something with this query now */
   

-  if (!(f1&0x01)) {
-    adns__diag(ads,serv,"server thinks we didn't ask for recursive lookup");
-    adns__query_fail(ads,qu,adns_s_serverfaulty);
-    return;
-  }
-
-  rcode= (f1&0x0f);

   switch (rcode) {
   case rcode_noerror:
   case rcode_nxdomain:
     break;
   case rcode_formaterror:
   switch (rcode) {
   case rcode_noerror:
   case rcode_nxdomain:
     break;
   case rcode_formaterror:

-    adns__warn(ads,serv,"server cannot understand our query (Format Error)");
+    adns__warn(ads,serv,qu,"server cannot understand our query (Format Error)");

     adns__query_fail(ads,qu,adns_s_serverfaulty);
     return;
   case rcode_servfail:
     adns__query_fail(ads,qu,adns_s_servfail);
     return;
   case rcode_notimp:
     adns__query_fail(ads,qu,adns_s_serverfaulty);
     return;
   case rcode_servfail:
     adns__query_fail(ads,qu,adns_s_servfail);
     return;
   case rcode_notimp:

-    adns__warn(ads,serv,"server claims not to implement our query");
+    adns__warn(ads,serv,qu,"server claims not to implement our query");

     adns__query_fail(ads,qu,adns_s_notimplemented);
     return;
   case rcode_refused:
     adns__query_fail(ads,qu,adns_s_notimplemented);
     return;
   case rcode_refused:

-    adns__warn(ads,serv,"server refused our query");
+    adns__warn(ads,serv,qu,"server refused our query");

     adns__query_fail(ads,qu,adns_s_refused);
     return;
   default:
     adns__query_fail(ads,qu,adns_s_refused);
     return;
   default:

-    adns__warn(ads,serv,"server gave unknown response code %d",rcode);
+    adns__warn(ads,serv,qu,"server gave unknown response code %d",rcode);

     adns__query_fail(ads,qu,adns_s_reasonunknown);
     return;
   }
     adns__query_fail(ads,qu,adns_s_reasonunknown);
     return;
   }


@@ -107,53 +104,57 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
   wantedrrs= 0;
   for (rri= 0; rri<ancount; rri++) {
     rrstart= cbyte;
   wantedrrs= 0;
   for (rri= 0; rri<ancount; rri++) {
     rrstart= cbyte;

-    if (qu->cnameoff >= 0) {
+    if (qu->cname_dgram >= 0) {

       st= adns__findrr(ads,serv, dgram,dglen,&cbyte,
                       &rrtype,&rrclass,&rdlength,&rdstart,
       st= adns__findrr(ads,serv, dgram,dglen,&cbyte,
                       &rrtype,&rrclass,&rdlength,&rdstart,

-                      dgram,dglen,qu->cnameoff, &ownermatched);
+                      qu->cname_dgram,qu->cname_dglen,qu->cname_begin, &ownermatched);

     } else {
     } else {

-      st= adns__get_rr_temp(ads,qu,serv, dgram,dglen,&cbyte,
-                           &rrtype,&rrclass,&rdlength,&rdstart,
-                           qu->querymsg,qu->querylen,DNS_HDRSIZE, &ownermatched);
+      st= adns__findrr(ads,serv, dgram,dglen,&cbyte,
+                      &rrtype,&rrclass,&rdlength,&rdstart,
+                      qu->querymsg,qu->querylen,DNS_HDRSIZE, &ownermatched);

     }
     if (st) adns__query_fail(ads,qu,st);
     if (rrtype == -1) goto x_truncated;
 
     if (rrclass != DNS_CLASS_IN) {
     }
     if (st) adns__query_fail(ads,qu,st);
     if (rrtype == -1) goto x_truncated;
 
     if (rrclass != DNS_CLASS_IN) {

-      adns__diag(ads,serv,"ignoring answer RR with wrong class %d (expected IN=%d)",
+      adns__diag(ads,serv,qu,"ignoring answer RR with wrong class %d (expected IN=%d)",

                 rrclass,DNS_CLASS_IN);
       continue;
     }
     if (!ownermatched) {
       if (ads->iflags & adns_if_debug) {
                 rrclass,DNS_CLASS_IN);
       continue;
     }
     if (!ownermatched) {
       if (ads->iflags & adns_if_debug) {

-       st= adns__get_domain_temp(ads,qu,serv, dgram,dglen,&rrstart,dglen, &ownerstart);
-       if (st)
-         adns__debug(ads,serv, "ignoring RR with an irrelevant owner"
-                     " whose format is bad, code %d",st);
-       else if (ownerstart>=0)
-         adns__debug(ads,serv, "ignoring RR with an irrelevant owner"
-                     " \"%s\"", qu->ans.buf+ownerstart);
-       else
-         adns__debug(ads,serv,"ignoring RR with an irrelevant truncated owner");
+       adns__debug(ads,serv,qu,"ignoring RR with an unexpected owner %s",
+                   adns__diag_domain(ads,serv,&vb,qu->flags,
+                                     dgram,dglen,rrstart,dglen));

       }
       continue;
     }
       }
       continue;
     }

-    if (qu->cnameoff<0 &&
-       (qu->typei->type & adns__rrt_typemask) != adns_r_cname &&
-       rrtype == adns_r_cname) { /* Ignore second and subsequent CNAMEs */
-      st= adns__get_domain_perm(ads,qu,serv, dgram,dglen,
-                               &rdstart,rdstart+rdlength,&qu->cnameoff);
-      if (st) { adns__query_fail(ads,qu,st); return; }
-      if (qu->cnameoff==-1) goto x_truncated;
-      /* If we find the answer section truncated after this point we restart
-       * the query at the CNAME; if beforehand then we obviously have to use
-       * TCP.  If there is no truncation we can use the whole answer if
-       * it contains the relevant info.
-       */
+    if (rrtype == adns_r_cname &&
+       (qu->typei->type & adns__rrt_typemask) != adns_r_cname) {
+      if (!qu->cname_str) { /* Ignore second and subsequent CNAMEs */
+       qu->cname_begin= rdstart;
+       qu->cname_dgram= dgram;
+       qu->cname_dglen= dglen;
+       st= adns__parse_domain(ads,serv,&vb,qu->flags,
+                              dgram,dglen, &rdstart,rdstart+rdlength);
+       if (!vb.used) goto x_truncated;
+       if (st) { adns__query_fail(ads,qu,st); return; }
+       qu->cname_str= adns__vbuf_extractstring(&vb);
+       /* If we find the answer section truncated after this point we restart
+        * the query at the CNAME; if beforehand then we obviously have to use
+        * TCP.  If there is no truncation we can use the whole answer if
+        * it contains the relevant info.
+        */
+      } else {
+       adns__debug(ads,serv,qu,"ignoring duplicate CNAME (%s, as well as %s)",
+                   adns__diag_domain(ads,serv,&vb,qu->flags,
+                                     dgram,dglen, rdstart,rdstart+rdlength),
+                   qu->cname_str);
+      }

     } else if (rrtype == (qu->typei->type & adns__rrt_typemask)) {
       wantedrrs++;
     } else {
     } else if (rrtype == (qu->typei->type & adns__rrt_typemask)) {
       wantedrrs++;
     } else {

-      adns__debug(ads,serv,"ignoring answer RR with irrelevant type %d",rrtype);
+      adns__debug(ads,serv,qu,"ignoring answer RR with irrelevant type %d",rrtype);

     }
   }
 
     }
   }
 


@@ -172,12 +173,14 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
     foundsoa= 0; foundns= 0;
     for (rri= 0; rri<nscount; rri++) {
       rrstart= cbyte;
     foundsoa= 0; foundns= 0;
     for (rri= 0; rri<nscount; rri++) {
       rrstart= cbyte;

-      st= adns__get_rr_temp(ads,qu,serv, dgram,dglen,&cbyte,
-                           &rrtype,&rrclass, &rdlength,&rdstart, 0,0,0,0);
+      st= adns__findrr(ads,serv, dgram,dglen,&cbyte,
+                      &rrtype,&rrclass,&rdlength,&rdstart,
+                      0,0,0,0);

       if (st) { adns__query_fail(ads,qu,st); return; }
       if (rrtype==-1) goto x_truncated;
       if (rrclass != DNS_CLASS_IN) {
       if (st) { adns__query_fail(ads,qu,st); return; }
       if (rrtype==-1) goto x_truncated;
       if (rrclass != DNS_CLASS_IN) {

-       adns__diag(ads,serv,"ignoring authority RR with wrong class %d (expected IN=%d)",
+       adns__diag(ads,serv,qu,
+                  "ignoring authority RR with wrong class %d (expected IN=%d)",

                   rrclass,DNS_CLASS_IN);
        continue;
       }
                   rrclass,DNS_CLASS_IN);
        continue;
       }


@@ -193,41 +196,58 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
 
     /* Now what ?  No relevant answers, no SOA, and at least some NS's.
      * Looks like a referral.  Just one last chance ... if we came across
 
     /* Now what ?  No relevant answers, no SOA, and at least some NS's.
      * Looks like a referral.  Just one last chance ... if we came across

-     * a CNAME then perhaps we should do our own CNAME lookup.
+     * a CNAME in this datagram then we should probably do our own CNAME
+     * lookup now in the hope that we won't get a referral again.

      */
      */

-    if (qu->cnameoff != -1) { cname_recurse(ads,qu,0); return; }
+    if (qu->cname_dgram == dgram) { cname_recurse(ads,qu,0); return; }

 
     /* Bloody hell, I thought we asked for recursion ? */
 
     /* Bloody hell, I thought we asked for recursion ? */

+    if (flg_rd) {
+      adns__diag(ads,serv,qu,"server thinks we didn't ask for recursive lookup");
+    }

     if (!flg_ra) {
     if (!flg_ra) {

-      adns__diag(ads,serv,"server is not willing to do recursive lookups for us");
+      adns__diag(ads,serv,qu,"server is not willing to do recursive lookups for us");

       adns__query_fail(ads,qu,adns_s_norecurse);
       adns__query_fail(ads,qu,adns_s_norecurse);

-      return;
+    } else {
+      adns__diag(ads,serv,qu,"server claims to do recursion, but gave us a referral");
+      adns__query_fail(ads,qu,adns_s_serverfaulty);

     }
     }

-    adns__diag(ads,serv,"server claims to do recursion, but gave us a referral");
-    adns__query_fail(ads,qu,adns_s_serverfaulty);

     return;
   }
 
   /* Now, we have some RRs which we wanted. */
 
     return;
   }
 
   /* Now, we have some RRs which we wanted. */
 

-  qu->rrsoff= adns__vbuf_malloc(&qu->ans,qu->typei->rrsz*wantedrrs);
-  if (qu->rrsoff == -1) adns__query_fail(ads,qu,adns_s_nolocalmem);
+  if (!adns__vbuf_ensure(&qu->ansbuf,qu->typei->rrsz*wantedrrs)) {
+    adns__query_fail(ads,qu,adns_s_nolocalmem);
+    return;
+  }

 
   cbyte= anstart;
   currentrrs= 0;
   arstart= -1;
 
   cbyte= anstart;
   currentrrs= 0;
   arstart= -1;

+  qu->ansbuf.used= 0;

   for (rri=0; rri<ancount; rri++) {
   for (rri=0; rri<ancount; rri++) {

-    st= adns__get_rr_temp(ads,qu,serv, dgram,dglen,&cbyte,
-                         &rrtype,&rrclass, &rdlength,&rdstart, 0,0,0,0);
+    if (qu->cname_dgram >= 0) {
+      st= adns__findrr(ads,serv, dgram,dglen,&cbyte,
+                      &rrtype,&rrclass,&rdlength,&rdstart,
+                      qu->cname_dgram,qu->cname_dglen,qu->cname_begin, &ownermatched);
+    } else {
+      st= adns__findrr(ads,serv, dgram,dglen,&cbyte,
+                      &rrtype,&rrclass,&rdlength,&rdstart,
+                      qu->querymsg,qu->querylen,DNS_HDRSIZE, &ownermatched);
+    }

     assert(!st); assert(rrtype != -1);
     if (rrclass != DNS_CLASS_IN ||
     assert(!st); assert(rrtype != -1);
     if (rrclass != DNS_CLASS_IN ||

-       rrtype != (qu->typei->type & adns__rrt_typemask))
+       rrtype != (qu->typei->type & adns__rrt_typemask) ||
+       !ownermatched)

       continue;
     assert(currentrrs<wantedrrs);
       continue;
     assert(currentrrs<wantedrrs);

-    st= qu->typei->get_fn(ads,qu,serv, dgram,dglen, &rdstart,rdstart+rdlength,
-                         nsstart,arcount,&arstart, qu->rrsoff,&currentrrs);
+    qu->ansbuf.used += quj->typei->rrsz;
+    st= qu->typei->parse(ads,qu,serv,&vb,
+                        dgram,dglen, &rdstart,rdstart+rdlength,
+                        (void*)(qu->ansbuf.buf+qu->ansbuf.used));

     if (st) { adns__query_fail(ads,qu,st); return; }
     if (st) { adns__query_fail(ads,qu,st); return; }

-    if (currentrrs==-1) goto x_truncated;
+    if (rdstart==-1) goto x_truncated;

   }
 
   /* This may have generated some child queries ... */
   }
 
   /* This may have generated some child queries ... */


@@ -242,13 +262,11 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
 
 x_truncated:
   if (!flg_tc) {
 
 x_truncated:
   if (!flg_tc) {

-    adns__diag(ads,serv,"server sent datagram which points outside itself");
+    adns__diag(ads,serv,qu,"server sent datagram which points outside itself");

     adns__query_fail(ads,qu,adns_s_serverfaulty);
     return;
   }
     adns__query_fail(ads,qu,adns_s_serverfaulty);
     return;
   }

-  if (qu->cnameoff != -1) { cname_recurse(ads,qu,adns_qf_usevc); return; }
-  qu->cnameoff= -1;
-  qu->rrsoff= -1;
+  if (qu->cname_dgram) { cname_recurse(ads,qu,adns_qf_usevc); return; }

   ans= (adns_answer*)qu->ans.buf;
   ans->nrrs= 0;
   qu->ans.used= sizeof(adns_answer);
   ans= (adns_answer*)qu->ans.buf;
   ans->nrrs= 0;
   qu->ans.used= sizeof(adns_answer);