chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timeout robustness: Introduce adns__timeout_{set,clear}
[adns.git]
/
src
/
event.c
diff --git
a/src/event.c
b/src/event.c
index 28cc60cbeac9f40a09319020d8176a311883d4d6..845bc690af88a80a3308d2ef3f5c89cb1baa3902 100644
(file)
--- a/
src/event.c
+++ b/
src/event.c
@@
-149,6
+149,11
@@
void adns__tcp_tryconnect(adns_state ads, struct timeval now) {
/* Timeout handling functions. */
/* 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;
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;
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);
} else {
if (!act) { inter_immed(tv_io,tvbuf); return; }
LIST_UNLINK(*queue,qu);