X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/f57665b944e0e4fe38d47ceb7b3940044b12773a..6064dcef170a17a3078f4d46afa43b1a1347f1d0:/src/transmit.c?ds=sidebyside diff --git a/src/transmit.c b/src/transmit.c index b97ffc6..08e49d0 100644 --- a/src/transmit.c +++ b/src/transmit.c @@ -5,10 +5,10 @@ */ /* * 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) 1997-2000 Ian Jackson * Copyright (C) 1999 Tony Finch * * This program is free software; you can redistribute it and/or modify @@ -115,9 +115,9 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r, label[ll++]= c; } if (!ll) return adns_s_querydomaininvalid; - if (ll > 63) return adns_s_querydomaintoolong; + if (ll > DNS_MAXLABEL) return adns_s_querydomaintoolong; nbytes+= ll+1; - if (nbytes > 254) return adns_s_querydomaintoolong; + if (nbytes >= DNS_MAXDOMAIN) return adns_s_querydomaintoolong; MKQUERY_ADDB(ll); memcpy(rqp,label,ll); rqp+= ll; } @@ -248,7 +248,7 @@ 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 != EAGAIN) adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno)); qu->timeout= now; timevaladd(&qu->timeout,UDPRETRYMS);