X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/923ffa3f870b3eefbfb4f4580d1990da4d4e92f2..609133ee3365572c56ffa2ffb14d274ff47eb94b:/src/transmit.c diff --git a/src/transmit.c b/src/transmit.c index 47785e6..3b14822 100644 --- a/src/transmit.c +++ b/src/transmit.c @@ -39,7 +39,8 @@ #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; @@ -131,7 +132,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; @@ -174,7 +176,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++; @@ -208,7 +211,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); } } @@ -247,8 +251,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 && errno != EAGAIN) 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);