First record and playback works.

[adns.git] / src / event.c

diff --git a/src/event.c b/src/event.c
index dcf0adb0c5f7dced70a0333cbf63cbdbe5c85ab6..d42afbd15df2e9be1e806759f94063ef662cb1b1 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -51,7 +51,7 @@ void adns__tcp_broken(adns_state ads, const char *what, const char *why) {
     qu->tcpfailed |= (1<<serv);
     if (qu->tcpfailed == (1<<ads->nservers)-1) {
       LIST_UNLINK(ads->timew,qu);
-      adns__query_fail(ads,qu,adns_s_allservfail);
+      adns__query_fail(qu,adns_s_allservfail);
     }
   }
 
@@ -68,7 +68,7 @@ static void tcp_connected(adns_state ads, struct timeval now) {
     nqu= qu->next;
     if (qu->state == query_udp) continue;
     assert (qu->state == query_tcpwait);
-    adns__query_tcp(ads,qu,now);
+    adns__query_tcp(qu,now);
   }
 }
 
@@ -125,16 +125,16 @@ static void inter_maxto(struct timeval **tv_io, struct timeval *tvbuf,
   } else {
     if (timercmp(rbuf,&maxto,>)) *rbuf= maxto;
   }
-fprintf(stderr,"inter_maxto maxto=%ld.%06ld result=%ld.%06ld\n",
-       maxto.tv_sec,maxto.tv_usec,(**tv_io).tv_sec,(**tv_io).tv_usec);
+/*fprintf(stderr,"inter_maxto maxto=%ld.%06ld result=%ld.%06ld\n",
+       maxto.tv_sec,maxto.tv_usec,(**tv_io).tv_sec,(**tv_io).tv_usec);*/
 }
 
 static void inter_maxtoabs(struct timeval **tv_io, struct timeval *tvbuf,
                           struct timeval now, struct timeval maxtime) {
   ldiv_t dr;
 
-fprintf(stderr,"inter_maxtoabs now=%ld.%06ld maxtime=%ld.%06ld\n",
-       now.tv_sec,now.tv_usec,maxtime.tv_sec,maxtime.tv_usec);
+/*fprintf(stderr,"inter_maxtoabs now=%ld.%06ld maxtime=%ld.%06ld\n",
+       now.tv_sec,now.tv_usec,maxtime.tv_sec,maxtime.tv_usec);*/
   if (!tv_io) return;
   maxtime.tv_sec -= (now.tv_sec+2);
   maxtime.tv_usec -= (now.tv_usec-2000000);
@@ -160,9 +160,9 @@ static void checktimeouts(adns_state ads, struct timeval now,
     if (timercmp(&now,&qu->timeout,>)) {
       LIST_UNLINK(ads->timew,qu);
       if (qu->state != query_udp) {
-       adns__query_fail(ads,qu,adns_s_timeout);
+       adns__query_fail(qu,adns_s_timeout);
       } else {
-       adns__query_udp(ads,qu,now);
+       adns__query_udp(qu,now);
       }
     } else {
       inter_maxtoabs(tv_io,tvbuf,now,qu->timeout);
@@ -177,9 +177,9 @@ void adns_interest(adns_state ads, int *maxfd,
   struct timeval tvto_lr;
   int r;
   
-fprintf(stderr,"adns_interest\n");
+/*fprintf(stderr,"adns_interest\n");*/
 
-r= gettimeofday(&now,0);
+  r= gettimeofday(&now,0);
   if (r) {
     adns__warn(ads,-1,0,"gettimeofday failed - will sleep for a bit: %s",
               strerror(errno));
@@ -201,6 +201,7 @@ r= gettimeofday(&now,0);
     inter_addfd(maxfd,readfds,ads->tcpsocket);
     inter_addfd(maxfd,exceptfds,ads->tcpsocket);
     if (ads->tcpsend.used) inter_addfd(maxfd,writefds,ads->tcpsocket);
+    break;
   default:
     abort();
   }
@@ -230,7 +231,7 @@ static int internal_callback(adns_state ads, int maxfd,
     if (callb_checkfd(maxfd,writefds,ads->tcpsocket)) {
       count++;
       assert(ads->tcprecv.used==0);
-      adns__vbuf_ensure(&ads->tcprecv,1);
+      if (!adns__vbuf_ensure(&ads->tcprecv,1)) return -1;
       if (ads->tcprecv.buf) {
        r= read(ads->tcpsocket,&ads->tcprecv.buf,1);
        if (r==0 || (r<0 && (errno==EAGAIN || errno==EWOULDBLOCK))) {
@@ -263,8 +264,10 @@ static int internal_callback(adns_state ads, int maxfd,
        }
        ads->tcprecv.used -= skip;
        memmove(ads->tcprecv.buf,ads->tcprecv.buf+skip,ads->tcprecv.used);
-       adns__vbuf_ensure(&ads->tcprecv,want);
-       if (ads->tcprecv.used >= ads->tcprecv.avail) break;
+       skip= 0;
+       if (!adns__vbuf_ensure(&ads->tcprecv,want)) return -1;
+       assert(ads->tcprecv.used <= ads->tcprecv.avail);
+       if (ads->tcprecv.used == ads->tcprecv.avail) continue;
        r= read(ads->tcpsocket,
                ads->tcprecv.buf+ads->tcprecv.used,
                ads->tcprecv.avail-ads->tcprecv.used);
@@ -292,6 +295,7 @@ static int internal_callback(adns_state ads, int maxfd,
        memmove(ads->tcpsend.buf,ads->tcpsend.buf+r,ads->tcpsend.used);
       }
     }
+    break;
   default:
     abort();
   }
@@ -370,7 +374,7 @@ static int internal_check(adns_state ads,
   }
   LIST_UNLINK(ads->output,qu);
   *answer= qu->answer;
-  if (context_r) *context_r= qu->context.ext;
+  if (context_r) *context_r= qu->ctx.ext;
   free(qu);
   return 0;
 }
@@ -390,7 +394,10 @@ int adns_wait(adns_state ads,
     FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds);
     adns_interest(ads,&maxfd,&readfds,&writefds,&exceptfds,&tvp,&tvbuf);
     rsel= select(maxfd,&readfds,&writefds,&exceptfds,tvp);
-    if (rsel==-1) return r;
+    if (rsel==-1) {
+      if (errno == EINTR && !(ads->iflags & adns_if_eintr)) continue;
+      return errno;
+    }
     rcb= adns_callback(ads,maxfd,&readfds,&writefds,&exceptfds);
     assert(rcb==rsel);
   }