X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftransmit.c;h=4590a16c7f74c95eb3b0dce8b84aeb827c628eaf;hb=70ad7a2a18f5371981c377d0c1938e7b0a970655;hp=d0b9d9514ef6b50653e1ae9ab25b6fb508b004db;hpb=ac868fa87da18cdebb86103b35ce250bd171f700;p=adns.git

diff --git a/src/transmit.c b/src/transmit.c
index d0b9d95..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-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
  *  
  *  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,8 +27,8 @@
  */
 
 #include <errno.h>
-#include <string.h>
 
+#include <sys/types.h>
 #include <sys/uio.h>
 
 #include "internal.h"
@@ -39,11 +44,10 @@ static adns_status mkquery_header(adns_state ads, vbuf *vb, int *id_r, int qdlen
   
   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);
   
+  *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) */
@@ -83,8 +87,7 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 
   p= owner; pe= owner+ol;
   nlabs= 0;
-  if (!*p) return adns_s_querydomaininvalid;
-  do {
+  while (p!=pe) {
     ll= 0;
     while (p!=pe && (c= *p++)!='.') {
       if (c=='\\') {
@@ -114,7 +117,7 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
     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);
@@ -212,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;
@@ -236,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));