* - main handling and parsing routine for received datagrams
*/
/*
- * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ * This file is
+ * Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ * It is part of adns, which is
+ * Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ * Copyright (C) 1999 Tony Finch <dot@dotat.at>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*/
#include <stdlib.h>
-#include <string.h>
#include "internal.h"
qdcount);
return;
}
- for (qu= ads->timew.head; qu; qu= nqu) {
+ for (qu= viatcp ? ads->tcpw.head : ads->udpw.head; qu; qu= nqu) {
nqu= qu->next;
if (qu->id != id) continue;
if (dglen < qu->query_dglen) continue;
qu->query_dglen-DNS_HDRSIZE))
continue;
if (viatcp) {
- if (qu->state != query_tcpsent) continue;
+ assert(qu->state == query_tcpw);
} else {
- if (qu->state != query_tosend) continue;
+ assert(qu->state == query_tosend);
if (!(qu->udpsent & (1<<serv))) continue;
}
break;
anstart= qu->query_dglen;
arstart= -1;
- LIST_UNLINK(ads->timew,qu);
+ if (viatcp) LIST_UNLINK(ads->tcpw,qu);
+ else LIST_UNLINK(ads->udpw,qu);
/* We're definitely going to do something with this query now */
switch (rcode) {
if (qu->flags & adns_qf_cname_forbid) {
adns__query_fail(qu,adns_s_prohibitedcname);
return;
- } else if (!qu->cname_dgram) { /* Ignore second and subsequent CNAMEs */
+ } else if (qu->cname_dgram) { /* Ignore second and subsequent CNAME(s) */
+ adns__debug(ads,serv,qu,"allegedly canonical name %s is actually alias for %s",
+ qu->answer->cname,
+ adns__diag_domain(ads,serv,qu, &qu->vb, dgram,dglen,rdstart));
+ adns__query_fail(qu,adns_s_prohibitedcname);
+ return;
+ } else if (wantedrrs) { /* Ignore CNAME(s) after RR(s). */
+ adns__debug(ads,serv,qu,"ignoring CNAME (to %s) coexisting with RR",
+ adns__diag_domain(ads,serv,qu, &qu->vb, dgram,dglen,rdstart));
+ } else {
qu->cname_begin= rdstart;
qu->cname_dglen= dglen;
st= adns__parse_domain(ads,serv,qu, &qu->vb,
* 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,qu, &qu->vb, dgram,dglen,rdstart),
- qu->answer->cname);
}
} else if (rrtype == (qu->typei->type & adns__rrt_typemask)) {
wantedrrs++;
/* This may have generated some child queries ... */
if (qu->children.head) {
- qu->state= query_child;
+ qu->state= query_childw;
LIST_LINK_TAIL(ads->childw,qu);
return;
}
memcpy(newquery,qu->vb.buf,qu->vb.used);
}
- if (qu->state == query_tcpsent) qu->state= query_tosend;
+ if (qu->state == query_tcpw) qu->state= query_tosend;
+ qu->retries= 0;
adns__reset_preserved(qu);
adns__query_send(qu,now);
}