X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Ftransmit.c;h=6136bf9b6e981b85b9088d279a866cec9fe4cde1;hp=edb79c305845ce5a63fe83d4a9c6ab0433dbe2ac;hb=d19b03d0267305c75f518c32a31424d2229fd06b;hpb=f7f83b4a88b5168130a7bb9cb3d3811eb8c1c260 diff --git a/src/transmit.c b/src/transmit.c index edb79c3..6136bf9 100644 --- a/src/transmit.c +++ b/src/transmit.c @@ -5,11 +5,11 @@ */ /* * This file is - * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1997-2000 Ian Jackson * * It is part of adns, which is - * Copyright (C) 1997-1999 Ian Jackson - * Copyright (C) 1999 Tony Finch + * Copyright (C) 1997-2000 Ian Jackson + * Copyright (C) 1999-2000 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 @@ -32,13 +32,15 @@ #include #include "internal.h" +#include "tvarith.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) -static adns_status mkquery_header(adns_state ads, vbuf *vb, int *id_r, int qdlen) { +static adns_status mkquery_header(adns_state ads, vbuf *vb, + int *id_r, int qdlen) { int id; byte *rqp; @@ -73,48 +75,74 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) { return adns_s_ok; } +adns_status adns__qdpl_normal(adns_state ads, + const char **p_io, const char *pe, int labelnum, + char label_r[], int *ll_io, + adns_queryflags flags, + const typeinfo *typei) { + int ll, c; + const char *p; + + ll= 0; + p= *p_io; + + while (p!=pe && (c= *p++)!='.') { + if (c=='\\') { + if (!(flags & adns_qf_quoteok_query)) return adns_s_querydomaininvalid; + if (ctype_digit(p[0])) { + if (p+1==pe || p+2==pe) return adns_s_querydomaininvalid; + if (ctype_digit(p[1]) && ctype_digit(p[2])) { + c= (*p++ - '0')*100; + c += (*p++ - '0')*10; + c += (*p++ - '0'); + if (c >= 256) return adns_s_querydomaininvalid; + } else { + return adns_s_querydomaininvalid; + } + } else if (!(c= *p++)) { + return adns_s_querydomaininvalid; + } + } + 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 == *ll_io) return adns_s_querydomaininvalid; + label_r[ll++]= c; + } + + *p_io= p; + *ll_io= ll; + 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; + int labelnum, ll, nbytes; + byte label[255]; + byte *rqp; const char *p, *pe; adns_status st; - st= mkquery_header(ads,vb,id_r,strlen(owner)+2); if (st) return st; + st= mkquery_header(ads,vb,id_r,ol+2); if (st) return st; MKQUERY_START(vb); p= owner; pe= owner+ol; - nlabs= 0; + nbytes= 0; + labelnum= 0; while (p!=pe) { - ll= 0; - while (p!=pe && (c= *p++)!='.') { - if (c=='\\') { - 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_querydomaininvalid; - } else { - return adns_s_querydomaininvalid; - } - } else if (!(c= *p++)) { - return adns_s_querydomaininvalid; - } - } - 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_querydomaininvalid; - label[ll++]= c; - } + ll= sizeof(label); + st= typei->qdparselabel(ads, &p,pe, labelnum++, label, &ll, flags, typei); + if (st) return st; if (!ll) return adns_s_querydomaininvalid; - if (nlabs++ > 63) return adns_s_querydomaintoolong; + if (ll > DNS_MAXLABEL) return adns_s_querydomaintoolong; + nbytes+= ll+1; + if (nbytes >= DNS_MAXDOMAIN) return adns_s_querydomaintoolong; MKQUERY_ADDB(ll); memcpy(rqp,label,ll); rqp+= ll; } @@ -128,7 +156,8 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r, } adns_status adns__mkquery_frdgram(adns_state ads, vbuf *vb, int *id_r, - const byte *qd_dgram, int qd_dglen, int qd_begin, + const byte *qd_dgram, int qd_dglen, + int qd_begin, adns_rrtype type, adns_queryflags flags) { byte *rqp; findlabel_state fls; @@ -171,7 +200,8 @@ void adns__querysend_tcp(adns_query qu, struct timeval now) { length[1]= (qu->query_dglen&0x0ff); ads= qu->ads; - if (!adns__vbuf_ensure(&ads->tcpsend,ads->tcpsend.used+qu->query_dglen+2)) return; + if (!adns__vbuf_ensure(&ads->tcpsend,ads->tcpsend.used+qu->query_dglen+2)) + return; qu->retries++; @@ -205,7 +235,8 @@ void adns__querysend_tcp(adns_query qu, struct timeval now) { wr-= 2; } if (wrquery_dglen) { - r= adns__vbuf_append(&ads->tcpsend,qu->query_dgram+wr,qu->query_dglen-wr); assert(r); + r= adns__vbuf_append(&ads->tcpsend,qu->query_dgram+wr,qu->query_dglen-wr); + assert(r); } } @@ -244,8 +275,13 @@ void adns__query_send(adns_query qu, struct timeval now) { r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0, (const struct sockaddr*)&servaddr,sizeof(servaddr)); - if (r<0 && errno == EMSGSIZE) { qu->retries= 0; query_usetcp(qu,now); return; } - if (r<0) adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno)); + if (r<0 && errno == EMSGSIZE) { + qu->retries= 0; + query_usetcp(qu,now); + return; + } + if (r<0 && errno != EAGAIN) + adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno)); qu->timeout= now; timevaladd(&qu->timeout,UDPRETRYMS);