timeout robustness: Introduce adns__timeout_{set,clear}

[adns.git] / src / event.c

diff --git a/src/event.c b/src/event.c
index 903426025dce94fa8b14f1498962a029bd0e50c5..845bc690af88a80a3308d2ef3f5c89cb1baa3902 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -6,7 +6,7 @@
  */
 /*
  *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016  Ian Jackson
+ *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
  *    Copyright (C) 2014  Mark Wooding
  *    Copyright (C) 1999-2000,2003,2006  Tony Finch
  *    Copyright (C) 1991 Massachusetts Institute of Technology
@@ -149,6 +149,11 @@ 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;
@@ -212,8 +217,8 @@ static void timeouts_queue(adns_state ads, int act,
   
   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_expires,>)) {
+      inter_maxtoabs(tv_io,tvbuf,now,qu->timeout_expires);
     } else {
       if (!act) { inter_immed(tv_io,tvbuf); return; }
       LIST_UNLINK(*queue,qu);