#include <errno.h>
#include <string.h>
+#include <stdlib.h>
#include <sys/uio.h>
#include "internal.h"
adns_status adns__mkquery(adns_state ads, const char *owner, int ol, int id,
- adns_rrtype type, adns_queryflags flags) {
+ const typeinfo *typei, adns_queryflags flags) {
/* Assembles a query packet in ads->rqbuf. */
int ll, c, nlabs;
byte label[255], *rqp;
#define MKQUERY_ADDB(b) *rqp++= (b)
#define MKQUERY_ADDW(w) (MKQUERY_ADDB(((w)>>8)&0x0ff), MKQUERY_ADDB((w)&0x0ff))
- if (!adns__vbuf_ensure(&ads->rqbuf,12+strlen(owner)+3)) return adns_s_nolocalmem;
+ if (!adns__vbuf_ensure(&ads->rqbuf,DNS_HDRSIZE+strlen(owner)+1+5))
+ return adns_s_nolocalmem;
rqp= ads->rqbuf.buf;
MKQUERY_ADDW(id);
if (!(flags & adns_qf_anyquote)) {
if (ctype_digit(c) || c == '-') {
if (!ll) return adns_s_invaliddomain;
- } else if ((c < 'a' || c > 'z') && (c < 'A' && c > 'Z')) {
+ } else if (!ctype_alpha(c)) {
return adns_s_invaliddomain;
}
}
} while (p!=pe);
MKQUERY_ADDB(0);
- MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */
- MKQUERY_ADDW(1); /* QCLASS=IN */
+ MKQUERY_ADDW(typei->type & adns__rrt_typemask); /* QTYPE */
+ MKQUERY_ADDW(DNS_CLASS_IN); /* QCLASS=IN */
ads->rqbuf.used= rqp - ads->rqbuf.buf;
- assert(ads->rqbuf.used < ads->rqbuf.avail);
+ assert(ads->rqbuf.used <= ads->rqbuf.avail);
return adns_s_ok;
}
int serv, r;
assert(qu->state == query_udp);
- if ((qu->flags & adns_qf_usevc) || (qu->querylen > MAXUDPDGRAM)) {
+ if ((qu->flags & adns_qf_usevc) || (qu->querylen > DNS_MAXUDP)) {
query_usetcp(ads,qu,now);
return;
}
- if (qu->udpretries >= MAXUDPRETRIES) {
+ if (qu->udpretries >= UDPMAXRETRIES) {
adns__query_fail(ads,qu,adns_s_timeout);
return;
}
memset(&servaddr,0,sizeof(servaddr));
servaddr.sin_family= AF_INET;
servaddr.sin_addr= ads->servers[serv].addr;
- servaddr.sin_port= htons(NSPORT);
+ servaddr.sin_port= htons(DNS_PORT);
r= sendto(ads->udpsocket,qu->querymsg,qu->querylen,0,&servaddr,sizeof(servaddr));
if (r<0 && errno == EMSGSIZE) { query_usetcp(ads,qu,now); return; }
LIST_LINK_TAIL(ads->timew,qu);
}
-void adns__query_nomem(adns_state ads, adns_query qu) {
- qu->answer.used= 0;
+static void adns__query_done(adns_state ads, adns_query qu) {
+ adns_answer *ans;
+ allocnode *an, *ann;
+
+ qu->answer= ans= realloc(qu->answer,
+ MEM_ROUND(MEM_ROUND(sizeof(*ans)) +
+ qu->interim_allocd));
+ qu->final_used= MEM_ROUND(sizeof(*ans));
+
+ adns__makefinal_str(qu,&ans->cname);
+ if (ans->nrrs) {
+ adns__makefinal_block(qu,&ans->rrs.untyped,ans->rrsz*ans->nrrs);
+ for (i=0; i<ans->nrrs; i++)
+ qu->typei->makefinal(ads,qu,ans->rrs.bytes+ans->rrsz*i);
+ }
+
+ for (an= qu->allocations; an; an= ann) { ann= an->next; free(an); }
+
+ adns__vbuf_free(&qu->vb);
+
qu->id= -1;
LIST_LINK_TAIL(ads->output,qu);
}
-void adns__query_fail(adns_state ads, adns_query qu, adns_status stat) {
- adns_answer *ans;
+void adns__reset_cnameonly(adns_state ads, adns_query qu) {
+ qu->answer->nrrs= 0;
+ qu->answer->rrs= 0;
+ qu->permalloclen= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
+}
- if (!adns__vbuf_ensure(&qu->answer,sizeof(adns_answer))) {
- adns__query_nomem(ads,qu);
- return;
- }
- ans= (adns_answer*)qu->answer.buf;
- ans->status= stat;
- ans->cname= 0;
- ans->type= qu->type;
- ans->nrrs= 0;
- qu->answer.used= sizeof(adns_answer);
- qu->id= -1;
- LIST_LINK_TAIL(ads->output,qu);
+void adns__query_fail(adns_state ads, adns_query qu, adns_status stat) {
+ adns__reset_cnameonly(ads,qu);
+ qu->answer->status= stat;
+ qu->answer->type= qu->type;
+ adns__query_done(ads,qu,stat);
}