timeout robustness: Track start time and duration

[adns.git] / src / event.c

diff --git a/src/event.c b/src/event.c
index 28cc60cbeac9f40a09319020d8176a311883d4d6..10d64b1da0c356575b7e5a50452e02f845ec1030 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -209,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,>)) {
-      inter_maxtoabs(tv_io,tvbuf,now,qu->timeout);
+    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);