#include "internal.h"
adns_status adns__mkquery(adns_state ads, const char *owner, int ol, int id,
- adns_rrtype type, adns_queryflags flags, int *qml_r) {
- int ll, c, nlabs, qbufreq;
- unsigned char label[255], *nqbuf;
+ adns_rrtype type, adns_queryflags flags) {
+ /* Assembles a query packet in ads->rqbuf. */
+ int ll, c, nlabs;
+ unsigned char label[255], *rqp;
const char *p, *pe;
-#define MKQUERY_ADDB(b) *nqbuf++= (b)
+#define MKQUERY_ADDB(b) *rqp++= (b)
#define MKQUERY_ADDW(w) (MKQUERY_ADDB(((w)>>8)&0x0ff), MKQUERY_ADDB((w)&0x0ff))
- qbufreq= 12+strlen(owner)+3;
- if (ads->qbufavail < qbufreq) {
- nqbuf= realloc(ads->qbuf,qbufreq);
- if (!nqbuf) return adns_s_nolocalmem;
- ads->qbuf= nqbuf; ads->qbufavail= qbufreq;
- }
- nqbuf= ads->qbuf;
-
+ if (!vbuf_ensure(&ads->rqbuf,12+strlen(owner)+3)) return adns_s_nolocalmem;
+ rqp= ads->rqbuf.buf;
+
MKQUERY_ADDW(id);
MKQUERY_ADDB(0x01); /* QR=Q(0), OPCODE=QUERY(0000), !AA, !TC, RD */
MKQUERY_ADDB(0x00); /* !RA, Z=000, RCODE=NOERROR(0000) */
if (!ll) return adns_s_invaliddomain;
if (nlabs++ > 63) return adns_s_invaliddomain;
MKQUERY_ADDB(ll);
- memcpy(nqbuf,label,ll); nqbuf+= ll;
+ memcpy(rqp,label,ll); rqp+= ll;
} while (p!=pe);
MKQUERY_ADDB(0);
MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */
MKQUERY_ADDW(1); /* QCLASS=IN */
- *qml_r= nqbuf - ads->qbuf;
+ ads->rqbuf.used= rqp - ads->rqbuf.used;
+ assert(ads->rqbuf.used < ads->rqbuf.avail);
return adns_s_ok;
}
-static void quproc_tosend_tcp(adns_state ads, adns_query qu, struct timeval now) {
+void adns__query_tcp(adns_state ads, adns_query qu) {
+ /* Query must be in state tcpwait/timew; it will be moved to a new state
+ * if possible and no further processing can be done on it for now.
+ * (Resulting state is one of tcpwait/timew (if server not connected),
+ * tcpsent/timew, child/childw or done/output.)
+ *
+ * adns__tcp_tryconnect should already have been called - _tcp
+ * will only use an existing connection (if there is one), which it
+ * may break. If the conn list lost then the caller is responsible for any
+ * reestablishment and retry.
+ */
unsigned char length[2];
struct iovec iov[2];
+ if (ads->tcpstate != server_ok) return;
+
length[0]= (qu->querylen&0x0ff00U) >>8;
length[1]= (qu->querylen&0x0ff);
- adns__tcp_tryconnect(ads);
- /* fixme: try sending queries as soon as server comes up */
- /* fixme: use vbuf_ensure, and preallocate buffer space */
- if (ads->tcpstate != server_ok) return;
+ if (!vbuf_ensure(&ads->tcpsend,ads->tcpsend.used+qu->querylen+2)) return;
- DLIST_UNLINK(ads->tosend,qu);
timevaladd(&now,TCPMS);
qu->timeout= now;
qu->senttcpserver= ads->tcpserver;
DLIST_LINKTAIL(ads->timew,qu);
if (ads->opbufused) {
- r= 0;
+ wr= 0;
} else {
iov[0].iovbase= length;
iov[0].iov_len= 2;
iov[1].iovbase= qu->querymsg;
iov[1].iov_len= qu->querylen;
- r= writev(ads->tcpsocket,iov,2);
- if (r < 0) {
+ wr= writev(ads->tcpsocket,iov,2);
+ if (wr < 0) {
if (!(errno == EAGAIN || errno == EINTR || errno == ENOSPC ||
errno == ENOBUFS || errno == ENOMEM)) {
adns__tcp_broken(ads,"write",strerror(errno));
return;
}
- r= 0;
+ wr= 0;
}
}
-
- if (r < qu->querylen+2) {
- newopbufused= qu->opbufused + qu->querylen + 2 - r;
- if (newopbufused > ads->opbufavail) {
- newopbufavail= ads->newopbufused<<1;
- newopbuf= realloc(newopbufavail);
- if (!newopbuf) {
- DLIST_UNLINK(ads->timew,qu);
- query_fail(ads,qu,adns_s_nolocalmem);
- return;
- }
- ads->opbuf= newopbuf;
- ads->opbufavail= newopbufavail;
- }
- if (r<2) {
- memcpy(ads->opbuf+ads->opbufused,length+r,2-r);
- ads->opbufused += (2-r);
- r= 0;
- } else {
- r -= 2;
- }
- memcpy(ads->opbuf+ads->opbufused,qu->querymsg+r,qu->querylen-r);
- ads->opbufused= newopbufused;
+
+ if (wr<2) {
+ r= vbuf_append(&ads->tcpsend,length,2-wr); assert(r);
+ wr= 0;
+ } esle {
+ wr-= 2;
+ }
+ if (wr<qu->querylen) {
+ r= vbuf_append(&ads->tcpsend,qu->querymsg+wr,qu->querylen-wr); assert(r);
}
}
-void adns__quproc_tosend(adns_state ads, adns_query qu, struct timeval now) {
- /* Query must be on the `tosend' queue, and we guarantee to remove it.
+static void query_usetcp(adns_state ads, adns_query qu, struct timeval now) {
+ timevaladd(&now,TCPMS);
+ qu->timeout= now;
+ qu->state= query_tcpwait;
+ DLIST_LINKTAIL(ads->timew,qu);
+ adns__query_tcp(ads,qu);
+ adns__tcp_tryconnect(ads);
+}
+
+void adns__query_udp(adns_state ads, adns_query qu, struct timeval now) {
+ /* Query must be in state udp/NONE; it will be moved to a new state,
+ * and no further processing can be done on it for now.
+ * (Resulting state is one of udp/timew, tcpwait/timew (if server not connected),
+ * tcpsent/timew, child/childw or done/output.)
*/
struct sockaddr_in servaddr;
int serv;
- if (qu->nextudpserver == -1) { quproc_tosend_tcp(ads,qu,now); return; }
- if (qu->querylen > UDPMAXDGRAM) {
- qu->nextudpserver= -1;
- quproc_tosend_tcp(ads,qu,now);
+ assert(qu->state == query_udp);
+ if ((qu->flags & adns_f_usevc) ||
+ (qu->querylen > UDPMAXDGRAM)) {
+ query_usetcp(ads,qu,now);
return;
}
-
+
if (qu->udpretries >= UDPMAXRETRIES) {
- DLIST_UNLINK(ads->tosend,qu);
query_fail(ads,qu,adns_s_notresponding);
return;
}
servaddr.sin_port= htons(NSPORT);
r= sendto(ads->udpsocket,qu->querymsg,qu->querylen,0,&servaddr,sizeof(servaddr));
- if (r<0 && errno == EMSGSIZE) {
- qu->nextudpserver= -1;
- quproc_tosend_tcp(ads,qu,now); return;
- }
+ if (r<0 && errno == EMSGSIZE) { query_usetcp(ads,qu,now); return; }
if (r<0) warn("sendto %s failed: %s",inet_ntoa(servaddr.sin_addr),strerror(errno));
- DLIST_UNLINK(ads->tosend,qu);
timevaladd(&now,UDPRETRYMS);
qu->timeout= now;
qu->sentudp |= (1<<serv);
~ianmdlvl / adns.git / blobdiff