*query_r= qu;
- qu->query_dgram= malloc(qumsg_vb->used);
- if (!qu->query_dgram) {
- adns__query_fail(qu,adns_s_nolocalmem);
- return adns_s_ok;
+ qu->query_dglen= qumsg_vb->used;
+ if (qumsg_vb->used) {
+ qu->query_dgram= malloc(qumsg_vb->used);
+ if (!qu->query_dgram) {
+ adns__query_fail(qu,adns_s_nolocalmem);
+ return adns_s_ok;
+ }
+ memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);
+ } else {
+ qu->query_dgram= 0;
}
- memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);
qu->vb= *qumsg_vb;
adns__vbuf_init(qumsg_vb);
adns__vbuf_init(&vb);
ol= strlen(owner);
- if (ol<=1 || ol>DNS_MAXDOMAIN+1) { stat= adns_s_invaliddomain; goto xit; }
+ if (ol<=1 || ol>DNS_MAXDOMAIN+1) { stat= adns_s_domaintoolong; goto xit; }
if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_qf_search; ol--; }
abort(); /* fixme */
}
-void *adns__alloc_interim(adns_query qu, size_t sz) {
+static void *alloc_common(adns_query qu, size_t sz) {
allocnode *an;
+ if (!sz) return qu; /* Any old pointer will do */
assert(!qu->final_allocspace);
- sz= MEM_ROUND(sz);
an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
- if (!an) {
- adns__query_fail(qu,adns_s_nolocalmem);
- return 0;
- }
- qu->interim_allocd += sz;
+ if (!an) return 0;
an->next= qu->allocations;
qu->allocations= an;
return (byte*)an + MEM_ROUND(sizeof(*an));
}
+void *adns__alloc_interim(adns_query qu, size_t sz) {
+ sz= MEM_ROUND(sz);
+ qu->interim_allocd += sz;
+ return alloc_common(qu,sz);
+}
+
+void *adns__alloc_mine(adns_query qu, size_t sz) {
+ return alloc_common(qu,MEM_ROUND(sz));
+}
+
void *adns__alloc_final(adns_query qu, size_t sz) {
/* When we're in the _final stage, we _subtract_ from interim_alloc'd
* each allocation, and use final_allocspace to point to the next free
}
void adns__reset_cnameonly(adns_query qu) {
- assert(qu->final_allocspace);
+ assert(!qu->final_allocspace);
qu->answer->nrrs= 0;
qu->answer->rrs= 0;
qu->interim_allocd= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
allocnode *an, *ann;
int i;
- qu->answer= ans= realloc(qu->answer,
- MEM_ROUND(MEM_ROUND(sizeof(*ans)) +
- qu->interim_allocd));
- qu->final_allocspace= (byte*)qu->answer + MEM_ROUND(sizeof(*ans));
+ if (qu->answer->status == adns_s_nolocalmem && !qu->interim_allocd) {
+ ans= qu->answer;
+ } else {
+ ans= realloc(qu->answer,
+ MEM_ROUND(MEM_ROUND(sizeof(*ans)) + qu->interim_allocd));
+ if (!ans) {
+ qu->answer->cname= 0;
+ adns__query_fail(qu, adns_s_nolocalmem);
+ return;
+ }
+ qu->answer= ans;
+ }
+ qu->final_allocspace= (byte*)ans + MEM_ROUND(sizeof(*ans));
adns__makefinal_str(qu,&ans->cname);
if (ans->nrrs) {
char *before, *after;
before= *strp;
+ if (!before) return;
l= strlen(before)+1;
after= adns__alloc_final(qu,l);
memcpy(after,before,l);
}
void adns__makefinal_block(adns_query qu, void **blpp, size_t sz) {
- void *after;
+ void *before, *after;
+ before= *blpp;
+ if (!before) return;
after= adns__alloc_final(qu,sz);
- memcpy(after,*blpp,sz);
+ memcpy(after,before,sz);
*blpp= after;
}