timeout robustness: Track start time and duration

[adns.git] / src / event.c

diff --git a/src/event.c b/src/event.c
index 845bc690af88a80a3308d2ef3f5c89cb1baa3902..10d64b1da0c356575b7e5a50452e02f845ec1030 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -149,11 +149,6 @@ void adns__tcp_tryconnect(adns_state ads, struct timeval now) {
 
 /* Timeout handling functions. */
 
-void adns__timeout_set(adns_query qu, struct timeval now, int ms) {
-  qu->timeout_expires= now;
-  timevaladd(&qu->timeout_expires,ms);
-}
-
 void adns__must_gettimeofday(adns_state ads, const struct timeval **now_io,
                             struct timeval *tv_buf) {
   const struct timeval *now;
@@ -214,11 +209,16 @@ static void timeouts_queue(adns_state ads, int act,
                           struct timeval **tv_io, struct timeval *tvbuf,
                           struct timeval now, struct query_queue *queue) {
   adns_query qu, nqu;
+  struct timeval expires;
   
   for (qu= queue->head; qu; qu= nqu) {
     nqu= qu->next;
-    if (!timercmp(&now,&qu->timeout_expires,>)) {
-      inter_maxtoabs(tv_io,tvbuf,now,qu->timeout_expires);
+    if (timercmp(&now,&qu->timeout_started,<)) /* clock rewound */
+      qu->timeout_started= now;
+    expires= qu->timeout_started;
+    timevaladd(&expires, qu->timeout_ms);
+    if (!timercmp(&now,&expires,>)) {
+      inter_maxtoabs(tv_io,tvbuf,now,expires);
     } else {
       if (!act) { inter_immed(tv_io,tvbuf); return; }
       LIST_UNLINK(*queue,qu);