* - send queries
*/
/*
- * This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+ * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
*
* 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
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "internal.h"
+#include <errno.h>
+#include <string.h>
-adns_status adns__mkquery(adns_state ads, vbuf *vb,
- const char *owner, int ol, int *id_r,
- const typeinfo *typei, adns_queryflags flags) {
- int ll, c, nlabs, id;
- byte label[255], *rqp;
- const char *p, *pe;
+#include <sys/uio.h>
+
+#include "internal.h"
+#define MKQUERY_START(vb) (rqp= (vb)->buf+(vb)->used)
#define MKQUERY_ADDB(b) *rqp++= (b)
#define MKQUERY_ADDW(w) (MKQUERY_ADDB(((w)>>8)&0x0ff), MKQUERY_ADDB((w)&0x0ff))
+#define MKQUERY_STOP(vb) ((vb)->used= rqp-(vb)->buf)
- vb->used= 0;
- if (!adns__vbuf_ensure(vb,DNS_HDRSIZE+strlen(owner)+1+5))
- return adns_s_nolocalmem;
- rqp= vb->buf;
+static adns_status mkquery_header(adns_state ads, vbuf *vb, int *id_r, int qdlen) {
+ int id;
+ byte *rqp;
+
+ if (!adns__vbuf_ensure(vb,DNS_HDRSIZE+qdlen+4)) return adns_s_nomemory;
*id_r= id= (ads->nextid++) & 0x0ffff;
-
+
+ vb->used= 0;
+ MKQUERY_START(vb);
+
MKQUERY_ADDW(id);
MKQUERY_ADDB(0x01); /* QR=Q(0), OPCODE=QUERY(0000), !AA, !TC, RD */
MKQUERY_ADDB(0x00); /* !RA, Z=000, RCODE=NOERROR(0000) */
MKQUERY_ADDW(0); /* ANCOUNT=0 */
MKQUERY_ADDW(0); /* NSCOUNT=0 */
MKQUERY_ADDW(0); /* ARCOUNT=0 */
+
+ MKQUERY_STOP(vb);
+
+ return adns_s_ok;
+}
+
+static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
+ byte *rqp;
+
+ MKQUERY_START(vb);
+ MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */
+ MKQUERY_ADDW(DNS_CLASS_IN); /* QCLASS=IN */
+ MKQUERY_STOP(vb);
+ assert(vb->used <= vb->avail);
+
+ return adns_s_ok;
+}
+
+adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
+ const char *owner, int ol,
+ const typeinfo *typei, adns_queryflags flags) {
+ int ll, c, nlabs;
+ byte label[255], *rqp;
+ const char *p, *pe;
+ adns_status st;
+
+ st= mkquery_header(ads,vb,id_r,strlen(owner)+2); if (st) return st;
+
+ MKQUERY_START(vb);
+
p= owner; pe= owner+ol;
nlabs= 0;
- if (!*p) return adns_s_invaliddomain;
+ if (!*p) return adns_s_querydomaininvalid;
do {
ll= 0;
while (p!=pe && (c= *p++)!='.') {
if (c=='\\') {
- if (!(flags & adns_qf_anyquote)) return adns_s_invaliddomain;
+ if (!(flags & adns_qf_quoteok_query)) return adns_s_querydomaininvalid;
if (ctype_digit(p[0])) {
if (ctype_digit(p[1]) && ctype_digit(p[2])) {
c= (*p++ - '0')*100 + (*p++ - '0')*10 + (*p++ - '0');
- if (c >= 256) return adns_s_invaliddomain;
+ if (c >= 256) return adns_s_querydomaininvalid;
} else {
- return adns_s_invaliddomain;
+ return adns_s_querydomaininvalid;
}
} else if (!(c= *p++)) {
- return adns_s_invaliddomain;
+ return adns_s_querydomaininvalid;
}
}
- if (!(flags & adns_qf_anyquote)) {
- if (ctype_digit(c) || c == '-') {
- if (!ll) return adns_s_invaliddomain;
- } else if (!ctype_alpha(c)) {
- return adns_s_invaliddomain;
+ if (!(flags & adns_qf_quoteok_query)) {
+ if (c == '-') {
+ if (!ll) return adns_s_querydomaininvalid;
+ } else if (!ctype_alpha(c) && !ctype_digit(c)) {
+ return adns_s_querydomaininvalid;
}
}
- if (ll == sizeof(label)) return adns_s_invaliddomain;
+ if (ll == sizeof(label)) return adns_s_querydomaininvalid;
label[ll++]= c;
}
- if (!ll) return adns_s_invaliddomain;
- if (nlabs++ > 63) return adns_s_invaliddomain;
+ if (!ll) return adns_s_querydomaininvalid;
+ if (nlabs++ > 63) return adns_s_querydomaintoolong;
MKQUERY_ADDB(ll);
memcpy(rqp,label,ll); rqp+= ll;
} while (p!=pe);
+ MKQUERY_ADDB(0);
+
+ MKQUERY_STOP(vb);
+
+ st= mkquery_footer(vb,typei->type);
+
+ return adns_s_ok;
+}
+adns_status adns__mkquery_frdgram(adns_state ads, vbuf *vb, int *id_r,
+ const byte *qd_dgram, int qd_dglen, int qd_begin,
+ adns_rrtype type, adns_queryflags flags) {
+ byte *rqp;
+ findlabel_state fls;
+ int lablen, labstart;
+ adns_status st;
+
+ st= mkquery_header(ads,vb,id_r,qd_dglen); if (st) return st;
+
+ MKQUERY_START(vb);
+
+ adns__findlabel_start(&fls,ads,-1,0,qd_dgram,qd_dglen,qd_dglen,qd_begin,0);
+ for (;;) {
+ st= adns__findlabel_next(&fls,&lablen,&labstart); assert(!st);
+ if (!lablen) break;
+ assert(lablen<255);
+ MKQUERY_ADDB(lablen);
+ memcpy(rqp,qd_dgram+labstart,lablen);
+ rqp+= lablen;
+ }
MKQUERY_ADDB(0);
- MKQUERY_ADDW(typei->type & adns__rrt_typemask); /* QTYPE */
- MKQUERY_ADDW(DNS_CLASS_IN); /* QCLASS=IN */
- vb->used= rqp - vb->buf;
- assert(vb->used <= vb->avail);
+ MKQUERY_STOP(vb);
+
+ st= mkquery_footer(vb,type);
return adns_s_ok;
}
-void adns__query_tcp(adns_state ads, adns_query qu, struct timeval now) {
+void adns__query_tcp(adns_query qu, struct timeval now) {
byte length[2];
struct iovec iov[2];
int wr, r;
+ adns_state ads;
- if (ads->tcpstate != server_ok) return;
+ if (qu->ads->tcpstate != server_ok) return;
length[0]= (qu->query_dglen&0x0ff00U) >>8;
length[1]= (qu->query_dglen&0x0ff);
-
+
+ ads= qu->ads;
if (!adns__vbuf_ensure(&ads->tcpsend,ads->tcpsend.used+qu->query_dglen+2)) return;
timevaladd(&now,TCPMS);
qu->timeout= now;
qu->state= query_tcpsent;
- LIST_LINK_TAIL(ads->timew,qu);
if (ads->tcpsend.used) {
wr= 0;
iov[0].iov_len= 2;
iov[1].iov_base= qu->query_dgram;
iov[1].iov_len= qu->query_dglen;
- wr= writev(ads->tcpsocket,iov,2);
+ wr= writev(qu->ads->tcpsocket,iov,2);
if (wr < 0) {
if (!(errno == EAGAIN || errno == EINTR || errno == ENOSPC ||
errno == ENOBUFS || errno == ENOMEM)) {
}
}
-static void query_usetcp(adns_state ads, adns_query qu, struct timeval now) {
+static void query_usetcp(adns_query qu, struct timeval now) {
timevaladd(&now,TCPMS);
qu->timeout= now;
qu->state= query_tcpwait;
- LIST_LINK_TAIL(ads->timew,qu);
- adns__query_tcp(ads,qu,now);
- adns__tcp_tryconnect(ads,now);
+ LIST_LINK_TAIL(qu->ads->timew,qu);
+ adns__query_tcp(qu,now);
+ adns__tcp_tryconnect(qu->ads,now);
}
-void adns__query_udp(adns_state ads, adns_query qu, struct timeval now) {
+void adns__query_udp(adns_query qu, struct timeval now) {
struct sockaddr_in servaddr;
int serv, r;
+ adns_state ads;
assert(qu->state == query_udp);
if ((qu->flags & adns_qf_usevc) || (qu->query_dglen > DNS_MAXUDP)) {
- query_usetcp(ads,qu,now);
+ query_usetcp(qu,now);
return;
}
if (qu->udpretries >= UDPMAXRETRIES) {
- adns__query_fail(ads,qu,adns_s_timeout);
+ adns__query_fail(qu,adns_s_timeout);
return;
}
serv= qu->udpnextserver;
memset(&servaddr,0,sizeof(servaddr));
+
+ ads= qu->ads;
servaddr.sin_family= AF_INET;
servaddr.sin_addr= ads->servers[serv].addr;
servaddr.sin_port= htons(DNS_PORT);
r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0,&servaddr,sizeof(servaddr));
- if (r<0 && errno == EMSGSIZE) { query_usetcp(ads,qu,now); return; }
+ if (r<0 && errno == EMSGSIZE) { query_usetcp(qu,now); return; }
if (r<0) adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno));
timevaladd(&now,UDPRETRYMS);
~mdw / adns / blobdiff