X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftransmit.c;h=4590a16c7f74c95eb3b0dce8b84aeb827c628eaf;hb=3ccea6ee865ecd08265da4b047bdf5ae45844e33;hp=c3ae94d45a3b81b516150ad88739c3786dfa319a;hpb=ffbda80c54147d112c125f208f6611daf09358b3;p=adns.git diff --git a/src/transmit.c b/src/transmit.c index c3ae94d..4590a16 100644 --- a/src/transmit.c +++ b/src/transmit.c @@ -4,7 +4,12 @@ * - send queries */ /* - * This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1999 Tony Finch * * 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 @@ -22,29 +27,27 @@ */ #include -#include +#include #include #include "internal.h" -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, id; - byte label[255], *rqp; - const char *p, *pe; - +#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; + vb->used= 0; + MKQUERY_START(vb); + *id_r= id= (ads->nextid++) & 0x0ffff; - MKQUERY_ADDW(id); MKQUERY_ADDB(0x01); /* QR=Q(0), OPCODE=QUERY(0000), !AA, !TC, RD */ MKQUERY_ADDB(0x00); /* !RA, Z=000, RCODE=NOERROR(0000) */ @@ -52,47 +55,104 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r, 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_invalidquerydomain; - do { + while (p!=pe) { ll= 0; while (p!=pe && (c= *p++)!='.') { if (c=='\\') { - if (!(flags & adns_qf_anyquote)) return adns_s_invalidquerydomain; + 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_invalidquerydomain; + if (c >= 256) return adns_s_querydomaininvalid; } else { - return adns_s_invalidquerydomain; + return adns_s_querydomaininvalid; } } else if (!(c= *p++)) { - return adns_s_invalidquerydomain; + return adns_s_querydomaininvalid; } } - if (!(flags & adns_qf_anyquote)) { + if (!(flags & adns_qf_quoteok_query)) { if (c == '-') { - if (!ll) return adns_s_invalidquerydomain; + if (!ll) return adns_s_querydomaininvalid; } else if (!ctype_alpha(c) && !ctype_digit(c)) { - return adns_s_invalidquerydomain; + return adns_s_querydomaininvalid; } } - if (ll == sizeof(label)) return adns_s_invalidquerydomain; + if (ll == sizeof(label)) return adns_s_querydomaininvalid; label[ll++]= c; } - if (!ll) return adns_s_invalidquerydomain; - if (nlabs++ > 63) return adns_s_domaintoolong; + 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; } @@ -114,7 +174,6 @@ void adns__query_tcp(adns_query qu, struct timeval now) { timevaladd(&now,TCPMS); qu->timeout= now; qu->state= query_tcpsent; - LIST_LINK_TAIL(ads->timew,qu); if (ads->tcpsend.used) { wr= 0; @@ -123,7 +182,9 @@ void adns__query_tcp(adns_query qu, struct timeval now) { iov[0].iov_len= 2; iov[1].iov_base= qu->query_dgram; iov[1].iov_len= qu->query_dglen; + adns__sigpipe_protect(qu->ads); wr= writev(qu->ads->tcpsocket,iov,2); + adns__sigpipe_unprotect(qu->ads); if (wr < 0) { if (!(errno == EAGAIN || errno == EINTR || errno == ENOSPC || errno == ENOBUFS || errno == ENOMEM)) { @@ -154,12 +215,12 @@ static void query_usetcp(adns_query qu, struct timeval now) { adns__tcp_tryconnect(qu->ads,now); } -void adns__query_udp(adns_query qu, struct timeval now) { +void adns__query_send(adns_query qu, struct timeval now) { struct sockaddr_in servaddr; int serv, r; adns_state ads; - assert(qu->state == query_udp); + assert(qu->state == query_tosend); if ((qu->flags & adns_qf_usevc) || (qu->query_dglen > DNS_MAXUDP)) { query_usetcp(qu,now); return; @@ -178,7 +239,8 @@ void adns__query_udp(adns_query qu, struct timeval now) { 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)); + r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0, + (const struct sockaddr*)&servaddr,sizeof(servaddr)); if (r<0 && errno == EMSGSIZE) { query_usetcp(qu,now); return; } if (r<0) adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno));